You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by rw...@apache.org on 2009/05/01 07:03:23 UTC

svn commit: r770539 - in /portals/jetspeed-2/portal/trunk/enterprise: ear-full/pom.xml ear-min/pom.xml

Author: rwatler
Date: Fri May  1 05:03:23 2009
New Revision: 770539

URL: http://svn.apache.org/viewvc?rev=770539&view=rev
Log:
move shared lib jars into JavaEE 5 specified lib EAR directory

Modified:
    portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml
    portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml

Modified: portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml?rev=770539&r1=770538&r2=770539&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml Fri May  1 05:03:23 2009
@@ -97,41 +97,41 @@
               <contextRoot>/webcontent</contextRoot>
             </webModule>                       
 
-            <javaModule>
+            <jarModule>
               <groupId>javax.ccpp</groupId>
               <artifactId>ccpp</artifactId>
-              <bundleDir>/</bundleDir>
-            </javaModule>
-            <javaModule>
+              <bundleDir>/lib</bundleDir>
+            </jarModule>
+            <jarModule>
               <groupId>${pom.groupId}</groupId>
               <artifactId>jetspeed-api</artifactId>
-              <bundleDir>/</bundleDir>
-            </javaModule>
-            <javaModule>
+              <bundleDir>/lib</bundleDir>
+            </jarModule>
+            <jarModule>
               <groupId>${pom.groupId}</groupId>
               <artifactId>jetspeed-commons</artifactId>
-              <bundleDir>/</bundleDir>
-            </javaModule>
-            <javaModule>
+              <bundleDir>/lib</bundleDir>
+            </jarModule>
+            <jarModule>
               <groupId>org.apache.portals.bridges</groupId>
               <artifactId>portals-bridges-common</artifactId>
-              <bundleDir>/</bundleDir>
-            </javaModule>
-            <javaModule>                      
+              <bundleDir>/lib</bundleDir>
+            </jarModule>
+            <jarModule>                      
               <groupId>javax.portlet</groupId>
               <artifactId>portlet-api</artifactId>
-              <bundleDir>/</bundleDir>
-            </javaModule>
-            <javaModule>                      
+              <bundleDir>/lib</bundleDir>
+            </jarModule>
+            <jarModule>                      
               <groupId>org.apache.pluto</groupId>
               <artifactId>pluto-container-api</artifactId>
-              <bundleDir>/</bundleDir>
-            </javaModule>                                              
-            <javaModule>                      
+              <bundleDir>/lib</bundleDir>
+            </jarModule>                                              
+            <jarModule>                      
               <groupId>org.apache.pluto</groupId>
               <artifactId>pluto-taglib</artifactId>
-              <bundleDir>/</bundleDir>
-            </javaModule>                                              
+              <bundleDir>/lib</bundleDir>
+            </jarModule>                                              
           </modules>
         </configuration>
       </plugin>

Modified: portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml?rev=770539&r1=770538&r2=770539&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/ear-min/pom.xml Fri May  1 05:03:23 2009
@@ -55,6 +55,11 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-ear-plugin</artifactId>
         <configuration>
+          <archive>
+            <manifest>
+              <addClasspath>true</addClasspath>
+            </manifest>
+          </archive>
           <modules>
             <webModule>
               <groupId>${pom.groupId}</groupId>
@@ -67,41 +72,41 @@
               <contextRoot>/j2-admin</contextRoot>
             </webModule>
             
-            <javaModule>
+            <jarModule>
               <groupId>javax.ccpp</groupId>
               <artifactId>ccpp</artifactId>
-              <bundleDir>/</bundleDir>
-            </javaModule>
-            <javaModule>
+              <bundleDir>/lib</bundleDir>
+            </jarModule>
+            <jarModule>
               <groupId>${pom.groupId}</groupId>
               <artifactId>jetspeed-api</artifactId>
-              <bundleDir>/</bundleDir>
-            </javaModule>
-            <javaModule>
+              <bundleDir>/lib</bundleDir>
+            </jarModule>
+            <jarModule>
               <groupId>${pom.groupId}</groupId>
               <artifactId>jetspeed-commons</artifactId>
-              <bundleDir>/</bundleDir>
-            </javaModule>
-            <javaModule>
+              <bundleDir>/lib</bundleDir>
+            </jarModule>
+            <jarModule>
               <groupId>org.apache.portals.bridges</groupId>
               <artifactId>portals-bridges-common</artifactId>
-              <bundleDir>/</bundleDir>
-            </javaModule>
-            <javaModule>                      
+              <bundleDir>/lib</bundleDir>
+            </jarModule>
+            <jarModule>                      
               <groupId>javax.portlet</groupId>
               <artifactId>portlet-api</artifactId>
-              <bundleDir>/</bundleDir>
-            </javaModule>
-            <javaModule>                      
+              <bundleDir>/lib</bundleDir>
+            </jarModule>
+            <jarModule>                      
               <groupId>org.apache.pluto</groupId>
               <artifactId>pluto-container-api</artifactId>
-              <bundleDir>/</bundleDir>
-            </javaModule>                                              
-            <javaModule>                      
+              <bundleDir>/lib</bundleDir>
+            </jarModule>                                              
+            <jarModule>                      
               <groupId>org.apache.pluto</groupId>
               <artifactId>pluto-taglib</artifactId>
-              <bundleDir>/</bundleDir>
-            </javaModule>                                              
+              <bundleDir>/lib</bundleDir>
+            </jarModule>                                              
           </modules>
         </configuration>
       </plugin>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org