[gatein-commits] gatein SVN: r6806 - in epp/portal/branches/EPP_5_2_Branch: distribution/jboss-epp/examples/src and 5 other directories.

Author: hfnukal Date: 2011-07-04 04:57:47 -0400 (Mon, 04 Jul 2011) New Revision: 6806 Added: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/src/main/ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/src/main/resources/ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/src/main/resources/gatein-sample-portal-ds.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/META-INF/ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/META-INF/context.xml Removed: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/deploy/gatein-sample-portal-ds.xml Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/src/assemble.xml Log: JBEPP-942 examples Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml 2011-07-04 08:14:37 UTC (rev 6805) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml 2011-07-04 08:57:47 UTC (rev 6806) @@ -18,22 +18,40 @@ <!-- Examples --> <dependency> - <groupId>org.jboss.portletbridge.examples.seam.booking</groupId> - <artifactId>seamBooking-ear</artifactId> - <version>${portletbridge.version}</version> + <groupId>org.exoplatform.portal</groupId> + <artifactId>gatein-sample-extension</artifactId> + <version>${project.version}</version> <type>ear</type> + <exclusions> + <exclusion> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.jboss.portal.examples</groupId> - <artifactId>JSFRIPortlet</artifactId> - <version>${portletbridge.version}</version> - <type>war</type> + <groupId>org.exoplatform.portal</groupId> + <artifactId>gatein-sample-portal</artifactId> + <version>${project.version}</version> + <type>ear</type> + <exclusions> + <exclusion> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.jboss.portal.examples</groupId> - <artifactId>richFacesPortlet</artifactId> - <version>${portletbridge.version}</version> + <groupId>org.gatein.portal.examples.skins</groupId> + <artifactId>gatein-sample-skin</artifactId> + <version>${project.version}</version> <type>war</type> + <exclusions> + <exclusion> + <groupId>org.hsqldb</groupId> + <artifactId>hsqldb</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/src/assemble.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/src/assemble.xml 2011-07-04 08:14:37 UTC (rev 6805) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/src/assemble.xml 2011-07-04 08:57:47 UTC (rev 6806) @@ -7,10 +7,16 @@ <format>zip</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>src/main/resources</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> <dependencySets> <dependencySet> <outputDirectory></outputDirectory> - <outputFileNameMapping>${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <unpack>false</unpack> <useTransitiveDependencies>false</useTransitiveDependencies> </dependencySet> Copied: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/src/main/resources/gatein-sample-portal-ds.xml (from rev 6781, epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/deploy/gatein-sample-portal-ds.xml) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/src/main/resources/gatein-sample-portal-ds.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/src/main/resources/gatein-sample-portal-ds.xml 2011-07-04 08:57:47 UTC (rev 6806) @@ -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> Deleted: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/deploy/gatein-sample-portal-ds.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/deploy/gatein-sample-portal-ds.xml 2011-07-04 08:14:37 UTC (rev 6805) +++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/src/main/resources/deploy/gatein-sample-portal-ds.xml 2011-07-04 08:57:47 UTC (rev 6806) @@ -1,52 +0,0 @@ -<?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> Copied: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/META-INF/context.xml (from rev 6683, portal/trunk/web/portal/src/main/webapp/META-INF/context.xml) =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/META-INF/context.xml (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/META-INF/context.xml 2011-07-04 08:57:47 UTC (rev 6806) @@ -0,0 +1,31 @@ +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. + +--> + +<Context path='/portal' docBase='portal' debug='0' reloadable='true' crossContext='true' privileged='true'> + <Realm className='org.apache.catalina.realm.JAASRealm' + appName='gatein-domain' + userClassNames='org.exoplatform.services.security.jaas.UserPrincipal' + roleClassNames='org.exoplatform.services.security.jaas.RolePrincipal' + debug='0' cache='false'/> + <Valve + className='org.apache.catalina.authenticator.FormAuthenticator' + characterEncoding='UTF-8'/> +</Context>