gatein SVN: r6358 - maven/dep/trunk.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-04-27 08:52:06 -0400 (Wed, 27 Apr 2011)
New Revision: 6358
Modified:
maven/dep/trunk/
Log:
svn:ignore
Property changes on: maven/dep/trunk
___________________________________________________________________
Added: svn:ignore
+ .idea
target
*.iml
13 years, 8 months
- 1
- 0
gatein SVN: r6357 - epp/portal/branches/EPP_5_1_Branch.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-04-27 08:37:24 -0400 (Wed, 27 Apr 2011)
New Revision: 6357
Modified:
epp/portal/branches/EPP_5_1_Branch/pom.xml
Log:
WSRP version to 2.0.1-Beta02
Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-04-27 10:11:16 UTC (rev 6356)
+++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-04-27 12:37:24 UTC (rev 6357)
@@ -48,7 +48,7 @@
<org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.2.0-GA</org.gatein.pc.version>
<org.picketlink.idm>1.1.8.GA</org.picketlink.idm>
- <org.gatein.wsrp.version>2.0.1-GA</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>2.0.1-Beta02</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
13 years, 8 months
- 1
- 0
gatein SVN: r6356 - epp/portal/branches/EPP_5_1_Branch.
by do-not-reply＠jboss.org
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/latest/...</url>
- <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/...</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</url>
+ <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</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ </profile>
+ </profiles>
</settings>
13 years, 8 months
- 1
- 0
gatein SVN: r6355 - components/pc/trunk.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-04-27 03:47:31 -0400 (Wed, 27 Apr 2011)
New Revision: 6355
Modified:
components/pc/trunk/pom.xml
Log:
- GTNPC-63: Added other modules to release profiles but kept test module out since there's no need to export the test artifacts. Still need to see which other modules are required.
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2011-04-27 06:26:46 UTC (rev 6354)
+++ components/pc/trunk/pom.xml 2011-04-27 07:47:31 UTC (rev 6355)
@@ -21,7 +21,8 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<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">
+<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>
@@ -309,8 +310,12 @@
<id>release</id>
<modules>
<module>api</module>
+ <module>jsr168api</module>
<module>portlet</module>
<module>controller</module>
+ <module>bridge</module>
+ <module>federation</module>
+ <module>management</module>
<module>mc</module>
<module>portal</module>
<module>samples</module>
13 years, 8 months
- 1
- 0
gatein SVN: r6354 - in epp/docs/branches/5.1/Reference_Guide/en-US: modules/Advanced and 4 other directories.
by do-not-reply＠jboss.org
Author: smumford
Date: 2011-04-27 02:26:46 -0400 (Wed, 27 Apr 2011)
New Revision: 6354
Added:
epp/docs/branches/5.1/Reference_Guide/en-US/extras/Authentication_Identity_LDAP/default-ldap.xml
Modified:
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/Foundations.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptInterApplicationCommunication.xml
epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml
Log:
Add LDAP config example file and general spellcheck fixes
Added: epp/docs/branches/5.1/Reference_Guide/en-US/extras/Authentication_Identity_LDAP/default-ldap.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/extras/Authentication_Identity_LDAP/default-ldap.xml (rev 0)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/extras/Authentication_Identity_LDAP/default-ldap.xml 2011-04-27 06:26:46 UTC (rev 6354)
@@ -0,0 +1,31 @@
+<repository>
+ <id>PortalRepository</id>
+ <class>org.picketlink.idm.impl.repository.FallbackIdentityStoreRepository</class>
+ <external-config/>
+ <default-identity-store-id>HibernateStore</default-identity-store-id>
+ <default-attribute-store-id>HibernateStore</default-attribute-store-id>
+ <identity-store-mappings>
+ <identity-store-mapping>
+ <identity-store-id>PortalLDAPStore</identity-store-id>
+ <identity-object-types>
+ <identity-object-type>USER</identity-object-type>
+ <identity-object-type>platform_type</identity-object-type>
+ <identity-object-type>organization_type</identity-object-type>
+ </identity-object-types>
+ <options/>
+ </identity-store-mapping>
+ </identity-store-mappings>
+ <options>
+ <option>
+ <name>allowNotDefinedAttributes</name>
+ <value>true</value>
+ </option>
+ </options>
+ </repository>
+ <repository>
+ <id>DefaultPortalRepository</id>
+ <class>org.picketlink.idm.impl.repository.WrapperIdentityStoreRepository</class>
+ <external-config/>
+ <default-identity-store-id>HibernateStore</default-identity-store-id>
+ <default-attribute-store-id>HibernateStore</default-attribute-store-id>
+ </repository>
\ No newline at end of file
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/Foundations.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/Foundations.xml 2011-04-27 06:25:29 UTC (rev 6353)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/Foundations.xml 2011-04-27 06:26:46 UTC (rev 6354)
@@ -418,7 +418,7 @@
A servlet in this instance should extend the <literal>org.exoplatform.container.web.AbstractHttpServlet</literal> class so as to properly initialize the current <literal>PortalContainer</literal>.
</para>
<para>
- This will also set the current thread's context classloader to one that looks for resources in associated web applications in the order specified by the <emphasis role="bold">dependencies</emphasis> configuration (as seen in <xref linkend="sect-Reference_Guide-Foundations-The_Extension_Mechanism_and_Portal_Extensions" />).
+ This will also set the current thread's context Classloader to one that looks for resources in associated web applications in the order specified by the <emphasis role="bold">dependencies</emphasis> configuration (as seen in <xref linkend="sect-Reference_Guide-Foundations-The_Extension_Mechanism_and_Portal_Extensions" />).
</para>
<para>
Filter classes need to extend the <literal>org.exoplatform.container.web.AbstractFilter</literal>.
@@ -450,7 +450,7 @@
<programlisting language="Java" role="Java"><xi:include href="../../extras/Advanced_Development_Foundations/default11.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
<para>
- If this method returns <emphasis>true</emphasis> the current thread's context classloader is set up according to the <emphasis role="bold">dependencies</emphasis> configuration and availability of the associated web applications.
+ If this method returns <emphasis>true</emphasis> the current thread's context Classloader is set up according to the <emphasis role="bold">dependencies</emphasis> configuration and availability of the associated web applications.
</para>
<para>
If it returns <emphasis>false</emphasis> the standard application separation rules are used for resource loading (effectively turning off the extension mechanism).
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml 2011-04-27 06:25:29 UTC (rev 6353)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml 2011-04-27 06:26:46 UTC (rev 6354)
@@ -79,17 +79,17 @@
<itemizedlist>
<listitem>
<para>
- <emphasis role="bold">K</emphasis> or <emphasis role="bold">KB</emphasis> for kiloBytes.
+ <emphasis role="bold">K</emphasis> or <emphasis role="bold">KB</emphasis> for kilobytes.
</para>
</listitem>
<listitem>
<para>
- <emphasis role="bold">M</emphasis> or <emphasis role="bold">MB</emphasis> for megaBytes.
+ <emphasis role="bold">M</emphasis> or <emphasis role="bold">MB</emphasis> for megabytes.
</para>
</listitem>
<listitem>
<para>
- <emphasis role="bold">G</emphasis> or <emphasis role="bold">GB</emphasis> for gigaBytes.
+ <emphasis role="bold">G</emphasis> or <emphasis role="bold">GB</emphasis> for gigabytes.
</para>
</listitem>
<listitem>
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml 2011-04-27 06:25:29 UTC (rev 6353)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/SSO.xml 2011-04-27 06:26:46 UTC (rev 6354)
@@ -738,7 +738,7 @@
</step>
<step>
<para>
- The user then launches a web browser to access a web application (that uses JBoss Negotiation) hosted on JBoss EPP.
+ The user then launches a web browser to access a web application (that uses JBoss Negotiation) hosted on JBoss Enterprise Portal Platform.
</para>
</step>
<step>
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptInterApplicationCommunication.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptInterApplicationCommunication.xml 2011-04-27 06:25:29 UTC (rev 6353)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptInterApplicationCommunication.xml 2011-04-27 06:26:46 UTC (rev 6354)
@@ -54,55 +54,6 @@
</variablelist>
</section>
-
- <!--
-<section
-id="sect-Reference_Guide-JavaScript_Inter_Application_Communication-GateInportalchangeTitle">
-<title>/GateIn/portal/changeTitle (not
-implemented yet)</title>
-<para>
-Send a message on this channel to change (and to be notified) the title
-of the portal.
-</para>
-</section>
-
-<section
-id="sect-Reference_Guide-JavaScript_Inter_Application_Communication-GateInportalpageLoaded">
-<title>/GateIn/portal/pageLoaded (not
-implemented yet)</title>
-<para>
-Receive a message when a page is loaded.
-</para>
-</section>
-
-<section
-id="sect-Reference_Guide-JavaScript_Inter_Application_Communication-GateInportalpageUnloaded">
-<title>/eXo/portal/pageUnloaded (not
-implemented yet)</title>
-<para>
-Receive a message when a page is unloaded.
-</para>
-</section>
-
-<section
-id="sect-Reference_Guide-JavaScript_Inter_Application_Communication-GateInapplicationapplicationLoaded">
-<title>/eXo/application/applicationLoaded
-(not implemented yet)</title>
-<para>
-Receive a message when an application is loaded in the page.
-</para>
-</section>
-
-<section
-id="sect-Reference_Guide-JavaScript_Inter_Application_Communication-GateInapplicationapplicationUnloaded">
-<title>/eXo/application/applicationUnloaded
-(not implemented yet)</title>
-<para>
-Receive a message when an application is unloaded in the page.
-</para>
-</section>
-
- -->
<section id="sect-Reference_Guide-JavaScript_Inter_Application_Communication-Library">
<title>Library</title>
<para>
@@ -110,37 +61,7 @@
</para>
<programlisting language="Java" role="Java"><xi:include href="../../extras/PortalDevelopment_JavascriptInterApplicationCommunication/default155.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
- <!-- <programlisting>/**
-* publish is used to publish an event to the other subscribers to the given channels
-* @param {Object} senderId is a string that identify the sender
-* @param {String} topic is the topic that the message will be published
-* @param {Object} message is the message that's going to be delivered to the subscribers to the topic
-*/
-Topic.prototype.publish = function(/*Object*/ senderId, /*String*/ topicName, /*Object*/ message ) { ... }
-/**
-* isSubscribed is used to check if a function receive the events from a topic
-* @param {String} topic The topic.
-* @param {Function} func is the name of the function of obj to call when a message is received on the topic
-*/
-Topic.prototype.isSubscribed = function(/*String*/ topic, /*Function*/ func) { ... }
-/**
-* subscribe is used to subscribe a callback to a topic
-* @param {String} topic is the topic that will be listened
-* @param {Function} func is the name of the function of obj to call when a message is received on the topic
-*
-* func is a function that take a Object in parameter. the event received have this format:
-* {senderId:senderId, message:message, topic: topic}
-*
-*/
-Topic.prototype.subscribe = function(/*String*/ topic, /*Function*/ func) { ... }
-/**
-* unsubscribe is used to unsubscribe a callback to a topic
-* @param {String} topic is the topic
-* @param {Object} id is the id of the listener we want to unsubscribe
-*/
-Topic.prototype.unsubscribe = function(/*String*/ topic, /*Object*/ id) { ... }
-Topic.prototype.initCometdBridge = function() { ... }
-</programlisting> -->
+
</section>
@@ -251,43 +172,7 @@
<title>Example of Javascript events usage</title>
<programlisting language="XML" role="XML"><xi:include href="../../extras/PortalDevelopment_JavascriptInterApplicationCommunication/default157.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
- <!-- <programlisting language="HTML" role="HTML"><![CDATA[<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<portlet:defineObjects/>
-<div>
-<p>
-Received messages:
-<div id="received_<portlet:namespace/>">
-</div>
-</p>
-<p>
-Send message:
-<input type="text" id="msg_<portlet:namespace/>"/> <a href="#" onclick="send_<portlet:namespace/>();">send</a>
-</p>
-</div>
-<script type="text/javascript">
-Function.prototype.bind = function(object) {
-var method = this;
-return function() {
-method.apply(object, arguments);
-}
-}
-function send_<portlet:namespace/>() {
-var msg = document.getElementById("msg_<portlet:namespace/>").value;
-eXo.core.Topic.publish("<portlet:namespace/>", "/demo", msg);
-}
-function Listener_<portlet:namespace/>(){
-}
-Listener_<portlet:namespace/>.prototype.receiveMsg = function(event) {
-document.getElementById("received_<portlet:namespace/>").innerHTML =
-document.getElementById("received_<portlet:namespace/>").innerHTML + "<br />* " +
-event.senderId + ": " + event.message;
-}
-function init_<portlet:namespace/>() {
-var listener_<portlet:namespace/> = new Listener_<portlet:namespace/>();
-eXo.core.Topic.subscribe("/demo", listener_<portlet:namespace/>.receiveMsg.bind(listener_<portlet:namespace/>));
-}
-init_<portlet:namespace/>();
-</script>]]></programlisting> -->
+
</section>
</chapter>
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml 2011-04-27 06:25:29 UTC (rev 6353)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/PortletDevelopment/Standard.xml 2011-04-27 06:26:46 UTC (rev 6354)
@@ -501,7 +501,7 @@
<calloutlist>
<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.processAction">
<para>
- <literal>processAction</literal> is the method from <literal>GenericPorlet</literal> to override for the <emphasis>action</emphasis> phase.
+ <literal>processAction</literal> is the method from <literal>GenericPortlet</literal> to override for the <emphasis>action</emphasis> phase.
</para>
</callout>
<callout arearefs="area-Reference_Guide-JavaServer_Pages_Portlet_Example-Portlet_Class.getActionParameter">
13 years, 8 months
- 1
- 0
gatein SVN: r6353 - epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity.
by do-not-reply＠jboss.org
Author: smumford
Date: 2011-04-27 02:25:29 -0400 (Wed, 27 Apr 2011)
New Revision: 6353
Modified:
epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/LDAP.xml
Log:
JBEPP-727: Finalized LDAP Integration section
Modified: epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/LDAP.xml
===================================================================
--- epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/LDAP.xml 2011-04-27 06:01:09 UTC (rev 6352)
+++ epp/docs/branches/5.1/Reference_Guide/en-US/modules/AuthenticationAndIdentity/LDAP.xml 2011-04-27 06:25:29 UTC (rev 6353)
@@ -108,7 +108,7 @@
<substeps>
<step>
<para>
- Install your <application>LDAP</application> server.
+ Install your <application>LDAP</application> server by following the installation instructions provided for the product you are using.
</para>
<para>
If you are installing the <application>Red Hat Directory Server</application> (RHDS), you should refer to the Installation Guide at <ulink type="http" url="http://docs.redhat.com/docs/en-US/Red_Hat_Directory_Server/index.html"></ulink>.
@@ -267,14 +267,14 @@
</step>
</procedure>
- <section id="sect-Reference_Guide-LDAP_Integration-LDAP_in_Readonly_Mode">
- <title>LDAP in Readonly Mode</title>
+ <section id="sect-Reference_Guide-LDAP_Integration-LDAP_in_Read-only_Mode">
+ <title>LDAP in Read-only Mode</title>
<para>
- This section will show you how to add LDAP in readonly mode. This means that user data entries (both pre-existing, and newly added through the JBoss Enterprise Portal Platform User Interface) will be consumed though the Directory Server and LDAP services, but written to the underlying database. The only exception is that passwords updated via the UI will also be propagated into the appropriate LDAP entry.
+ This section will show you how to add LDAP in read-only mode. This means that user data entries (both pre-existing, and newly added through the JBoss Enterprise Portal Platform User Interface) will be consumed though the Directory Server and LDAP services, but written to the underlying database. The only exception is that passwords updated via the UI will also be propagated into the appropriate LDAP entry.
</para>
- <procedure id="proc-Reference_Guide-LDAP_Integration-LDAP_in_readonly_mode-Set_up_LDAP_readonly_Mode">
- <title>Set up LDAP readonly Mode</title>
+ <procedure id="proc-Reference_Guide-LDAP_Integration-LDAP_in_Read-only_mode-Set_up_LDAP_read-only_Mode">
+ <title>Set up LDAP read-only Mode</title>
<step>
<para>
Open the <filename><replaceable>ID_HOME</replaceable>/idm-configuration.xml</filename> file.
@@ -295,22 +295,22 @@
<itemizedlist>
<listitem>
<para>
- <xref linkend="proc-Reference_Guide-LDAP_Integration-LDAP_in_readonly_mode-Set_up_LDAP_readonly_Mode-RHDS_or_OpenDS"/>
+ <xref linkend="proc-Reference_Guide-LDAP_Integration-LDAP_in_Read-only_Mode-Set_up_LDAP_read-only_Mode-RHDS_or_OpenDS"/>
</para>
</listitem>
<listitem>
<para>
- <xref linkend="proc-Reference_Guide-LDAP_Integration-LDAP_in_readonly_mode-Set_up_LDAP_readonly_Mode-MSAD"/>
+ <xref linkend="proc-Reference_Guide-LDAP_Integration-LDAP_in_Read-only_Mode-Set_up_LDAP_read-only_Mode-MSAD"/>
</para>
</listitem>
<listitem>
<para>
- <xref linkend="proc-Reference_Guide-LDAP_Integration-LDAP_in_readonly_mode-Set_up_LDAP_readonly_Mode-OpenLDAP"/>
+ <xref linkend="proc-Reference_Guide-LDAP_Integration-LDAP_in_Read-only_Mode-Set_up_LDAP_read-only_Mode-OpenLDAP"/>
</para>
</listitem>
</itemizedlist>
- <procedure id="proc-Reference_Guide-LDAP_Integration-LDAP_in_readonly_mode-Set_up_LDAP_readonly_Mode-RHDS_or_OpenDS">
+ <procedure id="proc-Reference_Guide-LDAP_Integration-LDAP_in_Read-only_Mode-Set_up_LDAP_read-only_Mode-RHDS_or_OpenDS">
<title>Red Hat Directory Server or OpenDS</title>
<step>
<para>
@@ -335,17 +335,17 @@
</entry>
]]></programlisting>
<para>
- Refer to <xref linkend="exam-Reference_Guide-LDAP_Integration-Examples-groupTypeMappings"/> for more information about how these <parameter>groupTypeMappings</parameter> operate.
+ Refer to <xref linkend="exam-Reference_Guide-LDAP_Integration-Examples-Read_Only_groupTypeMappings"/> for more information about how these <parameter>groupTypeMappings</parameter> operate.
</para>
</step>
<step>
<para>
- Continue to <xref linkend="step-Reference_Guide-LDAP_Integration-LDAP_in_readonly_mode-Set_up_LDAP_readonly_Mode-Step-4"/>.
+ Continue to <xref linkend="step-Reference_Guide-LDAP_Integration-LDAP_in_Read-only_Mode-Set_up_LDAP_read-only_Mode-Step-4"/>.
</para>
</step>
</procedure>
- <procedure id="proc-Reference_Guide-LDAP_Integration-LDAP_in_readonly_mode-Set_up_LDAP_readonly_Mode-MSAD">
+ <procedure id="proc-Reference_Guide-LDAP_Integration-LDAP_in_Read-only_Mode-Set_up_LDAP_read-only_Mode-MSAD">
<title>Microsoft Active Directory</title>
<step>
<para>
@@ -365,20 +365,25 @@
</entry>
]]></programlisting>
<para>
- Refer to <xref linkend="exam-Reference_Guide-LDAP_Integration-Examples-groupTypeMappings"/> for more information about how these <parameter>groupTypeMappings</parameter> operate.
+ Refer to <xref linkend="exam-Reference_Guide-LDAP_Integration-Examples-Read_Only_groupTypeMappings"/> for more information about how these <parameter>groupTypeMappings</parameter> operate.
</para>
</step>
<step>
<para>
- Continue to <xref linkend="step-Reference_Guide-LDAP_Integration-LDAP_in_readonly_mode-Set_up_LDAP_readonly_Mode-Step-4"/>.
+ Continue to <xref linkend="step-Reference_Guide-LDAP_Integration-LDAP_in_Read-only_Mode-Set_up_LDAP_read-only_Mode-Step-4"/>.
</para>
</step>
</procedure>
- <procedure id="proc-Reference_Guide-LDAP_Integration-LDAP_in_readonly_mode-Set_up_LDAP_readonly_Mode-OpenLDAP">
+ <procedure id="proc-Reference_Guide-LDAP_Integration-LDAP_in_Read-only_Mode-Set_up_LDAP_read-only_Mode-OpenLDAP">
<title>OpenLDAP</title>
<step>
<para>
+ If you have not done so already, install your LDAP server. Refer to <xref linkend="proc-Reference_Guide-LDAP_Integration-LDAP_Set_Up"/> for some assistance.
+ </para>
+ </step>
+ <step>
+ <para>
Uncomment the line under "<emphasis>OpenLDAP ReadOnly "ACME" LDAP Example</emphasis>":
</para>
<programlisting language="XML" role="XML"><![CDATA[<!--OpenLDAP ReadOnly "ACME" LDAP Example-->
@@ -399,18 +404,18 @@
</entry>
]]></programlisting>
<para>
- Refer to <xref linkend="exam-Reference_Guide-LDAP_Integration-Examples-groupTypeMappings"/> for more information about how these <parameter>groupTypeMappings</parameter> operate.
+ Refer to <xref linkend="exam-Reference_Guide-LDAP_Integration-Examples-Read_Only_groupTypeMappings"/> for more information about how these <parameter>groupTypeMappings</parameter> operate.
</para>
</step>
<step>
<para>
- Continue to <xref linkend="step-Reference_Guide-LDAP_Integration-LDAP_in_readonly_mode-Set_up_LDAP_readonly_Mode-Step-4"/>.
+ Continue to <xref linkend="step-Reference_Guide-LDAP_Integration-LDAP_in_Read-only_Mode-Set_up_LDAP_read-only_Mode-Step-4"/>.
</para>
</step>
</procedure>
</step>
- <step id="step-Reference_Guide-LDAP_Integration-LDAP_in_readonly_mode-Set_up_LDAP_readonly_Mode-Step-4">
+ <step id="step-Reference_Guide-LDAP_Integration-LDAP_in_Read-only_Mode-Set_up_LDAP_read-only_Mode-Step-4">
<para>
To use a different LDAP server or directory data, edit the DS-specific <filename>.xml</filename> file you uncommented in <emphasis role="bold">Substep 3a</emphasis> above and change the values to suit your requirements.
</para>
@@ -467,7 +472,7 @@
</procedure>
<para>
- Users defined in LDAP should be visable in "<emphasis>Users and groups management</emphasis>" and groups from LDAP should be present as children of <emphasis>/acme/roles</emphasis> and <emphasis>/acme/organization_units</emphasis>.
+ Users defined in LDAP should be visible in "<emphasis>Users and groups management</emphasis>" and groups from LDAP should be present as children of <emphasis>/acme/roles</emphasis> and <emphasis>/acme/organization_units</emphasis>.
</para>
<para>
More information about configuration can be found in <xref linkend="sect-Reference_Guide-PicketLink_IDM_integration"/> and in the PicketLink project <ulink type="http" url="http://anonsvn.jboss.org/repos/picketlink/idm/downloads/docs/1.0.0.GA/Ref...">Reference Guide</ulink>.
@@ -477,12 +482,20 @@
<section id="sect-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store">
<title>LDAP as Default Store</title>
<para>
- The procedure to set LDAP up as the default identity store for JBoss Enterprise Portal Platform.
+ Follow the procedure below to set LDAP up as the default identity store for JBoss Enterprise Portal Platform. All default accounts and some of groups that comes with JBoss Enterprise Portal Platform will be created in the LDAP store.
</para>
+ <para>
+ The LDAP server will be configured to store part of the JBoss Enterprise Portal Platform group tree. This means that groups under specified part of the tree will be stored in directory server while all others will be stored in database.
+ </para>
<procedure id="proc-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store">
<title>Set up LDAP as Default Indentity Store</title>
<step>
<para>
+ If you have not done so already, install your LDAP server. Refer to <xref linkend="proc-Reference_Guide-LDAP_Integration-LDAP_Set_Up"/> for some assistance.
+ </para>
+ </step>
+ <step>
+ <para>
Open the <filename><replaceable>ID_HOME</replaceable>/idm-configuration.xml</filename> file.
</para>
<para>
@@ -496,129 +509,101 @@
</step>
<step>
<para>
- Uncomment the appropriate sample configuration values as described below, depending on which Directory Server you are implementing:
+ Uncomment the appropriate LDAP configuration entry depending on your LDAP server:
</para>
- <itemizedlist>
- <listitem>
- <para>
- <xref linkend="proc-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-RHDS_or_OpenDS"/>
- </para>
- </listitem>
- <listitem>
- <para>
- <xref linkend="proc-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-MSAD"/>
- </para>
- </listitem>
- <listitem>
- <para>
- <xref linkend="proc-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-OpenLDAP"/>
- </para>
- </listitem>
- </itemizedlist>
-
- <procedure id="proc-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-RHDS_or_OpenDS">
- <title>Red Hat Directory Server or OpenDS</title>
+ <procedure>
+ <title>For RHDS and OpenDS</title>
<step>
<para>
- Uncomment the line under "<emphasis>Read Only "ACME" LDAP Example</emphasis>":
- </para>
-<programlisting language="XML" role="XML"><![CDATA[<!--Read Only "ACME" LDAP Example-->
-<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-acme-config.xml</value>
+ Expose the entry under "<emphasis>Sample LDAP config</emphasis>":
+ </para>
+<programlisting language="XML" role="XML"><![CDATA[<!--Sample LDAP config-->
+<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-ldap-config.xml</value>
]]></programlisting>
-
</step>
<step>
<para>
- Uncomment the <parameter>groupTypeMappings</parameter> under "<emphasis>Uncomment for ACME LDAP example</emphasis>":
+ Continue to <xref linkend="step-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-Step-5"/>
</para>
-<programlisting language="XML" role="XML"><![CDATA[<entry>
- <key><string>/acme/roles/*</string></key>
- <value><string>acme_roles_type</string></value>
-</entry>
-<entry>
- <key><string>/acme/organization_units/*</string></key>
- <value><string>acme_ou_type</string></value>
-</entry>
-]]></programlisting>
- <para>
- Refer to <xref linkend="exam-Reference_Guide-LDAP_Integration-Examples-groupTypeMappings"/> for more information about how these <parameter>groupTypeMappings</parameter> operate.
- </para>
</step>
- <step>
- <para>
- Continue to <xref linkend="step-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-Step-4"/>.
- </para>
- </step>
</procedure>
-
- <procedure id="proc-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-MSAD">
- <title>Microsoft Active Directory</title>
- <step>
- <para>
- Uncomment the line under "<emphasis>MSAD Read Only "ACME" LDAP Example</emphasis>":
- </para>
-<programlisting language="XML" role="XML"><![CDATA[<!--MSAD Read Only "ACME" LDAP Example-->
-<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-msad-readonly-config.xml</value>
+ <procedure>
+ <title>For MSAD</title>
+ <step>
+ <para>
+ Expose the entry under "<emphasis>MSAD LDAP Example</emphasis>":
+ </para>
+<programlisting language="XML" role="XML"><![CDATA[<!--MSAD LDAP Example-->
+<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-msad-config.xml</value>
]]></programlisting>
+ <procedure>
+ <title>To use SSL encryption with MSAD:</title>
+ <step>
+ <para>
+ Open the <filename><replaceable>ID_HOME</replaceable>/picketlink-idm/examples/picketlink-idm-msad-config.xml</filename>.
+ </para>
+ </step>
+ <step>
+ <para>
+ Ensure the following entries are uncommented and that the path to the <filename>truststore</filename> file and password are correct:
+ </para>
+<programlisting><option>
+ <name>customSystemProperties</name>
+ <value>javax.net.ssl.trustStore=<replaceable>/path/to/truststore</replaceable></value>
+ <value>javax.net.ssl.trustStorePassword=<replaceable>password</replaceable></value>
+</option>
+</programlisting>
+ <para>
+ You can import a custom certificate by replacing the <replaceable>certificate</replaceable> and <replaceable>truststore</replaceable> details in the following command:
+ </para>
+<programlisting><command>keytool -import -file <filename><replaceable>certificate</replaceable></filename> -keystore <filename><replaceable>truststore</replaceable></filename></command>
+</programlisting>
+ </step>
+ </procedure>
</step>
<step>
<para>
- Uncomment the <parameter>groupTypeMappings</parameter> under "<emphasis>Uncomment for MSAD ReadOnly LDAP example</emphasis>":
+ Continue to <xref linkend="step-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-Step-5"/>
</para>
-<programlisting language="XML" role="XML"><![CDATA[<entry>
- <key><string>/acme/roles/*</string></key>
- <value><string>msad_roles_type</string></value>
-</entry>
-]]></programlisting>
- <para>
- Refer to <xref linkend="exam-Reference_Guide-LDAP_Integration-Examples-groupTypeMappings"/> for more information about how these <parameter>groupTypeMappings</parameter> operate.
- </para>
- </step>
+ </step>
+ </procedure>
+ <procedure>
+ <title>For OpenLDAP</title>
<step>
<para>
- Continue to <xref linkend="step-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-Step-4"/>.
+ Expose the entry under "<emphasis>OpenLDAP LDAP config</emphasis>":
</para>
- </step>
- </procedure>
-
- <procedure id="proc-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-OpenLDAP">
- <title>OpenLDAP</title>
- <step>
- <para>
- Uncomment the line under "<emphasis>OpenLDAP ReadOnly "ACME" LDAP Example</emphasis>":
- </para>
-<programlisting language="XML" role="XML"><![CDATA[<!--OpenLDAP ReadOnly "ACME" LDAP Example-->
-<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-acme-config.xml</value>
+<programlisting language="XML" role="XML"><![CDATA[<!--OpenLDAP LDAP config-->
+<value>war:/conf/organization/picketlink-idm/examples/picketlink-idm-openldap-config.xml</value>
]]></programlisting>
</step>
<step>
<para>
- Uncomment the <parameter>groupTypeMappings</parameter> under "<emphasis>Uncomment for ACME LDAP example</emphasis>":
+ Continue to <xref linkend="step-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-Step-5"/>
</para>
+ </step>
+ </procedure>
+ </step>
+ <step id="step-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-Step-5">
+ <para>
+ Uncomment the <parameter>groupTypeMappings</parameter> under "<emphasis>Uncomment for sample LDAP configuration</emphasis>":
+ </para>
<programlisting language="XML" role="XML"><![CDATA[<entry>
- <key><string>/acme/roles/*</string></key>
- <value><string>acme_roles_type</string></value>
+ <key><string>/platform/*</string></key>
+ <value><string>platform_type</string></value>
</entry>
<entry>
- <key><string>/acme/organization_units/*</string></key>
- <value><string>acme_ou_type</string></value>
+ <key><string>/organization/*</string></key>
+ <value><string>organization_type</string></value>
</entry>
]]></programlisting>
- <para>
- Refer to <xref linkend="exam-Reference_Guide-LDAP_Integration-Examples-groupTypeMappings"/> for more information about how these <parameter>groupTypeMappings</parameter> operate.
- </para>
- </step>
- <step>
- <para>
- Continue to <xref linkend="step-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-Step-4"/>.
- </para>
- </step>
- </procedure>
+ <para>
+ Refer to <xref linkend="exam-Reference_Guide-LDAP_Integration-Examples-Default_groupTypeMappings"/> for more information about how these <parameter>groupTypeMappings</parameter> operate.
+ </para>
</step>
-
- <step id="step-Reference_Guide-LDAP_Integration-LDAP_as_Default_Store-Set_up_LDAP_as_Default_Indentity_Store-Step-4">
+ <step>
<para>
- To use a different LDAP server or directory data, edit the DS-specific <filename>.xml</filename> file you uncommented in <emphasis role="bold">Substep 3a</emphasis> above and change the values to suit your requirements.
+ To use a different LDAP server or directory data, edit the DS-specific <filename>.xml</filename> file you uncommented in <emphasis role="bold">Step 4</emphasis> above and change the values to suit your requirements.
</para>
<para>
Refer to the list in <xref linkend="exam-Reference_Guide-LDAP_Integration-Examples-LDAP_configuration_options"/> for some examples or refer to the product-specific documentation for more information.
@@ -634,42 +619,6 @@
Navigate to the portal homepage (<ulink type="http" url="http://localhost:8080/portal"></ulink>) and log in as an administrator.
</para>
</step>
- <step>
- <para>
- Navigate to <menuchoice>
- <guimenu>Group</guimenu>
- <guimenuitem>Organization</guimenuitem>
- <guimenuitem>Users and groups management</guimenuitem>
- </menuchoice>.
- </para>
- <substeps>
- <step>
- <para>
- Create a new group called <emphasis>acme</emphasis> under the root node.
- </para>
- </step>
- <step>
- <itemizedlist>
- <listitem>
- <para>
- <emphasis role="bold">For RHDS, OpenDS and OpenLDAP</emphasis>:
- </para>
- <para>
- Create two sub-groups called <emphasis>roles</emphasis> and <emphasis>organization_units</emphasis>.
- </para>
- </listitem>
- <listitem>
- <para>
- <emphasis role="bold">For MSAD:</emphasis>
- </para>
- <para>
- Create a subgroup called <emphasis>roles</emphasis>.
- </para>
- </listitem>
- </itemizedlist>
- </step>
- </substeps>
- </step>
</procedure>
</section>
@@ -691,7 +640,7 @@
</listitem>
<listitem>
<para>
- One of the three example configuration files discussed in <xref linkend="proc-Reference_Guide-LDAP_Integration-LDAP_in_readonly_mode-Set_up_LDAP_readonly_Mode"/>:
+ One of the three example configuration files discussed in <xref linkend="proc-Reference_Guide-LDAP_Integration-LDAP_in_Read-only_mode-Set_up_LDAP_read-only_Mode"/>:
</para>
<simplelist>
<member><filename>picketlink-idm-ldap-acme-config.xml</filename></member>
@@ -734,7 +683,7 @@
</listitem>
<listitem>
<para>
- <emphasis role="bold">MSAD</emphasis>: CN=Users,DC=test,DC=domain (in two places)
+ <emphasis role="bold">MSAD</emphasis>: CN=Users,DC=test,DC=domain (in two places).
</para>
</listitem>
</itemizedlist>
@@ -747,7 +696,7 @@
The LDAP server connection URL. Formatted as "ldap://localhost:<replaceable><PORT></replaceable>". The default setting is: <emphasis>ldap://localhost:1389</emphasis>.
</para>
<para>
- <emphasis role="bold">MSAD</emphasis>: Should use SSL connection (ldaps://xxx:636) if password update or entry creation is expected to work.
+ <emphasis role="bold">MSAD</emphasis>: Should use SSL connection (ldaps://xxx:636) for password update or creation to work.
</para>
</listitem>
</varlistentry>
@@ -793,11 +742,6 @@
<para>
This option defines the values needed to use SSL encryption with LDAP.
</para>
- <para>
- To use it, ensure that it is is uncommented and that the path to the <filename>.truststore</filename> file and passward are correct.
- </para>
-<remark>DOCS NOTE: I didn't include the <emphasis>keytool</emphasis> command or the code snippet here, as
-</remark>
</listitem>
</varlistentry>
</variablelist>
@@ -807,32 +751,32 @@
Author [w/email]: Bolesław Dawidowicz (bdawidow(a)redhat.com), Jeff Yu
License: ??
-->
- <example id="exam-Reference_Guide-LDAP_Integration-Examples-groupTypeMappings">
- <title>groupTypeMappings</title>
+ <example id="exam-Reference_Guide-LDAP_Integration-Examples-Read_Only_groupTypeMappings">
+ <title>Read Only groupTypeMappings</title>
<para>
- The <parameter>groupTypeMappings</parameter> exposed in the <filename>idm-configuration.xml</filename> file correspond to <parameter>identity-object-type</parameter> values defined in the DS-specific configuration file referenced in <emphasis>Sub-step 3a</emphasis> of the DS-specific procedure.
+ The <parameter>groupTypeMappings</parameter> exposed in the <filename>idm-configuration.xml</filename> file correspond to <parameter>identity-object-type</parameter> values defined in the DS-specific configuration file (referenced in <emphasis>Sub-step 3a</emphasis> of the DS-specific procedure above).
</para>
<para>
For RHDS, OpenDS and OpenLDAP the <filename>picketlink-idm-ldap-acme-config.xml</filename> and <filename>picketlink-idm-openldap-acme-config.xml</filename> files contain the following values:
</para>
<programlistingco>
<areaspec>
- <areaset id="area-Reference_Guide-LDAP_Integration-Examples-config-opends" coords="">
- <area coords="10 40" id="area-Reference_Guide-LDAP_Integration-Examples-config-users-opends" />
- <area coords="14 40" id="area-Reference_Guide-LDAP_Integration-Examples-config-groups-opends" />
+ <areaset id="area-Reference_Guide-LDAP_Integration-Examples-Read_Only_groupTypeMappings-config-opends" coords="">
+ <area coords="10 40" id="area-Reference_Guide-LDAP_Integration-Examples-Read_Only_groupTypeMappings-config-users-opends" />
+ <area coords="14 40" id="area-Reference_Guide-LDAP_Integration-Examples-Read_Only_groupTypeMappings-config-groups-opends" />
</areaset>
- <area coords="17 40" id="area-Reference_Guide-LDAP_Integration-Examples-config-readonly-opends" />
+ <area coords="17 40" id="area-Reference_Guide-LDAP_Integration-Examples-Read_Only_groupTypeMappings-config-read-only-opends" />
</areaspec>
<programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_LDAP/readonly-opends.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
<calloutlist>
<!--#1-->
- <callout arearefs="area-Reference_Guide-LDAP_Integration-Examples-config-opends">
+ <callout arearefs="area-Reference_Guide-LDAP_Integration-Examples-Read_Only_groupTypeMappings-config-opends">
<para>
The PicketLink IDM configuration file dictates that users and those two group types be stored in LDAP.
</para>
</callout>
<!--#2-->
- <callout arearefs="area-Reference_Guide-LDAP_Integration-Examples-config-readonly-opends">
+ <callout arearefs="area-Reference_Guide-LDAP_Integration-Examples-Read_Only_groupTypeMappings-config-read-only-opends">
<para>
An additional option defines that nothing else (except password updates) should be written there.
</para>
@@ -851,5 +795,35 @@
The difference is that this configuration maps only one group type and points to the same container in LDAP for both users and mapped groups.
</para>
</example>
+
+ <example id="exam-Reference_Guide-LDAP_Integration-Examples-Default_groupTypeMappings">
+ <title>Default groupTypeMappings</title>
+ <para>
+ The <parameter>groupTypeMappings</parameter> exposed in the <filename>idm-configuration.xml</filename> file correspond to <parameter>identity-object-type</parameter> values defined in the DS-specific configuration file (referenced in <emphasis>Sub-step 3a</emphasis> of the DS-specific procedure above).
+ </para>
+ <para>
+ All of the supported LDAP configurations use the following values when implemented as the default identity store:
+ </para>
+ <programlistingco>
+ <areaspec>
+ <areaset id="area-Reference_Guide-LDAP_Integration-Examples-Default_groupTypeMappings-config" coords="">
+ <area coords="10 40" id="area-Reference_Guide-LDAP_Integration-Examples-Default_groupTypeMappings-config-1" />
+ <area coords="14 40" id="area-Reference_Guide-LDAP_Integration-Examples-Default_groupTypeMappings-config-2" />
+ </areaset>
+ </areaspec>
+<programlisting language="XML" role="XML"><xi:include href="../../extras/Authentication_Identity_LDAP/default-ldap.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+ <calloutlist>
+ <!--#1-->
+ <callout arearefs="area-Reference_Guide-LDAP_Integration-Examples-Default_groupTypeMappings-config">
+ <para>
+ The <parameter>groupTypeMappings</parameter> define that all groups under <parameter>/platform</parameter> should be stored in PicketLink IDM with the <parameter>platform_type</parameter> group type name and groups under <parameter>/organization</parameter> should be stored in PicketLink IDM with <parameter>organization_type</parameter> group type name.
+ </para>
+ <para>
+ The PicketLink IDM configuration file repository maps users and those two group types as stored in LDAP.
+ </para>
+ </callout>
+ </calloutlist>
+ </programlistingco>
+ </example>
</section>
</section>
\ No newline at end of file
13 years, 8 months
- 1
- 0
gatein SVN: r6352 - in components/pc/trunk: api and 15 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-04-27 02:01:09 -0400 (Wed, 27 Apr 2011)
New Revision: 6352
Modified:
components/pc/trunk/api/pom.xml
components/pc/trunk/bridge/pom.xml
components/pc/trunk/controller/pom.xml
components/pc/trunk/docs/pom.xml
components/pc/trunk/docs/user-guide/pom.xml
components/pc/trunk/federation/pom.xml
components/pc/trunk/jsr168api/pom.xml
components/pc/trunk/management/pom.xml
components/pc/trunk/mc/pom.xml
components/pc/trunk/pom.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portlet/pom.xml
components/pc/trunk/samples/pom.xml
components/pc/trunk/test/core/pom.xml
components/pc/trunk/test/pom.xml
components/pc/trunk/test/servers/pom.xml
components/pc/trunk/test/servers/tomcat7/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2011-04-27 06:00:37 UTC (rev 6351)
+++ components/pc/trunk/api/pom.xml 2011-04-27 06:01:09 UTC (rev 6352)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.pc</groupId>
Modified: components/pc/trunk/bridge/pom.xml
===================================================================
--- components/pc/trunk/bridge/pom.xml 2011-04-27 06:00:37 UTC (rev 6351)
+++ components/pc/trunk/bridge/pom.xml 2011-04-27 06:01:09 UTC (rev 6352)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-bridge</artifactId>
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2011-04-27 06:00:37 UTC (rev 6351)
+++ components/pc/trunk/controller/pom.xml 2011-04-27 06:01:09 UTC (rev 6352)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-controller</artifactId>
Modified: components/pc/trunk/docs/pom.xml
===================================================================
--- components/pc/trunk/docs/pom.xml 2011-04-27 06:00:37 UTC (rev 6351)
+++ components/pc/trunk/docs/pom.xml 2011-04-27 06:01:09 UTC (rev 6352)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
Modified: components/pc/trunk/docs/user-guide/pom.xml
===================================================================
--- components/pc/trunk/docs/user-guide/pom.xml 2011-04-27 06:00:37 UTC (rev 6351)
+++ components/pc/trunk/docs/user-guide/pom.xml 2011-04-27 06:01:09 UTC (rev 6352)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>docs-aggregator</artifactId>
- <version>2.3.0-Beta03</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<groupId>org.gatein.pc</groupId>
<artifactId>user-guide-${translation}</artifactId>
Modified: components/pc/trunk/federation/pom.xml
===================================================================
--- components/pc/trunk/federation/pom.xml 2011-04-27 06:00:37 UTC (rev 6351)
+++ components/pc/trunk/federation/pom.xml 2011-04-27 06:01:09 UTC (rev 6352)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-federation</artifactId>
Modified: components/pc/trunk/jsr168api/pom.xml
===================================================================
--- components/pc/trunk/jsr168api/pom.xml 2011-04-27 06:00:37 UTC (rev 6351)
+++ components/pc/trunk/jsr168api/pom.xml 2011-04-27 06:01:09 UTC (rev 6352)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-jsr168api</artifactId>
Modified: components/pc/trunk/management/pom.xml
===================================================================
--- components/pc/trunk/management/pom.xml 2011-04-27 06:00:37 UTC (rev 6351)
+++ components/pc/trunk/management/pom.xml 2011-04-27 06:01:09 UTC (rev 6352)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-management</artifactId>
Modified: components/pc/trunk/mc/pom.xml
===================================================================
--- components/pc/trunk/mc/pom.xml 2011-04-27 06:00:37 UTC (rev 6351)
+++ components/pc/trunk/mc/pom.xml 2011-04-27 06:01:09 UTC (rev 6352)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-mc</artifactId>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2011-04-27 06:00:37 UTC (rev 6351)
+++ components/pc/trunk/pom.xml 2011-04-27 06:01:09 UTC (rev 6352)
@@ -29,7 +29,7 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
@@ -39,9 +39,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/tags/2.3.0-Be...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/tags/2.3.0-Beta03</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/pc/tags/2.3.0-Beta03</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/pc/trunk</url>
</scm>
<properties>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2011-04-27 06:00:37 UTC (rev 6351)
+++ components/pc/trunk/portal/pom.xml 2011-04-27 06:01:09 UTC (rev 6352)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portal</artifactId>
Modified: components/pc/trunk/portlet/pom.xml
===================================================================
--- components/pc/trunk/portlet/pom.xml 2011-04-27 06:00:37 UTC (rev 6351)
+++ components/pc/trunk/portlet/pom.xml 2011-04-27 06:01:09 UTC (rev 6352)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portlet</artifactId>
Modified: components/pc/trunk/samples/pom.xml
===================================================================
--- components/pc/trunk/samples/pom.xml 2011-04-27 06:00:37 UTC (rev 6351)
+++ components/pc/trunk/samples/pom.xml 2011-04-27 06:01:09 UTC (rev 6352)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-samples</artifactId>
Modified: components/pc/trunk/test/core/pom.xml
===================================================================
--- components/pc/trunk/test/core/pom.xml 2011-04-27 06:00:37 UTC (rev 6351)
+++ components/pc/trunk/test/core/pom.xml 2011-04-27 06:01:09 UTC (rev 6352)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test</artifactId>
- <version>2.3.0-Beta03</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-core</artifactId>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2011-04-27 06:00:37 UTC (rev 6351)
+++ components/pc/trunk/test/pom.xml 2011-04-27 06:01:09 UTC (rev 6352)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test</artifactId>
Modified: components/pc/trunk/test/servers/pom.xml
===================================================================
--- components/pc/trunk/test/servers/pom.xml 2011-04-27 06:00:37 UTC (rev 6351)
+++ components/pc/trunk/test/servers/pom.xml 2011-04-27 06:01:09 UTC (rev 6352)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test</artifactId>
- <version>2.3.0-Beta03</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-servers</artifactId>
Modified: components/pc/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/pom.xml 2011-04-27 06:00:37 UTC (rev 6351)
+++ components/pc/trunk/test/servers/tomcat7/pom.xml 2011-04-27 06:01:09 UTC (rev 6352)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta03</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-tomcat7</artifactId>
@@ -166,7 +166,7 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-core</artifactId>
- <version>2.3.0-Beta03</version>
+ <version>2.3.0-Beta04-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
13 years, 8 months
- 1
- 0
gatein SVN: r6351 - components/pc/tags.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-04-27 02:00:37 -0400 (Wed, 27 Apr 2011)
New Revision: 6351
Added:
components/pc/tags/2.3.0-Beta03/
Log:
[maven-scm] copy for tag 2.3.0-Beta03
13 years, 8 months
- 1
- 0
gatein SVN: r6350 - in components/pc/trunk: api and 15 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-04-27 02:00:02 -0400 (Wed, 27 Apr 2011)
New Revision: 6350
Modified:
components/pc/trunk/api/pom.xml
components/pc/trunk/bridge/pom.xml
components/pc/trunk/controller/pom.xml
components/pc/trunk/docs/pom.xml
components/pc/trunk/docs/user-guide/pom.xml
components/pc/trunk/federation/pom.xml
components/pc/trunk/jsr168api/pom.xml
components/pc/trunk/management/pom.xml
components/pc/trunk/mc/pom.xml
components/pc/trunk/pom.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portlet/pom.xml
components/pc/trunk/samples/pom.xml
components/pc/trunk/test/core/pom.xml
components/pc/trunk/test/pom.xml
components/pc/trunk/test/servers/pom.xml
components/pc/trunk/test/servers/tomcat7/pom.xml
Log:
[maven-release-plugin] prepare release 2.3.0-Beta03
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2011-04-27 02:14:03 UTC (rev 6349)
+++ components/pc/trunk/api/pom.xml 2011-04-27 06:00:02 UTC (rev 6350)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03-SNAPSHOT</version>
+ <version>2.3.0-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.pc</groupId>
Modified: components/pc/trunk/bridge/pom.xml
===================================================================
--- components/pc/trunk/bridge/pom.xml 2011-04-27 02:14:03 UTC (rev 6349)
+++ components/pc/trunk/bridge/pom.xml 2011-04-27 06:00:02 UTC (rev 6350)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03-SNAPSHOT</version>
+ <version>2.3.0-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-bridge</artifactId>
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2011-04-27 02:14:03 UTC (rev 6349)
+++ components/pc/trunk/controller/pom.xml 2011-04-27 06:00:02 UTC (rev 6350)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03-SNAPSHOT</version>
+ <version>2.3.0-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-controller</artifactId>
Modified: components/pc/trunk/docs/pom.xml
===================================================================
--- components/pc/trunk/docs/pom.xml 2011-04-27 02:14:03 UTC (rev 6349)
+++ components/pc/trunk/docs/pom.xml 2011-04-27 06:00:02 UTC (rev 6350)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03-SNAPSHOT</version>
+ <version>2.3.0-Beta03</version>
</parent>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
Modified: components/pc/trunk/docs/user-guide/pom.xml
===================================================================
--- components/pc/trunk/docs/user-guide/pom.xml 2011-04-27 02:14:03 UTC (rev 6349)
+++ components/pc/trunk/docs/user-guide/pom.xml 2011-04-27 06:00:02 UTC (rev 6350)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>docs-aggregator</artifactId>
- <version>2.3.0-Beta03-SNAPSHOT</version>
+ <version>2.3.0-Beta03</version>
</parent>
<groupId>org.gatein.pc</groupId>
<artifactId>user-guide-${translation}</artifactId>
Modified: components/pc/trunk/federation/pom.xml
===================================================================
--- components/pc/trunk/federation/pom.xml 2011-04-27 02:14:03 UTC (rev 6349)
+++ components/pc/trunk/federation/pom.xml 2011-04-27 06:00:02 UTC (rev 6350)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03-SNAPSHOT</version>
+ <version>2.3.0-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-federation</artifactId>
Modified: components/pc/trunk/jsr168api/pom.xml
===================================================================
--- components/pc/trunk/jsr168api/pom.xml 2011-04-27 02:14:03 UTC (rev 6349)
+++ components/pc/trunk/jsr168api/pom.xml 2011-04-27 06:00:02 UTC (rev 6350)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03-SNAPSHOT</version>
+ <version>2.3.0-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-jsr168api</artifactId>
Modified: components/pc/trunk/management/pom.xml
===================================================================
--- components/pc/trunk/management/pom.xml 2011-04-27 02:14:03 UTC (rev 6349)
+++ components/pc/trunk/management/pom.xml 2011-04-27 06:00:02 UTC (rev 6350)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03-SNAPSHOT</version>
+ <version>2.3.0-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-management</artifactId>
Modified: components/pc/trunk/mc/pom.xml
===================================================================
--- components/pc/trunk/mc/pom.xml 2011-04-27 02:14:03 UTC (rev 6349)
+++ components/pc/trunk/mc/pom.xml 2011-04-27 06:00:02 UTC (rev 6350)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03-SNAPSHOT</version>
+ <version>2.3.0-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-mc</artifactId>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2011-04-27 02:14:03 UTC (rev 6349)
+++ components/pc/trunk/pom.xml 2011-04-27 06:00:02 UTC (rev 6350)
@@ -29,7 +29,7 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03-SNAPSHOT</version>
+ <version>2.3.0-Beta03</version>
<packaging>pom</packaging>
<parent>
@@ -39,9 +39,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/pc/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/tags/2.3.0-Be...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/tags/2.3.0-Beta03</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/pc/tags/2.3.0-Beta03</url>
</scm>
<properties>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2011-04-27 02:14:03 UTC (rev 6349)
+++ components/pc/trunk/portal/pom.xml 2011-04-27 06:00:02 UTC (rev 6350)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03-SNAPSHOT</version>
+ <version>2.3.0-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portal</artifactId>
Modified: components/pc/trunk/portlet/pom.xml
===================================================================
--- components/pc/trunk/portlet/pom.xml 2011-04-27 02:14:03 UTC (rev 6349)
+++ components/pc/trunk/portlet/pom.xml 2011-04-27 06:00:02 UTC (rev 6350)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03-SNAPSHOT</version>
+ <version>2.3.0-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portlet</artifactId>
Modified: components/pc/trunk/samples/pom.xml
===================================================================
--- components/pc/trunk/samples/pom.xml 2011-04-27 02:14:03 UTC (rev 6349)
+++ components/pc/trunk/samples/pom.xml 2011-04-27 06:00:02 UTC (rev 6350)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03-SNAPSHOT</version>
+ <version>2.3.0-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-samples</artifactId>
Modified: components/pc/trunk/test/core/pom.xml
===================================================================
--- components/pc/trunk/test/core/pom.xml 2011-04-27 02:14:03 UTC (rev 6349)
+++ components/pc/trunk/test/core/pom.xml 2011-04-27 06:00:02 UTC (rev 6350)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test</artifactId>
- <version>2.3.0-Beta03-SNAPSHOT</version>
+ <version>2.3.0-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-core</artifactId>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2011-04-27 02:14:03 UTC (rev 6349)
+++ components/pc/trunk/test/pom.xml 2011-04-27 06:00:02 UTC (rev 6350)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta03-SNAPSHOT</version>
+ <version>2.3.0-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test</artifactId>
Modified: components/pc/trunk/test/servers/pom.xml
===================================================================
--- components/pc/trunk/test/servers/pom.xml 2011-04-27 02:14:03 UTC (rev 6349)
+++ components/pc/trunk/test/servers/pom.xml 2011-04-27 06:00:02 UTC (rev 6350)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test</artifactId>
- <version>2.3.0-Beta03-SNAPSHOT</version>
+ <version>2.3.0-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-servers</artifactId>
Modified: components/pc/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/pom.xml 2011-04-27 02:14:03 UTC (rev 6349)
+++ components/pc/trunk/test/servers/tomcat7/pom.xml 2011-04-27 06:00:02 UTC (rev 6350)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta03-SNAPSHOT</version>
+ <version>2.3.0-Beta03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-tomcat7</artifactId>
@@ -166,7 +166,7 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-core</artifactId>
- <version>2.3.0-Beta03-SNAPSHOT</version>
+ <version>2.3.0-Beta03</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
13 years, 8 months
- 1
- 0
gatein SVN: r6349 - in portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org/exoplatform/portal/pom/config: tasks and 1 other directory.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2011-04-26 22:14:03 -0400 (Tue, 26 Apr 2011)
New Revision: 6349
Modified:
portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java
portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java
Log:
GTNPORTAL-1877 Group Navigation list is blank after add a node
Modified: portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2011-04-26 15:41:50 UTC (rev 6348)
+++ portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2011-04-27 02:14:03 UTC (rev 6349)
@@ -239,6 +239,11 @@
return prefs;
}
+ public POMSessionManager getManager()
+ {
+ return mgr;
+ }
+
private static final BaseEncodingObjectFormatter formatter = new BaseEncodingObjectFormatter();
public <O extends WorkspaceObject> Iterator<O> findObjects(ObjectType<O> type, ObjectType<? extends Site> siteType,
Modified: portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java 2011-04-26 15:41:50 UTC (rev 6348)
+++ portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/SearchTask.java 2011-04-27 02:14:03 UTC (rev 6349)
@@ -23,6 +23,7 @@
import org.exoplatform.commons.utils.ListAccess;
import org.exoplatform.portal.application.PortletPreferences;
import org.exoplatform.portal.config.Query;
+import org.exoplatform.portal.pom.config.POMSessionManager;
import org.exoplatform.portal.pom.config.POMTask;
import org.exoplatform.portal.pom.data.Mapper;
import org.exoplatform.portal.pom.data.NavigationData;
@@ -32,6 +33,7 @@
import org.exoplatform.portal.pom.config.POMSession;
import org.gatein.mop.api.workspace.Navigation;
import org.gatein.mop.api.workspace.ObjectType;
+import org.gatein.mop.api.workspace.Page;
import org.gatein.mop.api.workspace.Site;
import org.gatein.mop.api.workspace.Workspace;
import org.gatein.mop.api.workspace.WorkspaceObject;
@@ -64,7 +66,7 @@
super(query);
}
- public LazyPageList<T> run(final POMSession session) throws Exception
+ public final LazyPageList<T> run(final POMSession session) throws Exception
{
Iterator<W> ite;
try
@@ -84,18 +86,20 @@
}
//
- final ArrayList<W> array = new ArrayList<W>();
+ final ArrayList<String> array = new ArrayList<String>();
while (ite.hasNext())
{
- array.add(ite.next());
+ array.add(ite.next().getObjectId());
}
//
- final Iterator<W> it = array.iterator();
+ final POMSessionManager manager = session.getManager();
+ final Iterator<String> it = array.iterator();
ListAccess<T> la = new ListAccess<T>()
{
public T[] load(int index, int length) throws Exception, IllegalArgumentException
{
+ POMSession session = manager.getSession();
T[] result = createT(length);
for (int i = 0; i < length; i++)
{
@@ -120,7 +124,7 @@
protected abstract T[] createT(int length);
- protected abstract T loadT(POMSession session, W w);
+ protected abstract T loadT(POMSession session, String w);
}
@@ -143,9 +147,10 @@
return new PageData[length];
}
- protected PageData loadT(POMSession session, org.gatein.mop.api.workspace.Page w)
+ protected PageData loadT(POMSession session, String id)
{
- return new Mapper(session).load(w);
+ Page page = session.getManager().getPOMService().getModel().findObjectById(ObjectType.PAGE, id);
+ return new Mapper(session).load(page);
}
}
@@ -168,9 +173,10 @@
return new NavigationData[length];
}
- protected NavigationData loadT(POMSession session, Navigation w)
+ protected NavigationData loadT(POMSession session, String id)
{
- return new Mapper(session).load(w);
+ Navigation nav = session.getManager().getPOMService().getModel().findObjectById(ObjectType.NAVIGATION, id);
+ return new Mapper(session).load(nav);
}
}
13 years, 8 months
- 1
- 0