Author: hfnukal Date: 2011-05-31 11:12:57 -0400 (Tue, 31 May 2011) New Revision: 6581 Added: epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/resources/conf/ epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/resources/conf/gatein/ epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/resources/conf/gatein/configuration.properties epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/resources/conf/gatein/configuration.xml epp/portal/branches/EPP-5-1-tmp/distribution/src/build.xml epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/ epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/ epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/jboss-log4j.xml.patch epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/jbossweb.deployer.web.xml.patch epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/jbossweb.sar.context.xml.patch epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/properties-service.xml.patch epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/run.conf.bat.patch epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/run.conf.patch epp/portal/branches/EPP-5-1-tmp/distribution/src/zip.xml epp/portal/branches/EPP-5-1-tmp/distribution/sso/ epp/portal/branches/EPP-5-1-tmp/distribution/sso/pom.xml epp/portal/branches/EPP-5-1-tmp/distribution/sso/src/ epp/portal/branches/EPP-5-1-tmp/distribution/sso/src/assemble.xml Modified: epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/pom.xml epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/assemble.xml epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml Log: EPP packaging with assemble, added patching and divided to submodules. Copy gatein to default, production and all profiles. Package to zip. Modified: epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml 2011-05-31 09:44:40 UTC (rev 6580) +++ epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml 2011-05-31 15:12:57 UTC (rev 6581) @@ -18,21 +18,18 @@ <eap.version>5.1.0</eap.version> <eap.dir>jboss-eap-5.1</eap.dir> <epp.dir>jboss-epp-5.1.1</epp.dir> + + <sso.version>1.0.2-epp-DEV01</sso.version> + + <epp.profiles>default,production,all</epp.profiles> </properties> <modules> - <module>integration.war</module> - <module>ear</module> + <module>serverAddon</module> </modules> - - <!-- NOTE: These dependency declarations are only required to sort this project to the - end of the line in the multimodule build. - - Since we only include the child1 module in our assembly, we only need to ensure this - distribution project builds AFTER that one... - --> + <dependencies> - <dependency> +<!-- <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging.jboss-as.ear</artifactId> <version>${project.version}</version> @@ -57,13 +54,30 @@ <version>5.1.1-epp-CR01-SNAPSHOT</version> <type>war</type> </dependency> + --> + <!-- Profile EPP files --> <dependency> + <groupId>org.exoplatform.portal.deploy</groupId> + <artifactId>serverAddon</artifactId> + <version>5.1.1-epp-CR01-SNAPSHOT</version> + <classifier>bin</classifier> + <type>zip</type> + </dependency> + + <dependency> <groupId>org.exoplatform.portal.distribution</groupId> <artifactId>portletbridge</artifactId> <version>5.1.1-epp-CR01-SNAPSHOT</version> <classifier>bin</classifier> <type>zip</type> </dependency> + + <dependency> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-packaging</artifactId> + <version>${sso.version}</version> + <type>zip</type> + </dependency> <!-- EAP overlay --> <dependency> @@ -112,8 +126,7 @@ </executions> </plugin>--> - - + <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> @@ -131,7 +144,7 @@ </execution> </executions> </plugin> -<!-- <plugin> + <plugin> <artifactId>maven-antrun-plugin</artifactId> <version>1.6</version> <executions> @@ -143,12 +156,60 @@ </goals> <configuration> <target> - <move file="${project.build.directory}/${project.build.finalName}-bin/${eap.dir}" toFile="${project.build.directory}/${project.build.finalName}-bin/${epp.dir}"/> + <echo>Find EAP directory</echo> + <path id="eap.path"> + <dirset dir="${project.build.directory}/${project.build.finalName}-bin/" includes="jboss-eap-*"/> + </path> + <property name="eap.path" refid="eap.path"/> + <echo message="eap.path: ${eap.path}"/> + + <echo>Finnd EPP directory</echo> + <property name="epp.path" value="${project.build.directory}/${project.build.finalName}-bin/${epp.dir}"/> + <echo message="epp.path: ${epp.path}"/> + + <echo>Renaming directories for unziped modules</echo> + <move file="${eap.path}/gatein-sso-${sso.version}" toFile="${eap.path}/gatein-sso"/> + <move file="${eap.path}" toFile="${epp.path}"/> + + <ant antfile="src/build.xml"> + <target name="patch"/> + <property name="toConfiguration" value="default"/> + </ant> + + + <ant antfile="src/build.xml"> + <target name="patch"/> + <property name="toConfiguration" value="production"/> + </ant> + + + <ant antfile="src/build.xml"> + <target name="patch"/> + <property name="toConfiguration" value="all"/> + </ant> + </target> </configuration> </execution> </executions> - </plugin>--> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distro-package</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/zip.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </project> \ No newline at end of file Modified: epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/pom.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/pom.xml 2011-05-31 09:44:40 UTC (rev 6580) +++ epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/pom.xml 2011-05-31 15:12:57 UTC (rev 6581) @@ -18,6 +18,40 @@ <groupId>org.exoplatform.portal.deploy</groupId> <version>5.1.1-epp-CR01-SNAPSHOT</version> + <modules> + <module>../integration.war</module> + <module>../ear</module> + </modules> + + <dependencies> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.packaging.jboss-as.ear</artifactId> + <version>${project.version}</version> + <type>ear</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>starter-gatein</artifactId> + <version>${project.version}</version> + <type>ear</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.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.dashboard</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + + </dependencies> + <build> <plugins> @@ -25,8 +59,8 @@ <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> - <id>distro-portalbridge-assembly</id> - <phase>package</phase> + <id>bin</id> + <phase>compile</phase> <goals> <goal>single</goal> </goals> Modified: epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/assemble.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/assemble.xml 2011-05-31 09:44:40 UTC (rev 6580) +++ epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/assemble.xml 2011-05-31 15:12:57 UTC (rev 6581) @@ -6,13 +6,39 @@ <formats> <format>zip</format> </formats> + <includeBaseDirectory>false</includeBaseDirectory> - + + <dependencySets> + <!-- GateIn ear module - unpacked --> + <dependencySet> + <includes> + <include>*:exo.portal.packaging.jboss-as.ear:ear</include> + </includes> + <outputDirectory>deploy/gatein.ear</outputDirectory> + <outputFileNameMapping>gatein.ear</outputFileNameMapping> + <unpack>true</unpack> + </dependencySet> + + <!-- Other ear modules - packed, stripped version - starter-gatein.ear, integration.war --> + <dependencySet> + <includes> + <include>*:ear</include> + <include>*:war</include> + </includes> + <excludes> + <exclude>*:exo.portal.packaging.jboss-as.ear:ear</exclude> + </excludes> + <outputDirectory>deploy</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + </dependencySet> + </dependencySets> + <fileSets> <fileSet> <directory>src/main/resources/</directory> - <outputDirectory>.</outputDirectory> + <outputDirectory></outputDirectory> </fileSet> </fileSets> - + </assembly> \ No newline at end of file Added: epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/resources/conf/gatein/configuration.properties =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/resources/conf/gatein/configuration.properties (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/resources/conf/gatein/configuration.properties 2011-05-31 15:12:57 UTC (rev 6581) @@ -0,0 +1,52 @@ +# +# 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=${jboss.server.data.dir}/gatein + +# DB +gatein.db.data.dir=${gatein.data.dir}/db + +# JCR +gatein.jcr.config.type=local +gatein.jcr.datasource.name=java:gatein-jcr +gatein.jcr.datasource.dialect=auto + +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=java:gatein-idm + +# 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 + Added: epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/resources/conf/gatein/configuration.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/resources/conf/gatein/configuration.xml (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/resources/conf/gatein/configuration.xml 2011-05-31 15:12:57 UTC (rev 6581) @@ -0,0 +1,68 @@ +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"> + + <component> + <!-- The full qualified name of the PortalContainerConfig --> + <type>org.exoplatform.container.definition.PortalContainerConfig</type> + <init-params> + <!-- The name of the default portal container --> + <value-param> + <name>default.portal.container</name> + <value>portal</value> + </value-param> + <!-- The name of the default rest ServletContext --> + <value-param> + <name>default.rest.context</name> + <value>rest</value> + </value-param> + <!-- The name of the default realm --> + <value-param> + <name>default.realm.name</name> + <value>gatein-domain</value> + </value-param> + <!-- The default portal container definition --> + <!-- It cans be used to avoid duplicating configuration --> + <object-param> + <name>default.portal.definition</name> + <object type="org.exoplatform.container.definition.PortalContainerDefinition"> + <!-- The path to the external properties file --> + <field name="externalSettingsPath"> + <string>configuration.properties</string> + </field> + <field name="dependencies"> + <collection type="java.util.ArrayList"> + <value> + <string>eXoResources</string> + </value> + <value> + <string>portal</string> + </value> + <value> + <string>dashboard</string> + </value> + <value> + <string>exoadmin</string> + </value> + <value> + <string>eXoGadgets</string> + </value> + <value> + <string>eXoGadgetServer</string> + </value> + <value> + <string>rest</string> + </value> + <value> + <string>wsrp-producer</string> + </value> + <value> + <string>web</string> + </value> + </collection> + </field> + </object> + </object-param> + </init-params> + </component> +</configuration> Modified: epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml 2011-05-31 09:44:40 UTC (rev 6580) +++ epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml 2011-05-31 15:12:57 UTC (rev 6581) @@ -5,18 +5,12 @@ <id>bin</id> <formats> <format>dir</format> - <format>zip</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> -<!-- <useProjectArtifact>false</useProjectArtifact>--> + <!-- <files> + Configuration to default <file> - <source>src/assemble.xml</source> - <destName>xml/aaa.xml</destName> - </file> - </files>--> - <files> - <file> <source>../component/common/src/main/java/conf/configuration-jboss.properties</source> <outputDirectory>${eap.dir}/jboss-as/server/default/conf/gatein</outputDirectory> </file> @@ -24,37 +18,70 @@ <source>../component/common/src/main/java/conf/configuration.xml</source> <outputDirectory>${eap.dir}/jboss-as/server/default/conf/gatein</outputDirectory> </file> -<!-- <file> - <source>src/main/run.sh</source> - <outputDirectory>${eap.dir}/jboss-as/bin/</outputDirectory> - </file>--> - </files> + </files>--> <dependencySets> - <dependencySet> + +<!-- START Profiles --> +<!-- TODO: Will move to module and included for profiles all, web, production, default + Unnecessary jars will be excluded --> + <!-- GateIn ear module - unpacked --> +<!-- <dependencySet> <includes> <include>*:exo.portal.packaging.jboss-as.ear:ear</include> </includes> <outputDirectory>${eap.dir}/jboss-as/server/default/deploy/gatein.ear</outputDirectory> <outputFileNameMapping>gatein.ear</outputFileNameMapping> <unpack>true</unpack> - </dependencySet> - <dependencySet> + </dependencySet>--> + + <!-- Other ear modules - packed, stripped version - starter-gatein.ear, integration.war --> +<!-- <dependencySet> <includes> <include>*:ear</include> + <include>*:war</include> </includes> <excludes> <exclude>*:exo.portal.packaging.jboss-as.ear:ear</exclude> </excludes> <outputDirectory>${eap.dir}/jboss-as/server/default/deploy</outputDirectory> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + </dependencySet>--> + + <!-- Resources - gateinds.xml, gatein-sample-portal-ds.xml --> + <dependencySet> + <includes> + <include>*.deploy:*:zip</include> + </includes> + <outputDirectory>${eap.dir}/jboss-as/server/default</outputDirectory> + <unpack>true</unpack> </dependencySet> <dependencySet> <includes> + <include>*.deploy:*:zip</include> + </includes> + <outputDirectory>${eap.dir}/jboss-as/server/all</outputDirectory> + <unpack>true</unpack> + </dependencySet> + <dependencySet> + <includes> + <include>*.deploy:*:zip</include> + </includes> + <outputDirectory>${eap.dir}/jboss-as/server/production</outputDirectory> + <unpack>true</unpack> + </dependencySet> + +<!-- END Profiles --> + +<!-- No jars needed --> +<!-- <dependencySet> + <includes> <include>*:jar</include> </includes> <outputDirectory>${eap.dir}/jboss-as/server/default/deploy</outputDirectory> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - </dependencySet> + </dependencySet>--> + + <!-- Modules - portletbridge --> <dependencySet> <includes> <include>*.distribution:*:zip</include> @@ -62,16 +89,27 @@ <outputDirectory>${eap.dir}/${artifact.artifactId}</outputDirectory> <unpack>true</unpack> </dependencySet> + + <!-- SSO Module - with root dir, renamed later --> <dependencySet> <includes> - <include>*.deploy:*:zip</include> + <include>org.gatein.sso:*:zip</include> </includes> - <outputDirectory>${eap.dir}/server/default/deploy/</outputDirectory> + <outputDirectory>${eap.dir}</outputDirectory> <unpack>true</unpack> </dependencySet> - + + <!-- Examples --> <dependencySet> <includes> + <include>*:gatein-examples-*:*</include> + </includes> + <outputDirectory>${eap.dir}/docs/examples/portal</outputDirectory> + </dependencySet> + + <!-- EAP --> + <dependencySet> + <includes> <include>org.jboss:jboss-eap:zip</include> </includes> <outputDirectory></outputDirectory> Added: epp/portal/branches/EPP-5-1-tmp/distribution/src/build.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/src/build.xml (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/src/build.xml 2011-05-31 15:12:57 UTC (rev 6581) @@ -0,0 +1,47 @@ + +<project name="packageEPP"> + <target name="patch"> + + <echo>***************************************************************</echo> + <echo>Patching EAP configuration: ${toConfiguration}</echo> + <echo>***************************************************************</echo> + <echo>Patching EAP log4j configuration ...</echo> + <patch + originalfile="${epp.path}/jboss-as/server/${toConfiguration}/conf/jboss-log4j.xml" + patchfile="src/patch/EAP/jboss-log4j.xml.patch" + failonerror="true" + /> + + <echo>Patching EAP deployers/jbossweb.deployer/web.xml configuration ...</echo> + <patch + originalfile="${epp.path}/jboss-as/server/${toConfiguration}/deployers/jbossweb.deployer/web.xml" + patchfile="src/patch/EAP/jbossweb.deployer.web.xml.patch" + failonerror="true" + /> + <makeurl property="pc.jarfile.url"> + <fileset dir="${epp.path}/jboss-as/server/default/deploy/gatein.ear/lib" includes="pc-portlet*"/> + </makeurl> + <basename property="pc.jarfile.name" file="${pc.jarfile.url}"/> + <echo message="pc.jarfile: ${pc.jarfile.name}"/> + <replace + file="${epp.path}/jboss-as/server/${toConfiguration}/deployers/jbossweb.deployer/web.xml" + token="%pc-portlet-version-jar%" + value="${pc.jarfile.name}" + /> + + <echo>Patching EAP properties-service.xml ...</echo> + <patch + originalfile="${epp.path}/jboss-as/server/${toConfiguration}/deploy/properties-service.xml" + patchfile="src/patch/EAP/properties-service.xml.patch" + failonerror="true" + /> + + <echo>Patching EAP jbossweb.sar/context.xml ...</echo> + <patch + originalfile="${epp.path}/jboss-as/server/${toConfiguration}/deploy/jbossweb.sar/context.xml" + patchfile="src/patch/EAP/jbossweb.sar.context.xml.patch" + failonerror="true" + /> + + </target> +</project> \ No newline at end of file Added: epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/jboss-log4j.xml.patch =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/jboss-log4j.xml.patch (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/jboss-log4j.xml.patch 2011-05-31 15:12:57 UTC (rev 6581) @@ -0,0 +1,25 @@ +diff -uNr --exclude .svn jboss-log4j.xml.orig jboss-log4j.xml +--- jboss-log4j.xml.orig 2010-03-30 16:51:10.000000000 +0200 ++++ jboss-log4j.xml 2010-05-10 11:03:24.000000000 +0200 +@@ -237,6 +237,21 @@ + <priority value="INFO"/> + </category> + ++ <!-- Limit the JSR170 categories --> ++ <category name="exo.jcr"> ++ <priority value="INFO"/> ++ </category> ++ ++ <!-- Limit the JSR-168 and JSR-286 categories --> ++ <category name="org.exoplatform.services"> ++ <priority value="INFO"/> ++ </category> ++ ++ <!-- Limit verbose jgroups when running in cluster --> ++ <category name="org.jgroups.protocols.UDP"> ++ <priority value="ERROR" /> ++ </category> ++ + <!-- Limit the verbose facelets compiler --> + <category name="facelets.compiler"> + <priority value="WARN"/> Added: epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/jbossweb.deployer.web.xml.patch =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/jbossweb.deployer.web.xml.patch (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/jbossweb.deployer.web.xml.patch 2011-05-31 15:12:57 UTC (rev 6581) @@ -0,0 +1,15 @@ +diff -uNr web.xml.orig web.xml +--- web.xml.orig 2009-10-20 21:29:24.000000000 +0200 ++++ web.xml 2010-03-04 10:37:20.000000000 +0100 +@@ -280,6 +280,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>${jboss.server.home.url}/deploy/gatein.ear/lib/%pc-portlet-version-jar%</param-value> ++ </init-param> + + + <load-on-startup>3</load-on-startup> Added: epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/jbossweb.sar.context.xml.patch =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/jbossweb.sar.context.xml.patch (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/jbossweb.sar.context.xml.patch 2011-05-31 15:12:57 UTC (rev 6581) @@ -0,0 +1,12 @@ +--- context.xml.orig 2010-03-30 10:51:10.000000000 +0200 ++++ context.xml 2010-04-27 13:42: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: epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/properties-service.xml.patch =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/properties-service.xml.patch (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/properties-service.xml.patch 2011-05-31 15:12:57 UTC (rev 6581) @@ -0,0 +1,14 @@ +--- properties-service.xml.orig 2010-10-05 12:40:54.671128735 +0200 ++++ properties-service.xml 2010-10-05 12:41:40.823129364 +0200 +@@ -40,6 +40,11 @@ + <mbean code="org.jboss.varia.property.SystemPropertiesService" + name="jboss:type=Service,name=SystemProperties"> + ++ <attribute name="Properties"> ++ exo.conf.dir.name=gatein ++ gatein.runtime.context=epp ++ </attribute> ++ + <!-- + | Load properties from each of the given comma seperated URLs + Added: epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/run.conf.bat.patch =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/run.conf.bat.patch (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/run.conf.bat.patch 2011-05-31 15:12:57 UTC (rev 6581) @@ -0,0 +1,10 @@ +diff -uNr run.conf.bat.orig run.conf.bat +--- run.conf.bat.orig 2009-10-21 03:28:28.000000000 +0200 ++++ run.conf.bat 2010-03-09 17:17:38.000000000 +0100 +@@ -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: epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/run.conf.patch =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/run.conf.patch (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/src/patch/EAP/run.conf.patch 2011-05-31 15:12:57 UTC (rev 6581) @@ -0,0 +1,10 @@ +diff -uNr run.conf.orig run.conf +--- run.conf.orig 2010-03-05 07:42:22.000000000 +0100 ++++ run.conf 2010-03-09 16:43:31.000000000 +0100 +@@ -52,3 +52,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" Copied: epp/portal/branches/EPP-5-1-tmp/distribution/src/zip.xml (from rev 6572, epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml) =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/src/zip.xml (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/src/zip.xml 2011-05-31 15:12:57 UTC (rev 6581) @@ -0,0 +1,17 @@ + +<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.2.xsd"> + <id>bin</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>${project.build.directory}/${project.build.finalName}-bin/</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Copied: epp/portal/branches/EPP-5-1-tmp/distribution/sso/pom.xml (from rev 6572, epp/portal/branches/EPP-5-1-tmp/distribution/portletbridge/pom.xml) =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/sso/pom.xml (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/sso/pom.xml 2011-05-31 15:12:57 UTC (rev 6581) @@ -0,0 +1,91 @@ + +<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>distribution</artifactId> + <version>5.1.1-epp-CR01-SNAPSHOT</version> + + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.parent</artifactId> + <version>5.1.1-epp-CR01-SNAPSHOT</version> + </parent>--> + <artifactId>sso</artifactId> + <packaging>pom</packaging> + <name>Distribution portletbridge</name> + + <groupId>org.exoplatform.portal.distribution</groupId> + <version>5.1.1-epp-CR01-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>org.jboss.portletbridge</groupId> + <artifactId>sso-packaging</artifactId> + <version>1.0.2-epp-DEV01</version> + <type>zip</type> + </dependency> + + + <!-- Examples --> + +<!-- +{"http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/307402/maven/ +org/jboss/portletbridge/examples/seam/booking/seamBooking-ear/2.1.0.GA.EPP51/" +:"seamBooking-ear-2.1.0.GA.EPP51.ear"}, + +{"http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/307402/maven/ +org/jboss/portal/examples/JSFRIPortlet/2.1.0.GA.EPP51/" +: "JSFRIPortlet-2.1.0.GA.EPP51.war"}, + +{"http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/307402/maven/ +org/jboss/portal/examples/richFacesPortlet/2.1.0.GA.EPP51/" +:"richFacesPortlet-2.1.0.GA.EPP51.war"} +--> + + <dependency> + <groupId>org.jboss.portletbridge.examples.seam.booking</groupId> + <artifactId>seamBooking-ear</artifactId> + <version>2.1.0.GA.EPP51</version> + <type>ear</type> + </dependency> + <dependency> + <groupId>org.jboss.portal.examples</groupId> + <artifactId>JSFRIPortlet</artifactId> + <version>2.1.0.GA.EPP51</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.portal.examples</groupId> + <artifactId>richFacesPortlet</artifactId> + <version>2.1.0.GA.EPP51</version> + <type>war</type> + </dependency> + + </dependencies> + + <build> + <plugins> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distro-portalbridge-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/assemble.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> Copied: epp/portal/branches/EPP-5-1-tmp/distribution/sso/src/assemble.xml (from rev 6572, epp/portal/branches/EPP-5-1-tmp/distribution/portletbridge/src/assemble.xml) =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/sso/src/assemble.xml (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/sso/src/assemble.xml 2011-05-31 15:12:57 UTC (rev 6581) @@ -0,0 +1,29 @@ + +<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.2.xsd"> + <id>bin</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <dependencySets> + <dependencySet> + <includes> + <include>*:jar</include> + </includes> + <outputDirectory></outputDirectory> + <outputFileNameMapping>${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping> + <unpack>false</unpack> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + <dependencySet> + <includes> + <include>*:ear</include> + <include>*:war</include> + </includes> + <outputDirectory>examples/</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping> + </dependencySet> + </dependencySets> +</assembly> \ No newline at end of file