perfsonar development work

Author: dante.delvaux
Date: 2013-03-14 22:52:04 +0000 (Thu, 14 Mar 2013)
New Revision: 6211

Added:
   trunk/mvn-settings.xml
Modified:
   trunk/BUILDING.txt
   trunk/perfsonar-base/apt/dummyservice/net/geant/perfsonar/dummyservice/
   
trunk/perfsonar-base/apt/dummyservice/net/geant/perfsonar/dummyservice/selftest/
   
trunk/perfsonar-base/apt/dummyservice/net/geant/perfsonar/dummyservice/xpath/
   trunk/pom.xml
Log:
Adding a mvn settings.xml file to solve the parent dependency issue.  I've 
not been able to find a perfect solution and this one seems to be the one 
bringing in the least inconviences.

Modified: trunk/BUILDING.txt
===================================================================
--- trunk/BUILDING.txt  2013-03-14 18:44:19 UTC (rev 6210)
+++ trunk/BUILDING.txt  2013-03-14 22:52:04 UTC (rev 6211)
@@ -126,6 +126,8 @@
 There is currently no procedure for branching, tagging, and producing
 non-SNAPSHOT builds. Such a procedure is being developed.
 
+See mvn-settings.xml if you have some issues finding a released parent
+pom.xml
 
 
 Legacy stuff

Added: trunk/mvn-settings.xml
===================================================================
--- trunk/mvn-settings.xml                              (rev 0)
+++ trunk/mvn-settings.xml      2013-03-14 22:52:04 UTC (rev 6211)
@@ -0,0 +1,29 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 
http://maven.apache.org/xsd/settings-1.0.0.xsd";>
+  <profiles>
+    <profile>
+      <!-- We setup a profile to define the perfSONAR repo where we can get 
released perfSONAR artifacts. -->
+      <!-- This is intended to solve the chicken and egg problem of relying 
on the parent pom to define -->
+      <!-- the repository where the parent pom is actually deployed! -->
+      <!-- This settings.xml file is used by the Jenkins tool for automatic 
deployements of new releases -->
+      <!-- To use it, one must add "-s mvn-settings.xml" option in the maven 
call. -->
+      <!-- You can olso copy it to your ~/.m2/settings.xml file and activate 
this profile only on demand. -->
+      <!-- Using it is then a call to "mvn clean package -P ps-build" -->
+      <id>ps-build</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <repositories>
+        <repository>
+            <id>geant-repository</id>
+            <name>perfSONAR repository</name>
+            
<url>https://artifactory.geant.net/artifactory/perfsonar-release-local/</url>
+            <!-- We consider only properly released artifacts, no snapshots! 
-->
+            
<releases><enabled>true</enabled><updatePolicy>always</updatePolicy></releases>
+            <snapshots><enabled>false</enabled></snapshots>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+
+</settings>


Property changes on: trunk/mvn-settings.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain


Property changes on: 
trunk/perfsonar-base/apt/dummyservice/net/geant/perfsonar/dummyservice
___________________________________________________________________
Added: svn:ignore
   + ServiceController.class



Property changes on: 
trunk/perfsonar-base/apt/dummyservice/net/geant/perfsonar/dummyservice/selftest
___________________________________________________________________
Added: svn:ignore
   + *.class



Property changes on: 
trunk/perfsonar-base/apt/dummyservice/net/geant/perfsonar/dummyservice/xpath
___________________________________________________________________
Added: svn:ignore
   + *.class


Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml       2013-03-14 18:44:19 UTC (rev 6210)
+++ trunk/pom.xml       2013-03-14 22:52:04 UTC (rev 6211)
@@ -37,15 +37,4 @@
       <module>nmwg-sql-converter</module>
     </modules>
     
-    <repositories>
-    <!-- We need to add our own repository here or the modules cannot find 
the published parent when they use a stable one -->
-        <repository>
-            <id>geant-repository</id>
-            <name>perfSONAR repository</name>
-            
<url>https://artifactory.geant.net/artifactory/perfsonar-release-local/</url>
-            
<releases><enabled>true</enabled><updatePolicy>always</updatePolicy></releases>
-            
<snapshots><enabled>true</enabled><updatePolicy>always</updatePolicy></snapshots>
-        </repository>
-    </repositories>
-
 </project>
\ No newline at end of file