portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r770552 - in /portals/jetspeed-2/portal/trunk/enterprise: ear-full/pom.xml ear-min/pom.xml
Date Fri, 01 May 2009 06:59:50 GMT
Author: rwatler
Date: Fri May  1 06:59:50 2009
New Revision: 770552

URL: http://svn.apache.org/viewvc?rev=770552&view=rev
Log:
update ear packaging to use skinny wars for shared libs

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=770552&r1=770551&r2=770552&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 06:59:50 2009
@@ -71,6 +71,7 @@
         <artifactId>maven-ear-plugin</artifactId>
         <configuration>
           <modules>
+            <!-- skinny wars: must be explicitly repackaged below with maven-ear-plugin-skinny-wars
-->
             <webModule>
               <groupId>${pom.groupId}</groupId>
               <artifactId>jetspeed</artifactId>
@@ -97,6 +98,7 @@
               <contextRoot>/webcontent</contextRoot>
             </webModule>                       
 
+            <!-- skinny wars classpath lib jars -->
             <jarModule>
               <groupId>javax.ccpp</groupId>
               <artifactId>ccpp</artifactId>
@@ -135,6 +137,64 @@
           </modules>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>maven-ear-plugin-skinny-wars</id>
+            <phase>package</phase>
+            <configuration>
+              <tasks>
+                <!-- unpackage EAR -->
+                <delete dir="${project.build.directory}/package-skinny-wars"/>
+                <unjar src="${project.build.directory}/${project.build.finalName}.ear"
dest="${project.build.directory}/package-skinny-wars"/>
+                <!-- determine skinny wars classpath from lib jars -->
+                <pathconvert pathsep=" " property="war.manifest.classpath">
+                  <map from="${project.build.directory}${file.separator}package-skinny-wars${file.separator}"
to=""/>
+                  <path>
+                    <fileset dir="${project.build.directory}/package-skinny-wars">
+                      <include name="lib/*.jar"/>
+                    </fileset>
+                  </path>
+                </pathconvert>
+                <!-- set skinny wars classpath -->
+                <jar destfile="${project.build.directory}/package-skinny-wars/jetspeed-${pom.version}.war"
update="true">
+                  <manifest>
+                    <attribute name="Class-Path" value="${war.manifest.classpath}"/>
+                  </manifest>
+                </jar>
+                <jar destfile="${project.build.directory}/package-skinny-wars/j2-admin-${pom.version}.war"
update="true">
+                  <manifest>
+                    <attribute name="Class-Path" value="${war.manifest.classpath}"/>
+                  </manifest>
+                </jar>
+                <jar destfile="${project.build.directory}/package-skinny-wars/apa-demo-${org.apache.portals.applications.apa-demo.version}.war"
update="true">
+                  <manifest>
+                    <attribute name="Class-Path" value="${war.manifest.classpath}"/>
+                  </manifest>
+                </jar>
+                <jar destfile="${project.build.directory}/package-skinny-wars/apa-rss-war-${org.apache.portals.applications.apa-rss.version}.war"
update="true">
+                  <manifest>
+                    <attribute name="Class-Path" value="${war.manifest.classpath}"/>
+                  </manifest>
+                </jar>
+                <jar destfile="${project.build.directory}/package-skinny-wars/apa-webcontent-war-${org.apache.portals.applications.apa-webcontent.version}.war"
update="true">
+                  <manifest>
+                    <attribute name="Class-Path" value="${war.manifest.classpath}"/>
+                  </manifest>
+                </jar>
+                <!-- repackage EAR with skinny wars -->
+                <jar destfile="${project.build.directory}/${project.build.finalName}.ear"
basedir="${project.build.directory}/package-skinny-wars" manifest="${project.build.directory}/package-skinny-wars/META-INF/MANIFEST.MF"/>
+                <delete dir="${project.build.directory}/package-skinny-wars"/>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

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=770552&r1=770551&r2=770552&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 06:59:50 2009
@@ -61,6 +61,7 @@
             </manifest>
           </archive>
           <modules>
+            <!-- skinny wars: must be explicitly repackaged below with maven-ear-plugin-skinny-wars
-->
             <webModule>
               <groupId>${pom.groupId}</groupId>
               <artifactId>jetspeed</artifactId>
@@ -71,7 +72,8 @@
               <artifactId>j2-admin</artifactId>
               <contextRoot>/j2-admin</contextRoot>
             </webModule>
-            
+
+            <!-- skinny wars classpath lib jars -->
             <jarModule>
               <groupId>javax.ccpp</groupId>
               <artifactId>ccpp</artifactId>
@@ -110,6 +112,49 @@
           </modules>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>maven-ear-plugin-skinny-wars</id>
+            <phase>package</phase>
+            <configuration>
+              <tasks>
+                <!-- unpackage EAR -->
+                <delete dir="${project.build.directory}/package-skinny-wars"/>
+                <unjar src="${project.build.directory}/${project.build.finalName}.ear"
dest="${project.build.directory}/package-skinny-wars"/>
+                <!-- determine skinny wars classpath from lib jars -->
+                <pathconvert pathsep=" " property="war.manifest.classpath">
+                  <map from="${project.build.directory}${file.separator}package-skinny-wars${file.separator}"
to=""/>
+                  <path>
+                    <fileset dir="${project.build.directory}/package-skinny-wars">
+                      <include name="lib/*.jar"/>
+                    </fileset>
+                  </path>
+                </pathconvert>
+                <!-- set skinny wars classpath -->
+                <jar destfile="${project.build.directory}/package-skinny-wars/jetspeed-${pom.version}.war"
update="true">
+                  <manifest>
+                    <attribute name="Class-Path" value="${war.manifest.classpath}"/>
+                  </manifest>
+                </jar>
+                <jar destfile="${project.build.directory}/package-skinny-wars/j2-admin-${pom.version}.war"
update="true">
+                  <manifest>
+                    <attribute name="Class-Path" value="${war.manifest.classpath}"/>
+                  </manifest>
+                </jar>
+                <!-- repackage EAR with skinny wars -->
+                <jar destfile="${project.build.directory}/${project.build.finalName}.ear"
basedir="${project.build.directory}/package-skinny-wars" manifest="${project.build.directory}/package-skinny-wars/META-INF/MANIFEST.MF"/>
+                <delete dir="${project.build.directory}/package-skinny-wars"/>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>



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


Mime
View raw message