[gatein-commits] gatein SVN: r6356 - epp/portal/branches/EPP_5_1_Branch.

Author: hfnukal Date: 2011-04-27 06:11:16 -0400 (Wed, 27 Apr 2011) New Revision: 6356 Added: epp/portal/branches/EPP_5_1_Branch/gatein-ds.xml epp/portal/branches/EPP_5_1_Branch/prepareEPP.xml epp/portal/branches/EPP_5_1_Branch/server-https.xml epp/portal/branches/EPP_5_1_Branch/server.keystore epp/portal/branches/EPP_5_1_Branch/server.xml Modified: epp/portal/branches/EPP_5_1_Branch/ epp/portal/branches/EPP_5_1_Branch/pom.xml epp/portal/branches/EPP_5_1_Branch/settings.xml Log: JCR version Property changes on: epp/portal/branches/EPP_5_1_Branch ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4894 /portal/branches/branch-GTNPORTAL-1643:5002 /portal/branches/branch-GTNPORTAL-1700:5348,5445 /portal/branches/branch-GTNPORTAL-1731:5668 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1822:5943 /portal/branches/branch-GTNPORTAL-1832:6030 /portal/trunk:4891,5744,5943,6168,6196,6201-6203,6205-6206 Added: epp/portal/branches/EPP_5_1_Branch/gatein-ds.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/gatein-ds.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/gatein-ds.xml 2011-04-27 10:11:16 UTC (rev 6356) @@ -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> Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-04-27 07:47:31 UTC (rev 6355) +++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-04-27 10:11:16 UTC (rev 6356) @@ -40,7 +40,7 @@ <org.exoplatform.kernel.version>2.2.8-GA</org.exoplatform.kernel.version> <org.exoplatform.core.version>2.3.8-GA</org.exoplatform.core.version> <org.exoplatform.ws.version>2.1.8-GA</org.exoplatform.ws.version> - <org.exoplatform.jcr.version>1.12.8-CP01</org.exoplatform.jcr.version> + <org.exoplatform.jcr.version>1.12.8_CP01</org.exoplatform.jcr.version> <org.jibx.version>1.2.1</org.jibx.version> <org.shindig.version>1.0-r790473-Patch04</org.shindig.version> <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version> Added: epp/portal/branches/EPP_5_1_Branch/prepareEPP.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/prepareEPP.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/prepareEPP.xml 2011-04-27 10:11:16 UTC (rev 6356) @@ -0,0 +1,16 @@ + <project name="prepareEPP" default="prepare"> + <target name="prepare"> + <copy file="so on, " overwrite="true" todir="packaging/pkg/target/jboss/server/default/deploy"/> + <delete file=""> + <fileset dir="packaging/pkg/target/jboss/server/default/deploy/" includes="gatein-sample-*"/> + </delete> + </target> + <target name="prepareHttps"> + <copy file="packaging/pkg/target/jboss/server/default/deploy/jbossweb.sar/server.xml" overwrite="true" todir="."/> + <copy file="server-https.xml" overwrite="true" tofile="packaging/pkg/target/jboss/server/default/deploy/jbossweb.sar/server.xml"/> + <copy file="server.keystore" todir="packaging/pkg/target/jboss/server/default/conf" overwrite="true" /> + </target> + <target name="prepareHttpsUndo"> + <copy file="server.xml" overwrite="true" todir="packaging/pkg/target/jboss/server/default/deploy/jbossweb.sar"/> + </target> + </project> \ No newline at end of file Added: epp/portal/branches/EPP_5_1_Branch/server-https.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/server-https.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/server-https.xml 2011-04-27 10:11:16 UTC (rev 6356) @@ -0,0 +1,170 @@ +<Server> + + <!-- Optional listener which ensures correct init and shutdown of APR, + and provides information if it is not installed --> + <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" /> + <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html --> + <Listener className="org.apache.catalina.core.JasperListener" /> + + <Service name="jboss.web"> + + <!-- A HTTP/1.1 Connector on port 8080 --> + <Connector protocol="HTTP/1.1" port="8080" address="${jboss.bind.address}" + connectionTimeout="20000" redirectPort="8443" /> + + <!-- Add this option to the connector to avoid problems with + .NET clients that don't implement HTTP/1.1 correctly + restrictedUserAgents="^.*MS Web Services Client Protocol 1.1.4322.*$" + --> + + <!-- A AJP 1.3 Connector on port 8009 --> + <Connector protocol="AJP/1.3" port="8009" address="${jboss.bind.address}" + redirectPort="8443" /> + + <!-- SSL/TLS Connector configuration using the admin devl guide keystore --> + <Connector protocol="HTTP/1.1" SSLEnabled="true" + port="8443" address="${jboss.bind.address}" + scheme="https" secure="true" clientAuth="false" + keystoreFile="${jboss.server.home.dir}/conf/server.keystore" + keystorePass="changeit" sslProtocol = "TLS" + connectionTimeout="20000" acceptCount="100" emptySessionPath="true" + maxThreads="250" enableLookups="false" disableUploadTimeout="true" + maxHttpHeaderSize="8192" /> + + <Engine name="jboss.web" defaultHost="localhost"> + + <!-- The JAAS based authentication and authorization realm implementation + that is compatible with the jboss 3.2.x realm implementation. + - certificatePrincipal : the class name of the + org.jboss.security.auth.certs.CertificatePrincipal impl + used for mapping X509[] cert chains to a Princpal. + - allRolesMode : how to handle an auth-constraint with a role-name=*, + one of strict, authOnly, strictAuthOnly + + strict = Use the strict servlet spec interpretation which requires + that the user have one of the web-app/security-role/role-name + + authOnly = Allow any authenticated user + + strictAuthOnly = Allow any authenticated user only if there are no + web-app/security-roles + --> + <Realm className="org.jboss.web.tomcat.security.JBossWebRealm" + certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping" + allRolesMode="authOnly" + /> + <!-- A subclass of JBossSecurityMgrRealm that uses the authentication + behavior of JBossSecurityMgrRealm, but overrides the authorization + checks to use JACC permissions with the current java.security.Policy + to determine authorized access. + - allRolesMode : how to handle an auth-constraint with a role-name=*, + one of strict, authOnly, strictAuthOnly + + strict = Use the strict servlet spec interpretation which requires + that the user have one of the web-app/security-role/role-name + + authOnly = Allow any authenticated user + + strictAuthOnly = Allow any authenticated user only if there are no + web-app/security-roles + <Realm className="org.jboss.web.tomcat.security.JaccAuthorizationRealm" + certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping" + allRolesMode="authOnly" + /> + --> + + <Host name="localhost"> + + <!-- Uncomment to enable request dumper. This Valve "logs interesting + contents from the specified Request (before processing) and the + corresponding Response (after processing). It is especially useful + in debugging problems related to headers and cookies." + --> + <!-- + <Valve className="org.apache.catalina.valves.RequestDumperValve" /> + --> + + <!-- Access logger --> + <!-- + <Valve className="org.apache.catalina.valves.AccessLogValve" + prefix="localhost_access_log." suffix=".log" + pattern="common" directory="${jboss.server.log.dir}" + resolveHosts="false" /> + --> + + <!-- Uncomment to enable single sign-on across web apps + deployed to this host. Does not provide SSO across a cluster. + + If this valve is used, do not use the JBoss ClusteredSingleSignOn + valve shown below. + + A new configuration attribute is available beginning with + release 4.0.4: + + cookieDomain configures the domain to which the SSO cookie + will be scoped (i.e. the set of hosts to + which the cookie will be presented). By default + the cookie is scoped to "/", meaning the host + that presented it. Set cookieDomain to a + wider domain (e.g. "xyz.com") to allow an SSO + to span more than one hostname. + --> + <!-- + <Valve className="org.apache.catalina.authenticator.SingleSignOn" /> + --> + + <!-- Uncomment to enable single sign-on across web apps + deployed to this host AND to all other hosts in the cluster. + + If this valve is used, do not use the standard Tomcat SingleSignOn + valve shown above. + + Valve uses a JBossCache instance to support SSO credential + caching and replication across the cluster. The JBossCache + instance must be configured separately. See the + "jboss-web-clusteredsso-beans.xml" file in the + server/all/deploy directory for cache configuration details. + + Besides the attributes supported by the standard Tomcat + SingleSignOn valve (see the Tomcat docs), this version also + supports the following attributes: + + cookieDomain see non-clustered valve above + + cacheConfig Name of the CacheManager service configuration + to use for the clustered SSO cache. See + deploy/cluster/jboss-cache-manager.sar/META-INF/jboss-cache-manager-jboss-beans.xml + Default is "clustered-sso". + + treeCacheName Deprecated. Use "cacheConfig". + JMX ObjectName of the JBoss Cache MBean used to + support credential caching and replication across + the cluster. Only used if no cache can be located + from the CacheManager service using the "cacheConfig" + attribute (or its default value). If not set, the + default is "jboss.cache:service=TomcatClusteringCache" + + maxEmptyLife The maximum number of seconds an SSO with no + active sessions will be usable by a request + + processExpiresInterval The minimum number of seconds between + efforts by the valve to find and invalidate + SSO's that have exceeded their 'maxEmptyLife'. + Does not imply effort will be spent on such + cleanup every 'processExpiresInterval'. + --> + <!-- + <Valve className="org.jboss.web.tomcat.service.sso.ClusteredSingleSignOn" /> + --> + + <!-- Check for unclosed connections and transaction terminated checks + in servlets/jsps. + + Important: The dependency on the CachedConnectionManager + in META-INF/jboss-service.xml must be uncommented, too + --> + + <Valve className="org.jboss.web.tomcat.service.jca.CachedConnectionValve" + cachedConnectionManagerObjectName="jboss.jca:service=CachedConnectionManager" + transactionManagerObjectName="jboss:service=TransactionManager" /> + + </Host> + </Engine> + + </Service> + +</Server> Property changes on: epp/portal/branches/EPP_5_1_Branch/server-https.xml ___________________________________________________________________ Added: svn:executable + * Added: epp/portal/branches/EPP_5_1_Branch/server.keystore =================================================================== (Binary files differ) Property changes on: epp/portal/branches/EPP_5_1_Branch/server.keystore ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: epp/portal/branches/EPP_5_1_Branch/server.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/server.xml (rev 0) +++ epp/portal/branches/EPP_5_1_Branch/server.xml 2011-04-27 10:11:16 UTC (rev 6356) @@ -0,0 +1,170 @@ +<Server> + + <!-- Optional listener which ensures correct init and shutdown of APR, + and provides information if it is not installed --> + <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" /> + <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html --> + <Listener className="org.apache.catalina.core.JasperListener" /> + + <Service name="jboss.web"> + + <!-- A HTTP/1.1 Connector on port 8080 --> + <Connector protocol="HTTP/1.1" port="8080" address="${jboss.bind.address}" + connectionTimeout="20000" redirectPort="8443" /> + + <!-- Add this option to the connector to avoid problems with + .NET clients that don't implement HTTP/1.1 correctly + restrictedUserAgents="^.*MS Web Services Client Protocol 1.1.4322.*$" + --> + + <!-- A AJP 1.3 Connector on port 8009 --> + <Connector protocol="AJP/1.3" port="8009" address="${jboss.bind.address}" + redirectPort="8443" /> + + <!-- SSL/TLS Connector configuration using the admin devl guide keystore --> + <Connector protocol="HTTP/1.1" SSLEnabled="true" + port="8443" address="${jboss.bind.address}" + scheme="https" secure="true" clientAuth="false" + keystoreFile="${jboss.server.home.dir}/conf/server.keystore" + keystorePass="changeit" sslProtocol = "TLS" + connectionTimeout="20000" acceptCount="100" emptySessionPath="true" + maxThreads="250" enableLookups="false" disableUploadTimeout="true" + maxHttpHeaderSize="8192" /> + + <Engine name="jboss.web" defaultHost="localhost"> + + <!-- The JAAS based authentication and authorization realm implementation + that is compatible with the jboss 3.2.x realm implementation. + - certificatePrincipal : the class name of the + org.jboss.security.auth.certs.CertificatePrincipal impl + used for mapping X509[] cert chains to a Princpal. + - allRolesMode : how to handle an auth-constraint with a role-name=*, + one of strict, authOnly, strictAuthOnly + + strict = Use the strict servlet spec interpretation which requires + that the user have one of the web-app/security-role/role-name + + authOnly = Allow any authenticated user + + strictAuthOnly = Allow any authenticated user only if there are no + web-app/security-roles + --> + <Realm className="org.jboss.web.tomcat.security.JBossWebRealm" + certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping" + allRolesMode="authOnly" + /> + <!-- A subclass of JBossSecurityMgrRealm that uses the authentication + behavior of JBossSecurityMgrRealm, but overrides the authorization + checks to use JACC permissions with the current java.security.Policy + to determine authorized access. + - allRolesMode : how to handle an auth-constraint with a role-name=*, + one of strict, authOnly, strictAuthOnly + + strict = Use the strict servlet spec interpretation which requires + that the user have one of the web-app/security-role/role-name + + authOnly = Allow any authenticated user + + strictAuthOnly = Allow any authenticated user only if there are no + web-app/security-roles + <Realm className="org.jboss.web.tomcat.security.JaccAuthorizationRealm" + certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping" + allRolesMode="authOnly" + /> + --> + + <Host name="localhost"> + + <!-- Uncomment to enable request dumper. This Valve "logs interesting + contents from the specified Request (before processing) and the + corresponding Response (after processing). It is especially useful + in debugging problems related to headers and cookies." + --> + <!-- + <Valve className="org.apache.catalina.valves.RequestDumperValve" /> + --> + + <!-- Access logger --> + <!-- + <Valve className="org.apache.catalina.valves.AccessLogValve" + prefix="localhost_access_log." suffix=".log" + pattern="common" directory="${jboss.server.log.dir}" + resolveHosts="false" /> + --> + + <!-- Uncomment to enable single sign-on across web apps + deployed to this host. Does not provide SSO across a cluster. + + If this valve is used, do not use the JBoss ClusteredSingleSignOn + valve shown below. + + A new configuration attribute is available beginning with + release 4.0.4: + + cookieDomain configures the domain to which the SSO cookie + will be scoped (i.e. the set of hosts to + which the cookie will be presented). By default + the cookie is scoped to "/", meaning the host + that presented it. Set cookieDomain to a + wider domain (e.g. "xyz.com") to allow an SSO + to span more than one hostname. + --> + <!-- + <Valve className="org.apache.catalina.authenticator.SingleSignOn" /> + --> + + <!-- Uncomment to enable single sign-on across web apps + deployed to this host AND to all other hosts in the cluster. + + If this valve is used, do not use the standard Tomcat SingleSignOn + valve shown above. + + Valve uses a JBossCache instance to support SSO credential + caching and replication across the cluster. The JBossCache + instance must be configured separately. See the + "jboss-web-clusteredsso-beans.xml" file in the + server/all/deploy directory for cache configuration details. + + Besides the attributes supported by the standard Tomcat + SingleSignOn valve (see the Tomcat docs), this version also + supports the following attributes: + + cookieDomain see non-clustered valve above + + cacheConfig Name of the CacheManager service configuration + to use for the clustered SSO cache. See + deploy/cluster/jboss-cache-manager.sar/META-INF/jboss-cache-manager-jboss-beans.xml + Default is "clustered-sso". + + treeCacheName Deprecated. Use "cacheConfig". + JMX ObjectName of the JBoss Cache MBean used to + support credential caching and replication across + the cluster. Only used if no cache can be located + from the CacheManager service using the "cacheConfig" + attribute (or its default value). If not set, the + default is "jboss.cache:service=TomcatClusteringCache" + + maxEmptyLife The maximum number of seconds an SSO with no + active sessions will be usable by a request + + processExpiresInterval The minimum number of seconds between + efforts by the valve to find and invalidate + SSO's that have exceeded their 'maxEmptyLife'. + Does not imply effort will be spent on such + cleanup every 'processExpiresInterval'. + --> + <!-- + <Valve className="org.jboss.web.tomcat.service.sso.ClusteredSingleSignOn" /> + --> + + <!-- Check for unclosed connections and transaction terminated checks + in servlets/jsps. + + Important: The dependency on the CachedConnectionManager + in META-INF/jboss-service.xml must be uncommented, too + --> + + <Valve className="org.jboss.web.tomcat.service.jca.CachedConnectionValve" + cachedConnectionManagerObjectName="jboss.jca:service=CachedConnectionManager" + transactionManagerObjectName="jboss:service=TransactionManager" /> + + </Host> + </Engine> + + </Service> + +</Server> Modified: epp/portal/branches/EPP_5_1_Branch/settings.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/settings.xml 2011-04-27 07:47:31 UTC (rev 6355) +++ epp/portal/branches/EPP_5_1_Branch/settings.xml 2011-04-27 10:11:16 UTC (rev 6356) @@ -1,14 +1,40 @@ <?xml version="1.0"?> -<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> +<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> - <localRepository>${env.HOME}/.m2_EPP</localRepository> + <localRepository>${env.HOME}/.m2_EPP</localRepository> - <mirrors> - <mirror> - <id>internal-repository</id> - <name>Maven Repository Manager running on repo.mycompany.com</name> - <url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/... - <mirrorOf>*</mirrorOf> - </mirror> - </mirrors> + <mirrors> + <!--<mirror>--> + <!--<id>internal-repository</id>--> + <!--<name>Maven Repository Manager running on repo.mycompany.com</name>--> + <!--<url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/latest/maven</url>--> + <!--<mirrorOf>*</mirrorOf>--> + <!--</mirror>--> + <mirror> + <id>internal-repository1</id> + <name>Maven Repository Manager running on jboss.org</name> + <url>http://repository.jboss.org/nexus/content/groups/public-jboss</... + <mirrorOf>*</mirrorOf> + </mirror> + </mirrors> + <profiles> + <profile> + + <id>jbrep</id> + + <repositories> + <repository> + <id>jboss-int</id> + <url>http://repository.jboss.org/nexus/content/groups/public-jboss</... + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + </profile> + </profiles> </settings>