[gatein-commits] gatein SVN: r4933 - in portal/trunk: server and 1 other directory.

[do-not-reply at jboss.org]

Author: trong.tran
Date: 2010-11-04 01:03:14 -0400 (Thu, 04 Nov 2010)
New Revision: 4933

Removed:
   portal/trunk/server/tomcat/
Modified:
   portal/trunk/packaging/pkg/pom.xml
   portal/trunk/server/pom.xml
Log:
GTNPORTAL-1632 Remove usage of exobuild for Tomcat packaging

Modified: portal/trunk/packaging/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/pkg/pom.xml	2010-11-04 04:59:41 UTC (rev 4932)
+++ portal/trunk/packaging/pkg/pom.xml	2010-11-04 05:03:14 UTC (rev 4933)
@@ -135,106 +135,6 @@
 
    <profiles>
       <profile>
-         <id>pkg-tomcat-legacy</id>
-         <build>
-            <finalName>GateIn-${project.version}</finalName>
-            <plugins>
-               <!-- Ensure your environment is correctly setup -->
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-enforcer-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>tomcat-check-environment-ready</id>
-                        <goals>
-                           <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                           <rules>
-                              <requireProperty>
-                                 <property>exo.projects.directory.dependencies</property>
-                                 <message>"You must define the property exo.projects.directory.dependencies to give the path to the directory where you store your applications servers"</message>
-                              </requireProperty>
-                              <requireProperty>
-                                 <property>exo.projects.app.tomcat.version</property>
-                                 <message>"You must define the property exo.projects.app.tomcat.version to give the name of the directory where is stored tomcat"</message>
-                              </requireProperty>
-                              <requireFilesExist>
-                                 <files>
-                                    <file>${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}/</file>
-                                 </files>
-                                 <message>"The following Tomcat directory doesn't exist : ${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}"</message>
-                              </requireFilesExist>
-                           </rules>
-                           <fail>true</fail>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-               <!-- run exo build -->
-               <plugin>
-                  <groupId>org.codehaus.mojo</groupId>
-                  <artifactId>exec-maven-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>tomcat-packaging</id>
-                        <phase>package</phase>
-                        <configuration>
-                           <executable>java</executable>
-                           <workingDirectory>${basedir}</workingDirectory>
-                           <arguments>
-                              <argument>-Dexo.package.home=${basedir}/target/packager</argument>
-                              <argument>-Dexo.current.dir=${basedir}</argument>
-                              <argument>-Dexo.base.dir=${exo.projects.directory.base}</argument>
-                              <argument>-Dexo.conf.dir=${basedir}/target/packager-conf</argument>
-                              <argument>-Dexo.working.dir=${gatein.working.dir}/</argument>
-                              <!--argument>-Dexo.src.dir=NONE</argument-->
-                              <argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument><!-- to get the server ref install -->
-                              <argument>-Dexo.m2.repos=file:${settings.localRepository}</argument>
-                              <argument>-Dclean.server=${exo.projects.app.tomcat.version}</argument>
-                              <argument>-Dexo.m2.home=${maven.home}</argument>
-                              <argument>-Xms128m</argument>
-                              <argument>-Xmx512m</argument>
-                              <argument>-classpath</argument>
-                              <argument>${basedir}/target/packager/lib/js.jar</argument>
-                              <argument>org.mozilla.javascript.tools.shell.Main</argument>
-                              <argument>${basedir}/target/packager/javascript/eXo/eXo.js</argument>
-                              <argument>exobuild</argument>
-                              <argument>--product=portal</argument>
-                              <argument>--deploy=tomcat</argument>
-                           </arguments>
-                        </configuration>
-                        <goals>
-                           <goal>exec</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-               </plugin>
-<!--
-               <plugin>
-                  <artifactId>maven-assembly-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>tomcat-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                           <goal>single</goal>
-                        </goals>
-                        <configuration>
-                           <descriptors>
-                              <descriptor>src/main/assembly/tomcat-zip.xml</descriptor>
-                           </descriptors>
-                           <attach>false</attach>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
--->
-            </plugins>
-         </build>
-      </profile>
-
-      <profile>
          <id>pkg-jbossas</id>
          <build>
             <finalName>GateIn-${project.version}</finalName>

Modified: portal/trunk/server/pom.xml
===================================================================
--- portal/trunk/server/pom.xml	2010-11-04 04:59:41 UTC (rev 4932)
+++ portal/trunk/server/pom.xml	2010-11-04 05:03:14 UTC (rev 4933)
@@ -35,7 +35,6 @@
    <name>GateIn Portal Server</name>
 
    <modules>
-      <module>tomcat</module>
       <module>jboss</module>
    </modules>