perfsonar-dev - [GEANT/SA2/ps-java-services] r5609 - in trunk/perfsonar-java-xml-ls: packaging/deb packaging/rpm src/main/resources/perfsonar/conf
Subject: perfsonar development work
List archive
[GEANT/SA2/ps-java-services] r5609 - in trunk/perfsonar-java-xml-ls: packaging/deb packaging/rpm src/main/resources/perfsonar/conf
Chronological Thread
- From:
- To:
- Subject: [GEANT/SA2/ps-java-services] r5609 - in trunk/perfsonar-java-xml-ls: packaging/deb packaging/rpm src/main/resources/perfsonar/conf
- Date: Thu, 29 Apr 2010 09:57:57 +0100
Author: psnc.trzaszczka
Date: 2010-04-29 09:57:56 +0100 (Thu, 29 Apr 2010)
New Revision: 5609
Added:
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/configuration.xml.template
Modified:
trunk/perfsonar-java-xml-ls/packaging/deb/changelog
trunk/perfsonar-java-xml-ls/packaging/deb/postinst
trunk/perfsonar-java-xml-ls/packaging/deb/postrm
trunk/perfsonar-java-xml-ls/packaging/rpm/perfsonar-java-xml-ls.specs
Log:
configuration template added, rpm/deb packaging scripts improved
Modified: trunk/perfsonar-java-xml-ls/packaging/deb/changelog
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/deb/changelog 2010-04-28 13:42:02
UTC (rev 5608)
+++ trunk/perfsonar-java-xml-ls/packaging/deb/changelog 2010-04-29 08:57:56
UTC (rev 5609)
@@ -1,7 +1,7 @@
perfsonar-java-xml-ls (1.5-0RC3) stable; urgency=low
* Fixes: bugs fixes
- -- Slawomir Trzaszczka
<>
Thu, 08 Apr 2010 10:00:00 +0200
+ -- Slawomir Trzaszczka
<>
Thu, 23 Apr 2010 10:00:00 +0200
perfsonar-java-xml-ls (1.5-0RC2) stable; urgency=low
Modified: trunk/perfsonar-java-xml-ls/packaging/deb/postinst
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/deb/postinst 2010-04-28 13:42:02
UTC (rev 5608)
+++ trunk/perfsonar-java-xml-ls/packaging/deb/postinst 2010-04-29 08:57:56
UTC (rev 5609)
@@ -17,6 +17,7 @@
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
+OLD_SERVICENAME="geant2-java-xml-ls"
SERVICENAME="perfsonar-java-xml-ls"
SERVICEPATH="/usr/lib/perfsonar/services"
@@ -47,7 +48,9 @@
rm -rf /usr/share/doc/$SERVICENAME/spec
fi
ln -sf $SERVICEPATH/$SERVICENAME/doc /usr/share/doc/$SERVICENAME/spec ||
true
-
+
+ ln -sf $SERVICEPATH/$SERVICENAME
/usr/share/tomcat5.5/webapps/$OLD_SERVICENAME || true
+
chown -R tomcat55
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
chown tomcat55 $SERVICEPATH/$SERVICENAME/WEB-INF/log
Modified: trunk/perfsonar-java-xml-ls/packaging/deb/postrm
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/deb/postrm 2010-04-28 13:42:02
UTC (rev 5608)
+++ trunk/perfsonar-java-xml-ls/packaging/deb/postrm 2010-04-29 08:57:56
UTC (rev 5609)
@@ -20,6 +20,7 @@
SERVICENAME="perfsonar-java-xml-ls"
+OLD_SERVICENAME="geant2-java-xml-ls"
SERVICEPATH="/usr/lib/perfsonar/services"
@@ -45,6 +46,11 @@
then
rm /usr/share/doc/$SERVICENAME/spec
fi
+
+ if [ -h /usr/share/tomcat5.5/webapps/$OLD_SERVICENAME ]
+ then
+ rm -rf /usr/share/tomcat5.5/webapps/$OLD_SERVICENAME
+ fi
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
Modified:
trunk/perfsonar-java-xml-ls/packaging/rpm/perfsonar-java-xml-ls.specs
===================================================================
--- trunk/perfsonar-java-xml-ls/packaging/rpm/perfsonar-java-xml-ls.specs
2010-04-28 13:42:02 UTC (rev 5608)
+++ trunk/perfsonar-java-xml-ls/packaging/rpm/perfsonar-java-xml-ls.specs
2010-04-29 08:57:56 UTC (rev 5609)
@@ -1,16 +1,17 @@
%define prefix /usr/lib/perfsonar/services/%{name}
+%define old_name geant2-java-xml-ls
Name: perfsonar-java-xml-ls
Version: 1.5
License: Modified BSD
-Release: RC2
+Release: RC3
Summary: perfSONAR Lookup Service
Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
Group: Network/Web service
packager: Slawomir Trzaszczka
<>
URL: http://www.perfsonar.org
-Requires: tomcat5-exist
+Requires: exist
BuildArch: noarch
@@ -67,6 +68,7 @@
%{__ln_s} -f %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml
%{_sysconfdir}/%{name}
%{__ln_s} -f %{prefix}/WEB-INF/log %{_var}/log/%{name}
%{__ln_s} -f %{prefix} %{_var}/lib/tomcat5/webapps/%{name}
+%{__ln_s} -f %{prefix} %{_var}/lib/tomcat5/webapps/%{old_name}
## restart tomcat
/sbin/service tomcat5 restart
@@ -79,6 +81,7 @@
%{__rm} -rf %{_sysconfdir}/%{name}/*.xml || true
%{__rm} -rf %{_var}/log/%{name} || true
%{__rm} -rf %{_var}/lib/tomcat5/webapps/%{name} || true
+ %{__rm} -rf %{_var}/lib/tomcat5/webapps/%{old_name} || true
fi
@@ -109,6 +112,9 @@
%changelog
+* Thu Apr 29 2010 Slawomir Trzaszczka
<>
1.5-RC3
+- Fixes: bugs fixes
+
* Thu Mar 18 2010 Slawomir Trzaszczka
<>
1.5-RC2
- Fixes: bugs fixes
Added:
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/configuration.xml.template
===================================================================
---
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/configuration.xml.template
(rev 0)
+++
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/configuration.xml.template
2010-04-29 08:57:56 UTC (rev 5609)
@@ -0,0 +1,225 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+
+<configuration xmlns="http://service.perfsonar.org/ns/config/base/0.9/";>
+
+
+ <service name="xmlls">
+
+ <!--
....................................................................................
-->
+
+ <!-- Lookup Info of the LS instance -->
+
+ <lookupInformation>
+ <option name="accessPoint" value="${service.r.access_point}"/>
+ <option name="serviceName" value="${service.r.service_name}"/>
+ <option name="serviceType" value="${service.r.service_type}"/>
+ </lookupInformation>
+
+ <!--
....................................................................................
-->
+
+ <!-- Message Handlers - message types and service engines -->
+
+ <messageHandler>
+
+ <!-- Echo -->
+ <message type="EchoRequest"
+
handler="org.perfsonar.base2.service.messages.GenericMessageHandler">
+ <option name="ServiceEngine"
+
value="org.perfsonar.service.lookupservice.EchoServiceEngine" />
+ <option name="authN" value="no" />
+ </message>
+
+ <!-- Register -->
+ <message type="LSRegisterRequest"
+
handler="org.perfsonar.service.lookupservice.LSRegistrationMessageHandler">
+ <option name="ServiceEngine"
+
value="org.perfsonar.service.lookupservice.LSRegisterServiceEngine"/>
+ <option name="authN" value="no" />
+ <option name="minTTL" value="10" />
+ <option name="maxTTL" value="100000" />
+ </message>
+
+ <!-- QUERY -->
+ <message type="LSQueryRequest"
+
handler="org.perfsonar.base2.service.messages.GenericMessageHandler">
+ <option name="ServiceEngine"
+
value="org.perfsonar.service.lookupservice.LSQueryServiceEngine" />
+ <option name="authN" value="no" />
+ </message>
+
+ <!-- Keepalive -->
+ <message type="LSKeepaliveRequest"
+
handler="org.perfsonar.base2.service.messages.GenericMessageHandler">
+ <option name="ServiceEngine"
+
value="org.perfsonar.service.lookupservice.LSKeepaliveServiceEngine" />
+ <option name="authN" value="no" />
+ </message>
+
+ <!-- Deregister -->
+ <message type="LSDeregisterRequest"
+
handler="org.perfsonar.base2.service.messages.GenericMessageHandler">
+ <option name="ServiceEngine"
+
value="org.perfsonar.service.lookupservice.LSDeregisterServiceEngine" />
+ <option name="authN" value="no" />
+ </message>
+
+ </messageHandler>
+
+ <!--
....................................................................................
-->
+
+ <!-- Additional auxiliary components -->
+
+ <auxiliaryComponents>
+
+ <!-- exist datasource contains optionally read-only credentials -->
+ <component name="existDataSource"
+
className="org.perfsonar.service.lookupservice.components.DataSourceComponent">
+ <option name="url" value="#replace(string
"${service.ls.db_uri}" regexp "http://(.+)/exist/rest/db/(.*)" with
"xmldb:exist://$1/exist/xmlrpc/db/$2")"/>
+ <option name="username" value="${service.ls.db_username}"/>
+ <option name="password" value="${service.ls.db_password}"/>
+ <option name="usernameRO" value="guest"/>
+ <option name="passwordRO" value="guest"/>
+ </component>
+
+ <!-- provides access to ExistDb with all permissions -->
+ <component name="existAccessManager"
className="org.perfsonar.service.lookupservice.components.XMLDBComponent">
+ <option name="dataSource-ref" value="existDataSource"/>
+ </component>
+
+ <!-- provides access to ExistDb with read-only permissions -->
+ <component name="existAccessManagerRO"
className="org.perfsonar.service.lookupservice.components.XMLDBComponent">
+ <option name="dataSource-ref" value="existDataSource"/>
+ <option name="readOnly" value="true"/>
+ </component>
+
+ <!-- Lookup Service DAO -->
+ <component name="lsdao"
className="org.perfsonar.service.lookupservice.storage.exist.dao.MultipleFilesDAOImpl">
+ <option name="dbAccessManager-ref" value="existAccessManager"/>
+ </component>
+
+ <!-- Lookup Service DAO with read-only permission. It is used in
LSQueryRequest -->
+ <component name="lsdao-ro"
className="org.perfsonar.service.lookupservice.storage.exist.dao.MultipleFilesDAOImpl">
+ <option name="dbAccessManager-ref" value="existAccessManagerRO"/>
+ </component>
+
+ <!-- Summarization Service DAO -->
+ <component name="summarizationdao"
className="org.perfsonar.service.lookupservice.storage.exist.dao.SummarizationDAOImpl">
+ <option name="dbAccessManager-ref" value="existAccessManager"/>
+ </component>
+
+ <!-- contains a nr of changes in DB - is used to synchronization -->
+ <component name="modificationCounterComponent"
className="org.perfsonar.service.lookupservice.components.ModificationCounterComponent"/>
+
+
+ <!-- auth configuration -->
+ <component name="auth"
className="org.perfsonar.base2.service.authn.component.wssec.WSSecAuthNComponent">
+ <option name="as_endpoint" value="${service.as.point}"/>
+ <option name="comp_id" value="urn:compId"/>
+ </component>
+
+ <!-- MIGRATION COMPONENT -->
+ <component name="migrator"
className="org.perfsonar.base2.service.configuration.migration.MigratorComponent"
/>
+
+ <!-- Scheduler -->
+ <component name="scheduling"
+
className="org.perfsonar.base2.service.scheduler.SchedulingComponent">
+
+ <option name="schedulerClassName"
value="org.perfsonar.base2.service.scheduler.singleThread.SingleThreadScheduler"/>
+ <option name="interval" value="60"/> <!-- sec -->
+ <actions>
+
+ <!--
+ action invokes cleanup operations on database. lsTTL -
default value of Time to live parameter.
+ After lsTTL time, if service didn't re-register, service will
be removed.
+ -->
+ <action name="LSCleanup_1"
className="org.perfsonar.service.lookupservice.schedulerActions.CleanupSchedulerAction">
+ <option name="status" value="on" />
+ <option name="interval"
value="${component.ls_cleanup_loader.interval}" />
+ <option name="lsTTL" value="${service.ls.ttl}"/>
+ </action>
+
+ <!--
+ this action supports synchronization of summarized data
stored in LSStore-summary with data stored in LSStore.xml
+ nrOfModifications - nr of changes in db after which
summarization process is executed immediately
+ nrOfIterations - after this nr of iteration if there are
some changes in db - summarization process is executed
+ -->
+ <action name="LSSummarySynchronization"
className="org.perfsonar.service.lookupservice.schedulerActions.SummarySynchronizationAction">
+ <option name="status" value="on" />
+ <option name="interval" value="60" />
+ <option name="nrOfModifications" value="10"/>
+ <option name="nrOfIterations" value="4"/>
+ </action>
+
+ <action name="registration"
className="org.perfsonar.service.lookupservice.schedulerActions.GLSRegistrationAction">
+
+ <option name="status" value="on" />
+ <option name="interval"
value="${component.registrator.interval}" />
+
+ <option name="registerDataSource"
+
value="org.perfsonar.service.lookupservice.registration.LSSummaryRegisterDataSource"/>
+
+ <option name="registerEventType"
+
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/summary/2.0"/>
+ <!--
+ <option name="registerEventType"
+
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/service/2.0"/>
+ -->
+ <option name="registrator"
+
value="org.perfsonar.base2.service.registration.GenericLSRegistrator"/>
+
+ <!-- define lsAddresses (lsAddress-1,lsAddress-2,..) where
this LS will be registered -->
+
+#for(var lsAddress string "${service.r.ls_url}" split ",")
+ <option name="lsAddress-#indexer()" value="${lsAddress}"
/>#end()
+
+
+ <!-- number of registration to GLS in a single iteration -->
+ <option name="nrOfGLSRegistration" value="1"/>
+
+ </action>
+
+ </actions>
+ </component>
+
+ </auxiliaryComponents>
+
+
+ <!--
....................................................................................
-->
+
+ <!-- Protocol mappings, XML elements and their bingings -->
+
+ <protocolMappings>
+
+
+ <!-- default mapping -->
+
+
+ <!-- general mappings -->
+ <element name="{http://ggf.org/ns/nmwg/base/2.0/}message";
+ mapping="org.perfsonar.base2.xml.nmwg.Message"/>
+ <element name="{http://ggf.org/ns/nmwg/base/2.0/}metadata";
+ mapping="org.perfsonar.base2.xml.nmwg.Metadata"/>
+ <element name="{http://ggf.org/ns/nmwg/base/2.0/}eventType";
+ mapping="org.perfsonar.base2.xml.nmwg.EventType"/>
+ <element name="{http://ggf.org/ns/nmwg/base/2.0/}data";
+ mapping="org.perfsonar.base2.xml.nmwg.Data"/>
+ <element name="{*}subject"
+ mapping="org.perfsonar.base2.xml.nmwg.Subject"/>
+ <element name="{http://ggf.org/ns/nmwg/base/2.0/}parameters";
+ mapping="org.perfsonar.base2.xml.nmwg.Parameters"/>
+ <element name="{http://ggf.org/ns/nmwg/base/2.0/}parameter";
+ mapping="org.perfsonar.base2.xml.nmwg.Parameter"/>
+ <element name="*"
+ mapping="org.perfsonar.base2.xml.Element"/>
+ <element
name="{http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0/}subject";
+ mapping="org.perfsonar.base2.xml.TextElement"/>
+
+
+ </protocolMappings>
+
+
+ </service>
+
+
+</configuration>
Property changes on:
trunk/perfsonar-java-xml-ls/src/main/resources/perfsonar/conf/configuration.xml.template
___________________________________________________________________
Name: svn:executable
+ *
- [GEANT/SA2/ps-java-services] r5609 - in trunk/perfsonar-java-xml-ls: packaging/deb packaging/rpm src/main/resources/perfsonar/conf, svn-noreply, 04/29/2010
Archive powered by MHonArc 2.6.16.