gatein SVN: r6581 - in epp/portal/branches/EPP-5-1-tmp/distribution: serverAddon and 9 other directories.
by do-not-reply＠jboss.org
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/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 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/...
+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/...
+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/...
+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/assembly/1.1.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 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
13 years, 7 months
- 1
- 0
gatein SVN: r6580 - in portal/trunk/docs/reference-guide/en-US/modules: PortletDevelopment and 1 other directory.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-05-31 05:44:40 -0400 (Tue, 31 May 2011)
New Revision: 6580
Added:
portal/trunk/docs/reference-guide/en-US/modules/PortletDevelopment/Global_portlet.xml
Modified:
portal/trunk/docs/reference-guide/en-US/modules/PortletDevelopment.xml
Log:
GTNPORTAL-1906 Update Reference Guide for Global Portlet feature
Added: portal/trunk/docs/reference-guide/en-US/modules/PortletDevelopment/Global_portlet.xml
===================================================================
--- portal/trunk/docs/reference-guide/en-US/modules/PortletDevelopment/Global_portlet.xml (rev 0)
+++ portal/trunk/docs/reference-guide/en-US/modules/PortletDevelopment/Global_portlet.xml 2011-05-31 09:44:40 UTC (rev 6580)
@@ -0,0 +1,95 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
+ %BOOK_ENTITIES;
+ ]>
+<section id="sect-Reference_Guide-Global_Portlet">
+ <title>Global porlet.xml file</title>
+ <section id="sect-Reference_Guide-Global_Portlet-Global_usecase">
+ <title>Global portlet.xml usecase</title>
+ <para>The Portlet Specification introduces PortletFilter as a standard approach to extend the behaviors of portlet
+ objects. For example, a filter can transform the content of portlet requests and portlet responses.
+ According to the Portlet Specification, normally there are three steps in setting up a portlet filter:
+ </para>
+ <orderedlist>
+ <listitem>
+ <para>Implement a PortletFilter object</para>
+ </listitem>
+ <listitem>
+ <para>Define the filter in portlet application deployment descriptor</para>
+ </listitem>
+ <listitem>
+ <para>Define the filter mapping in portlet definitions</para>
+ </listitem>
+ </orderedlist>
+ <para>Two first steps are quite simple and easy to be done, however, at the step 3, developers/administrators
+ need to replicate the filter mapping in many portlet definitions, that makes work error and tedious in
+ several use cases.
+ The global portlet feature is designed to compensate such limitation.
+ </para>
+ </section>
+ <section id="sect-Reference_Guide-Global_Portlet-Global_metadata">
+ <title>Global metadata</title>
+ <para>The Global metadata is declared in the
+ <emphasis role="italic">portlet.xml</emphasis> file conforming with Portlet 2.0 's XSD.
+ </para>
+ <programlisting role="XML"><portlet-app version="1.0" xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2... http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd">
+
+</portlet-app></programlisting>
+ <section id="sect-Reference_Guide-Global_Portlet-Location">
+ <title>Location</title>
+ <para>The path to the global <emphasis role="italic">portlet.xml</emphasis> is value of <emphasis role="italic">gatein.portlet.config</emphasis> in the <emphasis role="italic">configuration.properties</emphasis> file and varied by hosting
+ application servers.
+ </para>
+ <para><emphasis role="bold">For Tomcat</emphasis>: <emphasis role="italic">TOMCAT_HOME/gatein/conf/portlet.xml</emphasis></para>
+ <para><emphasis role="bold">For JBoss</emphasis>: <emphasis role="italic">JBOSS_HOME/server/default/conf/gatein/portlet.xml</emphasis></para>
+ </section>
+ <section id="sect-Reference_Guide-Global_Portlet-Global_metadata_elements">
+ <title>Global metadata elements</title>
+ <para>The global <emphasis role="italic">portlet.xml</emphasis> file conforms to the schema of the portlet deployment descriptor defined in the Portlet
+ Specification with some restrictions. In this file, the following elements are supported:
+ </para>
+ <orderedlist>
+ <listitem>
+ <para>Portlet Filter</para>
+ </listitem>
+ <listitem>
+ <para>Portlet Mode</para>
+ </listitem>
+ <listitem>
+ <para>Window State</para>
+ </listitem>
+ </orderedlist>
+ <section id="sect-Reference_Guide-Global_metadata_elements-Global_Portlet-Portlet_filter">
+ <title>Portlet filter</title>
+ <para>Portlet filter mappings declared in the global<emphasis role="italic"> portlet.xml</emphasis> file are applied across portlet applications. With
+ the XML configuration below, the filter ApplicationMonitoringFilter involves in request handling on any
+ deployed portlet.
+ </para>
+ <programlisting role="XML"><filter>
+ <filter-name>org.exoplatform.portal.application.ApplicationMonitoringFilter</filter-name>
+ <filter-class>org.exoplatform.portal.application.ApplicationMonitoringFilter</filter-class>
+ <lifecycle>ACTION_PHASE</lifecycle>
+ <lifecycle>RENDER_PHASE</lifecycle>
+ <lifecycle>EVENT_PHASE</lifecycle>
+ <lifecycle>RESOURCE_PHASE</lifecycle>
+</filter></programlisting>
+ <para>
+ <emphasis role="bold">Application Monitoring Filter</emphasis>
+ supports four lifecycle phases as the order below:
+ <emphasis role="italic">ACTION_PHASE/ EVENT_PHASE/ RENDER_PHASE/ RESOURCE_PHASE</emphasis>
+ and
+ records statistic information on deployed portlets.
+ The filter alternates actual monitoring mechanism in WebUI Framework.
+ </para>
+ </section>
+ <section id="sect-Reference_Guide-Global_metadata_elements-Global_Portlet-Portlet_mode">
+ <title>Portlet Mode and Window State</title>
+ <para>The global <emphasis role="italic">portlet.xml</emphasis> file is considered as an alternative place to declare custom Portlet Modes and Window States.
+ </para>
+ </section>
+ </section>
+ </section>
+</section>
Modified: portal/trunk/docs/reference-guide/en-US/modules/PortletDevelopment.xml
===================================================================
--- portal/trunk/docs/reference-guide/en-US/modules/PortletDevelopment.xml 2011-05-30 17:28:39 UTC (rev 6579)
+++ portal/trunk/docs/reference-guide/en-US/modules/PortletDevelopment.xml 2011-05-31 09:44:40 UTC (rev 6580)
@@ -6,7 +6,8 @@
<chapter id="chap-Reference_Guide-Portlet_development">
<title>Portlet development</title>
- <xi:include href="PortletDevelopment/Standard.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="PortletDevelopment/Standard.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="PortletDevelopment/Global_portlet.xml"/>
</chapter>
13 years, 7 months
- 1
- 0
gatein SVN: r6579 - in sandbox/as7_support/pc/portal/src: main/resources/jboss7/simple-portal.war/WEB-INF and 3 other directories.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-05-30 13:28:39 -0400 (Mon, 30 May 2011)
New Revision: 6579
Added:
sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/demo5.jsp
sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/single-decorated.jsp
sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/single.jsp
Modified:
sandbox/as7_support/pc/portal/src/assemble/simple-portal-ear-jboss7.xml
sandbox/as7_support/pc/portal/src/main/resources/jboss7/simple-portal.war/WEB-INF/web.xml
sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp
Log:
Single portlet - decorated, and undecorated
Modified: sandbox/as7_support/pc/portal/src/assemble/simple-portal-ear-jboss7.xml
===================================================================
--- sandbox/as7_support/pc/portal/src/assemble/simple-portal-ear-jboss7.xml 2011-05-30 14:16:11 UTC (rev 6578)
+++ sandbox/as7_support/pc/portal/src/assemble/simple-portal-ear-jboss7.xml 2011-05-30 17:28:39 UTC (rev 6579)
@@ -12,6 +12,7 @@
<outputDirectory>simple-portal.war</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<excludes>
+ <exclude>**/web.xml</exclude>
<exclude>**/jboss-web.xml</exclude>
<exclude>**/context.xml</exclude>
<exclude>**/jboss-portal-beans.xml</exclude>
Modified: sandbox/as7_support/pc/portal/src/main/resources/jboss7/simple-portal.war/WEB-INF/web.xml
===================================================================
--- sandbox/as7_support/pc/portal/src/main/resources/jboss7/simple-portal.war/WEB-INF/web.xml 2011-05-30 14:16:11 UTC (rev 6578)
+++ sandbox/as7_support/pc/portal/src/main/resources/jboss7/simple-portal.war/WEB-INF/web.xml 2011-05-30 17:28:39 UTC (rev 6579)
@@ -42,6 +42,9 @@
<filter-mapping>
<filter-name>ControllerFilter</filter-name>
<url-pattern>*.jsp</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
</filter-mapping>
<listener>
<listener-class>org.gatein.pc.portal.SimplePortalInitializer</listener-class>
Modified: sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
===================================================================
--- sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2011-05-30 14:16:11 UTC (rev 6578)
+++ sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2011-05-30 17:28:39 UTC (rev 6579)
@@ -45,6 +45,9 @@
<filter-mapping>
<filter-name>ControllerFilter</filter-name>
<url-pattern>*.jsp</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
</filter-mapping>
<listener>
<listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
Added: sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/demo5.jsp
===================================================================
--- sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/demo5.jsp (rev 0)
+++ sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/demo5.jsp 2011-05-30 17:28:39 UTC (rev 6579)
@@ -0,0 +1,30 @@
+<%@ page contentType="text/html" %>
+<%@ page language="java" %>
+<%@ taglib prefix="xportal" tagdir="/WEB-INF/tags/portal" %>
+<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
+<%@ page isELIgnored="false" %>
+
+<%@ include file="/layouts/header.jsp" %>
+
+<portal:page>
+ <xportal:2columns>
+ <jsp:attribute name="leftcol">
+ <jsp:include page="single-decorated.jsp">
+ <jsp:param name="portlet" value="Cart"/>
+ <jsp:param name="app" value="samples-shoppingcart-portlet"/>
+ </jsp:include>
+ </jsp:attribute>
+ <jsp:attribute name="rightcol">
+ <jsp:include page="single.jsp">
+ <jsp:param name="portlet" value="JSPPortlet"/>
+ <jsp:param name="app" value="samples-jsp-portlet"/>
+ </jsp:include>
+ <jsp:include page="single-decorated.jsp">
+ <jsp:param name="portlet" value="Catalog"/>
+ <jsp:param name="app" value="samples-shoppingcart-portlet"/>
+ </jsp:include>
+ </jsp:attribute>
+ </xportal:2columns>
+</portal:page>
+
+<%@ include file="/layouts/footer.jsp" %>
Added: sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/single-decorated.jsp
===================================================================
--- sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/single-decorated.jsp (rev 0)
+++ sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/single-decorated.jsp 2011-05-30 17:28:39 UTC (rev 6579)
@@ -0,0 +1,9 @@
+<%@ page contentType="text/html" %>
+<%@ page language="java" %>
+<%@ taglib prefix="xportal" tagdir="/WEB-INF/tags/portal" %>
+<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
+<%@ page isELIgnored="false" %>
+
+<portal:page>
+ <xportal:portlet name="${param.portlet}" applicationName="${param.app}"/>
+</portal:page>
\ No newline at end of file
Added: sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/single.jsp
===================================================================
--- sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/single.jsp (rev 0)
+++ sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/demo/single.jsp 2011-05-30 17:28:39 UTC (rev 6579)
@@ -0,0 +1,10 @@
+<%@ page contentType="text/html" %>
+<%@ page language="java" %>
+<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
+<%@ page isELIgnored="false" %>
+
+<portal:page>
+ <portal:portlet name="${param.portlet}" applicationName="${param.app}">
+ <portal:portletmarkup/>
+ </portal:portlet>
+</portal:page>
Modified: sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp
===================================================================
--- sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp 2011-05-30 14:16:11 UTC (rev 6578)
+++ sandbox/as7_support/pc/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp 2011-05-30 17:28:39 UTC (rev 6579)
@@ -32,8 +32,11 @@
<li>
<a href="${pageContext.request.contextPath}/demo/demo4.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'demo4.jsp' ? 'selected' : ''}">Demo4</a>
</li>
- <!--
<li>
+ <a href="${pageContext.request.contextPath}/demo/demo5.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'demo5.jsp' ? 'selected' : ''}">Demo5</a>
+ </li>
+ <!--
+ <li>
<a href="${pageContext.request.contextPath}/demo/jsr-301.jsp" class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') == 'jsr-301.jsp' ? 'selected' : ''}">JSR-301 Demo</a>
</li>
-->
13 years, 7 months
- 1
- 0
gatein SVN: r6578 - in sandbox/as7_support: pc and 1 other directory.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-05-30 10:16:11 -0400 (Mon, 30 May 2011)
New Revision: 6578
Added:
sandbox/as7_support/pc/jboss-as7-integration/
Removed:
sandbox/as7_support/pc/jboss-as7-extension/
Modified:
sandbox/as7_support/README.txt
Log:
Renamed pc/jboss-as7-extension parent dir into jboss-as7-integration
Modified: sandbox/as7_support/README.txt
===================================================================
--- sandbox/as7_support/README.txt 2011-05-30 14:02:23 UTC (rev 6577)
+++ sandbox/as7_support/README.txt 2011-05-30 14:16:11 UTC (rev 6578)
@@ -18,11 +18,12 @@
(on Windows remove the backslash: -P!default,portal)
-cd jboss-as7-extension
+cd jboss-as7-integration
mvn install -Ppkg-jbossas7,download -Dexo.projects.directory.dependencies=SERVERS_DIR
(the previous command automatically downloads jboss-7.0.0.Beta3 build and unpacks it into SERVERS_DIR. If you already have this JBoss AS7 build in SERVERS_DIR you can omit 'download' profile)
+cp pkg
cd target
cd jboss-7.0.0.Beta3
cd bin
13 years, 7 months
- 1
- 0
gatein SVN: r6577 - in sandbox/as7_support/pc/jboss-as7-extension: extension and 2 other directories.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-05-30 10:02:23 -0400 (Mon, 30 May 2011)
New Revision: 6577
Modified:
sandbox/as7_support/pc/jboss-as7-extension/extension/pom.xml
sandbox/as7_support/pc/jboss-as7-extension/modules/build.xml
sandbox/as7_support/pc/jboss-as7-extension/modules/pom.xml
sandbox/as7_support/pc/jboss-as7-extension/pkg/pom.xml
sandbox/as7_support/pc/jboss-as7-extension/pom.xml
Log:
Renamed artifacts, fixed hierarchy, and added module names
Modified: sandbox/as7_support/pc/jboss-as7-extension/extension/pom.xml
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/extension/pom.xml 2011-05-30 13:41:47 UTC (rev 6576)
+++ sandbox/as7_support/pc/jboss-as7-extension/extension/pom.xml 2011-05-30 14:02:23 UTC (rev 6577)
@@ -5,13 +5,13 @@
<parent>
<groupId>org.gatein.pc</groupId>
- <artifactId>jboss-as7-extension</artifactId>
+ <artifactId>jboss-as7-integration</artifactId>
<version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.gatein</groupId>
- <artifactId>gatein-jboss-as7</artifactId>
+ <artifactId>jboss-as7-integration-extension</artifactId>
+ <name>GateIn - Portlet Container (JBoss AS7 Extension)</name>
<dependencies>
Modified: sandbox/as7_support/pc/jboss-as7-extension/modules/build.xml
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/modules/build.xml 2011-05-30 13:41:47 UTC (rev 6576)
+++ sandbox/as7_support/pc/jboss-as7-extension/modules/build.xml 2011-05-30 14:02:23 UTC (rev 6577)
@@ -62,7 +62,7 @@
~ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-->
<module-def name="org.gatein">
- <maven-resource group="org.gatein" artifact="gatein-jboss-as7" />
+ <maven-resource group="org.gatein.pc" artifact="jboss-as7-integration-extension" />
</module-def>
<module-def name="org.gatein.wci">
Modified: sandbox/as7_support/pc/jboss-as7-extension/modules/pom.xml
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/modules/pom.xml 2011-05-30 13:41:47 UTC (rev 6576)
+++ sandbox/as7_support/pc/jboss-as7-extension/modules/pom.xml 2011-05-30 14:02:23 UTC (rev 6577)
@@ -5,12 +5,13 @@
<parent>
<groupId>org.gatein.pc</groupId>
- <artifactId>jboss-as7-extension</artifactId>
+ <artifactId>jboss-as7-integration</artifactId>
<version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>gatein-jboss-as7-modules</artifactId>
+ <artifactId>jboss-as7-integration-modules</artifactId>
+ <name>GateIn - Portlet Container (JBoss AS7 Extension Modules)</name>
<properties>
<version.org.jboss.jandex>1.0.0.Beta6</version.org.jboss.jandex>
@@ -19,8 +20,8 @@
<dependencies>
<dependency>
- <groupId>org.gatein</groupId>
- <artifactId>gatein-jboss-as7</artifactId>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>jboss-as7-integration-extension</artifactId>
</dependency>
<dependency>
<groupId>org.gatein.wci</groupId>
Modified: sandbox/as7_support/pc/jboss-as7-extension/pkg/pom.xml
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/pkg/pom.xml 2011-05-30 13:41:47 UTC (rev 6576)
+++ sandbox/as7_support/pc/jboss-as7-extension/pkg/pom.xml 2011-05-30 14:02:23 UTC (rev 6577)
@@ -7,14 +7,14 @@
<parent>
<groupId>org.gatein.pc</groupId>
- <artifactId>jboss-as7-extension</artifactId>
+ <artifactId>jboss-as7-integration</artifactId>
<version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
- <artifactId>gatein-jboss-as7-pkg</artifactId>
+ <artifactId>jboss-as7-integration-pkg</artifactId>
<packaging>pom</packaging>
- <name>SimplePortal for JBoss AS 7 packaging</name>
+ <name>GateIn - Portlet Container (JBoss AS7 Integration Packaging - SimplePortal)</name>
<properties>
<jbossas.version>7.0.0.Beta3</jbossas.version>
@@ -29,12 +29,12 @@
<dependencies>
<dependency>
- <groupId>org.gatein</groupId>
- <artifactId>gatein-jboss-as7</artifactId>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>jboss-as7-integration-extension</artifactId>
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
- <artifactId>gatein-jboss-as7-modules</artifactId>
+ <artifactId>jboss-as7-integration-modules</artifactId>
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
Modified: sandbox/as7_support/pc/jboss-as7-extension/pom.xml
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/pom.xml 2011-05-30 13:41:47 UTC (rev 6576)
+++ sandbox/as7_support/pc/jboss-as7-extension/pom.xml 2011-05-30 14:02:23 UTC (rev 6577)
@@ -10,9 +10,11 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-as7-extension</artifactId>
+ <artifactId>jboss-as7-integration</artifactId>
<packaging>pom</packaging>
+ <name>GateIn - Portlet Container (JBoss AS7 Integration)</name>
+
<properties>
<version.jboss.as>7.0.0.Beta3</version.jboss.as>
<jboss.as.release.version>7.0.0.Beta3</jboss.as.release.version>
@@ -22,13 +24,13 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.gatein</groupId>
- <artifactId>gatein-jboss-as7</artifactId>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>jboss-as7-integration-extension</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
- <artifactId>gatein-jboss-as7-modules</artifactId>
+ <artifactId>jboss-as7-integration-modules</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
13 years, 7 months
- 1
- 0
gatein SVN: r6576 - portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax.
by do-not-reply＠jboss.org
Author: nscavell
Date: 2011-05-30 09:41:47 -0400 (Mon, 30 May 2011)
New Revision: 6576
Modified:
portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/ApplicationStAXParser.java
portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/GadgetWindowStAXParer.java
portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PortletWindowStAXParser.java
Log:
GTNPORTAL-1905: Minor change for declaring optional elements in application specific parser.
Modified: portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/ApplicationStAXParser.java
===================================================================
--- portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/ApplicationStAXParser.java 2011-05-30 13:36:30 UTC (rev 6575)
+++ portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/ApplicationStAXParser.java 2011-05-30 13:41:47 UTC (rev 6576)
@@ -29,6 +29,8 @@
import org.staxnav.StaxNavException;
import org.staxnav.StaxNavigator;
+import java.util.Set;
+
/**
* @author <a href="mailto:nscavell@redhat.com">Nick Scavelli</a>
* @version $Revision$
@@ -64,11 +66,17 @@
public abstract ApplicationState<S> parseApplicationState() throws StaxNavException;
- public abstract boolean isElementOptional(StAXElement stAXElement) throws StaxNavException;
+ public abstract Set<StAXElement> getOptionalElements();
@Override
public final boolean isOptional(StAXElement staxElement)
{
+ Set<StAXElement> optional = getOptionalElements();
+ if (optional != null && optional.contains(staxElement))
+ {
+ return true;
+ }
+
switch (staxElement)
{
case theme:
@@ -82,7 +90,7 @@
return true;
default:
- return isElementOptional(staxElement);
+ return false;
}
}
}
Modified: portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/GadgetWindowStAXParer.java
===================================================================
--- portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/GadgetWindowStAXParer.java 2011-05-30 13:36:30 UTC (rev 6575)
+++ portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/GadgetWindowStAXParer.java 2011-05-30 13:41:47 UTC (rev 6576)
@@ -25,6 +25,9 @@
import org.staxnav.StaxNavException;
import org.staxnav.StaxNavigator;
+import java.util.Collections;
+import java.util.Set;
+
/**
* @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a>
* @date 5/19/11
@@ -47,8 +50,8 @@
}
@Override
- public boolean isElementOptional(StAXElement staxElement)
+ public Set<StAXElement> getOptionalElements()
{
- return false;
+ return Collections.emptySet();
}
}
Modified: portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PortletWindowStAXParser.java
===================================================================
--- portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PortletWindowStAXParser.java 2011-05-30 13:36:30 UTC (rev 6575)
+++ portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PortletWindowStAXParser.java 2011-05-30 13:41:47 UTC (rev 6576)
@@ -27,7 +27,10 @@
import org.staxnav.StaxNavigator;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumSet;
import java.util.List;
+import java.util.Set;
/**
* @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a>
@@ -84,18 +87,11 @@
}
}
+ private static final Set<StAXElement> optionalElements = EnumSet.of(StAXElement.preferences, StAXElement.value, StAXElement.read_only);
+
@Override
- public boolean isElementOptional(StAXElement staxElement)
+ public Set<StAXElement> getOptionalElements()
{
- switch(staxElement)
- {
- case preferences:
- case value:
- case read_only:
- return true;
-
- default:
- return false;
- }
+ return Collections.unmodifiableSet(optionalElements);
}
}
13 years, 7 months
- 1
- 0
gatein SVN: r6575 - sandbox/as7_support/wci.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-05-30 09:36:30 -0400 (Mon, 30 May 2011)
New Revision: 6575
Modified:
sandbox/as7_support/wci/pom.xml
Log:
Previous build fixes were insufficient - broke the build
Modified: sandbox/as7_support/wci/pom.xml
===================================================================
--- sandbox/as7_support/wci/pom.xml 2011-05-30 13:34:42 UTC (rev 6574)
+++ sandbox/as7_support/wci/pom.xml 2011-05-30 13:36:30 UTC (rev 6575)
@@ -153,10 +153,8 @@
<modules>
<module>wci</module>
<module>exo</module>
- <module>tomcat/tomcat6</module>
- <module>tomcat/tomcat7</module>
- <module>jboss/jboss6</module>
- <module>jboss/jboss7</module>
+ <module>tomcat</module>
+ <module>jboss</module>
<module>jetty</module>
<module>test</module>
</modules>
13 years, 7 months
- 1
- 0
gatein SVN: r6574 - in sandbox/as7_support/pc/jboss-as7-extension/extension/src/main: java/org/gatein/integration/jboss/as7/deployment and 1 other directories.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-05-30 09:34:42 -0400 (Mon, 30 May 2011)
New Revision: 6574
Modified:
sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/Attribute.java
sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/Constants.java
sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/Element.java
sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java
sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java
sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java
sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptions.java
sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/Namespace.java
sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/SharedPortletTldsMetaDataBuilder.java
sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java
sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarDeploymentInitializingProcessor.java
sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarKey.java
sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/resources/org/gatein/LocalDescriptions.properties
Log:
License headers
Modified: sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/Attribute.java
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/Attribute.java 2011-05-30 12:45:36 UTC (rev 6573)
+++ sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/Attribute.java 2011-05-30 13:34:42 UTC (rev 6574)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.
+ */
package org.gatein.integration.jboss.as7;
import java.util.HashMap;
Modified: sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/Constants.java
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/Constants.java 2011-05-30 12:45:36 UTC (rev 6573)
+++ sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/Constants.java 2011-05-30 13:34:42 UTC (rev 6574)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.
+ */
package org.gatein.integration.jboss.as7;
import org.jboss.as.server.deployment.AttachmentKey;
Modified: sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/Element.java
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/Element.java 2011-05-30 12:45:36 UTC (rev 6573)
+++ sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/Element.java 2011-05-30 13:34:42 UTC (rev 6574)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.
+ */
package org.gatein.integration.jboss.as7;
import java.util.HashMap;
Modified: sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java 2011-05-30 12:45:36 UTC (rev 6573)
+++ sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/GateInExtension.java 2011-05-30 13:34:42 UTC (rev 6574)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.
+ */
package org.gatein.integration.jboss.as7;
import org.jboss.as.controller.Extension;
Modified: sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java 2011-05-30 12:45:36 UTC (rev 6573)
+++ sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemAdd.java 2011-05-30 13:34:42 UTC (rev 6574)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.
+ */
package org.gatein.integration.jboss.as7;
import org.gatein.integration.jboss.as7.deployment.PortletWarClassloadingDependencyProcessor;
Modified: sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java 2011-05-30 12:45:36 UTC (rev 6573)
+++ sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescribe.java 2011-05-30 13:34:42 UTC (rev 6574)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.
+ */
package org.gatein.integration.jboss.as7;
import org.jboss.as.controller.BasicOperationResult;
Modified: sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptions.java
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptions.java 2011-05-30 12:45:36 UTC (rev 6573)
+++ sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/GateInSubsystemDescriptions.java 2011-05-30 13:34:42 UTC (rev 6574)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.
+ */
package org.gatein.integration.jboss.as7;
import org.jboss.dmr.ModelNode;
Modified: sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/Namespace.java
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/Namespace.java 2011-05-30 12:45:36 UTC (rev 6573)
+++ sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/Namespace.java 2011-05-30 13:34:42 UTC (rev 6574)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.
+ */
package org.gatein.integration.jboss.as7;
import java.util.HashMap;
Modified: sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/SharedPortletTldsMetaDataBuilder.java
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/SharedPortletTldsMetaDataBuilder.java 2011-05-30 12:45:36 UTC (rev 6573)
+++ sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/SharedPortletTldsMetaDataBuilder.java 2011-05-30 13:34:42 UTC (rev 6574)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.
+ */
package org.gatein.integration.jboss.as7;
import org.jboss.metadata.parser.jsp.TldMetaDataParser;
Modified: sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java 2011-05-30 12:45:36 UTC (rev 6573)
+++ sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarClassloadingDependencyProcessor.java 2011-05-30 13:34:42 UTC (rev 6574)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.
+ */
package org.gatein.integration.jboss.as7.deployment;
import org.jboss.as.server.deployment.Attachments;
Modified: sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarDeploymentInitializingProcessor.java
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarDeploymentInitializingProcessor.java 2011-05-30 12:45:36 UTC (rev 6573)
+++ sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarDeploymentInitializingProcessor.java 2011-05-30 13:34:42 UTC (rev 6574)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.
+ */
package org.gatein.integration.jboss.as7.deployment;
import org.jboss.as.ee.structure.DeploymentType;
Modified: sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarKey.java
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarKey.java 2011-05-30 12:45:36 UTC (rev 6573)
+++ sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/java/org/gatein/integration/jboss/as7/deployment/PortletWarKey.java 2011-05-30 13:34:42 UTC (rev 6574)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * 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.
+ */
package org.gatein.integration.jboss.as7.deployment;
import org.jboss.as.server.deployment.AttachmentKey;
Modified: sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/resources/org/gatein/LocalDescriptions.properties
===================================================================
--- sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/resources/org/gatein/LocalDescriptions.properties 2011-05-30 12:45:36 UTC (rev 6573)
+++ sandbox/as7_support/pc/jboss-as7-extension/extension/src/main/resources/org/gatein/LocalDescriptions.properties 2011-05-30 13:34:42 UTC (rev 6574)
@@ -1,3 +1,25 @@
+#
+# JBoss, Home of Professional Open Source.
+# Copyright 2011, Red Hat, Inc., and individual contributors
+# as indicated by the @author tags. See the copyright.txt file in the
+# distribution for a full listing of individual contributors.
+#
+# 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=The configuration of the jboss.web subsystem.
web.add=Operation adding the web subsystem.
web.default-virtual-server=The web container's default virtual server. The default value is "localhost".
13 years, 7 months
- 1
- 0
gatein SVN: r6573 - portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/conf/gatein.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2011-05-30 08:45:36 -0400 (Mon, 30 May 2011)
New Revision: 6573
Added:
portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/conf/gatein/portlet.xml
Log:
GTNPORTAL-1889 Global portlet metadata
Added: portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/conf/gatein/portlet.xml
===================================================================
--- portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/conf/gatein/portlet.xml (rev 0)
+++ portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/conf/gatein/portlet.xml 2011-05-30 12:45:36 UTC (rev 6573)
@@ -0,0 +1,36 @@
+<?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.
+
+-->
+<portlet-app version="1.0" xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd">
+
+ <!-- This filter collects runtime request statistics -->
+ <filter>
+ <filter-name>org.exoplatform.portal.application.ApplicationMonitoringFilter</filter-name>
+ <filter-class>org.exoplatform.portal.application.ApplicationMonitoringFilter</filter-class>
+ <lifecycle>ACTION_PHASE</lifecycle>
+ <lifecycle>RENDER_PHASE</lifecycle>
+ <lifecycle>EVENT_PHASE</lifecycle>
+ <lifecycle>RESOURCE_PHASE</lifecycle>
+ </filter>
+
+</portlet-app>
13 years, 7 months
- 1
- 0
gatein SVN: r6572 - in epp/portal/branches/EPP-5-1-tmp: distribution and 3 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-05-30 02:18:42 -0400 (Mon, 30 May 2011)
New Revision: 6572
Modified:
epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml
epp/portal/branches/EPP-5-1-tmp/distribution/portletbridge/
epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/
epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml
epp/portal/branches/EPP-5-1-tmp/settings.xml
Log:
Renaming root folder
Modified: epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml
===================================================================
--- epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml 2011-05-27 04:40:37 UTC (rev 6571)
+++ epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml 2011-05-30 06:18:42 UTC (rev 6572)
@@ -57,13 +57,13 @@
<version>5.1.1-epp-CR01-SNAPSHOT</version>
<type>war</type>
</dependency>
-<dependency>
- <groupId>org.exoplatform.portal.distribution</groupId>
- <artifactId>portletbridge</artifactId>
+ <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>
+ <classifier>bin</classifier>
+ <type>zip</type>
+ </dependency>
<!-- EAP overlay -->
<dependency>
@@ -75,6 +75,7 @@
</dependencies>
<build>
+ <finalName>EPP-${version}</finalName>
<plugins>
<!-- <plugin>
@@ -118,7 +119,7 @@
<executions>
<execution>
<id>distro-assembly</id>
- <phase>package</phase>
+ <phase>compile</phase>
<goals>
<goal>single</goal>
</goals>
@@ -130,21 +131,24 @@
</execution>
</executions>
</plugin>
- <plugin>
+<!-- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>ant-final</id>
- <phase>package</phase>
+ <phase>compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
<configuration>
<target>
- <move file="${eap.dir}" toFile="${epp.dir}"/>
+ <move file="${project.build.directory}/${project.build.finalName}-bin/${eap.dir}" toFile="${project.build.directory}/${project.build.finalName}-bin/${epp.dir}"/>
</target>
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>-->
</plugins>
</build>
</project>
\ No newline at end of file
Property changes on: epp/portal/branches/EPP-5-1-tmp/distribution/portletbridge
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon
___________________________________________________________________
Added: svn:ignore
+ target
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-27 04:40:37 UTC (rev 6571)
+++ epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml 2011-05-30 06:18:42 UTC (rev 6572)
@@ -5,6 +5,7 @@
<id>bin</id>
<formats>
<format>dir</format>
+ <format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<!-- <useProjectArtifact>false</useProjectArtifact>-->
@@ -23,6 +24,10 @@
<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>
<dependencySets>
<dependencySet>
@@ -57,10 +62,17 @@
<outputDirectory>${eap.dir}/${artifact.artifactId}</outputDirectory>
<unpack>true</unpack>
</dependencySet>
+ <dependencySet>
+ <includes>
+ <include>*.deploy:*:zip</include>
+ </includes>
+ <outputDirectory>${eap.dir}/server/default/deploy/</outputDirectory>
+ <unpack>true</unpack>
+ </dependencySet>
<dependencySet>
<includes>
- <include>*:zip</include>
+ <include>org.jboss:jboss-eap:zip</include>
</includes>
<outputDirectory></outputDirectory>
<unpack>true</unpack>
Modified: epp/portal/branches/EPP-5-1-tmp/settings.xml
===================================================================
--- epp/portal/branches/EPP-5-1-tmp/settings.xml 2011-05-27 04:40:37 UTC (rev 6571)
+++ epp/portal/branches/EPP-5-1-tmp/settings.xml 2011-05-30 06:18:42 UTC (rev 6572)
@@ -1,14 +1,27 @@
<?xml version="1.0"?>
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
- <localRepository>${env.HOME}/.m2_EPP</localRepository>
-
- <mirrors>
- <mirror>
- <id>internal-repository</id>
- <name>Maven Repository Manager running on repo.mycompany.com</name>
- <url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/latest/...</url>
- <mirrorOf>*</mirrorOf>
- </mirror>
- </mirrors>
+ <localRepository>${env.HOME}/.m2_EPP</localRepository>
+ <profiles>
+ <profile>
+ <id>local</id>
+ <repositories>
+ <repository>
+ <id>gatein-local</id>
+ <url>~/m2EPPexo</url>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
+ <activeProfiles><activeProfile>local</activeProfile></activeProfiles>
+<!--
+ <mirrors>
+ <mirror>
+ <id>internal-repository</id>
+ <name>Maven Repository Manager running on repo.mycompany.com</name>
+ <url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/latest/...</url>
+ <mirrorOf>*</mirrorOf>
+ </mirror>
+ </mirrors>-->
+
</settings>
13 years, 7 months
- 1
- 0