June 2011 - gatein-commits - Jboss List Archives

gatein SVN: r6639 - in components/shindig/trunk: features and 6 other directories.

by do-not-reply＠jboss.org

Author: theute Date: 2011-06-10 10:46:14 -0400 (Fri, 10 Jun 2011) New Revision: 6639 Modified: components/shindig/trunk/features/pom.xml components/shindig/trunk/java/common/pom.xml components/shindig/trunk/java/gadgets/pom.xml components/shindig/trunk/java/pom.xml components/shindig/trunk/java/samples/pom.xml components/shindig/trunk/java/server/pom.xml components/shindig/trunk/java/social-api/pom.xml components/shindig/trunk/pom.xml Log: Prepare for release Modified: components/shindig/trunk/features/pom.xml =================================================================== --- components/shindig/trunk/features/pom.xml 2011-06-10 13:39:41 UTC (rev 6638) +++ components/shindig/trunk/features/pom.xml 2011-06-10 14:46:14 UTC (rev 6639) @@ -23,12 +23,12 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version>1.0-r790473-Patch07-SNAPSHOT</version> + <version>1.0-r790473-Patch07</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>shindig-features</artifactId> - <version>1.0-r790473-Patch07-SNAPSHOT</version> + <version>1.0-r790473-Patch07</version> <packaging>jar</packaging> <name>Apache Shindig Features</name> Modified: components/shindig/trunk/java/common/pom.xml =================================================================== --- components/shindig/trunk/java/common/pom.xml 2011-06-10 13:39:41 UTC (rev 6638) +++ components/shindig/trunk/java/common/pom.xml 2011-06-10 14:46:14 UTC (rev 6639) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch07-SNAPSHOT</version> + <version>1.0-r790473-Patch07</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/java/gadgets/pom.xml =================================================================== --- components/shindig/trunk/java/gadgets/pom.xml 2011-06-10 13:39:41 UTC (rev 6638) +++ components/shindig/trunk/java/gadgets/pom.xml 2011-06-10 14:46:14 UTC (rev 6639) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch07-SNAPSHOT</version> + <version>1.0-r790473-Patch07</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/java/pom.xml =================================================================== --- components/shindig/trunk/java/pom.xml 2011-06-10 13:39:41 UTC (rev 6638) +++ components/shindig/trunk/java/pom.xml 2011-06-10 14:46:14 UTC (rev 6639) @@ -22,11 +22,11 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version>1.0-r790473-Patch07-SNAPSHOT</version> + <version>1.0-r790473-Patch07</version> </parent> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch07-SNAPSHOT</version> + <version>1.0-r790473-Patch07</version> <packaging>pom</packaging> <name>Apache Shindig Project Parent</name> Modified: components/shindig/trunk/java/samples/pom.xml =================================================================== --- components/shindig/trunk/java/samples/pom.xml 2011-06-10 13:39:41 UTC (rev 6638) +++ components/shindig/trunk/java/samples/pom.xml 2011-06-10 14:46:14 UTC (rev 6639) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch07-SNAPSHOT-SNAPSHOT</version> + <version>1.0-r790473-Patch07</version> </parent> <artifactId>shindig-samples</artifactId> Modified: components/shindig/trunk/java/server/pom.xml =================================================================== --- components/shindig/trunk/java/server/pom.xml 2011-06-10 13:39:41 UTC (rev 6638) +++ components/shindig/trunk/java/server/pom.xml 2011-06-10 14:46:14 UTC (rev 6639) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch07-SNAPSHOT</version> + <version>1.0-r790473-Patch07</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/java/social-api/pom.xml =================================================================== --- components/shindig/trunk/java/social-api/pom.xml 2011-06-10 13:39:41 UTC (rev 6638) +++ components/shindig/trunk/java/social-api/pom.xml 2011-06-10 14:46:14 UTC (rev 6639) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch07-SNAPSHOT</version> + <version>1.0-r790473-Patch07</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/pom.xml =================================================================== --- components/shindig/trunk/pom.xml 2011-06-10 13:39:41 UTC (rev 6638) +++ components/shindig/trunk/pom.xml 2011-06-10 14:46:14 UTC (rev 6639) @@ -28,7 +28,7 @@ <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version>1.0-r790473-Patch07-SNAPSHOT</version> + <version>1.0-r790473-Patch07</version> <packaging>pom</packaging> <name>Apache Shindig Project</name> @@ -1244,32 +1244,32 @@ <dependency> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-features</artifactId> - <version>1.0-r790473-Patch07-SNAPSHOT</version> + <version>1.0-r790473-Patch07</version> </dependency> <dependency> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-common</artifactId> - <version>1.0-r790473-Patch07-SNAPSHOT</version> + <version>1.0-r790473-Patch07</version> </dependency> <dependency> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-gadgets</artifactId> - <version>1.0-r790473-Patch07-SNAPSHOT</version> + <version>1.0-r790473-Patch07</version> </dependency> <dependency> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-server</artifactId> - <version>1.0-r790473-Patch07-SNAPSHOT</version> + <version>1.0-r790473-Patch07</version> </dependency> <dependency> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-social-api</artifactId> - <version>1.0-r790473-Patch07-SNAPSHOT</version> + <version>1.0-r790473-Patch07</version> </dependency> <dependency> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-common</artifactId> - <version>1.0-r790473-Patch07-SNAPSHOT</version> + <version>1.0-r790473-Patch07</version> <type>test-jar</type> </dependency>

13 years, 6 months

1
0
0 / 0

gatein SVN: r6638 - in epp/portal/branches/EPP_5_1_Branch: distribution and 21 other directories.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-06-10 09:39:41 -0400 (Fri, 10 Jun 2011) New Revision: 6638 Added: epp/portal/branches/EPP_5_1_Branch/distribution/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/examples/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/examples/pom.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/examples/src/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/examples/src/assemble.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/pom.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/portletbridge/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/portletbridge/pom.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/portletbridge/src/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/portletbridge/src/assemble.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/gatein.ear/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/gatein.ear/pom.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/pom.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/src/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/src/main/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/src/main/webapp/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/src/main/webapp/WEB-INF/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/src/main/webapp/WEB-INF/Context.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/src/main/webapp/WEB-INF/web.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/pom.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/assemble.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/resources/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/resources/deploy/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/resources/deploy/gatein-ds.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/resources/deploy/gatein-sample-portal-ds.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/resources/deploy/gatein.ear/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/resources/deploy/gatein.ear/META-INF/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/resources/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/resources/deploy/gatein.ear/META-INF/jboss-scanning.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/assemble.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/build.xml epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/main/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/ epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/jboss-log4j.xml.patch epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/jbossweb.deployer.web.xml.patch epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/jbossweb.sar.context.xml.patch epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/properties-service.xml.patch epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/run.conf.bat.patch epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/run.conf.patch epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/zip.xml epp/portal/branches/EPP_5_1_Branch/distribution/pom.xml Log: Automatic packaging Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/examples/pom.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/examples/pom.xml 2011-06-10 13:39:41 UTC (rev 6638) @@ -0,0 +1,65 @@ + +<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.parent</artifactId> + <version>5.1.1-epp-DEV02</version> + </parent> + + <groupId>org.exoplatform.portal.distribution</groupId> + <artifactId>examples</artifactId> + <packaging>pom</packaging> + <name>Distribution portletbridge</name> + + <dependencies> + +  + <dependency> + <groupId>org.jboss.portletbridge.examples.seam.booking</groupId> + <artifactId>seamBooking-ear</artifactId> + <version>${portletbridge.version}</version> + <type>ear</type> + </dependency> + <dependency> + <groupId>org.jboss.portal.examples</groupId> + <artifactId>JSFRIPortlet</artifactId> + <version>${portletbridge.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.portal.examples</groupId> + <artifactId>richFacesPortlet</artifactId> + <version>${portletbridge.version}</version> + <type>war</type> + </dependency> + </dependencies> + + <build> + + <plugins> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>bin</id> + <phase>compile</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/assemble.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/examples/src/assemble.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/examples/src/assemble.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/examples/src/assemble.xml 2011-06-10 13:39:41 UTC (rev 6638) @@ -0,0 +1,18 @@ + +<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> + <outputDirectory></outputDirectory> + <outputFileNameMapping>${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping> + <unpack>false</unpack> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + </dependencySets> +</assembly> \ No newline at end of file Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/pom.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/pom.xml 2011-06-10 13:39:41 UTC (rev 6638) @@ -0,0 +1,151 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>distribution.parent</artifactId> + <version>5.1.1-epp-DEV02</version> + </parent> + + <artifactId>distribution</artifactId> + <packaging>pom</packaging> + <name>Distribution</name> + + <modules> + <module>serverAddon</module> + <module>portletbridge</module> + <module>examples</module> + </modules> + + <dependencies> + <dependency> + <groupId>org.exoplatform.portal.distribution.root</groupId> + <artifactId>portletbridge</artifactId> + <version>${project.version}</version> + <type>zip</type> + </dependency> + + <dependency> + <groupId>org.gatein.sso</groupId> + <artifactId>sso-packaging</artifactId> + <version>${sso.version}</version> + <type>zip</type> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal.distribution.deploy</groupId> + <artifactId>serverAddon</artifactId> + <version>${project.version}</version> + <type>zip</type> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal.distribution</groupId> + <artifactId>examples</artifactId> + <version>${project.version}</version> + <type>zip</type> + </dependency> + +  + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-eap</artifactId> + <version>${eap.version}</version> + <type>zip</type> + </dependency> + + </dependencies> + + + <build> + <finalName>jboss-epp-${project.version}</finalName> + + <plugins> + +  + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distro-assembly</id> + <phase>compile</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/assemble.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + +  + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <id>ant-final</id> + <phase>compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <property name="epp.path">${project.build.directory}/${project.build.finalName}/${epp.dir}</property> + <property name="eap.path">${project.build.directory}/${project.build.finalName}/${eap.dir}</property> + + <move file="${eap.path}" toFile="${epp.path}"/> + <move file="${epp.path}/gatein-sso-${sso.version}" toFile="${epp.path}/gatein-sso"/> + + <ant antfile="src/build.xml" inheritRefs="true"> + <target name="patch"/> + <property name="toConfiguration" value="default"/> + </ant> + + <ant antfile="src/build.xml" inheritRefs="true"> + <target name="patch"/> + <property name="toConfiguration" value="production"/> + </ant> + + <ant antfile="src/build.xml" inheritRefs="true"> + <target name="patch"/> + <property name="toConfiguration" value="all"/> + </ant> + + </target> + </configuration> + </execution> + </executions> + </plugin> + +  + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distro-assembly-zip</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/zip.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> \ No newline at end of file Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/portletbridge/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/portletbridge/pom.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/portletbridge/pom.xml 2011-06-10 13:39:41 UTC (rev 6638) @@ -0,0 +1,78 @@ + +<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.parent</artifactId> + <version>5.1.1-epp-DEV02</version> + </parent> + + <groupId>org.exoplatform.portal.distribution.root</groupId> + <artifactId>portletbridge</artifactId> + <packaging>pom</packaging> + <name>Distribution portletbridge</name> + + <dependencies> + <dependency> + <groupId>org.jboss.portletbridge</groupId> + <artifactId>portletbridge-impl</artifactId> + <version>${portletbridge.version}</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.jboss.portletbridge</groupId> + <artifactId>portletbridge-api</artifactId> + <version>${portletbridge.version}</version> + <type>jar</type> + </dependency> + +  + <dependency> + <groupId>org.jboss.portletbridge.examples.seam.booking</groupId> + <artifactId>seamBooking-ear</artifactId> + <version>${portletbridge.version}</version> + <type>ear</type> + </dependency> + <dependency> + <groupId>org.jboss.portal.examples</groupId> + <artifactId>JSFRIPortlet</artifactId> + <version>${portletbridge.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.portal.examples</groupId> + <artifactId>richFacesPortlet</artifactId> + <version>${portletbridge.version}</version> + <type>war</type> + </dependency> + + </dependencies> + + <build> + + <plugins> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>bin</id> + <phase>compile</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/assemble.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/portletbridge/src/assemble.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/portletbridge/src/assemble.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/portletbridge/src/assemble.xml 2011-06-10 13:39:41 UTC (rev 6638) @@ -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 Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/gatein.ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/gatein.ear/pom.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/gatein.ear/pom.xml 2011-06-10 13:39:41 UTC (rev 6638) @@ -0,0 +1,1504 @@ + +<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.parent</artifactId> + <version>5.1.1-epp-DEV02</version> + </parent> + <artifactId>gatein</artifactId> + <packaging>ear</packaging> + <name>GateIn EAR</name> + <description>GateIn EAR</description> + + <dependencies> +  + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.portal</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.eXoResources</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.dashboard</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.exoadmin</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.rest</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.eXoGadgets</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets-server</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.web</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-admin-gui</artifactId> + <version>${org.gatein.wsrp.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer</artifactId> + <version>${org.gatein.wsrp.version}</version> + <type>war</type> + <exclusions> + <exclusion> + <artifactId>jaxws-api</artifactId> + <groupId>javax.xml.ws</groupId> + </exclusion> + <exclusion> + <artifactId>jbossxb</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>integration</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + + +  + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.common</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.security</artifactId> + <exclusions> + <exclusion> + <artifactId>reflext.apt</artifactId> + <groupId>org.reflext</groupId> + </exclusion> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.controller</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.server</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.api</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.web.resources</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.portal</artifactId> + <exclusions> + <exclusion> + <artifactId>jaxb-api</artifactId> + <groupId>javax.xml.bind</groupId> + </exclusion> + <exclusion> + <artifactId>jaxb-impl</artifactId> + <groupId>com.sun.xml.bind</groupId> + </exclusion> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.pc</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.identity</artifactId> + <exclusions> + <exclusion> + <artifactId>hibernate-annotations</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + <exclusion> + <artifactId>hibernate-core</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + <exclusion> + <artifactId>hibernate-cglib-repack</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + <exclusion> + <artifactId>javassist</artifactId> + <groupId>javassist</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.resources</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.application-registry</artifactId> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.scripting</artifactId> + <exclusions> + <exclusion> + <artifactId>ant</artifactId> + <groupId>org.apache.ant</groupId> + </exclusion> + <exclusion> + <artifactId>ant-launcher</artifactId> + <groupId>org.apache.ant</groupId> + </exclusion> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + <exclusion> + <artifactId>jline</artifactId> + <groupId>jline</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.management</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.framework</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.portlet</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.portal</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.eXo</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.webui.dashboard</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets-core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>gatein.portal.component.wsrp</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.server.jboss.plugin</artifactId> + </dependency> + + +  + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + <exclusion> + <artifactId>exo.tool.framework.junit</artifactId> + <groupId>org.exoplatform.tool</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.command</artifactId> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + <exclusion> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + <exclusion> + <artifactId>carol</artifactId> + <groupId>org.objectweb.carol</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>exo.tool.framework.junit</artifactId> + <groupId>org.exoplatform.tool</groupId> + </exclusion> + <exclusion> + <artifactId>howl-logger</artifactId> + <groupId>howl</groupId> + </exclusion> + <exclusion> + <artifactId>jmock</artifactId> + <groupId>jmock</groupId> + </exclusion> + <exclusion> + <artifactId>jotm_jrmp_stubs</artifactId> + <groupId>jotm</groupId> + </exclusion> + <exclusion> + <artifactId>jotm</artifactId> + <groupId>jotm</groupId> + </exclusion> + <exclusion> + <artifactId>jta</artifactId> + <groupId>javax.transaction</groupId> + </exclusion> + <exclusion> + <artifactId>mail</artifactId> + <groupId>javax.mail</groupId> + </exclusion> + <exclusion> + <artifactId>quartz</artifactId> + <groupId>quartz</groupId> + </exclusion> + <exclusion> + <artifactId>xstream</artifactId> + <groupId>xstream</groupId> + </exclusion> + <exclusion> + <artifactId>activation</artifactId> + <groupId>javax.activation</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.remote</artifactId> + <exclusions> + <exclusion> + <artifactId>exo.tool.framework.junit</artifactId> + <groupId>org.exoplatform.tool</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + <exclusions> + <exclusion> + <artifactId>bcel</artifactId> + <groupId>bcel</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>exo.tool.framework.junit</artifactId> + <groupId>org.exoplatform.tool</groupId> + </exclusion> + <exclusion> + <artifactId>jibx-extras</artifactId> + <groupId>org.jibx</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>exo.tool.framework.junit</artifactId> + <groupId>org.exoplatform.tool</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-transaction-api</artifactId> + <groupId>org.jboss.javaee</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-common-core</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-int</artifactId> + <exclusions> + <exclusion> + <artifactId>ant</artifactId> + <groupId>org.apache.ant</groupId> + </exclusion> + <exclusion> + <artifactId>jaxb-api</artifactId> + <groupId>sun-jaxb</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-deployers-structure-spi</artifactId> + <groupId>org.jboss.deployers</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-deployers-spi</artifactId> + <groupId>org.jboss.deployers</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-classloading-spi</artifactId> + <groupId>org.jboss.integration</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-logging-spi</artifactId> + <groupId>org.jboss.logging</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-dependency</artifactId> + <groupId>org.jboss.microcontainer</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-mdr</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-reflect</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-kernel</artifactId> + <groupId>org.jboss.microcontainer</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-deployers-impl</artifactId> + <groupId>org.jboss.deployers</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-aop-mc-int</artifactId> + <groupId>org.jboss.microcontainer</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-deployers-vfs-spi</artifactId> + <groupId>org.jboss.deployers</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-vfs</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-deployers-vfs</artifactId> + <groupId>org.jboss.deployers</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-deployers-core-spi</artifactId> + <groupId>org.jboss.deployers</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-common-core</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-classloader</artifactId> + <groupId>org.jboss.cl</groupId> + </exclusion> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>apache-xerces</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.mc-kernel-extras</artifactId> + <exclusions> + <exclusion> + <artifactId>jboss-kernel</artifactId> + <groupId>org.jboss.microcontainer</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>xdoclet</artifactId> + <groupId>xdoclet</groupId> + </exclusion> + <exclusion> + <artifactId>xdoclet-xdoclet-module</artifactId> + <groupId>xdoclet</groupId> + </exclusion> + <exclusion> + <artifactId>xdoclet-hibernate-module</artifactId> + <groupId>xdoclet</groupId> + </exclusion> + <exclusion> + <artifactId>xjavadoc</artifactId> + <groupId>xdoclet</groupId> + </exclusion> + <exclusion> + <artifactId>xstream</artifactId> + <groupId>xstream</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.database</artifactId> + <exclusions> + <exclusion> + <artifactId>antlr</artifactId> + <groupId>antlr</groupId> + </exclusion> + <exclusion> + <artifactId>ejb3-persistence</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + <exclusion> + <artifactId>exo.tool.framework.junit</artifactId> + <groupId>org.exoplatform.tool</groupId> + </exclusion> + <exclusion> + <artifactId>hibernate-annotations</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + <exclusion> + <artifactId>hibernate-core</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + <exclusion> + <artifactId>jta</artifactId> + <groupId>javax.transaction</groupId> + </exclusion> + <exclusion> + <artifactId>pull-parser</artifactId> + <groupId>pull-parser</groupId> + </exclusion> + <exclusion> + <artifactId>xapool</artifactId> + <groupId>com.experlog</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.ldap</artifactId> + <exclusions> + <exclusion> + <artifactId>exo.tool.framework.junit</artifactId> + <groupId>org.exoplatform.tool</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.jdbc</artifactId> + <exclusions> + <exclusion> + <artifactId>exo.tool.framework.junit</artifactId> + <groupId>org.exoplatform.tool</groupId> + </exclusion> + <exclusion> + <artifactId>hibernate-core</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + <exclusion> + <artifactId>xstream</artifactId> + <groupId>xstream</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.ldap</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + <exclusions> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.document</artifactId> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>exo.tool.framework.junit</artifactId> + <groupId>org.exoplatform.tool</groupId> + </exclusion> + <exclusion> + <artifactId>fontbox</artifactId> + <groupId>org.apache.pdfbox</groupId> + </exclusion> + <exclusion> + <artifactId>geronimo-stax-api_1.0_spec</artifactId> + <groupId>org.apache.geronimo.specs</groupId> + </exclusion> + <exclusion> + <artifactId>jempbox</artifactId> + <groupId>org.apache.pdfbox</groupId> + </exclusion> + <exclusion> + <artifactId>stax-api</artifactId> + <groupId>stax</groupId> + </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.core</artifactId> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>jbossjts</artifactId> + <groupId>jboss.jbossts</groupId> + </exclusion> + <exclusion> + <artifactId>jbossts-common</artifactId> + <groupId>jboss.jbossts</groupId> + </exclusion> + <exclusion> + <artifactId>jta</artifactId> + <groupId>javax.transaction</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-jdk14</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>stax-api</artifactId> + <groupId>javax.xml.stream</groupId> + </exclusion> + <exclusion> + <artifactId>stax-api</artifactId> + <groupId>stax</groupId> + </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + <exclusion> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + <exclusion> + <artifactId>jtidy</artifactId> + <groupId>jtidy</groupId> + </exclusion> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + <exclusion> + <artifactId>stax-api</artifactId> + <groupId>javax.xml.stream</groupId> + </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + <exclusion> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + </exclusion> + <exclusion> + <artifactId>exo.core.component.script.groovy</artifactId> + <groupId>org.exoplatform.core</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.webdav</artifactId> + <exclusions> + <exclusion> + <artifactId>jtidy</artifactId> + <groupId>jtidy</groupId> + </exclusion> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + <exclusion> + <artifactId>stax-api</artifactId> + <groupId>javax.xml.stream</groupId> + </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.framework.web</artifactId> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ftp</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.servlet</artifactId> + <exclusions> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.core</artifactId> + <exclusions> + <exclusion> + <artifactId>jaxb-api</artifactId> + <groupId>javax.xml.bind</groupId> + </exclusion> + <exclusion> + <artifactId>jtidy</artifactId> + <groupId>jtidy</groupId> + </exclusion> + <exclusion> + <artifactId>mail</artifactId> + <groupId>javax.mail</groupId> + </exclusion> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + <exclusion> + <artifactId>stax-api</artifactId> + <groupId>javax.xml.stream</groupId> + </exclusion> + <exclusion> + <artifactId>activation</artifactId> + <groupId>javax.activation</groupId> + </exclusion> + </exclusions> + </dependency> + + +  + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-logging</artifactId> + <exclusions> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-common</artifactId> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-logging-spi</artifactId> + <groupId>org.jboss.logging</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-vfs</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + <exclusion> + <artifactId>activation</artifactId> + <groupId>javax.activation</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.8.1</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-exo</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-tomcat</artifactId> + <exclusions> + <exclusion> + <artifactId>annotations-api</artifactId> + <groupId>org.apache.tomcat</groupId> + </exclusion> + <exclusion> + <artifactId>catalina</artifactId> + <groupId>org.apache.tomcat</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-bridge</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-federation</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-mc</artifactId> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + <exclusion> + <artifactId>jaxb-api</artifactId> + <groupId>sun-jaxb</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-logging-spi</artifactId> + <groupId>org.jboss.logging</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-reflect</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-unit</artifactId> + <groupId>org.jboss.unit</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-common-core</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>apache-xerces</groupId> + </exclusion> + <exclusion> + <artifactId>dtdparser121</artifactId> + <groupId>wutka-dtdparser</groupId> + </exclusion> + <exclusion> + <artifactId>xercesImpl</artifactId> + <groupId>apache-xerces</groupId> + </exclusion> + <exclusion> + <artifactId>jbossxb</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-portlet</artifactId> + <exclusions> + <exclusion> + <artifactId>jsp-api</artifactId> + <groupId>javax.servlet.jsp</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-api</artifactId> + <exclusions> + <exclusion> + <artifactId>jaxb-api</artifactId> + <groupId>sun-jaxb</groupId> + </exclusion> + <exclusion> + <artifactId>log4j</artifactId> + <groupId>log4j</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-controller</artifactId> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>apache-xerces</groupId> + </exclusion> + <exclusion> + <artifactId>resolver</artifactId> + <groupId>apache-xerces</groupId> + </exclusion> + <exclusion> + <artifactId>xercesImpl</artifactId> + <groupId>apache-xerces</groupId> + </exclusion> + </exclusions> + </dependency> + +  + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + <exclusions> + <exclusion> + <artifactId>jaxb-api</artifactId> + <groupId>javax.xml.bind</groupId> + </exclusion> + <exclusion> + <artifactId>mail</artifactId> + <groupId>javax.mail</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>jaxws-api</artifactId> + <groupId>javax.xml.ws</groupId> + </exclusion> + <exclusion> + <artifactId>jsr181-api</artifactId> + <groupId>javax.jws</groupId> + </exclusion> + <exclusion> + <artifactId>saaj-api</artifactId> + <groupId>javax.xml.soap</groupId> + </exclusion> + <exclusion> + <artifactId>jbossxb</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + <exclusion> + <artifactId>activation</artifactId> + <groupId>javax.activation</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-logging-spi</artifactId> + <groupId>org.jboss.logging</groupId> + </exclusion> + <exclusion> + <artifactId>jaxb-api</artifactId> + <groupId>sun-jaxb</groupId> + </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>apache-xerces</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + <exclusions> + <exclusion> + <artifactId>mail</artifactId> + <groupId>javax.mail</groupId> + </exclusion> + <exclusion> + <artifactId>saaj-api</artifactId> + <groupId>javax.xml.soap</groupId> + </exclusion> + <exclusion> + <artifactId>test-framework</artifactId> + <groupId>org.gatein.wsrp</groupId> + </exclusion> + <exclusion> + <artifactId>wsdl4j</artifactId> + <groupId>wsdl4j</groupId> + </exclusion> + <exclusion> + <artifactId>jbossxb</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-jdk14</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + <exclusions> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-spi</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-core</artifactId> + <exclusions> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> + </dependency> + + +  + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.api</artifactId> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.spi</artifactId> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.core</artifactId> + <exclusions> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.ext</artifactId> + </dependency> + +  + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-gadgets</artifactId> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + <exclusion> + <artifactId>htmlparser</artifactId> + <groupId>nu.validator.htmlparser</groupId> + </exclusion> + <exclusion> + <artifactId>oauth</artifactId> + <groupId>net.oauth.core</groupId> + </exclusion> + <exclusion> + <artifactId>oauth-consumer</artifactId> + <groupId>net.oauth.core</groupId> + </exclusion> + <exclusion> + <artifactId>oauth-httpclient3</artifactId> + <groupId>net.oauth.core</groupId> + </exclusion> + <exclusion> + <artifactId>xercesImpl</artifactId> + <groupId>xerces</groupId> + </exclusion> + <exclusion> + <artifactId>jdom</artifactId> + <groupId>org.jdom</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-features</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-common</artifactId> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>commons-beanutils-core</artifactId> + <groupId>commons-beanutils</groupId> + </exclusion> + <exclusion> + <artifactId>commons-betwixt</artifactId> + <groupId>commons-betwixt</groupId> + </exclusion> + <exclusion> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + </exclusion> + <exclusion> + <artifactId>ezmorph</artifactId> + <groupId>net.sf.ezmorph</groupId> + </exclusion> + <exclusion> + <artifactId>json-lib</artifactId> + <groupId>net.sf.json-lib</groupId> + </exclusion> + <exclusion> + <artifactId>oauth</artifactId> + <groupId>net.oauth.core</groupId> + </exclusion> + <exclusion> + <artifactId>xpp3_min</artifactId> + <groupId>xpp3</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.gatein.shindig</groupId> + <artifactId>shindig-social-api</artifactId> + <exclusions> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>geronimo-stax-api_1.0_spec</artifactId> + <groupId>org.apache.geronimo.specs</groupId> + </exclusion> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + <exclusion> + <artifactId>commons-betwixt</artifactId> + <groupId>commons-betwixt</groupId> + </exclusion> + <exclusion> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + </exclusion> + <exclusion> + <artifactId>ezmorph</artifactId> + <groupId>net.sf.ezmorph</groupId> + </exclusion> + <exclusion> + <artifactId>json-lib</artifactId> + <groupId>net.sf.json-lib</groupId> + </exclusion> + <exclusion> + <artifactId>oauth</artifactId> + <groupId>net.oauth.core</groupId> + </exclusion> + <exclusion> + <artifactId>oauth-consumer</artifactId> + <groupId>net.oauth.core</groupId> + </exclusion> + <exclusion> + <artifactId>oauth-provider</artifactId> + <groupId>net.oauth.core</groupId> + </exclusion> + <exclusion> + <artifactId>oauth-httpclient3</artifactId> + <groupId>net.oauth.core</groupId> + </exclusion> + <exclusion> + <artifactId>xpp3_min</artifactId> + <groupId>xpp3</groupId> + </exclusion> + </exclusions> + </dependency> + +  + <dependency> + <groupId>net.oauth</groupId> + <artifactId>core</artifactId> + <exclusions> + <exclusion> + <artifactId>servlet-api</artifactId> + <groupId>javax.servlet</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1.1</version> + </dependency> + +  + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jbosscache2</artifactId> + <version>3.3.2.GA</version> + <exclusions> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>jta</artifactId> + <groupId>javax.transaction</groupId> + </exclusion> + <exclusion> + <artifactId>hibernate-core</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + </exclusions> + </dependency> +  + <dependency> + <groupId>net.jcip</groupId> + <artifactId>jcip-annotations</artifactId> + <version>${jcip.version}</version> + </dependency> + + <dependency> + <groupId>rhino</groupId> + <artifactId>js</artifactId> + <version>${rhino.version}</version> + </dependency> + +  + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + + <version>3.2.6.GA</version> + <exclusions> + <exclusion> + <artifactId>jboss-transaction-api</artifactId> + <groupId>org.jboss.javaee</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-common-core</artifactId> + <groupId>org.jboss</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <artifactId>slf4j-jdk14</artifactId> + <groupId>org.slf4j</groupId> + <type>jar</type> + <version>1.5.6</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <artifactId>slf4j-api</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <artifactId>asm</artifactId> + <groupId>asm</groupId> + <type>jar</type> + <version>1.5.3</version> + </dependency> + </dependencies> + + <build> + <finalName>gatein</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <displayName>GateIn portal</displayName> + <defaultLibBundleDir>lib</defaultLibBundleDir> + <archive> + <manifest> + <addClasspath>true</addClasspath> + </manifest> + </archive> + + <modules> +  + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.eXoResources</artifactId> + <contextRoot>eXoResources</contextRoot> + <bundleFileName>01eXoResources.war</bundleFileName> + <unpack>true</unpack> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.portal</artifactId> + <contextRoot>portal</contextRoot> + <bundleFileName>02portal.war</bundleFileName> + <unpack>true</unpack> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.dashboard</artifactId> + <contextRoot>dashboard</contextRoot> + <bundleFileName>dashboard.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer</artifactId> + <contextRoot>wsrp-producer</contextRoot> + <bundleFileName>wsrp-producer.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.exoadmin</artifactId> + <contextRoot>exoadmin</contextRoot> + <bundleFileName>exoadmin.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.web.rest</artifactId> + <contextRoot>rest</contextRoot> + <bundleFileName>rest.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.eXoGadgets</artifactId> + <contextRoot>eXoGadgets</contextRoot> + <bundleFileName>eXoGadgets.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.portlet.web</artifactId> + <contextRoot>web</contextRoot> + <bundleFileName>web.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>integration</artifactId> + <contextRoot>integration</contextRoot> + <bundleFileName>integration.war</bundleFileName> + <unpack>true</unpack> + </webModule> + <webModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-admin-gui</artifactId> + <contextRoot>wsrp-admin-gui</contextRoot> + <bundleFileName>wsrp-admin-gui.war</bundleFileName> + </webModule> + <webModule> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.gadgets-server</artifactId> + <contextRoot>eXoGadgetServer</contextRoot> + <bundleFileName>eXoGadgetServer.war</bundleFileName> + </webModule> + </modules> + </configuration> + </plugin> + </plugins> + </build> +  + <repositories> + <repository> + <id>mead</id> + <url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/latest/...</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>jboss-public-repository-group</id> + <name>JBoss Public Maven Repository Group</name> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + <repository> + <id>oauth</id> + <url>http://oauth.googlecode.com/svn/code/maven</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>java.net</id> + <url>http://download.java.net/maven/2</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>exo-int</id> + <url>http://repository.exoplatform.org/content/groups/public</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> +</project> \ No newline at end of file Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/pom.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/pom.xml 2011-06-10 13:39:41 UTC (rev 6638) @@ -0,0 +1,12 @@ +<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.parent</artifactId> + <version>5.1.1-epp-DEV02</version> + </parent> + <artifactId>integration</artifactId> + <packaging>war</packaging> + <name>GateIn JBoss AS integration.war</name> +</project> \ No newline at end of file Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/src/main/webapp/WEB-INF/Context.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/src/main/webapp/WEB-INF/Context.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/src/main/webapp/WEB-INF/Context.xml 2011-06-10 13:39:41 UTC (rev 6638) @@ -0,0 +1,23 @@ + + +<Context privileged="true">  +</Context> \ No newline at end of file Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/src/main/webapp/WEB-INF/web.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/src/main/webapp/WEB-INF/web.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/integration.war/src/main/webapp/WEB-INF/web.xml 2011-06-10 13:39:41 UTC (rev 6638) @@ -0,0 +1,36 @@ +<?xml version="1.0"?> + + +<!DOCTYPE web-app PUBLIC + "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> + <context-param> + <param-name>jboss.portal.mc.beans_resource_type</param-name> + <param-value>classloader</param-value> + </context-param> + <servlet> + <servlet-name>ContainerServlet</servlet-name> + <servlet-class>org.gatein.wci.tomcat.TC6ContainerServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> +</web-app> Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/pom.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/pom.xml 2011-06-10 13:39:41 UTC (rev 6638) @@ -0,0 +1,57 @@ + +<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.parent</artifactId> + <version>5.1.1-epp-DEV02</version> + </parent> + + <groupId>org.exoplatform.portal.distribution.deploy</groupId> + <artifactId>serverAddon</artifactId> + <packaging>pom</packaging> + <name>Deploy serverAddon</name> + + <modules> + <module>integration.war</module> + <module>gatein.ear</module> + </modules> + + <dependencies> + + <dependency> + <groupId>org.exoplatform.portal</groupId> + <artifactId>starter-gatein</artifactId> + <version>${project.version}</version> + <type>ear</type> + </dependency> + + </dependencies> + + <build> + <plugins> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>bin</id> + <phase>compile</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/assemble.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/assemble.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/assemble.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/assemble.xml 2011-06-10 13:39:41 UTC (rev 6638) @@ -0,0 +1,72 @@ + +<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> + + <files> + + <file> + <source>../../../component/common/src/main/java/conf/configuration-jboss.properties</source> + <destName>configuration.properties</destName> + <outputDirectory>conf/gatein</outputDirectory> + </file> + <file> + <source>../../../component/common/src/main/java/conf/configuration.xml</source> + <outputDirectory>conf/gatein</outputDirectory> + </file> + </files> + + <fileSets> + <fileSet> + <directory>src/main/resources/deploy</directory> + <outputDirectory>deploy</outputDirectory> + </fileSet> + </fileSets> + + <moduleSets> + <moduleSet> + <includes> + <include>org.exoplatform.portal:gatein:ear</include> + </includes> + <binaries> + <includeDependencies>false</includeDependencies> + <outputDirectory>deploy/gatein.ear</outputDirectory> + + <unpack>true</unpack> + </binaries> + </moduleSet> + + </moduleSets> + + <dependencySets> +  + + +  + <dependencySet> + <includes> + <include>*:ear</include> + <include>*:war</include> + </includes> + <excludes> + <exclude>*:gatein:ear</exclude> + </excludes> + <outputDirectory>deploy</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + </dependencySet> + </dependencySets> + + +</assembly> \ No newline at end of file Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/resources/deploy/gatein-ds.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/resources/deploy/gatein-ds.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/resources/deploy/gatein-ds.xml 2011-06-10 13:39:41 UTC (rev 6638) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<datasources> + <no-tx-datasource> + <jndi-name>gatein-idm</jndi-name> + <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}gatein${/}hypersonic${/}gatein-idm-localDB</connection-url> + <driver-class>org.hsqldb.jdbcDriver</driver-class> + <user-name>sa</user-name> + <password></password> + + <min-pool-size>5</min-pool-size> + <max-pool-size>20</max-pool-size> + <idle-timeout-minutes>0</idle-timeout-minutes> + <prepared-statement-cache-size>32</prepared-statement-cache-size> + </no-tx-datasource> + + <no-tx-datasource> + <jndi-name>gatein-jcr</jndi-name> + <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}gatein${/}hypersonic${/}gatein-jcr-localDB</connection-url> + <driver-class>org.hsqldb.jdbcDriver</driver-class> + <user-name>sa</user-name> + <password></password> + + <min-pool-size>5</min-pool-size> + <max-pool-size>20</max-pool-size> + <idle-timeout-minutes>0</idle-timeout-minutes> + <prepared-statement-cache-size>32</prepared-statement-cache-size> + </no-tx-datasource> +</datasources> Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/resources/deploy/gatein-sample-portal-ds.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/resources/deploy/gatein-sample-portal-ds.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/resources/deploy/gatein-sample-portal-ds.xml 2011-06-10 13:39:41 UTC (rev 6638) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<datasources> + <no-tx-datasource> + <jndi-name>gatein-jcr_sample-portal</jndi-name> + <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}sample-portal-localDB</connection-url> + <driver-class>org.hsqldb.jdbcDriver</driver-class> + <user-name>sa</user-name> + <password></password> + + <min-pool-size>5</min-pool-size> + <max-pool-size>20</max-pool-size> + <idle-timeout-minutes>0</idle-timeout-minutes> + <prepared-statement-cache-size>32</prepared-statement-cache-size> + </no-tx-datasource> + + <no-tx-datasource> + <jndi-name>gatein-idm_sample-portal</jndi-name> + <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}sample-portal-idm-localDB</connection-url> + <driver-class>org.hsqldb.jdbcDriver</driver-class> + <user-name>sa</user-name> + <password></password> + + <min-pool-size>5</min-pool-size> + <max-pool-size>20</max-pool-size> + <idle-timeout-minutes>0</idle-timeout-minutes> + <prepared-statement-cache-size>32</prepared-statement-cache-size> + </no-tx-datasource> + +</datasources> Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/resources/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/resources/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/resources/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml 2011-06-10 13:39:41 UTC (rev 6638) @@ -0,0 +1,44 @@ +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <application-policy xmlns="urn:jboss:security-beans:1.0" name="gatein-domain"> + <authentication> + <login-module code="org.exoplatform.web.security.PortalLoginModule" flag="required"> + <module-option name="portalContainerName">portal</module-option> + <module-option name="realmName">gatein-domain</module-option> + </login-module> + <login-module code="org.exoplatform.services.security.jaas.SharedStateLoginModule" flag="required"> + <module-option name="portalContainerName">portal</module-option> + <module-option name="realmName">gatein-domain</module-option> + </login-module> + +  +  + + <login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required"> + <module-option name="portalContainerName">portal</module-option> + <module-option name="realmName">gatein-domain</module-option> + </login-module> + </authentication> + +  +  + </application-policy> + +</deployment> Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/resources/deploy/gatein.ear/META-INF/jboss-scanning.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/resources/deploy/gatein.ear/META-INF/jboss-scanning.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/serverAddon/src/main/resources/deploy/gatein.ear/META-INF/jboss-scanning.xml 2011-06-10 13:39:41 UTC (rev 6638) @@ -0,0 +1,2 @@ +<scanning xmlns="urn:jboss:scanning:1.0"> +</scanning> \ No newline at end of file Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/assemble.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/assemble.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/assemble.xml 2011-06-10 13:39:41 UTC (rev 6638) @@ -0,0 +1,101 @@ + +<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>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <dependencySets> + + + <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>*: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>*: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> + + +  + <dependencySet> + <includes> + <include>*.distribution.root:*:zip</include> + </includes> + <outputDirectory>${eap.dir}/${artifact.artifactId}</outputDirectory> + <unpack>true</unpack> + </dependencySet> + +  + <dependencySet> + <includes> + <include>org.gatein.sso:*:zip</include> + </includes> + <outputDirectory>${eap.dir}</outputDirectory> + <unpack>true</unpack> + </dependencySet> + +  + <dependencySet> + <includes> + <include>*.distribution:examples:zip</include> + </includes> + <outputDirectory>${eap.dir}/jboss-as/docs/examples/portal</outputDirectory> + <unpack>true</unpack> + </dependencySet> + +  + <dependencySet> + <includes> + <include>org.jboss:jboss-eap:zip</include> + </includes> + <outputDirectory></outputDirectory> + <unpack>true</unpack> + </dependencySet> + + </dependencySets> +</assembly> \ No newline at end of file Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/build.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/build.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/build.xml 2011-06-10 13:39:41 UTC (rev 6638) @@ -0,0 +1,67 @@ + +<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 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> +  + <antcall inheritRefs="true"> + <target name="patch"/> + <property name="epp.zip" value="${tmp.dir}"/> + </antcall> +  + <zip destfile="${epp.zip}" basedir="${tmp.dir}" update="true"> + </zip> + </target> +</project> \ No newline at end of file Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/jboss-log4j.xml.patch =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/jboss-log4j.xml.patch (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/jboss-log4j.xml.patch 2011-06-10 13:39:41 UTC (rev 6638) @@ -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> + ++  ++ <category name="exo.jcr"> ++ <priority value="INFO"/> ++ </category> ++ ++  ++ <category name="org.exoplatform.services"> ++ <priority value="INFO"/> ++ </category> ++ ++  ++ <category name="org.jgroups.protocols.UDP"> ++ <priority value="ERROR" /> ++ </category> ++ +  + <category name="facelets.compiler"> + <priority value="WARN"/> Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/jbossweb.deployer.web.xml.patch =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/jbossweb.deployer.web.xml.patch (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/jbossweb.deployer.web.xml.patch 2011-06-10 13:39:41 UTC (rev 6638) @@ -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_Branch/distribution/pack/src/patch/EAP/jbossweb.sar.context.xml.patch =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/jbossweb.sar.context.xml.patch (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/jbossweb.sar.context.xml.patch 2011-06-10 13:39:41 UTC (rev 6638) @@ -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> +- ++ ++  ++ <SessionCookie path="/"/> ++ + </Context> Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/properties-service.xml.patch =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/properties-service.xml.patch (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/properties-service.xml.patch 2011-06-10 13:39:41 UTC (rev 6638) @@ -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_Branch/distribution/pack/src/patch/EAP/run.conf.bat.patch =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/run.conf.bat.patch (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/run.conf.bat.patch 2011-06-10 13:39:41 UTC (rev 6638) @@ -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_Branch/distribution/pack/src/patch/EAP/run.conf.patch =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/run.conf.patch (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/patch/EAP/run.conf.patch 2011-06-10 13:39:41 UTC (rev 6638) @@ -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" Added: epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/zip.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/zip.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pack/src/zip.xml 2011-06-10 13:39:41 UTC (rev 6638) @@ -0,0 +1,16 @@ +<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}/</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Added: epp/portal/branches/EPP_5_1_Branch/distribution/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/distribution/pom.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/distribution/pom.xml 2011-06-10 13:39:41 UTC (rev 6638) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.parent</artifactId> + <version>5.1.1-epp-DEV02</version> + </parent> + + <artifactId>distribution.parent</artifactId> + <packaging>pom</packaging> + <name>Distribution</name> + + <properties> + <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> + <portletbridge.version>2.1.0.GA.EPP51</portletbridge.version> + </properties> + + <modules> + <module>pack</module> + </modules> + +</project> \ No newline at end of file

13 years, 6 months

1
0
0 / 0

gatein SVN: r6637 - in portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium: candidate and 1 other directories.

by do-not-reply＠jboss.org

Author: arthurpeltier Date: 2011-06-10 07:05:40 -0400 (Fri, 10 Jun 2011) New Revision: 6637 Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RecoverUserNameOrPassword.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_01_044_CheckWhenHaveRightToEditPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_22_019_ChangeEditRightOnPortalPageWhileEditingPortalPageProperties.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_25_02_033_CheckDoNotShowGroupEditorMenu.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_26_03_009_CheckFinishFunctionAfterChangeNodePageContainerLayout.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_PRL_03_05_012_AddSomeUsersIntoGroupInCaseAfterCommaHasSpace.html Log: TESTVN-3439: finished Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RecoverUserNameOrPassword.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RecoverUserNameOrPassword.html 2011-06-10 10:54:01 UTC (rev 6636) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_05_RecoverUserNameOrPassword.html 2011-06-10 11:05:40 UTC (rev 6637) @@ -277,16 +277,91 @@ <td></td> </tr> <tr> + <td>mouseDown</td> + <td>//html/body//span//b[text()='Password and username reminder']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//html/body//a[contains(@href,'RecoveryPasswordAndUsername')]</td> + <td></td> +</tr> +<tr> + <td>storeAttribute</td> + <td>//html/body//a[contains(@href,'RecoveryPasswordAndUsername')]@href</td> + <td>resetPas</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//a[text()='Sign out']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//a[text()='Sign out']</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Change password-- ${resetPas}</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>${resetPas}</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>newpassword</td> + <td>exonewpass</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>newpassword</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>confirmnewpassword</td> + <td>exonewpass</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>The password has been changed.</td> + <td></td> +</tr> +<tr> <td>verifyTextPresent</td> - <td>Password and username reminder</td> + <td>The password has been changed.</td> <td></td> </tr> <tr> - <td>clickAndWait</td> - <td>gb_71</td> + <td>waitForElementPresent</td> + <td>//div[@id='UIPortalApplication']//div[5]//div[@title='Close Window']</td> <td></td> </tr> <tr> + <td>click</td> + <td>//div[@id='UIPortalApplication']//div[5]//div[@title='Close Window']</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Login by new user after change password--</td> + <td></td> +</tr> +<tr> <td>open</td> <td>/portal/public/classic/</td> <td></td> @@ -304,6 +379,51 @@ <tr> <td>type</td> <td>username</td> + <td>Test_SNF_PRL_05</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>exonewpass</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Test_SNF_PRL_05 Test_SNF_PRL_05</td> + <td></td> +</tr> +<tr> + <td>verifyElementPresent</td> + <td>link=Test_SNF_PRL_05 Test_SNF_PRL_05</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> <td>root</td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_01_044_CheckWhenHaveRightToEditPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_01_044_CheckWhenHaveRightToEditPage.html 2011-06-10 10:54:01 UTC (rev 6636) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_14_01_044_CheckWhenHaveRightToEditPage.html 2011-06-10 11:05:40 UTC (rev 6637) @@ -478,12 +478,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[text()='Permission Setting']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[text()='Permission Setting']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_22_019_ChangeEditRightOnPortalPageWhileEditingPortalPageProperties.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_22_019_ChangeEditRightOnPortalPageWhileEditingPortalPageProperties.html 2011-06-10 10:54:01 UTC (rev 6636) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_22_019_ChangeEditRightOnPortalPageWhileEditingPortalPageProperties.html 2011-06-10 11:05:40 UTC (rev 6637) @@ -258,12 +258,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[text()='Permission Setting']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td> + <td>//div[text()='Permission Setting']</td> <td></td> </tr> <tr> @@ -406,7 +406,6 @@ <td>link=Sign out</td> <td></td> </tr> - </tbody></table> </body> </html> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_25_02_033_CheckDoNotShowGroupEditorMenu.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_25_02_033_CheckDoNotShowGroupEditorMenu.html 2011-06-10 10:54:01 UTC (rev 6636) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_25_02_033_CheckDoNotShowGroupEditorMenu.html 2011-06-10 11:05:40 UTC (rev 6637) @@ -827,11 +827,6 @@ <td></td> </tr> <tr> - <td>waitForConfirmation</td> - <td>Do you want to delete this page?</td> - <td></td> -</tr> -<tr> <td>assertConfirmation</td> <td>Do you want to delete this page?</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_26_03_009_CheckFinishFunctionAfterChangeNodePageContainerLayout.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_26_03_009_CheckFinishFunctionAfterChangeNodePageContainerLayout.html 2011-06-10 10:54:01 UTC (rev 6636) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_26_03_009_CheckFinishFunctionAfterChangeNodePageContainerLayout.html 2011-06-10 11:05:40 UTC (rev 6637) @@ -202,26 +202,31 @@ <td>//div[@id='oneRow']/div</td> </tr> <tr> + <td>waitForElementPresent</td> + <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUITabPane(this, 'UIApplicationList', '/portal/private/classic/groupnavigation?portal:componentId=UIPortalComposerTab&portal:action=SelectTab');ajaxAsyncGetRequest('/portal/private/classic/groupnavigation?portal:componentId=UIPortalComposerTab&portal:action=SelectTab&objectId=UIApplicationList', true);if(eXo.portal.portalMode) eXo.portal.portalMode -= 2;"]</td> + <td></td> +</tr> +<tr> <td>click</td> <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUITabPane(this, 'UIApplicationList', '/portal/private/classic/groupnavigation?portal:componentId=UIPortalComposerTab&portal:action=SelectTab');ajaxAsyncGetRequest('/portal/private/classic/groupnavigation?portal:componentId=UIPortalComposerTab&portal:action=SelectTab&objectId=UIApplicationList', true);if(eXo.portal.portalMode) eXo.portal.portalMode -= 2;"]</td> <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Administration</td> + <td></td> +</tr> +<tr> <td>click</td> <td>link=Administration</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='Administration/OrganizationPortlet']/div/div/img</td> - <td>//div[2]/div/div/div/div/div/div/div/div[1]/div/div/div/div[1]/div/div/div[2]/div/div/div/div[1]/div</td> + <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td></td> </tr> <tr> - <td>dragAndDropToObject</td> - <td>//div[@id='Administration/OrganizationPortlet']/div/div/img</td> - <td>//div[2]/div/div/div/div/div/div/div/div[1]/div/div/div/div[1]/div/div/div[2]/div/div/div/div[1]/div</td> -</tr> -<tr> <td>click</td> <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> <td></td> @@ -257,7 +262,7 @@ <td></td> </tr> <tr> - <td>click</td> + <td>clickAndWait</td> <td>link=Group</td> <td></td> </tr> @@ -277,7 +282,7 @@ <td></td> </tr> <tr> - <td>componentExoContextMenu</td> + <td>mouseDownRight</td> <td>//a[@class='NodeIcon DefaultPageIcon' and @title='Test_POR_26_03_009']</td> <td></td> </tr> @@ -307,6 +312,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> <td>clickAndWait</td> <td>link=Sign out</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_PRL_03_05_012_AddSomeUsersIntoGroupInCaseAfterCommaHasSpace.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_PRL_03_05_012_AddSomeUsersIntoGroupInCaseAfterCommaHasSpace.html 2011-06-10 10:54:01 UTC (rev 6636) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_PRL_03_05_012_AddSomeUsersIntoGroupInCaseAfterCommaHasSpace.html 2011-06-10 11:05:40 UTC (rev 6637) @@ -99,7 +99,7 @@ <tr> <td>type</td> <td>username</td> - <td>root, john,  demo</td> + <td>root, john, demo</td> </tr> <tr> <td>echo</td> @@ -122,7 +122,7 @@ <td></td> </tr> <tr> - <td>click</td> + <td>clickAt</td> <td>link=Save</td> <td></td> </tr> @@ -231,7 +231,6 @@ <td>link=Sign out</td> <td></td> </tr> - </tbody></table> </body> </html>

13 years, 6 months

1
0
0 / 0

gatein SVN: r6636 - in components/common/trunk: common and 2 other directories.

by do-not-reply＠jboss.org

Author: theute Date: 2011-06-10 06:54:01 -0400 (Fri, 10 Jun 2011) New Revision: 6636 Modified: components/common/trunk/common/pom.xml components/common/trunk/logging/pom.xml components/common/trunk/mc/pom.xml components/common/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: components/common/trunk/common/pom.xml =================================================================== --- components/common/trunk/common/pom.xml 2011-06-10 10:53:54 UTC (rev 6635) +++ components/common/trunk/common/pom.xml 2011-06-10 10:54:01 UTC (rev 6636) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.common</groupId> <artifactId>common-parent</artifactId> - <version>2.0.4-Beta03</version> + <version>2.0.4-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>common-common</artifactId> @@ -14,7 +14,7 @@ <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-logging</artifactId> - <version>2.0.4-Beta03</version> + <version>2.0.4-Beta04-SNAPSHOT</version> </dependency> <dependency> Modified: components/common/trunk/logging/pom.xml =================================================================== --- components/common/trunk/logging/pom.xml 2011-06-10 10:53:54 UTC (rev 6635) +++ components/common/trunk/logging/pom.xml 2011-06-10 10:54:01 UTC (rev 6636) @@ -21,7 +21,7 @@ <parent> <groupId>org.gatein.common</groupId> <artifactId>common-parent</artifactId> - <version>2.0.4-Beta03</version> + <version>2.0.4-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>common-logging</artifactId> Modified: components/common/trunk/mc/pom.xml =================================================================== --- components/common/trunk/mc/pom.xml 2011-06-10 10:53:54 UTC (rev 6635) +++ components/common/trunk/mc/pom.xml 2011-06-10 10:54:01 UTC (rev 6636) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.common</groupId> <artifactId>common-parent</artifactId> - <version>2.0.4-Beta03</version> + <version>2.0.4-Beta04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>common-mc</artifactId> @@ -14,7 +14,7 @@ <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-logging</artifactId> - <version>2.0.4-Beta03</version> + <version>2.0.4-Beta04-SNAPSHOT</version> </dependency> <dependency> Modified: components/common/trunk/pom.xml =================================================================== --- components/common/trunk/pom.xml 2011-06-10 10:53:54 UTC (rev 6635) +++ components/common/trunk/pom.xml 2011-06-10 10:54:01 UTC (rev 6636) @@ -6,7 +6,7 @@ <groupId>org.gatein.common</groupId> <artifactId>common-parent</artifactId> - <version>2.0.4-Beta03</version> + <version>2.0.4-Beta04-SNAPSHOT</version> <packaging>pom</packaging> <parent> @@ -16,9 +16,9 @@ </parent> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/tags/2.0....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/tags/2.0.4-B...</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/common/tags/2.0.4-Beta03</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/trunk</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/common/trunk</url> </scm>

13 years, 6 months

1
0
0 / 0

gatein SVN: r6635 - components/common/tags.

by do-not-reply＠jboss.org

Author: theute Date: 2011-06-10 06:53:54 -0400 (Fri, 10 Jun 2011) New Revision: 6635 Added: components/common/tags/2.0.4-Beta03/ Log: [maven-release-plugin] copy for tag 2.0.4-Beta03

13 years, 6 months

1
0
0 / 0

gatein SVN: r6634 - in components/common/trunk: common and 2 other directories.

by do-not-reply＠jboss.org

Author: theute Date: 2011-06-10 06:53:26 -0400 (Fri, 10 Jun 2011) New Revision: 6634 Modified: components/common/trunk/common/pom.xml components/common/trunk/logging/pom.xml components/common/trunk/mc/pom.xml components/common/trunk/pom.xml Log: [maven-release-plugin] prepare release 2.0.4-Beta03 Modified: components/common/trunk/common/pom.xml =================================================================== --- components/common/trunk/common/pom.xml 2011-06-10 10:52:29 UTC (rev 6633) +++ components/common/trunk/common/pom.xml 2011-06-10 10:53:26 UTC (rev 6634) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.common</groupId> <artifactId>common-parent</artifactId> - <version>2.0.4-Beta03-SNAPSHOT</version> + <version>2.0.4-Beta03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>common-common</artifactId> @@ -14,7 +14,7 @@ <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-logging</artifactId> - <version>2.0.4-Beta03-SNAPSHOT</version> + <version>2.0.4-Beta03</version> </dependency> <dependency> Modified: components/common/trunk/logging/pom.xml =================================================================== --- components/common/trunk/logging/pom.xml 2011-06-10 10:52:29 UTC (rev 6633) +++ components/common/trunk/logging/pom.xml 2011-06-10 10:53:26 UTC (rev 6634) @@ -21,7 +21,7 @@ <parent> <groupId>org.gatein.common</groupId> <artifactId>common-parent</artifactId> - <version>2.0.4-Beta03-SNAPSHOT</version> + <version>2.0.4-Beta03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>common-logging</artifactId> Modified: components/common/trunk/mc/pom.xml =================================================================== --- components/common/trunk/mc/pom.xml 2011-06-10 10:52:29 UTC (rev 6633) +++ components/common/trunk/mc/pom.xml 2011-06-10 10:53:26 UTC (rev 6634) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.common</groupId> <artifactId>common-parent</artifactId> - <version>2.0.4-Beta03-SNAPSHOT</version> + <version>2.0.4-Beta03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>common-mc</artifactId> @@ -14,7 +14,7 @@ <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-logging</artifactId> - <version>2.0.4-Beta03-SNAPSHOT</version> + <version>2.0.4-Beta03</version> </dependency> <dependency> Modified: components/common/trunk/pom.xml =================================================================== --- components/common/trunk/pom.xml 2011-06-10 10:52:29 UTC (rev 6633) +++ components/common/trunk/pom.xml 2011-06-10 10:53:26 UTC (rev 6634) @@ -6,7 +6,7 @@ <groupId>org.gatein.common</groupId> <artifactId>common-parent</artifactId> - <version>2.0.4-Beta03-SNAPSHOT</version> + <version>2.0.4-Beta03</version> <packaging>pom</packaging> <parent> @@ -16,9 +16,9 @@ </parent> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/common/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/tags/2.0....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/tags/2.0.4-B...</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/common/tags/2.0.4-Beta03</url> </scm>

13 years, 6 months

1
0
0 / 0

gatein SVN: r6633 - components/common/trunk.

by do-not-reply＠jboss.org

Author: theute Date: 2011-06-10 06:52:29 -0400 (Fri, 10 Jun 2011) New Revision: 6633 Modified: components/common/trunk/pom.xml Log: Upgrading Parent and Dep Modified: components/common/trunk/pom.xml =================================================================== --- components/common/trunk/pom.xml 2011-06-10 07:01:14 UTC (rev 6632) +++ components/common/trunk/pom.xml 2011-06-10 10:52:29 UTC (rev 6633) @@ -12,7 +12,7 @@ <parent> <groupId>org.gatein</groupId> <artifactId>gatein-parent</artifactId> - <version>1.1.0-Beta01</version> + <version>1.1.0-Beta02</version> </parent> <scm> @@ -27,7 +27,7 @@ <dependency> <groupId>org.gatein</groupId> <artifactId>gatein-dep</artifactId> - <version>1.0.3-Beta01</version> + <version>1.1.0-Beta04</version> <type>pom</type> <scope>import</scope> </dependency>

13 years, 6 months

1
0
0 / 0

gatein SVN: r6632 - portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2011-06-10 03:01:14 -0400 (Fri, 10 Jun 2011) New Revision: 6632 Modified: portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/ContainerStAXParser.java Log: GTNPORTAL-1905: Support optional attribute in Container Modified: portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/ContainerStAXParser.java =================================================================== --- portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/ContainerStAXParser.java 2011-06-10 06:45:04 UTC (rev 6631) +++ portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/ContainerStAXParser.java 2011-06-10 07:01:14 UTC (rev 6632) @@ -43,22 +43,29 @@ { Container container = new Container(); - String templateName = elementNavigator.getAttribute("template"); + String containerId, templateName, decorator, width, height; + + containerId = elementNavigator.getAttribute("id"); + templateName = elementNavigator.getAttribute("template"); + decorator = elementNavigator.getAttribute("decorator"); + width = elementNavigator.getAttribute("width"); + height = elementNavigator.getAttribute("height"); + + container.setId(containerId); + container.setName(getContent(elementNavigator, StAXElement.name)); + container.setTitle(getContent(elementNavigator, StAXElement.title)); + container.setIcon(getContent(elementNavigator, StAXElement.icon)); if(templateName != null) { container.setTemplate(templateName); } - - container.setId(elementNavigator.getAttribute("id")); - container.setWidth(elementNavigator.getAttribute("width")); - container.setHeight(elementNavigator.getAttribute("height")); - - container.setTitle(getContent(elementNavigator, StAXElement.title)); - container.setIcon(getContent(elementNavigator, StAXElement.icon)); container.setAccessPermissions(Utils.split(";", getContent(elementNavigator, StAXElement.access_permissions))); container.setFactoryId(getContent(elementNavigator, StAXElement.factory_id)); + container.setDecorator(decorator); + container.setDescription(getContent(elementNavigator, StAXElement.description)); + container.setWidth(width); + container.setHeight(height); - final Set<StAXElement> childElementSet = new HashSet<StAXElement>(); childElementSet.add(StAXElement.portlet_application); childElementSet.add(StAXElement.gadget_application); @@ -85,10 +92,12 @@ { switch(staxElement) { + case name: case access_permissions: case title: case icon: case factory_id: + case description: return true; default: return false;

13 years, 6 months

1
0
0 / 0

gatein SVN: r6631 - portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2011-06-10 02:45:04 -0400 (Fri, 10 Jun 2011) New Revision: 6631 Modified: portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PageStAXParser.java 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/StAXElement.java Log: GTNPORTAL-1905: Update code on PageStAXParser to support page-id element Modified: portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PageStAXParser.java =================================================================== --- portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PageStAXParser.java 2011-06-10 06:04:24 UTC (rev 6630) +++ portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PageStAXParser.java 2011-06-10 06:45:04 UTC (rev 6631) @@ -45,6 +45,9 @@ { Page page = new Page(); + page.setPageId(getContent(elementNavigator, StAXElement.page_id)); + page.setOwnerType(getContent(elementNavigator, StAXElement.owner_type)); + page.setOwnerId(getContent(elementNavigator, StAXElement.owner_id)); page.setName(getContent(elementNavigator, StAXElement.name)); page.setTitle(getContent(elementNavigator, StAXElement.title)); page.setFactoryId(getContent(elementNavigator, StAXElement.factory_id)); @@ -81,6 +84,9 @@ { switch(staxElement) { + case page_id: + case owner_type: + case owner_id: case title: case factory_id: case access_permissions: 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-06-10 06:04:24 UTC (rev 6630) +++ portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/PortletWindowStAXParser.java 2011-06-10 06:45:04 UTC (rev 6631) @@ -87,7 +87,7 @@ } } - private static final Set<StAXElement> optionalElements = EnumSet.of(StAXElement.preferences, StAXElement.value, StAXElement.read_only); + private static final Set<StAXElement> optionalElements = EnumSet.of(StAXElement.preferences, StAXElement.value, StAXElement.read_only, StAXElement.access_permissions, StAXElement.show_info_bar); @Override public Set<StAXElement> getOptionalElements() Modified: portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/StAXElement.java =================================================================== --- portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/StAXElement.java 2011-06-10 06:04:24 UTC (rev 6630) +++ portal/branches/stax-integration/component/portal/src/main/java/org/exoplatform/portal/config/stax/StAXElement.java 2011-06-10 06:45:04 UTC (rev 6631) @@ -28,6 +28,8 @@ page, + page_id, + name, title,

13 years, 6 months

1
0
0 / 0

gatein SVN: r6630 - maven/dep/trunk.

by do-not-reply＠jboss.org

Author: theute Date: 2011-06-10 02:04:24 -0400 (Fri, 10 Jun 2011) New Revision: 6630 Modified: maven/dep/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: maven/dep/trunk/pom.xml =================================================================== --- maven/dep/trunk/pom.xml 2011-06-10 06:04:18 UTC (rev 6629) +++ maven/dep/trunk/pom.xml 2011-06-10 06:04:24 UTC (rev 6630) @@ -8,7 +8,7 @@ <groupId>org.gatein</groupId> <artifactId>gatein-dep</artifactId> - <version>1.1.0-Beta04</version> + <version>1.1.0-Beta05-SNAPSHOT</version> <packaging>pom</packaging> <parent> @@ -18,9 +18,9 @@ </parent> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/maven/dep/tags/1.1.0-Beta04</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/maven/dep/tags/1.1.0-Beta04</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/maven/dep/tags/1.1.0-Beta04</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/maven/dep/trunk/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/maven/dep/trunk/</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/maven/dep/trunk/</url> </scm> <properties>

13 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits June 2011