[jboss-svn-commits] JBL Code SVN: r8897 - in labs/shotoku/trunk-2.6: lib/portal and 6 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Jan 17 19:51:53 EST 2007


Author: adamw
Date: 2007-01-17 19:51:53 -0500 (Wed, 17 Jan 2007)
New Revision: 8897

Modified:
   labs/shotoku/trunk-2.6/lib/portal/portal-cms-lib.jar
   labs/shotoku/trunk-2.6/lib/portal/portal-common-lib.jar
   labs/shotoku/trunk-2.6/lib/portal/portal-core-lib.jar
   labs/shotoku/trunk-2.6/lib/portal/portal-identity-lib.jar
   labs/shotoku/trunk-2.6/lib/portal/portal-portlet-lib.jar
   labs/shotoku/trunk-2.6/maven.xml
   labs/shotoku/trunk-2.6/project.properties
   labs/shotoku/trunk-2.6/shotoku-base/maven.xml
   labs/shotoku/trunk-2.6/shotoku-feeds/maven.xml
   labs/shotoku/trunk-2.6/shotoku-file-access/maven.xml
   labs/shotoku/trunk-2.6/shotoku-jcr/maven.xml
   labs/shotoku/trunk-2.6/shotoku-portal/maven.xml
   labs/shotoku/trunk-2.6/shotoku-svn/maven.xml
Log:
Build improvements

Modified: labs/shotoku/trunk-2.6/lib/portal/portal-cms-lib.jar
===================================================================
(Binary files differ)

Modified: labs/shotoku/trunk-2.6/lib/portal/portal-common-lib.jar
===================================================================
(Binary files differ)

Modified: labs/shotoku/trunk-2.6/lib/portal/portal-core-lib.jar
===================================================================
(Binary files differ)

Modified: labs/shotoku/trunk-2.6/lib/portal/portal-identity-lib.jar
===================================================================
(Binary files differ)

Modified: labs/shotoku/trunk-2.6/lib/portal/portal-portlet-lib.jar
===================================================================
(Binary files differ)

Modified: labs/shotoku/trunk-2.6/maven.xml
===================================================================
--- labs/shotoku/trunk-2.6/maven.xml	2007-01-18 00:25:07 UTC (rev 8896)
+++ labs/shotoku/trunk-2.6/maven.xml	2007-01-18 00:51:53 UTC (rev 8897)
@@ -37,23 +37,21 @@
         <j:set var="goal" value="deploy" />
         <attainGoal name="shotoku-all-projects" />
 
-        <!-- Constructing the sar -->
+        <!-- Copying the libraries -->
         <ant:copy
-                todir="target/${shotoku.sar.dir}" overwrite="true"
+                todir="${shotoku.jar.dest}" overwrite="true"
                 file="${maven.repo.local}/commons-configuration/jars/commons-configuration-1.1.jar" />
         <ant:copy
-                todir="target/${shotoku.sar.dir}" overwrite="true"
+                todir="${shotoku.jar.dest}" overwrite="true"
                 file="${maven.repo.local}/commons-lang/jars/commons-lang-2.1.jar" />
         <ant:copy
-                todir="target/${shotoku.sar.dir}" overwrite="true"
-                file="${maven.repo.local}/commons-collections/jars/commons-collections-3.1.jar" />
-        <ant:copy
-                todir="target/${shotoku.sar.dir}" overwrite="true">
+                todir="${shotoku.jar.dest}" overwrite="true">
             <ant:fileset dir="${maven.repo.local}/velocity/jars">
                 <ant:filename name="velocity*-1.4.jar" />
             </ant:fileset>
         </ant:copy>
 
+	<!-- Constructing the sar -->
         <ant:copy todir="target/${shotoku.sar.dir}">
             <ant:fileset dir="src/app" flatten="true" overwrite="true">
                 <ant:filename name="**" />

Modified: labs/shotoku/trunk-2.6/project.properties
===================================================================
--- labs/shotoku/trunk-2.6/project.properties	2007-01-18 00:25:07 UTC (rev 8896)
+++ labs/shotoku/trunk-2.6/project.properties	2007-01-18 00:51:53 UTC (rev 8897)
@@ -9,6 +9,8 @@
 #shotoku.subprojects=${shotoku.subprojects.cms},aop,test,,admin,tags,feeds,file-access,portal
 shotoku.subprojects=${shotoku.subprojects.cms},aop,admin,tags,feeds,file-access
 
+shotoku.jar.dest=${local.deploy.dir}/../lib/shotoku
+
 maven.final.name=${pom.artifactId}
 
 maven.jar.override=on

Modified: labs/shotoku/trunk-2.6/shotoku-base/maven.xml
===================================================================
--- labs/shotoku/trunk-2.6/shotoku-base/maven.xml	2007-01-18 00:25:07 UTC (rev 8896)
+++ labs/shotoku/trunk-2.6/shotoku-base/maven.xml	2007-01-18 00:51:53 UTC (rev 8897)
@@ -11,7 +11,7 @@
     <goal name="deploy">
         <ant:copy
                 file="target/shotoku-base.jar"
-                tofile="../target/${shotoku.sar.dir}/shotoku-base.jar"
+                tofile="${shotoku.jar.dest}/shotoku-base.jar"
                 overwrite="true" />
     </goal>
 </project>

Modified: labs/shotoku/trunk-2.6/shotoku-feeds/maven.xml
===================================================================
--- labs/shotoku/trunk-2.6/shotoku-feeds/maven.xml	2007-01-18 00:25:07 UTC (rev 8896)
+++ labs/shotoku/trunk-2.6/shotoku-feeds/maven.xml	2007-01-18 00:51:53 UTC (rev 8897)
@@ -27,32 +27,32 @@
 
         <!-- Copying the rome plugins jar -->
         <ant:copy
-                todir="../target/${shotoku.sar.dir}" overwrite="true"
+                todir="${shotoku.jar.dest}" overwrite="true"
                 file="target/rome-plugins.jar" />
 
         <ant:copy
-                todir="../target/${shotoku.sar.dir}" overwrite="true"
+                todir="${shotoku.jar.dest}" overwrite="true"
                 file="${maven.repo.local}/jdom/jars/jdom-1.0.jar" />
         <ant:copy
-                todir="../target/${shotoku.sar.dir}" overwrite="true"
+                todir="${shotoku.jar.dest}" overwrite="true"
                 file="${maven.repo.local}/xerces/jars/xercesImpl-2.8.0.jar" />
         <ant:copy
-                todir="../target/${shotoku.sar.dir}" overwrite="true"
+                todir="${shotoku.jar.dest}" overwrite="true"
                 file="${maven.repo.local}/xerces/jars/xmlParserAPIs-2.6.2.jar" />
         <ant:copy
-                todir="../target/${shotoku.sar.dir}" overwrite="true"
+                todir="${shotoku.jar.dest}" overwrite="true"
                 file="${maven.repo.local}/xalan/jars/xalan-2.7.0.jar" />
 
         <ant:copy
-                todir="../target/${shotoku.sar.dir}" overwrite="true"
+                todir="${shotoku.jar.dest}" overwrite="true"
                 file="lib/informa.jar" />
 
         <ant:copy
-                todir="../target/${shotoku.sar.dir}" overwrite="true"
+                todir="${shotoku.jar.dest}" overwrite="true"
                 file="lib/rome-0.7.jar" />
-        <j:set var="jar.to.dir" value="../target/${shotoku.sar.dir}/rome-0.7.jar" />
+        <j:set var="jar.to.dir" value="${shotoku.jar.dest}/rome-0.7.jar" />
         <attainGoal name="jar-to-dir" />
-        <ant:copy todir="../target/${shotoku.sar.dir}/rome-0.7.jar/com/sun/syndication"
+        <ant:copy todir="${shotoku.jar.dest}/rome-0.7.jar/com/sun/syndication"
                   overwrite="true"
                   file="src/rome/rome.properties" />
         <attainGoal name="dir-to-jar" />

Modified: labs/shotoku/trunk-2.6/shotoku-file-access/maven.xml
===================================================================
--- labs/shotoku/trunk-2.6/shotoku-file-access/maven.xml	2007-01-18 00:25:07 UTC (rev 8896)
+++ labs/shotoku/trunk-2.6/shotoku-file-access/maven.xml	2007-01-18 00:51:53 UTC (rev 8897)
@@ -13,7 +13,7 @@
 
     <goal name="deploy">
         <ant:copy file="target/shotoku-file-access.jar"
-                  todir="../target/${shotoku.sar.dir}" />
+                  todir="${shotoku.jar.dest}" />
         <ant:copy file="target/shotoku-file-access.war"
                   todir="${local.deploy.dir}" />
     </goal>

Modified: labs/shotoku/trunk-2.6/shotoku-jcr/maven.xml
===================================================================
--- labs/shotoku/trunk-2.6/shotoku-jcr/maven.xml	2007-01-18 00:25:07 UTC (rev 8896)
+++ labs/shotoku/trunk-2.6/shotoku-jcr/maven.xml	2007-01-18 00:51:53 UTC (rev 8897)
@@ -10,22 +10,22 @@
 
     <goal name="deploy">
         <ant:copy
-                todir="../target/${shotoku.sar.dir}" overwrite="true"
+                todir="${shotoku.jar.dest}" overwrite="true"
                 file="${maven.repo.local}/concurrent/jars/concurrent-1.3.4.jar" />
         <ant:copy
-                todir="../target/${shotoku.sar.dir}" overwrite="true"
+                todir="${shotoku.jar.dest}" overwrite="true"
                 file="${maven.repo.local}/geronimo-spec/jars/geronimo-spec-jta-1.0-M1.jar" />
         <ant:copy
-                todir="../target/${shotoku.sar.dir}" overwrite="true"
+                todir="${shotoku.jar.dest}" overwrite="true"
                 file="${maven.repo.local}/lucene/jars/lucene-1.4.3.jar" />
         <ant:copy
-                todir="../target/${shotoku.sar.dir}" overwrite="true"
+                todir="${shotoku.jar.dest}" overwrite="true"
                 file="${maven.repo.local}/org.apache.derby/jars/derby-10.1.1.0.jar" />
         <ant:copy
-                todir="../target/${shotoku.sar.dir}" overwrite="true"
+                todir="${shotoku.jar.dest}" overwrite="true"
                 file="lib/jcr-1.0.jar" />
 	    <ant:copy
-                todir="../target/${shotoku.sar.dir}" overwrite="true"
+                todir="${shotoku.jar.dest}" overwrite="true"
                 file="lib/jackrabbit.jar" />
         
         <ant:copy

Modified: labs/shotoku/trunk-2.6/shotoku-portal/maven.xml
===================================================================
--- labs/shotoku/trunk-2.6/shotoku-portal/maven.xml	2007-01-18 00:25:07 UTC (rev 8896)
+++ labs/shotoku/trunk-2.6/shotoku-portal/maven.xml	2007-01-18 00:51:53 UTC (rev 8897)
@@ -10,7 +10,7 @@
     <goal name="deploy">
         <ant:copy
                 file="target/shotoku-portal.jar"
-                tofile="${local.deploy.dir}/jboss-portal.sar/portal-cms.sar/shotoku-portal.jar"
+                tofile="${shotoku.jar.dest}/shotoku-portal.jar"
                 overwrite="true" />
     </goal>
 </project>

Modified: labs/shotoku/trunk-2.6/shotoku-svn/maven.xml
===================================================================
--- labs/shotoku/trunk-2.6/shotoku-svn/maven.xml	2007-01-18 00:25:07 UTC (rev 8896)
+++ labs/shotoku/trunk-2.6/shotoku-svn/maven.xml	2007-01-18 00:51:53 UTC (rev 8897)
@@ -11,7 +11,7 @@
     <goal name="deploy">
         <ant:copy
                 file="lib/javasvn.jar"
-                todir="../target/${shotoku.sar.dir}"
+                todir="${shotoku.jar.dest}"
                 overwrite="true" />
         <ant:copy
                 file="target/shotoku-svn.jar"




More information about the jboss-svn-commits mailing list