r1458 - in topia/trunk: . src/site topia-persistence topia-persistence/src/site topia-soa topia-soa/src/site topia-ui topia-ui/src/site - Topia-commits

15 May 2009

Author: tchemit
Date: 2009-05-15 16:30:09 +0000 (Fri, 15 May 2009)
New Revision: 1458

Modified:
   topia/trunk/pom.xml
   topia/trunk/src/site/site.xml
   topia/trunk/topia-persistence/pom.xml
   topia/trunk/topia-persistence/src/site/site.xml
   topia/trunk/topia-soa/pom.xml
   topia/trunk/topia-soa/src/site/site.xml
   topia/trunk/topia-ui/pom.xml
   topia/trunk/topia-ui/src/site/site.xml
Log:
make scm plugin works for multi-modules + use nuiton-utils

Modified: topia/trunk/pom.xml
===================================================================

--- topia/trunk/pom.xml	2009-05-15 02:12:45 UTC (rev 1457)
+++ topia/trunk/pom.xml	2009-05-15 16:30:09 UTC (rev 1458)
@@ -12,7 +12,6 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.nuiton</groupId>
     <artifactId>topia</artifactId>
     <version>2.2.0-SNAPSHOT</version>
 
@@ -34,7 +33,7 @@
 
             <dependency>
                 <groupId>org.nuiton</groupId>
-                <artifactId>nuitonutil</artifactId>
+                <artifactId>nuiton-utils</artifactId>
                 <version>${nuitonutil.version}</version>
                 <scope>compile</scope>
             </dependency>
@@ -169,21 +168,19 @@
     <packaging>pom</packaging>
 
     <properties>
-        <!-- id du projet du labs -->
-        <labs.id>21</labs.id>
-
-        <!-- nom du projet sur le labs -->
-        <labs.project>topia</labs.project>
-
+        
         <!-- libs version -->
         <generator.version>1.0.0-SNAPSHOT</generator.version>
         <processor.version>1.0.0-SNAPSHOT</processor.version>
         <nuitonutil.version>1.1.0-SNAPSHOT</nuitonutil.version>
+        <xmlrpc.version>3.1</xmlrpc.version>
+        <hibernate.version>3.3.1.GA</hibernate.version>
         
         <topia.version>${project.version}</topia.version>
 
-        <xmlrpc.version>3.1</xmlrpc.version>
-        <hibernate.version>3.3.1.GA</hibernate.version>
+        <!-- a supprimer des qu'on pourra deployer les sites sur nuiton -->
+        <site.deploy.url>scpexe://labs.libre-entreprise.org/home/groups/topia/htdocs</site.deploy.url>
+        
     </properties>
 
     <build>
@@ -195,7 +192,7 @@
 
                 <plugin>
                     <groupId>org.nuiton</groupId>
-                    <artifactId>maven-processor-plugin</artifactId>
+                    <artifactId>maven-process-plugin</artifactId>
                     <version>${processor.version}</version>
                     <executions>
                         <execution>
@@ -246,18 +243,13 @@
     <!-- ************************************************************* -->
     <!-- *** Build Environment  ************************************** -->
     <!-- ************************************************************* -->
-    <scm>
-        <url>${maven.scm.url}</url>
-        <connection>${maven.scm.connection}</connection>
-        <developerConnection>${maven.scm.developerConnection}</developerConnection>
-    </scm>
 
-    <!--Code Lutin Repository-->
+    <!--Nuiton Repository : pourra etre supprimer lorsqu'on sera sur central -->
     <repositories>
         <repository>
-            <id>codelutin-repository</id>
-            <name>CodeLutinRepository</name>
-            <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url>
+            <id>nuiton-repository</id>
+            <name>NuitonRepository</name>
+            <url>${repository.home.url}</url>
             <snapshots>
                 <enabled>true</enabled>
                 <checksumPolicy>warn</checksumPolicy>

Modified: topia/trunk/src/site/site.xml
===================================================================
--- topia/trunk/src/site/site.xml	2009-05-15 02:12:45 UTC (rev 1457)
+++ topia/trunk/src/site/site.xml	2009-05-15 16:30:09 UTC (rev 1458)
@@ -30,6 +30,7 @@
         <links>
             <item name="ToPIA Service" href="../topia-service"/>
             <item name="Labs" href="http://labs.libre-entreprise.org/"/>
+            <item name="Nuiton" href="http://www.nuiton.org"/>
             <item name="Code Lutin" href="http://www.codelutin.com/"/>
         </links>
 

Modified: topia/trunk/topia-persistence/pom.xml
===================================================================
--- topia/trunk/topia-persistence/pom.xml	2009-05-15 02:12:45 UTC (rev 1457)
+++ topia/trunk/topia-persistence/pom.xml	2009-05-15 16:30:09 UTC (rev 1458)
@@ -20,7 +20,7 @@
 
         <dependency>
             <groupId>org.nuiton</groupId>
-            <artifactId>nuitonutil</artifactId>
+            <artifactId>nuiton-utils</artifactId>
         </dependency>
 
         <dependency>
@@ -77,6 +77,10 @@
 
     <packaging>jar</packaging>
 
+    <properties>
+        <helper.scmModuleLevel>1</helper.scmModuleLevel>
+    </properties>
+
     <build>
 
         <testResources>
@@ -101,7 +105,7 @@
 
             <plugin>
                 <groupId>org.nuiton</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
+                <artifactId>maven-process-plugin</artifactId>
             </plugin>
 
             <plugin>
@@ -134,11 +138,5 @@
     <!-- ************************************************************* -->
     <!-- *** Build Environment  ************************************** -->
     <!-- ************************************************************* -->
-    <scm>
-        <url>${maven.scm.url.child}</url>
-        <connection>${maven.scm.connection.child}</connection>
-        <developerConnection>${maven.scm.developerConnection.child}</developerConnection>
-    </scm>
-
-
+    
 </project>

Modified: topia/trunk/topia-persistence/src/site/site.xml
===================================================================
--- topia/trunk/topia-persistence/src/site/site.xml	2009-05-15 02:12:45 UTC (rev 1457)
+++ topia/trunk/topia-persistence/src/site/site.xml	2009-05-15 16:30:09 UTC (rev 1458)
@@ -30,6 +30,7 @@
         <links>
             <item name="ToPIA Service" href="http://topia.labs.libre-entreprise.org/topia-service"/>
             <item name="Labs" href="http://labs.libre-entreprise.org/"/>
+            <item name="Nuiton" href="http://www.nuiton.org"/>
             <item name="Code Lutin" href="http://www.codelutin.com/"/>
         </links>
 
@@ -40,11 +41,11 @@
         </menu>
 
         <menu name="Téléchargement">
-            <item href="${labs.builder.url}/org/codelutin/${project.parent.artifactId}/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
+            <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
                   name="Librairie (jar)"/>
-            <item href="${labs.builder.url}/org/codelutin/${project.parent.artifactId}/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
+            <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
                   name="Javadoc (jar)"/>
-            <item href="${labs.builder.url}/org/codelutin/${project.parent.artifactId}/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
+            <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
                   name="Sources (jar)"/>
         </menu>
 

Modified: topia/trunk/topia-soa/pom.xml
===================================================================
--- topia/trunk/topia-soa/pom.xml	2009-05-15 02:12:45 UTC (rev 1457)
+++ topia/trunk/topia-soa/pom.xml	2009-05-15 16:30:09 UTC (rev 1458)
@@ -30,7 +30,7 @@
 
         <dependency>
             <groupId>org.nuiton</groupId>
-            <artifactId>nuitonutil</artifactId>
+            <artifactId>nuiton-utils</artifactId>
         </dependency>
 
         <dependency>
@@ -90,6 +90,10 @@
     <!-- ************************************************************* -->
 
     <packaging>jar</packaging>
+
+    <properties>
+        <helper.scmModuleLevel>1</helper.scmModuleLevel>
+    </properties>
     
     <build>
         
@@ -97,7 +101,7 @@
 
             <plugin>
                 <groupId>org.nuiton</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
+                <artifactId>maven-process-plugin</artifactId>
             </plugin>
             
             <plugin>
@@ -138,10 +142,5 @@
     <!-- ************************************************************* -->
     <!-- *** Build Environment  ************************************** -->
     <!-- ************************************************************* -->
-    <scm>
-        <url>${maven.scm.url.child}</url>
-        <connection>${maven.scm.connection.child}</connection>
-        <developerConnection>${maven.scm.developerConnection.child}</developerConnection>
-    </scm>
-
+    
 </project>

Modified: topia/trunk/topia-soa/src/site/site.xml
===================================================================
--- topia/trunk/topia-soa/src/site/site.xml	2009-05-15 02:12:45 UTC (rev 1457)
+++ topia/trunk/topia-soa/src/site/site.xml	2009-05-15 16:30:09 UTC (rev 1458)
@@ -30,6 +30,7 @@
         <links>
             <item name="ToPIA Service" href="http://topia.labs.libre-entreprise.org/topia-service"/>
             <item name="Labs" href="http://labs.libre-entreprise.org/"/>
+            <item name="Nuiton" href="http://www.nuiton.org"/>
             <item name="Code Lutin" href="http://www.codelutin.com/"/>
         </links>
 
@@ -39,12 +40,12 @@
             <item href="/index.html" name="Accueil"/>
         </menu>
 
-        <menu name="Téléchargement">
-            <item href="${labs.builder.url}/org/codelutin/${project.parent.artifactId}/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
+         <menu name="Téléchargement">
+            <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
                   name="Librairie (jar)"/>
-            <item href="${labs.builder.url}/org/codelutin/${project.parent.artifactId}/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
+            <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
                   name="Javadoc (jar)"/>
-            <item href="${labs.builder.url}/org/codelutin/${project.parent.artifactId}/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
+            <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
                   name="Sources (jar)"/>
         </menu>
 

Modified: topia/trunk/topia-ui/pom.xml
===================================================================
--- topia/trunk/topia-ui/pom.xml	2009-05-15 02:12:45 UTC (rev 1457)
+++ topia/trunk/topia-ui/pom.xml	2009-05-15 16:30:09 UTC (rev 1458)
@@ -20,7 +20,7 @@
 
         <dependency>
             <groupId>org.nuiton</groupId>
-            <artifactId>nuitonutil</artifactId>
+            <artifactId>nuiton-utils</artifactId>
         </dependency>
 
         <dependency>
@@ -65,13 +65,17 @@
 
     <packaging>jar</packaging>
 
+    <properties>
+        <helper.scmModuleLevel>1</helper.scmModuleLevel>
+    </properties>
+    
     <build>
 
         <plugins>
 
             <plugin>
                 <groupId>org.nuiton</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
+                <artifactId>maven-process-plugin</artifactId>
             </plugin>
 
             <plugin>
@@ -106,10 +110,5 @@
     <!-- ************************************************************* -->
     <!-- *** Build Environment  ************************************** -->
     <!-- ************************************************************* -->
-    <scm>
-        <url>${maven.scm.url.child}</url>
-        <connection>${maven.scm.connection.child}</connection>
-        <developerConnection>${maven.scm.developerConnection.child}</developerConnection>
-    </scm>
-
+    
 </project>

Modified: topia/trunk/topia-ui/src/site/site.xml
===================================================================
--- topia/trunk/topia-ui/src/site/site.xml	2009-05-15 02:12:45 UTC (rev 1457)
+++ topia/trunk/topia-ui/src/site/site.xml	2009-05-15 16:30:09 UTC (rev 1458)
@@ -30,6 +30,7 @@
         <links>
             <item name="ToPIA Service" href="http://topia.labs.libre-entreprise.org/topia-service"/>
             <item name="Labs" href="http://labs.libre-entreprise.org/"/>
+            <item name="Nuiton" href="http://www.nuiton.org"/>
             <item name="Code Lutin" href="http://www.codelutin.com/"/>
         </links>
 
@@ -39,12 +40,12 @@
             <item href="/index.html" name="Accueil"/>
         </menu>
 
-        <menu name="Téléchargement">
-            <item href="${labs.builder.url}/org/codelutin/${project.parent.artifactId}/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
+         <menu name="Téléchargement">
+            <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
                   name="Librairie (jar)"/>
-            <item href="${labs.builder.url}/org/codelutin/${project.parent.artifactId}/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
+            <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
                   name="Javadoc (jar)"/>
-            <item href="${labs.builder.url}/org/codelutin/${project.parent.artifactId}/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
+            <item href="${repository.home.url}/org/nuiton/topia/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
                   name="Sources (jar)"/>
         </menu>

    

r1458 - in topia/trunk: . src/site topia-persistence topia-persistence/src/site topia-soa topia-soa/src/site topia-ui topia-ui/src/site

tchemit＠users.labs.libre-entreprise.org

tags

participants (1)