[gatein-commits] gatein SVN: r2289 - in portal/branches/EPP_5_0_Branch: examples/extension and 8 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Mar 17 15:38:37 EDT 2010
Author: thomas.heute at jboss.com
Date: 2010-03-17 15:38:36 -0400 (Wed, 17 Mar 2010)
New Revision: 2289
Removed:
portal/branches/EPP_5_0_Branch/packaging/pkg/src/main/assembly/tomcat-zip.xml
portal/branches/EPP_5_0_Branch/patch/
portal/branches/EPP_5_0_Branch/server/tomcat/
Modified:
portal/branches/EPP_5_0_Branch/README.txt
portal/branches/EPP_5_0_Branch/examples/extension/README.txt
portal/branches/EPP_5_0_Branch/examples/portal/README.txt
portal/branches/EPP_5_0_Branch/packaging/module/src/main/javascript/portal.packaging.module.js
portal/branches/EPP_5_0_Branch/packaging/pkg/pom.xml
portal/branches/EPP_5_0_Branch/packaging/product/src/main/javascript/portal.packaging.product.js
portal/branches/EPP_5_0_Branch/packaging/profiles.xml
portal/branches/EPP_5_0_Branch/packaging/profiles.xml.template
portal/branches/EPP_5_0_Branch/packaging/reports/build.xml
portal/branches/EPP_5_0_Branch/packaging/reports/pom.xml
portal/branches/EPP_5_0_Branch/server/pom.xml
Log:
JBEPP-186: Remove Tomcat related configuration
Modified: portal/branches/EPP_5_0_Branch/README.txt
===================================================================
--- portal/branches/EPP_5_0_Branch/README.txt 2010-03-17 18:51:51 UTC (rev 2288)
+++ portal/branches/EPP_5_0_Branch/README.txt 2010-03-17 19:38:36 UTC (rev 2289)
@@ -1,48 +1,39 @@
Welcome to GateIn:
===========================
-This will explain you how to build a package of GateIn with Tomcat or JBoss.
+This will explain you how to build a package of GateIn with JBoss.
*****************
* COMPILATION
*****************
* mvn install
-For example: mvn install
+For example: mvn install
-Note: If you run "mvn install" twice in a row without cleaning, one test will
-fail. To workaround this issue you will need to delete the test data located
-here: component/portal/target/temp/
+**********************
+* MAVEN CONFIGURATION:
+**********************
-**********************
-* MAVEN CONFIGURATION:
-**********************
-
-* edit packaging/profiles.xml and replace the values mentioned so that:
- * ${exo.projects.directory.dependencies} directory contains :
- ** ${exo.projects.app.tomcat.version}/ a clean Tomcat installation, to be used as packaging template
- ** ${exo.projects.app.jboss.version}/ a clean JBoss installation, to be used as packaging template
+* edit packaging/profiles.xml and replace the values mentioned so that:
+ * ${exo.projects.directory.dependencies} directory contains :
+ ** ${exo.projects.app.jboss.version}/ a clean JBoss installation, to be used as packaging template
* See http://maven.apache.org/guides/introduction/introduction-to-profiles.html for more informations
-
-Alternatively you can edit your local settings.xml to add the information
-provided in profiles.xml. It will override what's in the provided file.
-
-*****************
-* PACKAGING:
-*****************
+
+Alternatively you can edit your local settings.xml to add the information
+provided in profiles.xml. It will override what's in the provided file.
-* mvn install -Ppkg-tomcat
-** Creates a Tomcat delivery in packaging/pkg/target/tomcat/
-
-* mvn install -Ppkg-jbossas
+*****************
+* PACKAGING:
+*****************
+
+* mvn install -Ppkg-jbossas
** Creates a JBossAS delivery in packaging/pkg/target/jboss/
-
-*****************
-* STARTING:
-*****************
-* On Tomcat: go to the tomcat directory (or unzip the archive in your favorite location) and execute 'bin/gatein.sh start' ('bin/gatein.bat start' on Windows)
-* On JBoss: go to the jboss directory (or unzip the archive in your favorite location) and execute 'bin/run.sh start' ('bin/run.bat start' on Windows)
-
-* Go to http://localhost:8080/portal to see the homepage of the portal. That's it.
+*****************
+* STARTING:
+*****************
+* Go to the jboss directory (or unzip the archive in your favorite location) and execute 'bin/run.sh start' ('bin/run.bat start' on Windows)
+
+* Go to http://localhost:8080/portal to see the homepage of the portal. That's it.
+
Modified: portal/branches/EPP_5_0_Branch/examples/extension/README.txt
===================================================================
--- portal/branches/EPP_5_0_Branch/examples/extension/README.txt 2010-03-17 18:51:51 UTC (rev 2288)
+++ portal/branches/EPP_5_0_Branch/examples/extension/README.txt 2010-03-17 19:38:36 UTC (rev 2289)
@@ -22,7 +22,7 @@
########################################
########################################
-# On JBoss (tested on JBoss 5.1.0.GA)
+# On JBoss
########################################
We assume that you have a clean JBoss version of GateIn: ie We assume that you have already the file gatein.ear in the deploy directory
@@ -37,22 +37,6 @@
the load order is first the exoplatform.ear then the sample-ext.ear and finally the starter.ear
########################################
-# On Tomcat (tested on Tomcat 6.0.20)
-########################################
-
-We assume that you have a clean Tomcat version of GateIn: ie We assume that you have already all the jar files of GateIn and their dependencies
-into tomcat/lib and you have the related relam name "gatein-domain" defined in the file tomcat/conf/jaas.conf
-
-1. Add the file sample-ext.war from sample/extension/war/target/ to the tomcat/webapps directory
-2. Add the folder starter from starter/war/target/ to the tomcat/webapps directory
-3. Rename the directory (unzipped folder) starter to "starter.war" (for more details see the warning below)
-4. Add the jar file exo.portal.sample.extension.config-X.Y.Z.jar from sample/extension/config/target/ to the tomcat/lib directory
-5. Add the jar file exo.portal.sample.extension.jar-X.Y.Z.jar from sample/extension/jar/target/ to the tomcat/lib directory
-
-WARNING: This can only work if the starter.war is the last war file to be loaded, so don't hesitate to rename it if your war files are loaded
-following to the alphabetic order
-
-########################################
# HOW TO TEST
########################################
@@ -65,13 +49,3 @@
1. Go to the bin directory of jboss
2. Launch "./run.sh" or "run.bat"
3. When jboss is ready, you can launch your web browser and access to http://localhost:8080/portal
-
-########################################
-# On Tomcat (tested on Tomcat 6.0.20)
-########################################
-
-You need to:
-
-1. Go to the bin directory of tomcat
-2. Launch "./gatein.sh run" or "gatein.bat run"
-3. When tomcat is ready, you can launch your web browser and access to http://localhost:8080/portal
Modified: portal/branches/EPP_5_0_Branch/examples/portal/README.txt
===================================================================
--- portal/branches/EPP_5_0_Branch/examples/portal/README.txt 2010-03-17 18:51:51 UTC (rev 2288)
+++ portal/branches/EPP_5_0_Branch/examples/portal/README.txt 2010-03-17 19:38:36 UTC (rev 2289)
@@ -22,7 +22,7 @@
########################################
########################################
-# On JBoss (tested on JBoss 5.1.0.GA)
+# On JBoss
########################################
We assume that you have a clean JBoss version of GateIn: ie We assume that you have already the file gatein.ear in the deploy directory
@@ -37,62 +37,6 @@
the load order is first the gatein.ear then the sample-portal.ear and finally the starter.ear
########################################
-# On Tomcat (tested on Tomcat 6.0.20)
-########################################
-
-We assume that you have a clean Tomcat version of GateIn: ie We assume that you have already all the jar files of GateIn and their dependencies
-into tomcat/lib and you have the related relam name "gatein-domain" defined in the file tomcat/conf/jaas.conf
-
-1. Add the file sample-portal.war from sample/portal/war/target/ to the tomcat/webapps directory
-2. Add the file rest-sample-portal.war from sample/portal/rest-war/target/ to the tomcat/webapps directory
-3. Add the folder starter from starter/war/target/ to the tomcat/webapps directory
-4. Rename the directory (unzipped folder) starter to "starter.war" (for more details see the warning below)
-5. Add the jar file exo.portal.sample.portal.config-X.Y.Z.jar from sample/portal/config/target/ to the tomcat/lib directory
-6. Add the jar file exo.portal.sample.portal.jar-X.Y.Z.jar from sample/portal/jar/target/ to the tomcat/lib directory
-7. Define the related realm in your file tomcat/conf/jaas.conf, as below:
-
-gatein-domain-sample-portal {
- org.exoplatform.web.security.PortalLoginModule required
- portalContainerName="sample-portal"
- realmName="gatein-domain-sample-portal";
- org.exoplatform.services.security.jaas.SharedStateLoginModule required
- portalContainerName="sample-portal"
- realmName="gatein-domain-sample-portal";
- org.exoplatform.services.security.j2ee.TomcatLoginModule required
- portalContainerName="sample-portal"
- realmName="gatein-domain-sample-portal";
-};
-8. Define the context of sample-portal by creating a file called "sample-portal.xml" in tomcat/conf/Catalina/localhost/ with the following content
-
-<Context path='/sample-portal' docBase='sample-portal' debug='0' reloadable='true' crossContext='true' privileged='true'>
- <Logger className='org.apache.catalina.logger.SystemOutLogger'
- prefix='localhost_portal_log.' suffix='.txt' timestamp='true'/>
- <Manager className='org.apache.catalina.session.PersistentManager' saveOnRestart='false'/>
- <Realm className='org.apache.catalina.realm.JAASRealm'
- appName='gatein-domain-sample-portal'
- userClassNames='org.exoplatform.services.security.jaas.UserPrincipal'
- roleClassNames='org.exoplatform.services.security.jaas.RolePrincipal'
- debug='0' cache='false'/>
- <Valve className='org.apache.catalina.authenticator.FormAuthenticator' characterEncoding='UTF-8'/></Context>
-
-9. Define the context of rest-sample-portal by creating a file called "rest-sample-portal.xml" in tomcat/conf/Catalina/localhost/ with the following content
-
-<Context path="/rest-sample-portal" docBase="rest-sample-portal" reloadable="true" crossContext="false">
-
- <Logger className='org.apache.catalina.logger.SystemOutLogger'
- prefix='localhost_portal_log.' suffix='.txt' timestamp='true'/>
- <Manager className='org.apache.catalina.session.PersistentManager' saveOnRestart='false'/>
- <Realm className='org.apache.catalina.realm.JAASRealm'
- appName='gatein-domain-sample-portal'
- userClassNames="org.exoplatform.services.security.jaas.UserPrincipal"
- roleClassNames="org.exoplatform.services.security.jaas.RolePrincipal"
- debug='0' cache='false'/>
-</Context>
-
-WARNING: This can only work if the starter.war is the last war file to be loaded, so don't hesitate to rename it if your war files are loaded
-following to the alphabetic order
-
-########################################
# HOW TO TEST
########################################
@@ -105,13 +49,3 @@
1. Go to the bin directory of jboss
2. Launch "./run.sh" or "run.bat"
3. When jboss is ready, you can launch your web browser and access to http://localhost:8080/sample-portal
-
-########################################
-# On Tomcat (tested on Tomcat 6.0.20)
-########################################
-
-You need to:
-
-1. Go to the bin directory of tomcat
-2. Launch "./gatein.sh run" or "gatein.bat run"
-3. When tomcat is ready, you can launch your web browser and access to http://localhost:8080/sample-portal
Modified: portal/branches/EPP_5_0_Branch/packaging/module/src/main/javascript/portal.packaging.module.js
===================================================================
--- portal/branches/EPP_5_0_Branch/packaging/module/src/main/javascript/portal.packaging.module.js 2010-03-17 18:51:51 UTC (rev 2288)
+++ portal/branches/EPP_5_0_Branch/packaging/module/src/main/javascript/portal.packaging.module.js 2010-03-17 19:38:36 UTC (rev 2289)
@@ -246,14 +246,6 @@
module.server = {}
- module.server.tomcat = {}
- module.server.tomcat.patch =
- new Project("org.exoplatform.portal", "exo.portal.server.tomcat.patch", "jar", module.version);
-
- module.server.jboss = {}
- module.server.jboss.patch =
- new Project("org.exoplatform.portal", "exo.portal.server.jboss.patch", "jar", module.version);
-
module.server.jbossear = {}
module.server.jbossear.patch =
new Project("org.exoplatform.portal", "exo.portal.server.jboss.patch-ear", "jar", module.version);
Modified: portal/branches/EPP_5_0_Branch/packaging/pkg/pom.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/packaging/pkg/pom.xml 2010-03-17 18:51:51 UTC (rev 2288)
+++ portal/branches/EPP_5_0_Branch/packaging/pkg/pom.xml 2010-03-17 19:38:36 UTC (rev 2289)
@@ -135,106 +135,6 @@
<profiles>
<profile>
- <id>pkg-tomcat</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>
@@ -334,107 +234,6 @@
</build>
</profile>
<profile>
- <id>pkg-tomcat-tests</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>
- <argument>--integration-test</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-tests</id>
<build>
<finalName>GateIn-${project.version}</finalName>
Deleted: portal/branches/EPP_5_0_Branch/packaging/pkg/src/main/assembly/tomcat-zip.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/packaging/pkg/src/main/assembly/tomcat-zip.xml 2010-03-17 18:51:51 UTC (rev 2288)
+++ portal/branches/EPP_5_0_Branch/packaging/pkg/src/main/assembly/tomcat-zip.xml 2010-03-17 19:38:36 UTC (rev 2289)
@@ -1,49 +0,0 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
- <id>tomcat</id>
- <formats>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/tomcat</directory>
- <outputDirectory>${project.build.finalName}</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <excludes>
- <exclude>**/*.sh</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>target/tomcat</directory>
- <outputDirectory>${project.build.finalName}</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>**/*.sh</include>
- </includes>
- <fileMode>755</fileMode>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Modified: portal/branches/EPP_5_0_Branch/packaging/product/src/main/javascript/portal.packaging.product.js
===================================================================
--- portal/branches/EPP_5_0_Branch/packaging/product/src/main/javascript/portal.packaging.product.js 2010-03-17 18:51:51 UTC (rev 2288)
+++ portal/branches/EPP_5_0_Branch/packaging/product/src/main/javascript/portal.packaging.product.js 2010-03-17 19:38:36 UTC (rev 2289)
@@ -49,8 +49,6 @@
product.addDependencies(portal.ibm.jdk.support);
- product.addServerPatch("tomcat", portal.server.tomcat.patch) ;
- product.addServerPatch("jboss", portal.server.jboss.patch) ;
product.addServerPatch("jbossear", portal.server.jbossear.patch) ;
/* cleanup duplicated lib */
Modified: portal/branches/EPP_5_0_Branch/packaging/profiles.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/packaging/profiles.xml 2010-03-17 18:51:51 UTC (rev 2288)
+++ portal/branches/EPP_5_0_Branch/packaging/profiles.xml 2010-03-17 19:38:36 UTC (rev 2289)
@@ -29,7 +29,7 @@
ex: On Windows 'c:/AS'
ex: On Linux '/home/user/AS'
-->
- <exo.projects.directory.dependencies>/home/martin/dev/exo-dependencies</exo.projects.directory.dependencies>
+ <exo.projects.directory.dependencies>/home/theute/AS</exo.projects.directory.dependencies>
<!--
If you want that the server is deployed always at the same place (not in packaging/pkg/target/<server> dir)
@@ -39,10 +39,6 @@
<gatein.working.dir>REPLACE_WITH_SERVER_DIR</gatein.working.dir>
-->
<!--
- Replace with the name of the directory containing Tomcat 6
- -->
- <exo.projects.app.tomcat.version>apache-tomcat-6.0.20</exo.projects.app.tomcat.version>
- <!--
Replace with the name of the directory containing JBoss AS 5.1
-->
<exo.projects.app.jboss.version>jboss-5.1.0.GA</exo.projects.app.jboss.version>
Modified: portal/branches/EPP_5_0_Branch/packaging/profiles.xml.template
===================================================================
--- portal/branches/EPP_5_0_Branch/packaging/profiles.xml.template 2010-03-17 18:51:51 UTC (rev 2288)
+++ portal/branches/EPP_5_0_Branch/packaging/profiles.xml.template 2010-03-17 19:38:36 UTC (rev 2289)
@@ -38,12 +38,7 @@
<!--
<gatein.working.dir>REPLACE_WITH_SERVER_DIR</gatein.working.dir>
-->
-
<!--
- Replace with the name of the directory containing Tomcat 6
- -->
- <exo.projects.app.tomcat.version>apache-tomcat-6.0.20</exo.projects.app.tomcat.version>
- <!--
Replace with the name of the directory containing JBoss AS 5.1
-->
<exo.projects.app.jboss.version>jboss-5.1.0.GA</exo.projects.app.jboss.version>
Modified: portal/branches/EPP_5_0_Branch/packaging/reports/build.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/packaging/reports/build.xml 2010-03-17 18:51:51 UTC (rev 2288)
+++ portal/branches/EPP_5_0_Branch/packaging/reports/build.xml 2010-03-17 19:38:36 UTC (rev 2289)
@@ -28,7 +28,6 @@
<target name="generate-report">
<available file="${jboss_scan_dir}" property="perform_jboss_scan"/>
- <available file="${tomcat_scan_dir}" property="perform_tomcat_scan"/>
<contrib:if>
<contrib:equals arg1="${perform_jboss_scan}" arg2="true"/>
@@ -36,13 +35,6 @@
<antcall target="generate-report-from-jboss" />
</contrib:then>
</contrib:if>
-
- <contrib:if>
- <contrib:equals arg1="${perform_tomcat_scan}" arg2="true"/>
- <contrib:then>
- <antcall target="generate-report-from-tomcat" />
- </contrib:then>
- </contrib:if>
</target>
<target name="generate-report-from-jboss">
@@ -53,14 +45,5 @@
<tattletale:report scanDir="${jboss_scan_dir}" outputDir="${jboss_output_dir}" />
</target>
-
- <target name="generate-report-from-tomcat">
- <echo message="Report based on Tomcat deploy" />
- <echo message="Tattletale scan dir: ${tomcat_scan_dir}" />
- <echo message="Tattletale output dir: ${tomcat_output_dir}" />
- <echo message="Generating ..." />
-
- <tattletale:report scanDir="${tomcat_scan_dir}" outputDir="${tomcat_output_dir}" />
- </target>
</project>
Modified: portal/branches/EPP_5_0_Branch/packaging/reports/pom.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/packaging/reports/pom.xml 2010-03-17 18:51:51 UTC (rev 2288)
+++ portal/branches/EPP_5_0_Branch/packaging/reports/pom.xml 2010-03-17 19:38:36 UTC (rev 2289)
@@ -68,10 +68,7 @@
<configuration>
<tasks>
<property name="jboss_output_dir" value="${project.build.directory}/jboss-tattletale" />
- <property name="tomcat_output_dir" value="${project.build.directory}/tomcat-tattletale" />
- <property name="jboss_scan_dir" value="${basedir}/../pkg/target/jboss/server/default/deploy/gatein.ear/lib" />
- <property name="tomcat_scan_dir" value="${basedir}/../pkg/target/tomcat/lib" />
-
+ <property name="jboss_scan_dir" value="${basedir}/../pkg/target/jboss/server/default/deploy/gatein.ear/lib" />
<ant antfile="build.xml">
<target name="generate-report" />
</ant>
Modified: portal/branches/EPP_5_0_Branch/server/pom.xml
===================================================================
--- portal/branches/EPP_5_0_Branch/server/pom.xml 2010-03-17 18:51:51 UTC (rev 2288)
+++ portal/branches/EPP_5_0_Branch/server/pom.xml 2010-03-17 19:38:36 UTC (rev 2289)
@@ -35,7 +35,6 @@
<name>GateIn Portal Server</name>
<modules>
- <module>tomcat</module>
<module>jboss</module>
</modules>
More information about the gatein-commits
mailing list