Author: mpodolin Date: 2010-07-16 12:52:11 -0400 (Fri, 16 Jul 2010) New Revision: 3639 Added: portal/trunk/packaging/jboss-as/ portal/trunk/packaging/jboss-as/ear/ portal/trunk/packaging/jboss-as/ear/pom.xml portal/trunk/packaging/jboss-as/pkg/ portal/trunk/packaging/jboss-as/pkg/pom.xml portal/trunk/packaging/jboss-as/pkg/profiles.xml portal/trunk/packaging/jboss-as/pkg/src/ portal/trunk/packaging/jboss-as/pkg/src/assembly/ portal/trunk/packaging/jboss-as/pkg/src/assembly/jboss-as-init.xml portal/trunk/packaging/jboss-as/pkg/src/main/ portal/trunk/packaging/jboss-as/pkg/src/main/resources/ portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/ portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/bin.run.conf.bat.patch portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/bin.run.conf.patch portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/jboss-log4j.xml.patch portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/jbossweb.deployer.web.xml.patch portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/jbossweb.sar.context.xml.patch portal/trunk/packaging/jboss-as/pom.xml Modified: portal/trunk/packaging/pom.xml portal/trunk/pom.xml Log: GTNPORTAL-1338: initial version of maven based packaging for jboss-as Added: portal/trunk/packaging/jboss-as/ear/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as/ear/pom.xml (rev 0) +++ portal/trunk/packaging/jboss-as/ear/pom.xml 2010-07-16 16:52:11 UTC (rev 3639) @@ -0,0 +1,470 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.parent</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </parent> + <artifactId>exo.portal.packaging.jboss-as.ear</artifactId> + <packaging>ear</packaging> + <name>GateIn EAR</name> + <description>GateIn EAR</description> + + <dependencies> + <!-- WARs --> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.portal</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.eXoResources</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.dashboard</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.exoadmin</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.rest</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.eXoGadgets</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets-server</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.web</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-admin-gui</artifactId> + <version>${org.gatein.wsrp.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer</artifactId> + <version>${org.gatein.wsrp.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.packaging.jboss-as.integration</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + + + <!-- portal components --> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.common</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.portal</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.pc</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.identity</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.resources</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.application-registry</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.xml-parser</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.scripting</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.dashboard</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.management</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.portal</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.eXo</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets-core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>gatein.portal.component.wsrp</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.server.jboss.plugin</artifactId> + </dependency> + + + <!-- eXo JCR stack --> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.command</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + </dependency> + + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.remote</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-int</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-kernel-extras</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.database</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.ldap</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.jdbc</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.ldap</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.document</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.webdav</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.framework.web</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ftp</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.servlet</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.core</artifactId> + </dependency> + + + <!-- GateIn components --> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-logging</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-common</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-exo</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-bridge</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-federation</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-mc</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-portlet</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-controller</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-spi</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-core</artifactId> + </dependency> + + <!-- wsrp libs --> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + </dependency> + + <!-- Chromattic --> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.api</artifactId> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.spi</artifactId> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.core</artifactId> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.ext</artifactId> + </dependency> + + <!-- apache shindig --> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-gadgets</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-features</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-common</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-social-api</artifactId> + </dependency> + + <!-- --> + <dependency> + <groupId>net.oauth</groupId> + <artifactId>core</artifactId> + </dependency> + </dependencies> + + <build> + <finalName>gatein</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <displayName>GateIn portal</displayName> + <defaultLibBundleDir>lib</defaultLibBundleDir> + <archive> + <manifest> + <addClasspath>true</addClasspath> + </manifest> + </archive> + + <modules> + <!-- WAR modules --> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.eXoResources</artifactId> + <contextRoot>eXoResources</contextRoot> + <bundleFileName>01eXoResources.war</bundleFileName> + <unpack>true</unpack> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.portal</artifactId> + <contextRoot>portal</contextRoot> + <bundleFileName>02portal.war</bundleFileName> + <unpack>true</unpack> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.dashboard</artifactId> + <contextRoot>dashboard</contextRoot> + <bundleFileName>dashboard.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer</artifactId> + <contextRoot>wsrp-producer</contextRoot> + <bundleFileName>wsrp-producer.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.exoadmin</artifactId> + <contextRoot>exoadmin</contextRoot> + <bundleFileName>exoadmin.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.rest</artifactId> + <contextRoot>rest</contextRoot> + <bundleFileName>rest.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.eXoGadgets</artifactId> + <contextRoot>eXoGadgets</contextRoot> + <bundleFileName>eXoGadgets.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.web</artifactId> + <contextRoot>web</contextRoot> + <bundleFileName>web.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.packaging.jboss-as.integration</artifactId> + <contextRoot>integration</contextRoot> + <bundleFileName>integration.war</bundleFileName> + <unpack>true</unpack> + </webModule> + <webModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-admin-gui</artifactId> + <contextRoot>wsrp-admin-gui</contextRoot> + <bundleFileName>wsrp-admin-gui.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets-server</artifactId> + <contextRoot>eXoGadgetServer</contextRoot> + <bundleFileName>eXoGadgetServer.war</bundleFileName> + </webModule> + </modules> + </configuration> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file Added: portal/trunk/packaging/jboss-as/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as/pkg/pom.xml (rev 0) +++ portal/trunk/packaging/jboss-as/pkg/pom.xml 2010-07-16 16:52:11 UTC (rev 3639) @@ -0,0 +1,180 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.parent</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </parent> + <artifactId>exo.portal.packaging.jboss-as.pkg</artifactId> + <packaging>pom</packaging> + <name>GateIn PKG</name> + + <dependencies> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.packaging.jboss-as.ear</artifactId> + <version>${project.version}</version> + <type>ear</type> + </dependency> + </dependencies> + + <build> + <finalName>jboss-as-pkg</finalName> + <plugins> + <!-- Ensure your environment is correctly setup --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>jbossas-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.jboss.version</property> + <message>"You must define the property exo.projects.app.jboss.version to give the name of the directory where is stored JBossAS"</message> + </requireProperty> + <requireFilesExist> + <files> + <file>${exo.projects.directory.dependencies}/${exo.projects.app.jboss.version}/</file> + </files> + <message>"The following JBossAS directory doesn't exist: ${exo.projects.directory.dependencies}/${exo.projects.app.jboss.version}"</message> + </requireFilesExist> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-5</version> + <configuration> + <descriptors> + <descriptor>src/assembly/jboss-as-init.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>init-assembly</id> + <phase>generate-resources</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack-gatein-ear</id> + <phase>generate-test-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.packaging.jboss-as.ear</artifactId> + <version>${project.version}</version> + <type>ear</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/jboss-as-pkg-jboss-as/jboss-as/server/default/deploy/gatein.ear</outputDirectory> + </artifactItem> + </artifactItems> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + </configuration> + </execution> + <execution> + <id>deploy-gatein-parts</id> + <phase>generate-test-resources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.exoplatform.portal</groupId> + <artifactId>starter-gatein</artifactId> + <version>${project.version}</version> + <type>ear</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/jboss-as-pkg-jboss-as/jboss-as/server/default/deploy/</outputDirectory> + <destFileName>starter-gatein.ear</destFileName> + </artifactItem> + <artifactItem> + <groupId>org.exoplatform.portal</groupId> + <artifactId>gatein-sample-extension</artifactId> + <version>${project.version}</version> + <type>ear</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/jboss-as-pkg-jboss-as/jboss-as/server/default/deploy/</outputDirectory> + <destFileName>gatein-sample-extension.ear</destFileName> + </artifactItem> + <artifactItem> + <groupId>org.exoplatform.portal</groupId> + <artifactId>gatein-sample-portal</artifactId> + <version>${project.version}</version> + <type>ear</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/jboss-as-pkg-jboss-as/jboss-as/server/default/deploy/</outputDirectory> + <destFileName>gatein-sample-portal.ear</destFileName> + </artifactItem> + <artifactItem> + <groupId>org.gatein.portal.examples.skins</groupId> + <artifactId>gatein-sample-skin</artifactId> + <version>${project.version}</version> + <type>war</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/jboss-as-pkg-jboss-as/jboss-as/server/default/deploy/</outputDirectory> + <destFileName>gatein-sample-skin.war</destFileName> + </artifactItem> + </artifactItems> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-patch-plugin</artifactId> + <version>1.1.1</version> + <configuration> + <targetDirectory>${project.build.directory}/jboss-as-pkg-jboss-as</targetDirectory> + </configuration> + <executions> + <execution> + <id>jboss-as-patches</id> + <configuration> + <patchDirectory>src/main/resources/jboss-as-patch/</patchDirectory> + <naturalOrderProcessing>true</naturalOrderProcessing> + </configuration> + <phase>prepare-package</phase> + <goals> + <goal>apply</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file Added: portal/trunk/packaging/jboss-as/pkg/profiles.xml =================================================================== --- portal/trunk/packaging/jboss-as/pkg/profiles.xml (rev 0) +++ portal/trunk/packaging/jboss-as/pkg/profiles.xml 2010-07-16 16:52:11 UTC (rev 3639) @@ -0,0 +1,24 @@ +<profilesXml> + <profiles> + <profile> + <id>gatein-projects</id> + <properties> + <!-- + Replace with the directory where uncompressed Tomcat 6 and/or JBoss 5.1 can be found + ex: On Windows 'c:/AS' + ex: On Linux '/home/user/AS' + --> + <exo.projects.directory.dependencies>/home/martin/dev/exo-dependencies</exo.projects.directory.dependencies> + + <!-- + 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> + </properties> + </profile> + </profiles> + + <activeProfiles> + <activeProfile>gatein-projects</activeProfile> + </activeProfiles> +</profilesXml> Added: portal/trunk/packaging/jboss-as/pkg/src/assembly/jboss-as-init.xml =================================================================== --- portal/trunk/packaging/jboss-as/pkg/src/assembly/jboss-as-init.xml (rev 0) +++ portal/trunk/packaging/jboss-as/pkg/src/assembly/jboss-as-init.xml 2010-07-16 16:52:11 UTC (rev 3639) @@ -0,0 +1,50 @@ +<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.0.xsd"> + + <id>jboss-as</id> + <includeBaseDirectory>false</includeBaseDirectory> + <formats> + <format>dir</format> + </formats> + + <fileSets> + <!-- copy jboss as - without unix executables --> + <fileSet> + <directory>${exo.projects.directory.dependencies}/${exo.projects.app.jboss.version}</directory> + <outputDirectory>jboss-as</outputDirectory> + <excludes> + <exclude>bin/*.sh</exclude> + </excludes> + </fileSet> + <!-- copy jboss as - only unix executabls --> + <fileSet> + <directory>${exo.projects.directory.dependencies}/${exo.projects.app.jboss.version}/bin</directory> + <outputDirectory>jboss-as/bin</outputDirectory> + <includes> + <include>*.sh</include> + </includes> + <fileMode>0755</fileMode> + </fileSet> + + <!-- copy couple gatein.ear/META-INF/* descriptors --> + <fileSet> + <directory>${basedir}/../../../server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/META-INF</directory> + <outputDirectory>jboss-as/server/default/deploy/gatein.ear/META-INF</outputDirectory> + </fileSet> + </fileSets> + + <files> + <!-- copy gatein configuration file --> + <file> + <source>${basedir}/../../../server/jboss/patch-ear/src/main/jboss/server/default/conf/gatein/configuration.xml</source> + <outputDirectory>jboss-as/server/default/conf/gatein</outputDirectory> + </file> + <file> + <source>${basedir}/../../../component/common/src/main/java/conf/configuration-jboss.properties</source> + <outputDirectory>jboss-as/server/default/conf/gatein</outputDirectory> + <destName>configuration.properties</destName> + </file> + </files> + +</assembly> Added: portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/bin.run.conf.bat.patch =================================================================== --- portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/bin.run.conf.bat.patch (rev 0) +++ portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/bin.run.conf.bat.patch 2010-07-16 16:52:11 UTC (rev 3639) @@ -0,0 +1,19 @@ +diff -uNr --exclude .svn jboss-as.orig/bin/run.conf.bat jboss-as/bin/run.conf.bat +--- jboss-as.orig/bin/run.conf.bat 2010-07-12 11:09:54.000000000 +0200 ++++ jboss-as/bin/run.conf.bat 2010-07-12 11:22:05.000000000 +0200 +@@ -40,7 +40,7 @@ + rem # + + rem # JVM memory allocation pool parameters - modify as appropriate. +-set "JAVA_OPTS=-Xms128M -Xmx512M -XX:MaxPermSize=256M" ++set "JAVA_OPTS=-Xms512M -Xmx1024M -XX:MaxPermSize=256M" + + rem # Reduce the RMI GCs to once per hour for Sun JVMs. + set "JAVA_OPTS=%JAVA_OPTS% -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000" +@@ -55,3 +55,6 @@ + rem set "JAVA_OPTS=%JAVA_OPTS% -Xrunjdwp:transport=dt_shmem,address=jboss,server=y,suspend=n" + + :JAVA_OPTS_SET ++ ++rem # GateIn configuration directory ++set "JAVA_OPTS=%JAVA_OPTS% -Dexo.conf.dir.name=gatein" Added: portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/bin.run.conf.patch =================================================================== --- portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/bin.run.conf.patch (rev 0) +++ portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/bin.run.conf.patch 2010-07-16 16:52:11 UTC (rev 3639) @@ -0,0 +1,19 @@ +diff -uNr --exclude .svn jboss-as.orig/bin/run.conf jboss-as/bin/run.conf +--- jboss-as.orig/bin/run.conf 2010-07-12 11:09:53.000000000 +0200 ++++ jboss-as/bin/run.conf 2010-07-12 11:22:05.000000000 +0200 +@@ -42,7 +42,7 @@ + # Specify options to pass to the Java VM. + # + if [ "x$JAVA_OPTS" = "x" ]; then +- JAVA_OPTS="-Xms128m -Xmx512m -XX:MaxPermSize=256m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000" ++ JAVA_OPTS="-Xms512m -Xmx1024m -XX:MaxPermSize=256m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000" + fi + + # Sample JPDA settings for remote socket debugging +@@ -50,3 +50,6 @@ + + # Sample JPDA settings for shared memory debugging + #JAVA_OPTS="$JAVA_OPTS -Xrunjdwp:transport=dt_shmem,address=jboss,server=y,suspend=n" ++ ++# GateIn configuration directory ++JAVA_OPTS="$JAVA_OPTS -Dexo.conf.dir.name=gatein" Added: portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/jboss-log4j.xml.patch =================================================================== --- portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/jboss-log4j.xml.patch (rev 0) +++ portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/jboss-log4j.xml.patch 2010-07-16 16:52:11 UTC (rev 3639) @@ -0,0 +1,708 @@ +diff -uNr --exclude .svn jboss-as.orig/server/default/conf/jboss-log4j.xml jboss-as/server/default/conf/jboss-log4j.xml +--- jboss-as.orig/server/default/conf/jboss-log4j.xml 2010-07-12 11:11:18.000000000 +0200 ++++ jboss-as/server/default/conf/jboss-log4j.xml 2010-07-12 11:22:05.000000000 +0200 +@@ -1,376 +1,328 @@ +-<?xml version="1.0" encoding="UTF-8"?> +-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> +- +-<!-- ===================================================================== --> +-<!-- --> +-<!-- Log4j Configuration --> +-<!-- --> +-<!-- ===================================================================== --> +- +-<!-- $Id: jboss-log4j.xml 87678 2009-04-22 16:47:08Z bstansberry(a)jboss.com $ --> +- +-<!-- +- | For more configuration information and examples see the Jakarta Log4j +- | owebsite: http://jakarta.apache.org/log4j +- --> +- +-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> +- +- <!-- ================================= --> +- <!-- Preserve messages in a local file --> +- <!-- ================================= --> +- +- <!-- A time/date based rolling appender --> +- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> +- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> +- <param name="File" value="${jboss.server.log.dir}/server.log"/> +- <param name="Append" value="true"/> +- <!-- In AS 5.0.x the server log threshold was set by a system +- property. In 5.1 and later we are instead using the system +- property to set the priority on the root logger (see <root/> below) +- <param name="Threshold" value="${jboss.server.log.threshold}"/> +- --> +- +- <!-- Rollover at midnight each day --> +- <param name="DatePattern" value="'.'yyyy-MM-dd"/> +- +- <!-- Rollover at the top of each hour +- <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/> +- --> +- +- <layout class="org.apache.log4j.PatternLayout"> +- <!-- The default pattern: Date Priority [Category] (Thread) Message\n --> +- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/> +- +- <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n +- <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/> +- --> +- </layout> +- </appender> +- +- <!-- A size based file rolling appender +- <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender"> +- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> +- <param name="File" value="${jboss.server.log.dir}/server.log"/> +- <param name="Append" value="false"/> +- <param name="MaxFileSize" value="500KB"/> +- <param name="MaxBackupIndex" value="1"/> +- +- <layout class="org.apache.log4j.PatternLayout"> +- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> +- </layout> +- </appender> +- --> +- +- <!-- ============================== --> +- <!-- Append messages to the console --> +- <!-- ============================== --> +- +- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> +- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> +- <param name="Target" value="System.out"/> +- <param name="Threshold" value="INFO"/> +- +- <layout class="org.apache.log4j.PatternLayout"> +- <!-- The default pattern: Date Priority [Category] Message\n --> +- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> +- </layout> +- </appender> +- +- <!-- ====================== --> +- <!-- More Appender examples --> +- <!-- ====================== --> +- +- <!-- Buffer events and log them asynchronously +- <appender name="ASYNC" class="org.apache.log4j.AsyncAppender"> +- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> +- <appender-ref ref="FILE"/> +- <appender-ref ref="CONSOLE"/> +- <appender-ref ref="SMTP"/> +- </appender> +- --> +- +- <!-- EMail events to an administrator +- <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender"> +- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> +- <param name="Threshold" value="ERROR"/> +- <param name="To" value=&quot;admin(a)myhost.domain.com&quot;/&gt; +- <param name="From" value=&quot;nobody(a)myhost.domain.com&quot;/&gt; +- <param name="Subject" value="JBoss Sever Errors"/> +- <param name="SMTPHost" value="localhost"/> +- <param name="BufferSize" value="10"/> +- <layout class="org.apache.log4j.PatternLayout"> +- <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/> +- </layout> +- </appender> +- --> +- +- <!-- Syslog events +- <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender"> +- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> +- <param name="Facility" value="LOCAL7"/> +- <param name="FacilityPrinting" value="true"/> +- <param name="SyslogHost" value="localhost"/> +- <layout class="org.apache.log4j.PatternLayout"> +- <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/> +- </layout> +- </appender> +- --> +- +- <!-- Log events to JMS (requires a topic to be created) +- <appender name="JMS" class="org.apache.log4j.net.JMSAppender"> +- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> +- <param name="Threshold" value="ERROR"/> +- <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/> +- <param name="TopicBindingName" value="topic/MyErrorsTopic"/> +- </appender> +- --> +- +- <!-- Log events through SNMP +- <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender"> +- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> +- <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/> +- <param name="ManagementHost" value="127.0.0.1"/> +- <param name="ManagementHostTrapListenPort" value="162"/> +- <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/> +- <param name="LocalIPAddress" value="127.0.0.1"/> +- <param name="LocalTrapSendPort" value="161"/> +- <param name="GenericTrapType" value="6"/> +- <param name="SpecificTrapType" value="12345678"/> +- <param name="CommunityString" value="public"/> +- <param name="ForwardStackTraceWithTrap" value="true"/> +- <param name="Threshold" value="DEBUG"/> +- <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/> +- <layout class="org.apache.log4j.PatternLayout"> +- <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/> +- </layout> +- </appender> +- --> +- +- <!-- Emit events as JMX notifications +- <appender name="JMX" class="org.jboss.monitor.services.JMXNotificationAppender"> +- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> +- +- <param name="Threshold" value="WARN"/> +- <param name="ObjectName" value="jboss.system:service=Logging,type=JMXNotificationAppender"/> +- +- <layout class="org.apache.log4j.PatternLayout"> +- <param name="ConversionPattern" value="%d %-5p [%c] %m"/> +- </layout> +- </appender> +- --> +- +- <!-- Security AUDIT Appender +- <appender name="AUDIT" class="org.jboss.logging.appender.DailyRollingFileAppender"> +- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> +- <param name="File" value="${jboss.server.log.dir}/audit.log"/> +- <param name="Append" value="true"/> +- <param name="DatePattern" value="'.'yyyy-MM-dd"/> +- <layout class="org.apache.log4j.PatternLayout"> +- <param name="ConversionPattern" value="%d %-5p [%c] (%t:%x) %m%n"/> +- </layout> +- </appender> +- --> +- +- <!-- ================ --> +- <!-- Limit categories --> +- <!-- ================ --> +- +- <!-- Limit the org.apache category to INFO as its DEBUG is verbose --> +- <category name="org.apache"> +- <priority value="INFO"/> +- </category> +- +- <!-- Limit the jacorb category to WARN as its INFO is verbose --> +- <category name="jacorb"> +- <priority value="WARN"/> +- </category> +- +- <!-- Set the logging level of the JSF implementation that uses +- | java.util.logging. The jdk logging levels can be controlled +- | through the org.jboss.logging.log4j.JDKLevel class that +- | in addition to the standard log4j levels it adds support for +- | SEVERE, WARNING, CONFIG, FINE, FINER, FINEST +- --> +- <category name="javax.enterprise.resource.webcontainer.jsf"> +- <priority value="INFO" class="org.jboss.logging.log4j.JDKLevel"/> +- </category> +- +- <!-- Limit the org.jgroups category to WARN as its INFO is verbose --> +- <category name="org.jgroups"> +- <priority value="WARN"/> +- </category> +- +- <!-- Limit the org.quartz category to INFO as its DEBUG is verbose --> +- <category name="org.quartz"> +- <priority value="INFO"/> +- </category> +- +- <!-- Limit the com.sun category to INFO as its FINE is verbose --> +- <category name="com.sun"> +- <priority value="INFO"/> +- </category> +- +- <!-- Limit the sun category to INFO as its FINE is verbose --> +- <category name="sun"> +- <priority value="INFO"/> +- </category> +- +- <!-- Limit the javax.xml.bind category to INFO as its FINE is verbose --> +- <category name="javax.xml.bind"> +- <priority value="INFO"/> +- </category> +- +- <!-- Limit JBoss categories +- <category name="org.jboss"> +- <priority value="INFO"/> +- </category> +- --> +- +- <!-- Limit the JSR77 categories --> +- <category name="org.jboss.management"> +- <priority value="INFO"/> +- </category> +- +- <!-- Limit the verbose facelets compiler --> +- <category name="facelets.compiler"> +- <priority value="WARN"/> +- </category> +- +- <!-- Limit the verbose ajax4jsf cache initialization --> +- <category name="org.ajax4jsf.cache"> +- <priority value="WARN"/> +- </category> +- +- <!-- Limit the verbose embedded jopr categories --> +- <category name="org.rhq"> +- <priority value="WARN"/> +- </category> +- +- <!-- Limit the verbose seam categories --> +- <category name="org.jboss.seam"> +- <priority value="WARN"/> +- </category> +- +- <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max] +- <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool"> +- <priority value="TRACE"/> +- </category> +- --> +- +- <!-- Category specifically for Security Audit Provider +- <category name="org.jboss.security.audit.providers.LogAuditProvider" additivity="false"> +- <priority value="TRACE"/> +- <appender-ref ref="AUDIT"/> +- </category> +- --> +- +- <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose --> +- <category name="org.jboss.serial"> +- <priority value="INFO"/> +- </category> +- +- <!-- Decrease the priority threshold for the org.jboss.varia category +- <category name="org.jboss.varia"> +- <priority value="DEBUG"/> +- </category> +- --> +- +- <!-- Enable JBossWS message tracing +- <category name="org.jboss.ws.core.MessageTrace"> +- <priority value="TRACE"/> +- </category> +- --> +- +- <!-- +- | An example of enabling the custom TRACE level priority that is used +- | by the JBoss internals to diagnose low level details. This example +- | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its +- | subpackages. This will produce A LOT of logging output. +- | +- | Note: since jboss AS 4.2.x, the trace level is supported natively by +- | log4j, so although the custom org.jboss.logging.XLevel priority will +- | still work, there is no need to use it. The two examples that follow +- | will both enable trace logging. +- <category name="org.jboss.system"> +- <priority value="TRACE" class="org.jboss.logging.XLevel"/> +- </category> +- <category name="org.jboss.ejb.plugins"> +- <priority value="TRACE"/> +- </category> +- --> +- +- <!-- +- | Logs these events to SNMP: +- - server starts/stops +- - cluster evolution (node death/startup) +- - When an EJB archive is deployed (and associated verified messages) +- - When an EAR archive is deployed +- +- <category name="org.jboss.system.server.Server"> +- <priority value="INFO" /> +- <appender-ref ref="TRAP_LOG"/> +- </category> +- +- <category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle"> +- <priority value="INFO" /> +- <appender-ref ref="TRAP_LOG"/> +- </category> +- +- <category name="org.jboss.deployment.MainDeployer"> +- <priority value="ERROR" /> +- <appender-ref ref="TRAP_LOG"/> +- </category> +- +- <category name="org.jboss.ejb.EJBDeployer"> +- <priority value="INFO" /> +- <appender-ref ref="TRAP_LOG"/> +- </category> +- +- <category name="org.jboss.deployment.EARDeployer"> +- <priority value="INFO" /> +- <appender-ref ref="TRAP_LOG"/> +- </category> +- --> +- +- <!-- Clustering logging --> +- <!-- Uncomment the following to redirect the org.jgroups and +- org.jboss.ha categories to a cluster.log file. +- +- <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender"> +- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> +- <param name="File" value="${jboss.server.log.dir}/cluster.log"/> +- <param name="Append" value="false"/> +- <param name="MaxFileSize" value="500KB"/> +- <param name="MaxBackupIndex" value="1"/> +- +- <layout class="org.apache.log4j.PatternLayout"> +- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> +- </layout> +- </appender> +- <category name="org.jgroups"> +- <priority value="DEBUG" /> +- <appender-ref ref="CLUSTER"/> +- </category> +- <category name="org.jboss.ha"> +- <priority value="DEBUG" /> +- <appender-ref ref="CLUSTER"/> +- </category> +- --> +- +- <!-- ======================= --> +- <!-- Setup the Root category --> +- <!-- ======================= --> +- +- <root> +- <!-- +- Set the root logger priority via a system property. Note this is parsed by log4j, +- so the full JBoss system property format is not supported; e.g. +- setting a default via ${jboss.server.log.threshold:WARN} will not work. +- --> +- <priority value="${jboss.server.log.threshold}"/> +- <appender-ref ref="CONSOLE"/> +- <appender-ref ref="FILE"/> +- </root> +- +-</log4j:configuration> ++<?xml version="1.0" encoding="UTF-8"?> ++<!-- ++ ++ 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. ++ ++--> ++ ++<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> ++ ++<!-- ===================================================================== --> ++<!-- --> ++<!-- Log4j Configuration --> ++<!-- --> ++<!-- ===================================================================== --> ++ ++<!-- $Id: jboss-log4j.xml 62403 2007-04-18 15:26:43Z dimitris(a)jboss.org $ --> ++ ++<!-- ++ | For more configuration infromation and examples see the Jakarta Log4j ++ | owebsite: http://jakarta.apache.org/log4j ++ --> ++ ++<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> ++ ++ <!-- ================================= --> ++ <!-- Preserve messages in a local file --> ++ <!-- ================================= --> ++ ++ <!-- A time/date based rolling appender --> ++ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> ++ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> ++ <param name="File" value="${jboss.server.log.dir}/server.log"/> ++ <param name="Append" value="false"/> ++ ++ <!-- Rollover at midnight each day --> ++ <param name="DatePattern" value="'.'yyyy-MM-dd"/> ++ ++ <!-- Rollover at the top of each hour ++ <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/> ++ --> ++ ++ <layout class="org.apache.log4j.PatternLayout"> ++ <!-- The default pattern: Date Priority [Category] Message\n --> ++ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> ++ ++ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n ++ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/> ++ --> ++ </layout> ++ </appender> ++ ++ <!-- A size based file rolling appender ++ <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender"> ++ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> ++ <param name="File" value="${jboss.server.log.dir}/server.log"/> ++ <param name="Append" value="false"/> ++ <param name="MaxFileSize" value="500KB"/> ++ <param name="MaxBackupIndex" value="1"/> ++ ++ <layout class="org.apache.log4j.PatternLayout"> ++ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> ++ </layout> ++ </appender> ++ --> ++ ++ <!-- ============================== --> ++ <!-- Append messages to the console --> ++ <!-- ============================== --> ++ ++ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> ++ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> ++ <param name="Target" value="System.out"/> ++ <param name="Threshold" value="INFO"/> ++ ++ <layout class="org.apache.log4j.PatternLayout"> ++ <!-- The default pattern: Date Priority [Category] Message\n --> ++ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> ++ </layout> ++ </appender> ++ ++ <!-- ====================== --> ++ <!-- More Appender examples --> ++ <!-- ====================== --> ++ ++ <!-- Buffer events and log them asynchronously ++ <appender name="ASYNC" class="org.apache.log4j.AsyncAppender"> ++ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> ++ <appender-ref ref="FILE"/> ++ <appender-ref ref="CONSOLE"/> ++ <appender-ref ref="SMTP"/> ++ </appender> ++ --> ++ ++ <!-- EMail events to an administrator ++ <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender"> ++ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> ++ <param name="Threshold" value="ERROR"/> ++ <param name="To" value=&quot;admin(a)myhost.domain.com&quot;/&gt; ++ <param name="From" value=&quot;nobody(a)myhost.domain.com&quot;/&gt; ++ <param name="Subject" value="JBoss Sever Errors"/> ++ <param name="SMTPHost" value="localhost"/> ++ <param name="BufferSize" value="10"/> ++ <layout class="org.apache.log4j.PatternLayout"> ++ <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/> ++ </layout> ++ </appender> ++ --> ++ ++ <!-- Syslog events ++ <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender"> ++ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> ++ <param name="Facility" value="LOCAL7"/> ++ <param name="FacilityPrinting" value="true"/> ++ <param name="SyslogHost" value="localhost"/> ++ <layout class="org.apache.log4j.PatternLayout"> ++ <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/> ++ </layout> ++ </appender> ++ --> ++ ++ <!-- Log events to JMS (requires a topic to be created) ++ <appender name="JMS" class="org.apache.log4j.net.JMSAppender"> ++ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> ++ <param name="Threshold" value="ERROR"/> ++ <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/> ++ <param name="TopicBindingName" value="topic/MyErrorsTopic"/> ++ </appender> ++ --> ++ ++ <!-- Log events through SNMP ++ <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender"> ++ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> ++ <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/> ++ <param name="ManagementHost" value="127.0.0.1"/> ++ <param name="ManagementHostTrapListenPort" value="162"/> ++ <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/> ++ <param name="LocalIPAddress" value="127.0.0.1"/> ++ <param name="LocalTrapSendPort" value="161"/> ++ <param name="GenericTrapType" value="6"/> ++ <param name="SpecificTrapType" value="12345678"/> ++ <param name="CommunityString" value="public"/> ++ <param name="ForwardStackTraceWithTrap" value="true"/> ++ <param name="Threshold" value="DEBUG"/> ++ <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/> ++ <layout class="org.apache.log4j.PatternLayout"> ++ <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/> ++ </layout> ++ </appender> ++ --> ++ ++ <!-- Emit events as JMX notifications ++ <appender name="JMX" class="org.jboss.monitor.services.JMXNotificationAppender"> ++ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> ++ ++ <param name="Threshold" value="WARN"/> ++ <param name="ObjectName" value="jboss.system:service=Logging,type=JMXNotificationAppender"/> ++ ++ <layout class="org.apache.log4j.PatternLayout"> ++ <param name="ConversionPattern" value="%d %-5p [%c] %m"/> ++ </layout> ++ </appender> ++ --> ++ ++ <!-- ================ --> ++ <!-- Limit categories --> ++ <!-- ================ --> ++ ++ <!-- Limit the org.apache category to INFO as its DEBUG is verbose --> ++ <category name="org.apache"> ++ <priority value="INFO"/> ++ </category> ++ ++ <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose --> ++ <category name="org.jboss.serial"> ++ <priority value="INFO"/> ++ </category> ++ ++ <!-- Limit the org.jgroups category to WARN as its INFO is verbose --> ++ <category name="org.jgroups"> ++ <priority value="WARN"/> ++ </category> ++ ++ <!-- Limit the jacorb category to WARN as its INFO is verbose --> ++ <category name="jacorb"> ++ <priority value="WARN"/> ++ </category> ++ ++ <!-- Limit JBoss categories ++ <category name="org.jboss"> ++ <priority value="INFO"/> ++ </category> ++ --> ++ ++ <!-- Limit the JSR77 categories --> ++ <category name="org.jboss.management"> ++ <priority value="INFO"/> ++ </category> ++ ++ <!-- Limit the JSR77 categories --> ++ <category name="jcr"> ++ <priority value="INFO"/> ++ </category> ++ ++ <!-- Limit the JSR-168 and JSR-286 categories --> ++ <category name="org.exoplatform.services"> ++ <priority value="INFO"/> ++ </category> ++ ++ <!-- Enable JBossWS message tracing ++ <category name="jbossws.SOAPMessage"> ++ <priority value="TRACE"/> ++ </category> ++ --> ++ ++ <!-- Decrease the priority threshold for the org.jboss.varia category ++ <category name="org.jboss.varia"> ++ <priority value="DEBUG"/> ++ </category> ++ --> ++ ++ <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max] ++ <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool"> ++ <priority value="TRACE"/> ++ </category> ++ --> ++ ++ <!-- ++ | An example of enabling the custom TRACE level priority that is used ++ | by the JBoss internals to diagnose low level details. This example ++ | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its ++ | subpackages. This will produce A LOT of logging output. ++ | ++ | Note: since jboss AS 4.2.x, the trace level is supported natively by ++ | log4j, so although the custom org.jboss.logging.XLevel priority will ++ | still work, there is no need to use it. The two examples that follow ++ | will both enable trace logging. ++ <category name="org.jboss.system"> ++ <priority value="TRACE" class="org.jboss.logging.XLevel"/> ++ </category> ++ <category name="org.jboss.ejb.plugins"> ++ <priority value="TRACE"/> ++ </category> ++ --> ++ ++ <!-- ++ | Logs these events to SNMP: ++ - server starts/stops ++ - cluster evolution (node death/startup) ++ - When an EJB archive is deployed (and associated verified messages) ++ - When an EAR archive is deployed ++ ++ <category name="org.jboss.system.server.Server"> ++ <priority value="INFO" /> ++ <appender-ref ref="TRAP_LOG"/> ++ </category> ++ ++ <category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle"> ++ <priority value="INFO" /> ++ <appender-ref ref="TRAP_LOG"/> ++ </category> ++ ++ <category name="org.jboss.deployment.MainDeployer"> ++ <priority value="ERROR" /> ++ <appender-ref ref="TRAP_LOG"/> ++ </category> ++ ++ <category name="org.jboss.ejb.EJBDeployer"> ++ <priority value="INFO" /> ++ <appender-ref ref="TRAP_LOG"/> ++ </category> ++ ++ <category name="org.jboss.deployment.EARDeployer"> ++ <priority value="INFO" /> ++ <appender-ref ref="TRAP_LOG"/> ++ </category> ++ ++ --> ++ ++ <!-- ======================= --> ++ <!-- Setup the Root category --> ++ <!-- ======================= --> ++ ++ <root> ++ <appender-ref ref="CONSOLE"/> ++ <appender-ref ref="FILE"/> ++ </root> ++ ++ <!-- Clustering logging --> ++ <!-- Uncomment the following to redirect the org.jgroups and ++ org.jboss.ha categories to a cluster.log file. ++ ++ <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender"> ++ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> ++ <param name="File" value="${jboss.server.log.dir}/cluster.log"/> ++ <param name="Append" value="false"/> ++ <param name="MaxFileSize" value="500KB"/> ++ <param name="MaxBackupIndex" value="1"/> ++ ++ <layout class="org.apache.log4j.PatternLayout"> ++ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> ++ </layout> ++ </appender> ++ <category name="org.jgroups"> ++ <priority value="DEBUG" /> ++ <appender-ref ref="CLUSTER"/> ++ </category> ++ <category name="org.jboss.ha"> ++ <priority value="DEBUG" /> ++ <appender-ref ref="CLUSTER"/> ++ </category> ++ --> ++ ++</log4j:configuration> Added: portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/jbossweb.deployer.web.xml.patch =================================================================== --- portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/jbossweb.deployer.web.xml.patch (rev 0) +++ portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/jbossweb.deployer.web.xml.patch 2010-07-16 16:52:11 UTC (rev 3639) @@ -0,0 +1,41 @@ +diff -uNr --exclude .svn jboss-as.orig/server/default/deployers//jbossweb.deployer/web.xml jboss-as/server/default/deployers/jbossweb.deployer/web.xml +--- jboss-as.orig/server/default/deployers//jbossweb.deployer/web.xml 2010-07-09 16:22:04.000000000 +0200 ++++ jboss-as/server/default/deployers/jbossweb.deployer/web.xml 2010-06-28 15:37:27.000000000 +0200 +@@ -1,4 +1,25 @@ + <?xml version="1.0" encoding="ISO-8859-1"?> ++<!-- ++ ++ 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. ++ ++--> ++ + <web-app xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" +@@ -280,6 +301,11 @@ + <param-name>tagLibJar1</param-name> + <param-value>jstl.jar</param-value> + </init-param> ++ <init-param> ++ <description>Portlet standard tlds</description> ++ <param-name>tagLibJar2</param-name> ++ <param-value>../../deploy/gatein.ear/lib/pc-portlet-2.1.1-GA.jar</param-value> ++ </init-param> + + + <load-on-startup>3</load-on-startup> Added: portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/jbossweb.sar.context.xml.patch =================================================================== --- portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/jbossweb.sar.context.xml.patch (rev 0) +++ portal/trunk/packaging/jboss-as/pkg/src/main/resources/jboss-as-patch/jbossweb.sar.context.xml.patch 2010-07-16 16:52:11 UTC (rev 3639) @@ -0,0 +1,12 @@ +diff -uNr --exclude .svn jboss-as.orig/server/default/deploy/jbossweb.sar/context.xml jboss-as/server/default/deploy/jbossweb.sar/context.xml +--- jboss-as.orig/server/default/deploy/jbossweb.sar/context.xml 2010-07-08 11:36:18.000000000 +0200 ++++ jboss-as/server/default/deploy/jbossweb.sar/context.xml 2010-06-28 15:37:27.000000000 +0200 +@@ -13,5 +13,8 @@ + role for servlet init/destroy events. + --> + <InstanceListener>org.jboss.web.tomcat.security.RunAsListener</InstanceListener> ++ ++ <!-- Needed for portal session paths --> ++ <SessionCookie path="/"/> + + </Context> Added: portal/trunk/packaging/jboss-as/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as/pom.xml (rev 0) +++ portal/trunk/packaging/jboss-as/pom.xml 2010-07-16 16:52:11 UTC (rev 3639) @@ -0,0 +1,19 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.parent</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </parent> + <artifactId>exo.portal.packaging.jboss-as</artifactId> + <packaging>pom</packaging> + <name>GateIn JBoss AS package</name> + + <modules> + <module>integration.war</module> + <module>ear</module> + <module>pkg</module> + </modules> +</project> \ No newline at end of file Modified: portal/trunk/packaging/pom.xml =================================================================== --- portal/trunk/packaging/pom.xml 2010-07-16 13:54:46 UTC (rev 3638) +++ portal/trunk/packaging/pom.xml 2010-07-16 16:52:11 UTC (rev 3639) @@ -31,11 +31,27 @@ <packaging>pom</packaging> <name>GateIn Portal Packaging</name> - <modules> - <module>module</module> - <module>product</module> - <module>pkg</module> - <module>reports</module> - </modules> - + <profiles> + <profile> + <id>default</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>module</module> + <module>product</module> + <module>pkg</module> + <module>reports</module> + </modules> + </profile> + <profile> + <id>pkg-jbossas-beta</id> + <modules> + <module>module</module> + <module>product</module> + <module>jboss-as</module> + <module>reports</module> + </modules> + </profile> + </profiles> </project> Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2010-07-16 13:54:46 UTC (rev 3638) +++ portal/trunk/pom.xml 2010-07-16 16:52:11 UTC (rev 3639) @@ -131,6 +131,11 @@ </dependency> <dependency> <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.remote</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.container</artifactId> <version>${org.exoplatform.kernel.version}</version> <exclusions> @@ -150,6 +155,16 @@ <version>${org.exoplatform.kernel.version}</version> </dependency> <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-int</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-kernel-extras</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> <groupId>org.exoplatform.core</groupId> <artifactId>exo.core.component.organization.api</artifactId> <version>${org.exoplatform.core.version}</version> @@ -171,6 +186,11 @@ </dependency> <dependency> <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.ldap</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> <artifactId>exo.core.component.organization.jdbc</artifactId> <version>${org.exoplatform.core.version}</version> <exclusions> @@ -186,6 +206,11 @@ </dependency> <dependency> <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.ldap</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> <artifactId>exo.core.component.security.core</artifactId> <version>${org.exoplatform.core.version}</version> </dependency> @@ -215,6 +240,21 @@ </exclusions> </dependency> <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.webdav</artifactId> + <version>${org.exoplatform.jcr.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.framework.web</artifactId> + <version>${org.exoplatform.jcr.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ftp</artifactId> + <version>${org.exoplatform.jcr.version}</version> + </dependency> + <dependency> <groupId>org.exoplatform.ws</groupId> <artifactId>exo.ws.frameworks.servlet</artifactId> <version>${org.exoplatform.ws.version}</version> @@ -242,6 +282,16 @@ <version>${org.gatein.wci.version}</version> </dependency> <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-exo</artifactId> + <version>${org.gatein.wci.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat</artifactId> + <version>${org.gatein.wci.version}</version> + </dependency> + <dependency> <groupId>org.gatein.pc</groupId> <artifactId>pc-bridge</artifactId> <version>${org.gatein.pc.version}</version> @@ -267,6 +317,11 @@ <version>${org.gatein.pc.version}</version> </dependency> <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-controller</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-producer-lib</artifactId> <version>${org.gatein.wsrp.version}</version> @@ -362,6 +417,11 @@ </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.management</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portal</artifactId> <version>3.2.0-Beta01-SNAPSHOT</version> </dependency> @@ -413,6 +473,16 @@ <version>3.2.0-Beta01-SNAPSHOT</version> <type>test-jar</type> </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>gatein.portal.component.wsrp</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.server.jboss.plugin</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + </dependency> <!-- Chromattic --> <dependency>