GTNPORTAL-2630 : Simplify tomcat packaging maven structure

vstorm83 · Oct 4, 2012 · cc247c7 · cc247c7
1 parent 1f398cb
commit cc247c7
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 125 deletions.
diff --git a/packaging/tomcat/integration/pom.xml b/packaging/tomcat/integration/pom.xml
diff --git a/packaging/tomcat/integration/src/main/webapp/WEB-INF/web.xml b/packaging/tomcat/integration/src/main/webapp/WEB-INF/web.xml
diff --git a/packaging/tomcat/pkg/pom.xml b/packaging/tomcat/pkg/pom.xml
@@ -837,14 +837,6 @@
        <type>war</type>
     </dependency>
 
-    <dependency>
-      <?rename integration.war?>
-      <groupId>org.gatein.portal</groupId>
-      <artifactId>exo.portal.packaging.tomcat.integration</artifactId>
-      <version>${project.version}</version>
-      <type>war</type>
-    </dependency>
-
   </dependencies>
 
   <build>
@@ -891,42 +883,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <profiles>
-    <profile>
-      <id>pkg-all</id>
-      <activation>
-        <property>
-          <name>!gatein.dev</name>
-        </property>
-      </activation>
-      <modules>
-        <module>tc7</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>pkg-tomcat</id>
-      <activation>
-        <property>
-          <name>gatein.dev</name>
-          <value>tomcat</value>
-        </property>
-      </activation>
-      <modules>
-        <module>tc7</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>pkg-tomcat7</id>
-      <activation>
-        <property>
-          <name>gatein.dev</name>
-          <value>tomcat7</value>
-        </property>
-      </activation>
-      <modules>
-        <module>tc7</module>
-      </modules>
-    </profile>
-  </profiles>
 </project>
diff --git a/packaging/tomcat/pom.xml b/packaging/tomcat/pom.xml
@@ -10,8 +10,49 @@
   <name>GateIn Tomcat package</name>
 
   <modules>
-    <module>integration</module>
     <module>pkg</module>
+    <module>tomcat7</module>
   </modules>
 
+  <profiles>
+    <profile>
+      <id>pkg-all</id>
+      <activation>
+        <property>
+          <name>!gatein.dev</name>
+        </property>
+      </activation>
+      <modules>
+        <module>pkg</module>
+        <module>tomcat7</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>pkg-tomcat</id>
+      <activation>
+        <property>
+          <name>gatein.dev</name>
+          <value>tomcat</value>
+        </property>
+      </activation>
+      <modules>
+        <module>pkg</module>
+        <module>tomcat7</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>pkg-tomcat7</id>
+      <activation>
+        <property>
+          <name>gatein.dev</name>
+          <value>tomcat7</value>
+        </property>
+      </activation>
+      <modules>
+        <module>pkg</module>
+        <module>tomcat7</module>
+      </modules>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/packaging/tomcat/pkg/tc7/download-tomcat.xml → packaging/tomcat/tomcat7/download-tomcat.xml b/packaging/tomcat/pkg/tc7/download-tomcat.xml → packaging/tomcat/tomcat7/download-tomcat.xml
diff --git a/.../tomcat/pkg/tc7/extract-download-urls.xsl → .../tomcat/tomcat7/extract-download-urls.xsl b/.../tomcat/pkg/tc7/extract-download-urls.xsl → .../tomcat/tomcat7/extract-download-urls.xsl
diff --git a/packaging/tomcat/pkg/tc7/package.xml → packaging/tomcat/tomcat7/package.xml b/packaging/tomcat/pkg/tc7/package.xml → packaging/tomcat/tomcat7/package.xml
@@ -35,7 +35,7 @@
     <echo>Using Tomcat at: ${tomcat.dir}</echo>
 
     <!-- Copy tomcat 7 -->
-    <copy todir="${maven.project.build.directory}/tomcat7">
+    <copy todir="${maven.project.build.directory}/tomcat">
       <fileset dir="${tomcat.dir}">
         <exclude name="webapps/ROOT/**"/>
         <exclude name="webapps/examples/**"/>
@@ -44,27 +44,27 @@
     </copy>
 
     <!-- Copy generic tomcat packaging -->
-    <copy todir="${maven.project.build.directory}/tomcat7">
-      <fileset dir="${maven.project.build.directory}/../../target/tomcat"/>
+    <copy todir="${maven.project.build.directory}/tomcat">
+      <fileset dir="${maven.project.build.directory}/../../pkg/target/tomcat"/>
     </copy>
 
     <!-- Copy specific tomcat configration -->
-    <copy todir="${maven.project.build.directory}/tomcat7" overwrite="true">
+    <copy todir="${maven.project.build.directory}/tomcat" overwrite="true">
       <fileset dir="${maven.project.basedir}/src/main/resources/tomcat"/>
     </copy>
 
     <!-- Tomcat 7 specific dependencies -->
     <copy
         file="${maven.dependency.org.gatein.wci.wci-tomcat7.jar.path}"
-        todir="${maven.project.build.directory}/tomcat7/lib"/>
+        todir="${maven.project.build.directory}/tomcat/lib"/>
 
-    <!-- Tomcat 7 specific configuration -->
-    <copy
-        file="${maven.project.basedir}/src/main/resources/conf/integration/web.xml"
-        tofile="${maven.project.build.directory}/tomcat7/webapps/integration/WEB-INF/web.xml"/>
+    <!-- WCI integration -->
+    <copy todir="${maven.project.build.directory}/tomcat/webapps/integration/">
+      <fileset dir="${maven.project.basedir}/src/main/webapp"/>
+    </copy>
 
     <!-- Extract common config from packaging.common artifact to gatein/conf -->
-    <unzip src="${org.gatein.portal:exo.portal.packaging.common:jar}" dest="${maven.project.build.directory}/tomcat7/gatein/conf">
+    <unzip src="${org.gatein.portal:exo.portal.packaging.common:jar}" dest="${maven.project.build.directory}/tomcat/gatein/conf">
       <patternset>
         <exclude name="META-INF/"/>
       </patternset>
@@ -73,8 +73,8 @@
 
     <!-- File permissions -->
     <!-- Excluded due to ARG_MAX limitation on Mac OS X -->
-    <!--chmod perm="0644" type="file" dir="${project.build.directory}/tomcat7" excludes="**/*.sh"/-->
-    <chmod perm="0755" type="file" dir="${maven.project.build.directory}/tomcat7" includes="**/*.sh"/>
+    <!--chmod perm="0644" type="file" dir="${project.build.directory}/tomcat" excludes="**/*.sh"/-->
+    <chmod perm="0755" type="file" dir="${maven.project.build.directory}/tomcat" includes="**/*.sh"/>
 
   </target>
 </project>
diff --git a/packaging/tomcat/pkg/tc7/pom.xml → packaging/tomcat/tomcat7/pom.xml b/packaging/tomcat/pkg/tc7/pom.xml → packaging/tomcat/tomcat7/pom.xml
@@ -8,7 +8,7 @@
     <artifactId>exo.portal.packaging.tomcat.pkg</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent>
-  <artifactId>exo.portal.packaging.tomcat.pkg.tc7</artifactId>
+  <artifactId>exo.portal.packaging.tomcat.tomcat7</artifactId>
   <packaging>pom</packaging>
   <name>GateIn for Tomcat 7 packaging</name>
 

diff --git a/...resources/tomcat/conf/catalina.properties → ...resources/tomcat/conf/catalina.properties b/...resources/tomcat/conf/catalina.properties → ...resources/tomcat/conf/catalina.properties
diff --git a/.../resources/tomcat/conf/logging.properties → .../resources/tomcat/conf/logging.properties b/.../resources/tomcat/conf/logging.properties → .../resources/tomcat/conf/logging.properties
diff --git a/...tion/src/main/webapp/META-INF/context.xml → ...cat7/src/main/webapp/META-INF/context.xml b/...tion/src/main/webapp/META-INF/context.xml → ...cat7/src/main/webapp/META-INF/context.xml
diff --git a/...c/main/resources/conf/integration/web.xml → ...t/tomcat7/src/main/webapp/WEB-INF/web.xml b/...c/main/resources/conf/integration/web.xml → ...t/tomcat7/src/main/webapp/WEB-INF/web.xml