Author: thomas.heute(a)jboss.com Date: 2010-09-28 03:36:11 -0400 (Tue, 28 Sep 2010) New Revision: 4404 Removed: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/configuration-tomcat.properties epp/portal/branches/EPP_5_1_Branch/packaging/pkg/src/main/assembly/tomcat-zip.xml epp/portal/branches/EPP_5_1_Branch/server/tomcat/ Modified: epp/portal/branches/EPP_5_1_Branch/examples/extension/README.txt epp/portal/branches/EPP_5_1_Branch/examples/portal/README.txt epp/portal/branches/EPP_5_1_Branch/packaging/module/src/main/javascript/portal.packaging.module.js epp/portal/branches/EPP_5_1_Branch/packaging/product/src/main/javascript/portal.packaging.product.js epp/portal/branches/EPP_5_1_Branch/packaging/profiles.xml epp/portal/branches/EPP_5_1_Branch/packaging/profiles.xml.template epp/portal/branches/EPP_5_1_Branch/packaging/reports/build.xml epp/portal/branches/EPP_5_1_Branch/packaging/reports/pom.xml epp/portal/branches/EPP_5_1_Branch/server/pom.xml Log: JBEPP-511: Remove Tomcat specific files Deleted: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/configuration-tomcat.properties =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/configuration-tomcat.properties 2010-09-28 07:34:35 UTC (rev 4403) +++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/configuration-tomcat.properties 2010-09-28 07:36:11 UTC (rev 4404) @@ -1,62 +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. -# - -# Data -gatein.data.dir=../gatein/data - -# DB -gatein.db.data.dir=${gatein.data.dir}/db - -# JCR -gatein.jcr.config.type=local -gatein.jcr.datasource.name=jdbcjcr -gatein.jcr.datasource.dialect=auto -gatein.jcr.datasource.driver=org.hsqldb.jdbcDriver -gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr_${name} -gatein.jcr.datasource.username=sa -gatein.jcr.datasource.password= - -gatein.jcr.data.dir=${gatein.data.dir}/jcr -gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values -gatein.jcr.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml -gatein.jcr.lock.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml -gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene -gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter -gatein.jcr.index.cache.config=classpath:/conf/jcr/jbosscache/cluster/indexer-config.xml -gatein.jcr.jgroups.config=classpath:/conf/jcr/jbosscache/cluster/udp-mux.xml - -# IDM -gatein.idm.datasource.name=jdbcidm -gatein.idm.datasource.driver=org.hsqldb.jdbcDriver -gatein.idm.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm_${name} -gatein.idm.datasource.username=sa -gatein.idm.datasource.password= - -# Arjuna configuration -com.arjuna.ats.arjuna.objectstore.objectStoreDir=${gatein.data.dir}/jta - -# EMail -gatein.email.smtp.username= -gatein.email.smtp.password= -gatein.email.smtp.host=smtp.gmail.com -gatein.email.smtp.port=465 -gatein.email.smtp.starttls.enable=true -gatein.email.smtp.auth=true -gatein.email.smtp.socketFactory.port=465 -gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory \ No newline at end of file Modified: epp/portal/branches/EPP_5_1_Branch/examples/extension/README.txt =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/extension/README.txt 2010-09-28 07:34:35 UTC (rev 4403) +++ epp/portal/branches/EPP_5_1_Branch/examples/extension/README.txt 2010-09-28 07:36:11 UTC (rev 4404) @@ -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: epp/portal/branches/EPP_5_1_Branch/examples/portal/README.txt =================================================================== --- epp/portal/branches/EPP_5_1_Branch/examples/portal/README.txt 2010-09-28 07:34:35 UTC (rev 4403) +++ epp/portal/branches/EPP_5_1_Branch/examples/portal/README.txt 2010-09-28 07:36:11 UTC (rev 4404) @@ -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: epp/portal/branches/EPP_5_1_Branch/packaging/module/src/main/javascript/portal.packaging.module.js =================================================================== --- epp/portal/branches/EPP_5_1_Branch/packaging/module/src/main/javascript/portal.packaging.module.js 2010-09-28 07:34:35 UTC (rev 4403) +++ epp/portal/branches/EPP_5_1_Branch/packaging/module/src/main/javascript/portal.packaging.module.js 2010-09-28 07:36:11 UTC (rev 4404) @@ -275,14 +275,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); Deleted: epp/portal/branches/EPP_5_1_Branch/packaging/pkg/src/main/assembly/tomcat-zip.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/packaging/pkg/src/main/assembly/tomcat-zip.xml 2010-09-28 07:34:35 UTC (rev 4403) +++ epp/portal/branches/EPP_5_1_Branch/packaging/pkg/src/main/assembly/tomcat-zip.xml 2010-09-28 07:36:11 UTC (rev 4404) @@ -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/assembl... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... 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: epp/portal/branches/EPP_5_1_Branch/packaging/product/src/main/javascript/portal.packaging.product.js =================================================================== --- epp/portal/branches/EPP_5_1_Branch/packaging/product/src/main/javascript/portal.packaging.product.js 2010-09-28 07:34:35 UTC (rev 4403) +++ epp/portal/branches/EPP_5_1_Branch/packaging/product/src/main/javascript/portal.packaging.product.js 2010-09-28 07:36:11 UTC (rev 4404) @@ -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: epp/portal/branches/EPP_5_1_Branch/packaging/profiles.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/packaging/profiles.xml 2010-09-28 07:34:35 UTC (rev 4403) +++ epp/portal/branches/EPP_5_1_Branch/packaging/profiles.xml 2010-09-28 07:36:11 UTC (rev 4404) @@ -30,7 +30,6 @@ ex: On Linux '/home/user/AS' --> <exo.projects.directory.dependencies>REPLACE_WITH_YOUR_OWN_DIRECTORY</exo.projects.directory.dependencies> - <!-- If you want that the server is deployed always at the same place (not in packaging/pkg/target/<server> dir) Uncomment and Replace with the directory you prefer @@ -39,10 +38,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: epp/portal/branches/EPP_5_1_Branch/packaging/profiles.xml.template =================================================================== --- epp/portal/branches/EPP_5_1_Branch/packaging/profiles.xml.template 2010-09-28 07:34:35 UTC (rev 4403) +++ epp/portal/branches/EPP_5_1_Branch/packaging/profiles.xml.template 2010-09-28 07:36:11 UTC (rev 4404) @@ -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: epp/portal/branches/EPP_5_1_Branch/packaging/reports/build.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/packaging/reports/build.xml 2010-09-28 07:34:35 UTC (rev 4403) +++ epp/portal/branches/EPP_5_1_Branch/packaging/reports/build.xml 2010-09-28 07:36:11 UTC (rev 4404) @@ -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: epp/portal/branches/EPP_5_1_Branch/packaging/reports/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/packaging/reports/pom.xml 2010-09-28 07:34:35 UTC (rev 4403) +++ epp/portal/branches/EPP_5_1_Branch/packaging/reports/pom.xml 2010-09-28 07:36:11 UTC (rev 4404) @@ -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: epp/portal/branches/EPP_5_1_Branch/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/server/pom.xml 2010-09-28 07:34:35 UTC (rev 4403) +++ epp/portal/branches/EPP_5_1_Branch/server/pom.xml 2010-09-28 07:36:11 UTC (rev 4404) @@ -35,7 +35,6 @@ <name>GateIn Portal Server</name> <modules> - <module>tomcat</module> <module>jboss</module> </modules>