Author: hfnukal Date: 2011-06-24 09:26:16 -0400 (Fri, 24 Jun 2011) New Revision: 6734 Added: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/assemble.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jboss-log4j.xml.patch epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jbossweb.deployer.web.xml.patch epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jbossweb.sar.context.xml.patch epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/properties-service.xml.patch epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/run.conf.bat.patch Removed: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/assemble.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jboss-log4j.xml.patch epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jbossweb.deployer.web.xml.patch epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jbossweb.sar.context.xml.patch epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/properties-service.xml.patch epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/run.conf.bat.patch Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml Log: JBEPP-942 Renaming folder for jboss-epp Deleted: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/assemble.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/assemble.xml 2011-06-24 06:46:24 UTC (rev 6729) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/assemble.xml 2011-06-24 13:26:16 UTC (rev 6734) @@ -1,101 +0,0 @@ - -<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>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <dependencySets> - -<!-- START profiles --> - <dependencySet> - <includes> - <include>*.distribution.deploy:*:zip</include> - </includes> - <excludes> - <exclude>*:hibernate-core:3.3.2.GA:jar</exclude> - <exclude>*:jaxb-api:2.1:jar</exclude> - <exclude>*:stax-api:1.0:jar</exclude> - </excludes> - <outputDirectory>${eap.dir}/jboss-as/server/default</outputDirectory> - <unpack>true</unpack> - </dependencySet> - - <dependencySet> - <includes> - <include>*.distribution.deploy:*:zip</include> - </includes> - <excludes> - <exclude>*:hibernate-core:3.3.2.GA:jar</exclude> - <exclude>*:jaxb-api:2.1:jar</exclude> - <exclude>*:stax-api:1.0:jar</exclude> - - <!-- Exclude cluster --> - <exclude>*:hibernate-jbosscache2:3.3.2.GA:jar</exclude> - <exclude>*:jbosscache-core:3.2.6.GA:jar</exclude> - <exclude>*:jgroups:2.6.13.GA:jar</exclude> - </excludes> - <outputDirectory>${eap.dir}/jboss-as/server/all</outputDirectory> - <unpack>true</unpack> - </dependencySet> - - <dependencySet> - <includes> - <include>*.distribution.deploy:*:zip</include> - </includes> - <excludes> - <exclude>*:hibernate-core:3.3.2.GA:jar</exclude> - <exclude>*:jaxb-api:2.1:jar</exclude> - <exclude>*:stax-api:1.0:jar</exclude> - - <!-- Exclude cluster --> - <exclude>*:hibernate-jbosscache2:3.3.2.GA:jar</exclude> - <exclude>*:jbosscache-core:3.2.6.GA:jar</exclude> - <exclude>*:jgroups:2.6.13.GA:jar</exclude> - </excludes> - <outputDirectory>${eap.dir}/jboss-as/server/production</outputDirectory> - <unpack>true</unpack> - </dependencySet> -<!-- END profiles --> - - <!-- Modules - portletbridge --> - <dependencySet> - <includes> - <include>*.distribution.root:*:zip</include> - </includes> - <outputDirectory>${eap.dir}/${artifact.artifactId}</outputDirectory> - <unpack>true</unpack> - </dependencySet> - - <!-- SSO Module - with root dir, renamed later --> - <dependencySet> - <includes> - <include>org.gatein.sso:*:zip</include> - </includes> - <outputDirectory>${eap.dir}</outputDirectory> - <unpack>true</unpack> - </dependencySet> - - <!-- Examples --> - <dependencySet> - <includes> - <include>*.distribution:examples:zip</include> - </includes> - <outputDirectory>${eap.dir}/jboss-as/docs/examples/portal</outputDirectory> - <unpack>true</unpack> - </dependencySet> - - <!-- EAP --> - <dependencySet> - <includes> - <include>org.jboss:jboss-eap:zip</include> - </includes> - <outputDirectory></outputDirectory> - <unpack>true</unpack> - </dependencySet> - - </dependencySets> -</assembly> \ No newline at end of file Copied: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/assemble.xml (from rev 6733, epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/assemble.xml) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/assemble.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/assemble.xml 2011-06-24 13:26:16 UTC (rev 6734) @@ -0,0 +1,101 @@ + +<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>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <dependencySets> + +<!-- START profiles --> + <dependencySet> + <includes> + <include>*.distribution.deploy:*:zip</include> + </includes> + <excludes> + <exclude>*:hibernate-core:3.3.2.GA:jar</exclude> + <exclude>*:jaxb-api:2.1:jar</exclude> + <exclude>*:stax-api:1.0:jar</exclude> + </excludes> + <outputDirectory>${eap.dir}/jboss-as/server/default</outputDirectory> + <unpack>true</unpack> + </dependencySet> + + <dependencySet> + <includes> + <include>*.distribution.deploy:*:zip</include> + </includes> + <excludes> + <exclude>*:hibernate-core:3.3.2.GA:jar</exclude> + <exclude>*:jaxb-api:2.1:jar</exclude> + <exclude>*:stax-api:1.0:jar</exclude> + + <!-- Exclude cluster --> + <exclude>*:hibernate-jbosscache2:3.3.2.GA:jar</exclude> + <exclude>*:jbosscache-core:3.2.6.GA:jar</exclude> + <exclude>*:jgroups:2.6.13.GA:jar</exclude> + </excludes> + <outputDirectory>${eap.dir}/jboss-as/server/all</outputDirectory> + <unpack>true</unpack> + </dependencySet> + + <dependencySet> + <includes> + <include>*.distribution.deploy:*:zip</include> + </includes> + <excludes> + <exclude>*:hibernate-core:3.3.2.GA:jar</exclude> + <exclude>*:jaxb-api:2.1:jar</exclude> + <exclude>*:stax-api:1.0:jar</exclude> + + <!-- Exclude cluster --> + <exclude>*:hibernate-jbosscache2:3.3.2.GA:jar</exclude> + <exclude>*:jbosscache-core:3.2.6.GA:jar</exclude> + <exclude>*:jgroups:2.6.13.GA:jar</exclude> + </excludes> + <outputDirectory>${eap.dir}/jboss-as/server/production</outputDirectory> + <unpack>true</unpack> + </dependencySet> +<!-- END profiles --> + + <!-- Modules - portletbridge --> + <dependencySet> + <includes> + <include>*.distribution.root:*:zip</include> + </includes> + <outputDirectory>${eap.dir}/${artifact.artifactId}</outputDirectory> + <unpack>true</unpack> + </dependencySet> + + <!-- SSO Module - with root dir, renamed later --> + <dependencySet> + <includes> + <include>org.gatein.sso:*:zip</include> + </includes> + <outputDirectory>${eap.dir}</outputDirectory> + <unpack>true</unpack> + </dependencySet> + + <!-- Examples --> + <dependencySet> + <includes> + <include>*.distribution:examples:zip</include> + </includes> + <outputDirectory>${eap.dir}/jboss-as/docs/examples/portal</outputDirectory> + <unpack>true</unpack> + </dependencySet> + + <!-- EAP --> + <dependencySet> + <includes> + <include>${eap.groupId}:jboss-eap:zip</include> + </includes> + <outputDirectory></outputDirectory> + <unpack>true</unpack> + </dependencySet> + + </dependencySets> +</assembly> \ No newline at end of file Deleted: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/build.xml 2011-06-24 06:46:24 UTC (rev 6729) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml 2011-06-24 13:26:16 UTC (rev 6734) @@ -1,67 +0,0 @@ - -<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> - - <target name="patchInZip"> - <!-- unzip --> - <unzip src="${epp.zip}" dest="${tmp.dir}"> - <patternset> - <include name="jboss-as/server/${toConfiguration}/conf/jboss-log4j.xml"/> - <include name="jboss-as/server/${toConfiguration}/deployers/jbossweb.deployer/web.xml"/> - <include name="jboss-as/server/${toConfiguration}/deploy/properties-service.xml"/> - <include name="jboss-as/server/${toConfiguration}/deploy/jbossweb.sar/context.xml"/> - </patternset> - </unzip> - <!-- patch --> - <antcall inheritRefs="true"> - <target name="patch"/> - <property name="epp.zip" value="${tmp.dir}"/> - </antcall> - <!-- zip --> - <zip destfile="${epp.zip}" basedir="${tmp.dir}" update="true"> - </zip> - </target> -</project> \ No newline at end of file Copied: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml (from rev 6733, epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/build.xml) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/build.xml 2011-06-24 13:26:16 UTC (rev 6734) @@ -0,0 +1,73 @@ + +<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" + /> + + <!-- Setting this to false may broke build, useful for preparing patches --> + <property name="patch.failonerror">true</property> + + <!-- + patch jboss-as/server/${toConfiguration}/deployers/jbossweb.deployer/web.xml < src/patch/EAP/jbossweb.deployer.web.xml.patch + --> + <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="${patch.failonerror}" + /> + <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="${patch.failonerror}" + /> + + <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="${patch.failonerror}" + /> + + </target> + + <target name="patchInZip"> + <!-- unzip --> + <unzip src="${epp.zip}" dest="${tmp.dir}"> + <patternset> + <include name="jboss-as/server/${toConfiguration}/conf/jboss-log4j.xml"/> + <include name="jboss-as/server/${toConfiguration}/deployers/jbossweb.deployer/web.xml"/> + <include name="jboss-as/server/${toConfiguration}/deploy/properties-service.xml"/> + <include name="jboss-as/server/${toConfiguration}/deploy/jbossweb.sar/context.xml"/> + </patternset> + </unzip> + <!-- patch --> + <antcall inheritRefs="true"> + <target name="patch"/> + <property name="epp.zip" value="${tmp.dir}"/> + </antcall> + <!-- zip --> + <zip destfile="${epp.zip}" basedir="${tmp.dir}" update="true"> + </zip> + </target> +</project> \ No newline at end of file Deleted: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jboss-log4j.xml.patch =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/jboss-log4j.xml.patch 2011-06-24 06:46:24 UTC (rev 6729) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jboss-log4j.xml.patch 2011-06-24 13:26:16 UTC (rev 6734) @@ -1,25 +0,0 @@ -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"/> Copied: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jboss-log4j.xml.patch (from rev 6733, epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/jboss-log4j.xml.patch) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jboss-log4j.xml.patch (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jboss-log4j.xml.patch 2011-06-24 13:26:16 UTC (rev 6734) @@ -0,0 +1,25 @@ +--- jboss-log4j.xml.orig 2011-06-24 10:50:16.000000000 +0200 ++++ jboss-log4j.xml 2011-06-24 11:11:10.341965795 +0200 +@@ -180,7 +180,22 @@ + <category name="org.apache"> + <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 jacorb category to WARN as its INFO is verbose --> + <category name="jacorb"> + <priority value="WARN"/> Deleted: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jbossweb.deployer.web.xml.patch =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/jbossweb.deployer.web.xml.patch 2011-06-24 06:46:24 UTC (rev 6729) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jbossweb.deployer.web.xml.patch 2011-06-24 13:26:16 UTC (rev 6734) @@ -1,15 +0,0 @@ -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> Copied: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jbossweb.deployer.web.xml.patch (from rev 6733, epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/jbossweb.deployer.web.xml.patch) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jbossweb.deployer.web.xml.patch (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jbossweb.deployer.web.xml.patch 2011-06-24 13:26:16 UTC (rev 6734) @@ -0,0 +1,16 @@ +diff -uNr web.xml.orig web.xml +--- web.xml.orig 2011-06-24 12:58:10.000000000 +0200 ++++ web.xml 2011-06-24 13:06:59.595627467 +0200 +@@ -284,7 +284,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> + </servlet> Deleted: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jbossweb.sar.context.xml.patch =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/jbossweb.sar.context.xml.patch 2011-06-24 06:46:24 UTC (rev 6729) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jbossweb.sar.context.xml.patch 2011-06-24 13:26:16 UTC (rev 6734) @@ -1,12 +0,0 @@ ---- 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> Copied: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jbossweb.sar.context.xml.patch (from rev 6733, epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/jbossweb.sar.context.xml.patch) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jbossweb.sar.context.xml.patch (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/jbossweb.sar.context.xml.patch 2011-06-24 13:26:16 UTC (rev 6734) @@ -0,0 +1,11 @@ +--- context.xml.orig 2011-06-24 13:54:02.000000000 +0200 ++++ context.xml 2011-06-24 14:01:54.304475869 +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> Deleted: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/properties-service.xml.patch =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/properties-service.xml.patch 2011-06-24 06:46:24 UTC (rev 6729) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/properties-service.xml.patch 2011-06-24 13:26:16 UTC (rev 6734) @@ -1,14 +0,0 @@ ---- 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 - Copied: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/properties-service.xml.patch (from rev 6733, epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/properties-service.xml.patch) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/properties-service.xml.patch (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/properties-service.xml.patch 2011-06-24 13:26:16 UTC (rev 6734) @@ -0,0 +1,14 @@ +--- properties-service.xml.orig 2011-06-24 13:22:45.000000000 +0200 ++++ properties-service.xml 2011-06-24 13:41:48.865959790 +0200 +@@ -39,6 +39,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 Deleted: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/run.conf.bat.patch =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/run.conf.bat.patch 2011-06-24 06:46:24 UTC (rev 6729) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/run.conf.bat.patch 2011-06-24 13:26:16 UTC (rev 6734) @@ -1,10 +0,0 @@ -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" Copied: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/run.conf.bat.patch (from rev 6733, epp/portal/branches/EPP_5_2_Branch/distribution/pack/src/patch/EAP/run.conf.bat.patch) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/run.conf.bat.patch (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/src/patch/EAP/run.conf.bat.patch 2011-06-24 13:26:16 UTC (rev 6734) @@ -0,0 +1,8 @@ +--- run.conf.bat.orig 2011-06-24 14:18:19.000000000 +0200 ++++ run.conf.bat 2011-06-24 14:19:53.707990235 +0200 +@@ -56,3 +56,5 @@ + + :JAVA_OPTS_SET + ++rem # GateIn configuration directory ++set "JAVA_OPTS=%JAVA_OPTS% -Dexo.conf.dir.name=gatein" Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-06-24 12:55:50 UTC (rev 6733) +++ epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-06-24 13:26:16 UTC (rev 6734) @@ -41,7 +41,7 @@ <activeByDefault>false</activeByDefault> </activation> <modules> - <module>pack</module> + <module>jboss-epp</module> </modules> </profile> </profiles>