perfsonar development work

Author: psnc.pietrzak
Date: 2013-05-06 18:06:06 +0100 (Mon, 06 May 2013)
New Revision: 6361

Removed:
   trunk/perfsonar-base/ls/src/test/resources/configuration.xml
Modified:
   trunk/perfsonar-base/ls/pom.xml
Log:
Moved to parent 1.0.2

Modified: trunk/perfsonar-base/ls/pom.xml
===================================================================
--- trunk/perfsonar-base/ls/pom.xml     2013-05-06 17:04:53 UTC (rev 6360)
+++ trunk/perfsonar-base/ls/pom.xml     2013-05-06 17:06:06 UTC (rev 6361)
@@ -5,7 +5,7 @@
        <parent>
                <groupId>net.geant.perfsonar</groupId>
                <artifactId>parent</artifactId>
-               <version>1.0.1</version>
+               <version>1.0.2</version>
                <relativePath>../../parent/</relativePath>
        </parent>
 
@@ -15,12 +15,27 @@
        <name>perfSONAR base 3 LS client</name>
        <description>Functions to register, update and remove service 
information from perfSONAR LS service</description>
     <packaging>bundle</packaging>
-       
+    
     <scm>
         
<connection>scm:svn:http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/perfsonar-base/ls/</connection>
         
<developerConnection>scm:svn:svn+ssh:///GEANT/SA2/ps-java-services/trunk/perfsonar-base/ls/</developerConnection>
         
<url>https://svn.geant.net/fisheye/browse/SA2T3-ps-java-services/trunk/perfsonar-base/ls/</url>
     </scm>
+       
+       <developers>
+               <developer>
+                       <id>blazej.pietrzak</id>
+                       <name>Blazej Pietrzak</name>
+                       
<email></email>
+                       <organization>PSNC</organization>
+                       
<organizationUrl>http://www.man.poznan.pl/</organizationUrl>
+                       <roles>
+                               <role>architect</role>
+                               <role>developer</role>
+                       </roles>
+                       <timezone>+1</timezone>
+               </developer>
+       </developers>
 
        <dependencies>
                <dependency>

Deleted: trunk/perfsonar-base/ls/src/test/resources/configuration.xml
===================================================================
--- trunk/perfsonar-base/ls/src/test/resources/configuration.xml        
2013-05-06 17:04:53 UTC (rev 6360)
+++ trunk/perfsonar-base/ls/src/test/resources/configuration.xml        
2013-05-06 17:06:06 UTC (rev 6361)
@@ -1,132 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<configuration xmlns="http://service.perfsonar.org/ns/config/base/0.9/";>
-  <service name="sshtelnet-mp">
-    <lookupInformation>
-      <option name="accessPoint" 
value="http://localhost:${tomcat.port}/${project.artifactId}/services/SSHTelnet"/>
-      <option name="serviceName" value="Geant3 JAVA - SSHTelnet MP"/>
-      <option name="serviceType" value="MP"/>
-    </lookupInformation>
-
-    <!-- Message Handlers - message types and service engines -->
-
-    <messageHandler>
- 
-      <message type="EchoRequest"
-               
handler="org.perfsonar.base2.service.messages.GenericMessageHandler">
-        <option name="ServiceEngine" 
-                
value="org.perfsonar.service.measurementPoint.EchoServiceEngine" />  
-        <option name="authN" value="no" />
-      </message>
-      
-      <message type="MetadataKeyRequest"
-               
handler="org.perfsonar.base2.service.messages.GenericMessageHandler">
-        <option name="ServiceEngine"
-                
value="org.perfsonar.service.measurementPoint.ServiceCapabilitiesEngine" />
-        <option name="authN" value="no" />
-      </message>
-
-      <message type="SetupDataRequest"
-               
handler="org.perfsonar.base2.service.messages.GenericMessageHandler">
-        <option name="ServiceEngine"
-                
value="org.perfsonar.service.measurementPoint.SetupDataServiceEngine" />
-        <option name="authN" value="no" />
-      </message>
-      
-    </messageHandler>
-
-    <!-- Additional auxiliary components -->
-
-    <auxiliaryComponents>
-     <component name="migrator" 
className="org.perfsonar.base2.service.configuration.migration.MigratorComponent">
-       <option name="config-directory" value="${old-config-directory}" />
-     </component>
-     <component name="XMLDB" 
className="org.perfsonar.base2.service.storage.xml.XMLDBComponent">
-        <option name="dataStorageClassName" 
value="org.perfsonar.base2.service.storage.xml.exist.ExistHTTPDataStorage" />
-        <option name="uri"                  
value="http://localhost:${tomcat.port}/exist/rest/db"/>
-        <option name="username"             value="sshtelnet"/>
-        <option name="password"             value="sshtelnet"/>
-     </component>
-     
-     <component name="Configuration" 
className="org.perfsonar.service.measurementPoint.Configuration">
-       <option name="metadata-file" 
value="${config.path}/sshtelnetmetadata.xml" />
-       <option name="token-path" value="${token.path}" />
-     </component>
-     
-     <!-- auth configuration -->
-     <component name="auth" 
className="org.perfsonar.base2.service.authn.component.wssec.WSSecAuthNComponent">
-       <option name="as_endpoint"      
value="http://homer.rediris.es:8080/geant2-java-as-1.2/services/SimpleService"/>
-       <option name="comp_id"          value="urn:compId"/>
-     </component>
-     
-     <!-- Scheduler -->
-     <component name="scheduling" 
className="org.perfsonar.base2.service.scheduler.SchedulingComponent">
-       <option name="schedulerClassName" 
value="org.perfsonar.base2.service.scheduler.SimpleScheduler"/>
-       <option name="interval" value="60"/>
-
-       <actions>
-         <action name="registration" 
className="org.perfsonar.base2.service.registration.LSRegistrationAction">
-          <option name="status" value="on" />
-            <option name="interval" value="2" />
-            <option name="registerDataSource" 
value="org.perfsonar.base2.service.registration.MetadataExistDBRegisterDataSource"/>
                
-            <option name="registerEventType" 
value="http://ogf.org/ns/nmwg/tools/org/perfsonar/service/lookup/registration/summary/2.0"/>
-            <option name="registrator" 
value="org.perfsonar.base2.service.registration.GenericLSRegistrator"/>
-            <option name="lsAddress-1" 
value="http://localhost:9000/perfsonar-ls"/>
-          </action>
-          
-          <!-- Checks whether a given metadata file has changed and updates 
it in the database.
-               If the given metadata file is not stored in the database it 
is added.             -->
-          <action name="metadata-updater" 
className="org.perfsonar.service.measurementPoint.MetadataUpdater">
-            <!--  Should the user configured in the "Configuration" section 
be created if it does not exist -->
-            <option name="create-user" value="yes" />
-            
-            <!-- login and password for the user that has rights to create 
user accounts. Obligatory only when "create-user" option is set to "yes" -->
-            <option name="username" value="admin" />
-            <option name="password" value="" />
-          </action>
-        </actions>
-     </component>
-    </auxiliaryComponents>
-    
-    <extension name="registerExtension-registerDataSource">
-        <option name="exist-config" value="XMLDB" />
-    </extension>
-
-    <!-- 
....................................................................................
 -->
-
-    <!-- Protocol mappings, XML elements and their bingings -->
-
-    <protocolMappings>
-
-
-      <!-- default mapping -->
-
-
-      <!-- general mappings -->
-      <element name="{*}message" 
-               mapping="org.perfsonar.base2.xml.nmwg.Message"/>
-      <element name="{*}metadata" 
-               mapping="org.perfsonar.base2.xml.nmwg.Metadata"/>
-      <element name="{*}eventType" 
-               mapping="org.perfsonar.base2.xml.nmwg.EventType"/>
-      <element name="{*}data" 
-               mapping="org.perfsonar.base2.xml.nmwg.Data"/>
-      <element name="{*}subject" 
-               mapping="org.perfsonar.base2.xml.nmwg.Subject"/>
-      <element name="{*}parameters" 
-               mapping="org.perfsonar.base2.xml.nmwg.Parameters"/>
-      <element name="{*}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>