Author: hfnukal Date: 2011-05-25 19:18:25 -0400 (Wed, 25 May 2011) New Revision: 6563 Added: epp/portal/branches/EPP-5-1-tmp/distribution/portletbridge/ epp/portal/branches/EPP-5-1-tmp/distribution/portletbridge/pom.xml epp/portal/branches/EPP-5-1-tmp/distribution/portletbridge/src/ epp/portal/branches/EPP-5-1-tmp/distribution/portletbridge/src/assemble.xml epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/ epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/pom.xml epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/ epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/assemble.xml epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/ epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/resources/ epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/resources/deploy/ epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/resources/deploy/gatein-ds.xml epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/resources/deploy/gatein-sample-portal-ds.xml Modified: epp/portal/branches/EPP-5-1-tmp/distribution/ epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml Log: Distribution Modules Property changes on: epp/portal/branches/EPP-5-1-tmp/distribution ___________________________________________________________________ Added: svn:ignore + target Modified: epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml 2011-05-25 14:13:43 UTC (rev 6562) +++ epp/portal/branches/EPP-5-1-tmp/distribution/pom.xml 2011-05-25 23:18:25 UTC (rev 6563) @@ -11,13 +11,12 @@ </parent> <artifactId>distribution</artifactId> - <packaging>pom</packaging> - <name>Distribution</name> <properties> <eap.version>5.1.0</eap.version> + <eap.dir>jboss-eap-5.1</eap.dir> </properties> <modules> @@ -56,7 +55,16 @@ <artifactId>exo.portal.portlet.dashboard</artifactId> <version>5.1.1-epp-CR01-SNAPSHOT</version> <type>war</type> - </dependency> + </dependency> +<dependency> + <groupId>org.exoplatform.portal.distribution</groupId> + <artifactId>portletbridge</artifactId> + <version>5.1.1-epp-CR01-SNAPSHOT</version> + <classifier>bin</classifier> + <type>zip</type> +</dependency> + + <!-- EAP overlay --> <dependency> <groupId>org.jboss</groupId> <artifactId>jboss-eap</artifactId> @@ -68,7 +76,7 @@ <build> <plugins> - <plugin> +<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>2.1</version> @@ -83,7 +91,6 @@ <executions> <execution> <id>unpack-zips</id> -<!-- <phase>generate-resources</phase>--> <phase>package</phase> <goals> <goal>unpack</goal> @@ -101,7 +108,7 @@ </configuration> </execution> </executions> - </plugin> + </plugin>--> Added: epp/portal/branches/EPP-5-1-tmp/distribution/portletbridge/pom.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/portletbridge/pom.xml (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/portletbridge/pom.xml 2011-05-25 23:18:25 UTC (rev 6563) @@ -0,0 +1,96 @@ + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> +<!-- <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>distribution</artifactId> + <version>5.1.1-epp-CR01-SNAPSHOT</version> + + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.parent</artifactId> + <version>5.1.1-epp-CR01-SNAPSHOT</version> + </parent>--> + <artifactId>portletbridge</artifactId> + <packaging>pom</packaging> + <name>Distribution portletbridge</name> + + <groupId>org.exoplatform.portal.distribution</groupId> + <version>5.1.1-epp-CR01-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>org.jboss.portletbridge</groupId> + <artifactId>portletbridge-impl</artifactId> + <version>2.1.0.GA.EPP51</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.jboss.portletbridge</groupId> + <artifactId>portletbridge-api</artifactId> + <version>2.1.0.GA.EPP51</version> + <type>jar</type> + </dependency> + + <!-- Examples --> + +<!-- +{"http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/307402/maven/ +org/jboss/portletbridge/examples/seam/booking/seamBooking-ear/2.1.0.GA.EPP51/" +:"seamBooking-ear-2.1.0.GA.EPP51.ear"}, + +{"http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/307402/maven/ +org/jboss/portal/examples/JSFRIPortlet/2.1.0.GA.EPP51/" +: "JSFRIPortlet-2.1.0.GA.EPP51.war"}, + +{"http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/307402/maven/ +org/jboss/portal/examples/richFacesPortlet/2.1.0.GA.EPP51/" +:"richFacesPortlet-2.1.0.GA.EPP51.war"} +--> + + <dependency> + <groupId>org.jboss.portletbridge.examples.seam.booking</groupId> + <artifactId>seamBooking-ear</artifactId> + <version>2.1.0.GA.EPP51</version> + <type>ear</type> + </dependency> + <dependency> + <groupId>org.jboss.portal.examples</groupId> + <artifactId>JSFRIPortlet</artifactId> + <version>2.1.0.GA.EPP51</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.portal.examples</groupId> + <artifactId>richFacesPortlet</artifactId> + <version>2.1.0.GA.EPP51</version> + <type>war</type> + </dependency> + + </dependencies> + + <build> + <plugins> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distro-portalbridge-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/assemble.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> Copied: epp/portal/branches/EPP-5-1-tmp/distribution/portletbridge/src/assemble.xml (from rev 6544, epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml) =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/portletbridge/src/assemble.xml (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/portletbridge/src/assemble.xml 2011-05-25 23:18:25 UTC (rev 6563) @@ -0,0 +1,29 @@ + +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>bin</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <dependencySets> + <dependencySet> + <includes> + <include>*:jar</include> + </includes> + <outputDirectory></outputDirectory> + <outputFileNameMapping>${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping> + <unpack>false</unpack> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + <dependencySet> + <includes> + <include>*:ear</include> + <include>*:war</include> + </includes> + <outputDirectory>examples/</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping> + </dependencySet> + </dependencySets> +</assembly> \ No newline at end of file Added: epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/pom.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/pom.xml (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/pom.xml 2011-05-25 23:18:25 UTC (rev 6563) @@ -0,0 +1,45 @@ + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> +<!-- <parent> + <groupId>org.exoplatform.portal</groupId> + <artifactId>distribution</artifactId> + <version>5.1.1-epp-CR01-SNAPSHOT</version> + + <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.parent</artifactId> + <version>5.1.1-epp-CR01-SNAPSHOT</version> + </parent>--> + <artifactId>serverAddon</artifactId> + <packaging>pom</packaging> + <name>Distribution portletbridge</name> + + <groupId>org.exoplatform.portal.deploy</groupId> + <version>5.1.1-epp-CR01-SNAPSHOT</version> + + <build> + <plugins> + + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distro-portalbridge-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/assemble.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> Added: epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/assemble.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/assemble.xml (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/assemble.xml 2011-05-25 23:18:25 UTC (rev 6563) @@ -0,0 +1,18 @@ + +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>bin</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>src/main/resources/</directory> + <outputDirectory>.</outputDirectory> + </fileSet> + </fileSets> + +</assembly> \ No newline at end of file Added: epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/resources/deploy/gatein-ds.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/resources/deploy/gatein-ds.xml (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/resources/deploy/gatein-ds.xml 2011-05-25 23:18:25 UTC (rev 6563) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2009, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<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-tmp/distribution/serverAddon/src/main/resources/deploy/gatein-sample-portal-ds.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/resources/deploy/gatein-sample-portal-ds.xml (rev 0) +++ epp/portal/branches/EPP-5-1-tmp/distribution/serverAddon/src/main/resources/deploy/gatein-sample-portal-ds.xml 2011-05-25 23:18:25 UTC (rev 6563) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2009, Red Hat Middleware, LLC, and individual ~ + ~ contributors as indicated by the @authors tag. See the ~ + ~ copyright.txt in the distribution for a full listing of ~ + ~ individual contributors. ~ + ~ ~ + ~ This is free software; you can redistribute it and/or modify it ~ + ~ under the terms of the GNU Lesser General Public License as ~ + ~ published by the Free Software Foundation; either version 2.1 of ~ + ~ the License, or (at your option) any later version. ~ + ~ ~ + ~ This software is distributed in the hope that it will be useful, ~ + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~ + ~ Lesser General Public License for more details. ~ + ~ ~ + ~ You should have received a copy of the GNU Lesser General Public ~ + ~ License along with this software; if not, write to the Free ~ + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<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> Modified: epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml =================================================================== --- epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml 2011-05-25 14:13:43 UTC (rev 6562) +++ epp/portal/branches/EPP-5-1-tmp/distribution/src/assemble.xml 2011-05-25 23:18:25 UTC (rev 6563) @@ -14,12 +14,22 @@ <destName>xml/aaa.xml</destName> </file> </files>--> + <files> + <file> + <source>../component/common/src/main/java/conf/configuration-jboss.properties</source> + <outputDirectory>${eap.dir}/jboss-as/server/default/conf/gatein</outputDirectory> + </file> + <file> + <source>../component/common/src/main/java/conf/configuration.xml</source> + <outputDirectory>${eap.dir}/jboss-as/server/default/conf/gatein</outputDirectory> + </file> + </files> <dependencySets> <dependencySet> <includes> <include>*:exo.portal.packaging.jboss-as.ear:ear</include> </includes> - <outputDirectory>jboss-as/server/default/deploy/gatein.ear</outputDirectory> + <outputDirectory>${eap.dir}/jboss-as/server/default/deploy/gatein.ear</outputDirectory> <outputFileNameMapping>gatein.ear</outputFileNameMapping> <unpack>true</unpack> </dependencySet> @@ -30,40 +40,54 @@ <excludes> <exclude>*:exo.portal.packaging.jboss-as.ear:ear</exclude> </excludes> - <outputDirectory>jboss-as/server/default/deploy</outputDirectory> + <outputDirectory>${eap.dir}/jboss-as/server/default/deploy</outputDirectory> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> </dependencySet> <dependencySet> <includes> <include>*:jar</include> </includes> - <outputDirectory>jboss-as/server/default/deploy</outputDirectory> + <outputDirectory>${eap.dir}/jboss-as/server/default/deploy</outputDirectory> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> </dependencySet> -<!-- <dependencySet> + <dependencySet> <includes> + <include>*.distribution:*:zip</include> + </includes> + <outputDirectory>${eap.dir}/${artifact.artifactId}</outputDirectory> + <unpack>true</unpack> + </dependencySet> + + <dependencySet> + <includes> <include>*:zip</include> </includes> <outputDirectory></outputDirectory> <unpack>true</unpack> - </dependencySet>--> + </dependencySet> + </dependencySets> - <files> - <file> - <source>../component/common/src/main/java/conf/configuration-jboss.properties</source> - <outputDirectory>jboss-as/server/default/conf/gatein</outputDirectory> - </file> - <file> - <source>../component/common/src/main/java/conf/configuration.xml</source> - <outputDirectory>jboss-as/server/default/conf/gatein</outputDirectory> - </file> - </files> - <fileSets> + + + <!-- EAP overlay --> + + +<!-- <fileSets> <fileSet> - <directory>${project.build.directory}/work/jboss-eap-5.1</directory> + <directory>${project.build.directory}/work/${eap.dir}</directory> <outputDirectory></outputDirectory> </fileSet> + <fileSet> + <file>${project.build.directory}/work/${eap.dir}/jboss-as/server/all/lib/jcip-annotations.jar</file> + <outputDirectory>/jboss-as/server/default/lib/</outputDirectory> + </fileSet> </fileSets> + --> +<!-- // the workaround JBEPP-167, is valid until JBAS-6437 is fixed + Log.info "Applying the workaround JBEPP-167" + new AntBuilder().copy(file:config.epp5.working.path + "/" + config.epp5.directory + "/jboss-as/server/all/lib/jcip-annotations.jar", + tofile:config.epp5.working.path + "/" + config.epp5.directory + "/jboss-as/server/default/lib/jcip-annotations.jar")--> + <!-- <moduleSets> <moduleSet>