gatein SVN: r4685 - in components/wsrp/trunk: admin-gui and 9 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-15 10:17:27 -0400 (Fri, 15 Oct 2010)
New Revision: 4685
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/api/pom.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/hibernate-impl/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
components/wsrp/trunk/wsrp2-ws/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2010-10-15 14:17:06 UTC (rev 4684)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-10-15 14:17:27 UTC (rev 4685)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02</version>
+ <version>2.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/trunk/api/pom.xml
===================================================================
--- components/wsrp/trunk/api/pom.xml 2010-10-15 14:17:06 UTC (rev 4684)
+++ components/wsrp/trunk/api/pom.xml 2010-10-15 14:17:27 UTC (rev 4685)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02</version>
+ <version>2.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2010-10-15 14:17:06 UTC (rev 4684)
+++ components/wsrp/trunk/common/pom.xml 2010-10-15 14:17:27 UTC (rev 4685)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02</version>
+ <version>2.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2010-10-15 14:17:06 UTC (rev 4684)
+++ components/wsrp/trunk/consumer/pom.xml 2010-10-15 14:17:27 UTC (rev 4685)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02</version>
+ <version>2.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/trunk/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/trunk/hibernate-impl/pom.xml 2010-10-15 14:17:06 UTC (rev 4684)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-10-15 14:17:27 UTC (rev 4685)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02</version>
+ <version>2.0.0-Beta03-SNAPSHOT</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-10-15 14:17:06 UTC (rev 4684)
+++ components/wsrp/trunk/pom.xml 2010-10-15 14:17:27 UTC (rev 4685)
@@ -29,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02</version>
+ <version>2.0.0-Beta03-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -40,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-Beta02</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.0.0-Beta02</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2010-10-15 14:17:06 UTC (rev 4684)
+++ components/wsrp/trunk/producer/pom.xml 2010-10-15 14:17:27 UTC (rev 4685)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02</version>
+ <version>2.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/trunk/test/pom.xml
===================================================================
--- components/wsrp/trunk/test/pom.xml 2010-10-15 14:17:06 UTC (rev 4684)
+++ components/wsrp/trunk/test/pom.xml 2010-10-15 14:17:27 UTC (rev 4685)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02</version>
+ <version>2.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-10-15 14:17:06 UTC (rev 4684)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-10-15 14:17:27 UTC (rev 4685)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02</version>
+ <version>2.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-10-15 14:17:06 UTC (rev 4684)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-10-15 14:17:27 UTC (rev 4685)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02</version>
+ <version>2.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/trunk/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp2-ws/pom.xml 2010-10-15 14:17:06 UTC (rev 4684)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2010-10-15 14:17:27 UTC (rev 4685)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.0.0-Beta02</version>
+ <version>2.0.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
14 years
gatein SVN: r4684 - components/wsrp/tags.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-15 10:17:06 -0400 (Fri, 15 Oct 2010)
New Revision: 4684
Added:
components/wsrp/tags/2.0.0-Beta02/
Log:
[maven-scm] copy for tag 2.0.0-Beta02
Copied: components/wsrp/tags/2.0.0-Beta02 (from rev 4683, components/wsrp/trunk)
14 years
gatein SVN: r4683 - in components/wsrp/trunk: admin-gui and 9 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-15 10:16:46 -0400 (Fri, 15 Oct 2010)
New Revision: 4683
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/api/pom.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/hibernate-impl/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
components/wsrp/trunk/wsrp2-ws/pom.xml
Log:
[maven-release-plugin] prepare release 2.0.0-Beta02
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2010-10-15 14:13:40 UTC (rev 4682)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-10-15 14:16:46 UTC (rev 4683)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/trunk/api/pom.xml
===================================================================
--- components/wsrp/trunk/api/pom.xml 2010-10-15 14:13:40 UTC (rev 4682)
+++ components/wsrp/trunk/api/pom.xml 2010-10-15 14:16:46 UTC (rev 4683)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2010-10-15 14:13:40 UTC (rev 4682)
+++ components/wsrp/trunk/common/pom.xml 2010-10-15 14:16:46 UTC (rev 4683)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2010-10-15 14:13:40 UTC (rev 4682)
+++ components/wsrp/trunk/consumer/pom.xml 2010-10-15 14:16:46 UTC (rev 4683)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/trunk/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/trunk/hibernate-impl/pom.xml 2010-10-15 14:13:40 UTC (rev 4682)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-10-15 14:16:46 UTC (rev 4683)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta02</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-10-15 14:13:40 UTC (rev 4682)
+++ components/wsrp/trunk/pom.xml 2010-10-15 14:16:46 UTC (rev 4683)
@@ -21,8 +21,7 @@
~ 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>
@@ -30,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta02</version>
<packaging>pom</packaging>
@@ -41,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-Beta02</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.0.0-Beta02</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2010-10-15 14:13:40 UTC (rev 4682)
+++ components/wsrp/trunk/producer/pom.xml 2010-10-15 14:16:46 UTC (rev 4683)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/trunk/test/pom.xml
===================================================================
--- components/wsrp/trunk/test/pom.xml 2010-10-15 14:13:40 UTC (rev 4682)
+++ components/wsrp/trunk/test/pom.xml 2010-10-15 14:16:46 UTC (rev 4683)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-10-15 14:13:40 UTC (rev 4682)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-10-15 14:16:46 UTC (rev 4683)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-10-15 14:13:40 UTC (rev 4682)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-10-15 14:16:46 UTC (rev 4683)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/trunk/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp2-ws/pom.xml 2010-10-15 14:13:40 UTC (rev 4682)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2010-10-15 14:16:46 UTC (rev 4683)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
14 years
gatein SVN: r4682 - portal/trunk.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-15 10:13:40 -0400 (Fri, 15 Oct 2010)
New Revision: 4682
Modified:
portal/trunk/pom.xml
Log:
- Updated to use PC 2.2.0-BETA06.
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-10-15 14:10:44 UTC (rev 4681)
+++ portal/trunk/pom.xml 2010-10-15 14:13:40 UTC (rev 4682)
@@ -46,7 +46,7 @@
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.3-GA</org.gatein.common.version>
<org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version>
- <org.gatein.pc.version>2.2.0-Beta06-SNAPSHOT</org.gatein.pc.version>
+ <org.gatein.pc.version>2.2.0-Beta06</org.gatein.pc.version>
<org.picketlink.idm>1.1.6.GA</org.picketlink.idm>
<org.gatein.wsrp.version>2.0.0-Beta02-SNAPSHOT</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version>
14 years
gatein SVN: r4681 - components/wsrp/trunk.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-15 10:10:44 -0400 (Fri, 15 Oct 2010)
New Revision: 4681
Modified:
components/wsrp/trunk/pom.xml
Log:
- Updated to PC 2.2.0-Beta06.
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-10-15 13:48:57 UTC (rev 4680)
+++ components/wsrp/trunk/pom.xml 2010-10-15 14:10:44 UTC (rev 4681)
@@ -47,7 +47,7 @@
</scm>
<properties>
- <version.gatein.pc>2.2.0-Beta06-SNAPSHOT</version.gatein.pc>
+ <version.gatein.pc>2.2.0-Beta06</version.gatein.pc>
<version.gatein.common>2.0.3-GA</version.gatein.common>
<version.gatein.wci>2.0.2-GA</version.gatein.wci>
14 years
gatein SVN: r4680 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-10-15 09:48:57 -0400 (Fri, 15 Oct 2010)
New Revision: 4680
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
Log:
GTNPORTAL-1552: Make sure the navigational state is added when handling actions and serving resources. Make sure to not overwrite the navigational state unless a new value is being provided.
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2010-10-15 13:31:39 UTC (rev 4679)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2010-10-15 13:48:57 UTC (rev 4680)
@@ -97,6 +97,13 @@
HttpServletRequest request = prcontext.getRequest();
setupPublicRenderParams(uiPortlet, request.getParameterMap());
+ // set the navigational state
+ String navState =prcontext.getRequestParameter(ExoPortletInvocationContext.NAVIGATIONAL_STATE_PARAM_NAME);
+ if (navState != null)
+ {
+ uiPortlet.setNavigationalState(ParametersStateString.create(navState));
+ }
+
//
ActionInvocation actionInvocation = uiPortlet.create(ActionInvocation.class, prcontext);
if (actionInvocation == null)
@@ -187,7 +194,10 @@
//
StateString navigationalState = navStateResponse.getNavigationalState();
- uiPortlet.setNavigationalState(navigationalState);
+ if (navigationalState != null)
+ {
+ uiPortlet.setNavigationalState(navigationalState);
+ }
// update the public render parameters with the changes from the invocation
setupPublicRenderParams(uiPortlet, navStateResponse.getPublicNavigationalStateUpdates());
@@ -349,6 +359,13 @@
PortalRequestContext context = (PortalRequestContext)event.getRequestContext();
HttpServletResponse response = context.getResponse();
+ //Set the NavigationalState
+ String navState = context.getRequestParameter(ExoPortletInvocationContext.NAVIGATIONAL_STATE_PARAM_NAME);
+ if (navState != null)
+ {
+ uiPortlet.setNavigationalState(ParametersStateString.create(navState));
+ }
+
//
ResourceInvocation resourceInvocation = uiPortlet.create(ResourceInvocation.class, context);
@@ -568,7 +585,11 @@
PortletMode mode = new PortletMode(getPortletModeOrDefault(navResponse));
setNextMode(uiPortlet, mode);
- uiPortlet.setNavigationalState(navResponse.getNavigationalState());
+ StateString navState = navResponse.getNavigationalState();
+ if (navState != null)
+ {
+ uiPortlet.setNavigationalState(navResponse.getNavigationalState());
+ }
setupPublicRenderParams(uiPortlet, navResponse.getPublicNavigationalStateUpdates());
//TODO: (mwringe) add this to the UpdateNavigationStateResponse.Event class instead of here
14 years
gatein SVN: r4679 - in components/wci/branches/adf: test/core/src/main/java/org/gatein/wci/container and 10 other directories.
by do-not-reply＠jboss.org
Author: alain_defrance
Date: 2010-10-15 09:31:39 -0400 (Fri, 15 Oct 2010)
New Revision: 4679
Added:
components/wci/branches/adf/wci/src/main/doc/
components/wci/branches/adf/wci/src/main/doc/wci-authentication.odp
components/wci/branches/adf/wci/src/main/doc/wci-authentication.pdf
components/wci/branches/adf/wci/src/main/java/org/gatein/wci/authentication/AuthenticationException.java
Modified:
components/wci/branches/adf/jetty/src/main/java/org/gatein/wci/jetty/Jetty6ServletContainerContext.java
components/wci/branches/adf/test/core/src/main/java/org/gatein/wci/container/ServletContainerContextImpl.java
components/wci/branches/adf/test/core/src/main/java/org/gatein/wci/spi/SPIAuthenticationTestCase.java
components/wci/branches/adf/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java
components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java
components/wci/branches/adf/wci/src/main/java/org/gatein/wci/ServletContainer.java
components/wci/branches/adf/wci/src/main/java/org/gatein/wci/authentication/GenericAuthentication.java
components/wci/branches/adf/wci/src/main/java/org/gatein/wci/authentication/GenericAuthenticationResult.java
components/wci/branches/adf/wci/src/main/java/org/gatein/wci/authentication/TicketService.java
components/wci/branches/adf/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java
components/wci/branches/adf/wci/src/main/java/org/gatein/wci/impl/generic/GenericServletContainerContext.java
components/wci/branches/adf/wci/src/main/java/org/gatein/wci/spi/ServletContainerContext.java
Log:
Add tests & documentation
Modified: components/wci/branches/adf/jetty/src/main/java/org/gatein/wci/jetty/Jetty6ServletContainerContext.java
===================================================================
--- components/wci/branches/adf/jetty/src/main/java/org/gatein/wci/jetty/Jetty6ServletContainerContext.java 2010-10-15 13:31:22 UTC (rev 4678)
+++ components/wci/branches/adf/jetty/src/main/java/org/gatein/wci/jetty/Jetty6ServletContainerContext.java 2010-10-15 13:31:39 UTC (rev 4679)
@@ -62,9 +62,9 @@
this.registration = null;
}
- public AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validity)
+ public AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validityMillis)
{
- return GenericAuthentication.getInstance().login(userName, password, request, response, validity);
+ return GenericAuthentication.getInstance().login(userName, password, request, response, validityMillis);
}
public void logout(HttpServletRequest request, HttpServletResponse response)
Modified: components/wci/branches/adf/test/core/src/main/java/org/gatein/wci/container/ServletContainerContextImpl.java
===================================================================
--- components/wci/branches/adf/test/core/src/main/java/org/gatein/wci/container/ServletContainerContextImpl.java 2010-10-15 13:31:22 UTC (rev 4678)
+++ components/wci/branches/adf/test/core/src/main/java/org/gatein/wci/container/ServletContainerContextImpl.java 2010-10-15 13:31:39 UTC (rev 4679)
@@ -61,7 +61,7 @@
this.registration = null;
}
- public AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validity)
+ public AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validityMillis)
{
throw new UnsupportedOperationException();
}
Modified: components/wci/branches/adf/test/core/src/main/java/org/gatein/wci/spi/SPIAuthenticationTestCase.java
===================================================================
--- components/wci/branches/adf/test/core/src/main/java/org/gatein/wci/spi/SPIAuthenticationTestCase.java 2010-10-15 13:31:22 UTC (rev 4678)
+++ components/wci/branches/adf/test/core/src/main/java/org/gatein/wci/spi/SPIAuthenticationTestCase.java 2010-10-15 13:31:39 UTC (rev 4679)
@@ -25,6 +25,7 @@
import org.gatein.wci.WebRequest;
import org.gatein.wci.WebResponse;
import org.gatein.wci.authentication.AuthenticationEvent;
+import org.gatein.wci.authentication.AuthenticationException;
import org.gatein.wci.authentication.AuthenticationListener;
import org.gatein.wci.authentication.AuthenticationResult;
import org.gatein.wci.authentication.GenericAuthentication;
@@ -77,9 +78,28 @@
if (result instanceof GenericAuthenticationResult)
{
GenericAuthenticationResult gAuthentication = (GenericAuthenticationResult) result;
+ // Test Ticket Expiration
+ GenericAuthentication.getInstance();
+ String expireTicket = GenericAuthentication.TICKET_SERVICE.createTicket(new Credentials("foo", "bar"), 5);
+ boolean expired = false;
+ try
+ {
+ Thread.sleep(5);
+ GenericAuthentication.TICKET_SERVICE.validateTicket(expireTicket, true);
+ }
+ catch (InterruptedException ignore)
+ {
+ }
+ catch (AuthenticationException ae)
+ {
+ expired = true;
+ }
+ if (!expired) return new FailureResponse(Failure.createAssertionFailure(""));
+
+
// Test Ticket Service
Credentials srcCredentials = new Credentials(username, password);
- String ticket = GenericAuthentication.TICKET_SERVICE.createTicket(srcCredentials);
+ String ticket = GenericAuthentication.TICKET_SERVICE.createTicket(srcCredentials, TicketService.DEFAULT_VALIDITY);
Credentials resultCredentials = GenericAuthentication.TICKET_SERVICE.validateTicket(ticket, false);
assertEquals(srcCredentials.getUsername(), resultCredentials.getUsername());
assertEquals(srcCredentials.getPassword(), resultCredentials.getPassword());
Modified: components/wci/branches/adf/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java
===================================================================
--- components/wci/branches/adf/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java 2010-10-15 13:31:22 UTC (rev 4678)
+++ components/wci/branches/adf/tomcat6/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java 2010-10-15 13:31:39 UTC (rev 4679)
@@ -99,9 +99,9 @@
this.registration = null;
}
- public AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validity)
+ public AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validityMillis)
{
- return GenericAuthentication.getInstance().login(userName, password, request, response, validity);
+ return GenericAuthentication.getInstance().login(userName, password, request, response, validityMillis);
}
public void logout(HttpServletRequest request, HttpServletResponse response)
Modified: components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java
===================================================================
--- components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java 2010-10-15 13:31:22 UTC (rev 4678)
+++ components/wci/branches/adf/tomcat7/src/main/java/org/gatein/wci/tomcat/TC7ServletContainerContext.java 2010-10-15 13:31:39 UTC (rev 4679)
@@ -104,7 +104,7 @@
this.registration = null;
}
- public AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validity) throws ServletException
+ public AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validityMillis) throws ServletException
{
try
{
@@ -114,8 +114,7 @@
{
try
{
- GenericAuthentication.TICKET_SERVICE.setValidityMillis(TicketService.DEFAULT_VALIDITY);
- String ticket = GenericAuthentication.TICKET_SERVICE.createTicket(new Credentials(userName, password));
+ String ticket = GenericAuthentication.TICKET_SERVICE.createTicket(new Credentials(userName, password), TicketService.DEFAULT_VALIDITY);
String url = "j_security_check?j_username=" + userName + "&j_password=" + ticket;
url = response.encodeRedirectURL(url);
response.sendRedirect(url);
Added: components/wci/branches/adf/wci/src/main/doc/wci-authentication.odp
===================================================================
(Binary files differ)
Property changes on: components/wci/branches/adf/wci/src/main/doc/wci-authentication.odp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: components/wci/branches/adf/wci/src/main/doc/wci-authentication.pdf
===================================================================
(Binary files differ)
Property changes on: components/wci/branches/adf/wci/src/main/doc/wci-authentication.pdf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: components/wci/branches/adf/wci/src/main/java/org/gatein/wci/ServletContainer.java
===================================================================
--- components/wci/branches/adf/wci/src/main/java/org/gatein/wci/ServletContainer.java 2010-10-15 13:31:22 UTC (rev 4678)
+++ components/wci/branches/adf/wci/src/main/java/org/gatein/wci/ServletContainer.java 2010-10-15 13:31:39 UTC (rev 4679)
@@ -102,7 +102,7 @@
* @param userName the username which try to login
* @param password the password of the username
*/
- AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validity) throws ServletException;
+ AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validityMillis) throws ServletException;
/**
* Authentication support.
Added: components/wci/branches/adf/wci/src/main/java/org/gatein/wci/authentication/AuthenticationException.java
===================================================================
--- components/wci/branches/adf/wci/src/main/java/org/gatein/wci/authentication/AuthenticationException.java (rev 0)
+++ components/wci/branches/adf/wci/src/main/java/org/gatein/wci/authentication/AuthenticationException.java 2010-10-15 13:31:39 UTC (rev 4679)
@@ -0,0 +1,46 @@
+/*
+* Copyright (C) 2003-2009 eXo Platform SAS.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.gatein.wci.authentication;
+
+/**
+ * @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
+ * @version $Revision$
+ */
+public class AuthenticationException extends RuntimeException
+{
+ public AuthenticationException()
+ {
+ }
+
+ public AuthenticationException(String message)
+ {
+ super(message);
+ }
+
+ public AuthenticationException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+ public AuthenticationException(Throwable cause)
+ {
+ super(cause);
+ }
+}
Modified: components/wci/branches/adf/wci/src/main/java/org/gatein/wci/authentication/GenericAuthentication.java
===================================================================
--- components/wci/branches/adf/wci/src/main/java/org/gatein/wci/authentication/GenericAuthentication.java 2010-10-15 13:31:22 UTC (rev 4678)
+++ components/wci/branches/adf/wci/src/main/java/org/gatein/wci/authentication/GenericAuthentication.java 2010-10-15 13:31:39 UTC (rev 4679)
@@ -35,10 +35,9 @@
private GenericAuthentication() {}
- public AuthenticationResult login(String login, String password, HttpServletRequest request, HttpServletResponse response, long validity)
+ public AuthenticationResult login(String login, String password, HttpServletRequest request, HttpServletResponse response, long validityMillis)
{
- TICKET_SERVICE.setValidityMillis(validity);
- String ticket = TICKET_SERVICE.createTicket(new Credentials(login, password));
+ String ticket = TICKET_SERVICE.createTicket(new Credentials(login, password), validityMillis);
return new GenericAuthenticationResult(login, ticket);
}
Modified: components/wci/branches/adf/wci/src/main/java/org/gatein/wci/authentication/GenericAuthenticationResult.java
===================================================================
--- components/wci/branches/adf/wci/src/main/java/org/gatein/wci/authentication/GenericAuthenticationResult.java 2010-10-15 13:31:22 UTC (rev 4678)
+++ components/wci/branches/adf/wci/src/main/java/org/gatein/wci/authentication/GenericAuthenticationResult.java 2010-10-15 13:31:39 UTC (rev 4679)
@@ -26,7 +26,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.lang.reflect.Method;
/**
* @author <a href="mailto:alain.defrance@exoplatform.com">Alain Defrance</a>
Modified: components/wci/branches/adf/wci/src/main/java/org/gatein/wci/authentication/TicketService.java
===================================================================
--- components/wci/branches/adf/wci/src/main/java/org/gatein/wci/authentication/TicketService.java 2010-10-15 13:31:22 UTC (rev 4678)
+++ components/wci/branches/adf/wci/src/main/java/org/gatein/wci/authentication/TicketService.java 2010-10-15 13:31:39 UTC (rev 4679)
@@ -30,83 +30,69 @@
*/
public class TicketService
{
- public static final long DEFAULT_VALIDITY = 60 * 1000;
-
- protected long validityMillis;
+ public static final long DEFAULT_VALIDITY = 60 * 1000;
- protected final ConcurrentHashMap<String, Ticket> tickets = new ConcurrentHashMap<String, Ticket>();
+ protected final ConcurrentHashMap<String, Ticket> tickets = new ConcurrentHashMap<String, Ticket>();
- protected final Random random = new Random();
+ protected final Random random = new Random();
- public String createTicket(Credentials credentials)
- {
- if (validityMillis < 0)
- {
- throw new IllegalArgumentException();
- }
- if (credentials == null)
- {
- throw new NullPointerException();
- }
- String tokenId = nextTicketId();
- long expirationTimeMillis = System.currentTimeMillis() + validityMillis;
- tickets.put(tokenId, new Ticket(expirationTimeMillis, credentials));
- return tokenId;
- }
+ public String createTicket(Credentials credentials, long validityMillis)
+ {
+ if (validityMillis < 0)
+ {
+ throw new IllegalArgumentException("validityMillis must be positive");
+ }
+ if (credentials == null)
+ {
+ throw new NullPointerException();
+ }
+ String tokenId = nextTicketId();
+ long expirationTimeMillis = System.currentTimeMillis() + validityMillis;
+ tickets.put(tokenId, new Ticket(expirationTimeMillis, credentials));
+ return tokenId;
+ }
- public Credentials validateTicket(String stringKey, boolean remove)
- {
- if (stringKey == null)
- {
- throw new IllegalArgumentException("stringKey is null");
- }
+ public Credentials validateTicket(String stringKey, boolean remove)
+ {
+ if (stringKey == null)
+ {
+ throw new IllegalArgumentException("stringKey is null");
+ }
- Ticket token;
- try
- {
+ Ticket ticket;
if (remove)
{
- token = tickets.remove(stringKey);
+ ticket = tickets.remove(stringKey);
}
else
{
- token = tickets.get(stringKey);
+ ticket = tickets.get(stringKey);
}
- if (token != null)
+ if (ticket != null)
{
- boolean valid = token.getExpirationTimeMillis() > System.currentTimeMillis();
-
- if (valid)
- {
- return token.getPayload();
- }
- else if (!remove)
- {
- tickets.remove(stringKey);
- }
-
- }
- }
- catch (Exception ignore)
- {
- }
+ boolean valid = ticket.getExpirationTimeMillis() > System.currentTimeMillis();
- return null;
- }
+ if (valid)
+ {
+ return ticket.getPayload();
+ }
+ else if (!remove)
+ {
+ tickets.remove(stringKey);
+ }
+ if (!valid)
+ {
+ throw new AuthenticationException("Ticket " + stringKey + " has expired");
+ }
- private String nextTicketId()
- {
- return "wci-ticket-" + random.nextInt();
- }
+ }
- public long getValidityMillis()
- {
- return validityMillis;
- }
+ return null;
+ }
- public void setValidityMillis(long validityMillis)
- {
- this.validityMillis = validityMillis;
- }
+ private String nextTicketId()
+ {
+ return "wci-ticket-" + random.nextInt();
+ }
}
Modified: components/wci/branches/adf/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java
===================================================================
--- components/wci/branches/adf/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java 2010-10-15 13:31:22 UTC (rev 4678)
+++ components/wci/branches/adf/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java 2010-10-15 13:31:39 UTC (rev 4679)
@@ -99,9 +99,9 @@
}
/** . */
- public AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validity) throws ServletException
+ public AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validityMillis) throws ServletException
{
- AuthenticationResult result = registration.context.login(request, response, userName, password, validity);
+ AuthenticationResult result = registration.context.login(request, response, userName, password, validityMillis);
//
if (!(result instanceof GenericAuthenticationResult))
Modified: components/wci/branches/adf/wci/src/main/java/org/gatein/wci/impl/generic/GenericServletContainerContext.java
===================================================================
--- components/wci/branches/adf/wci/src/main/java/org/gatein/wci/impl/generic/GenericServletContainerContext.java 2010-10-15 13:31:22 UTC (rev 4678)
+++ components/wci/branches/adf/wci/src/main/java/org/gatein/wci/impl/generic/GenericServletContainerContext.java 2010-10-15 13:31:39 UTC (rev 4679)
@@ -130,9 +130,9 @@
this.registration = null;
}
- public AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validity)
+ public AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validityMillis)
{
- return GenericAuthentication.getInstance().login(userName, password, request, response, validity);
+ return GenericAuthentication.getInstance().login(userName, password, request, response, validityMillis);
}
public void logout(HttpServletRequest request, HttpServletResponse response)
Modified: components/wci/branches/adf/wci/src/main/java/org/gatein/wci/spi/ServletContainerContext.java
===================================================================
--- components/wci/branches/adf/wci/src/main/java/org/gatein/wci/spi/ServletContainerContext.java 2010-10-15 13:31:22 UTC (rev 4678)
+++ components/wci/branches/adf/wci/src/main/java/org/gatein/wci/spi/ServletContainerContext.java 2010-10-15 13:31:39 UTC (rev 4679)
@@ -82,7 +82,7 @@
* @param userName the username which try to login
* @param password the password of the username
*/
- AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validity) throws ServletException;
+ AuthenticationResult login(HttpServletRequest request, HttpServletResponse response, String userName, String password, long validityMillis) throws ServletException;
/**
* Authentication support.
14 years
gatein SVN: r4678 - in components/pc/trunk: api and 12 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-15 09:31:22 -0400 (Fri, 15 Oct 2010)
New Revision: 4678
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/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2010-10-15 13:30:59 UTC (rev 4677)
+++ components/pc/trunk/api/pom.xml 2010-10-15 13:31:22 UTC (rev 4678)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06</version>
+ <version>2.2.0-CR01-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 2010-10-15 13:30:59 UTC (rev 4677)
+++ components/pc/trunk/bridge/pom.xml 2010-10-15 13:31:22 UTC (rev 4678)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06</version>
+ <version>2.2.0-CR01-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 2010-10-15 13:30:59 UTC (rev 4677)
+++ components/pc/trunk/controller/pom.xml 2010-10-15 13:31:22 UTC (rev 4678)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06</version>
+ <version>2.2.0-CR01-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 2010-10-15 13:30:59 UTC (rev 4677)
+++ components/pc/trunk/docs/pom.xml 2010-10-15 13:31:22 UTC (rev 4678)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06</version>
+ <version>2.2.0-CR01-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 2010-10-15 13:30:59 UTC (rev 4677)
+++ components/pc/trunk/docs/user-guide/pom.xml 2010-10-15 13:31:22 UTC (rev 4678)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06</version>
+ <version>2.2.0-CR01-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 2010-10-15 13:30:59 UTC (rev 4677)
+++ components/pc/trunk/federation/pom.xml 2010-10-15 13:31:22 UTC (rev 4678)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06</version>
+ <version>2.2.0-CR01-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 2010-10-15 13:30:59 UTC (rev 4677)
+++ components/pc/trunk/jsr168api/pom.xml 2010-10-15 13:31:22 UTC (rev 4678)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06</version>
+ <version>2.2.0-CR01-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 2010-10-15 13:30:59 UTC (rev 4677)
+++ components/pc/trunk/management/pom.xml 2010-10-15 13:31:22 UTC (rev 4678)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06</version>
+ <version>2.2.0-CR01-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 2010-10-15 13:30:59 UTC (rev 4677)
+++ components/pc/trunk/mc/pom.xml 2010-10-15 13:31:22 UTC (rev 4678)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06</version>
+ <version>2.2.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-mc</artifactId>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2010-10-15 13:30:59 UTC (rev 4677)
+++ components/pc/trunk/pom.xml 2010-10-15 13:31:22 UTC (rev 4678)
@@ -29,7 +29,7 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06</version>
+ <version>2.2.0-CR01-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.2.0-Be...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/tags/2.2.0-Beta06</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/pc/tags/2.2.0-Beta06</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 2010-10-15 13:30:59 UTC (rev 4677)
+++ components/pc/trunk/portal/pom.xml 2010-10-15 13:31:22 UTC (rev 4678)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06</version>
+ <version>2.2.0-CR01-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 2010-10-15 13:30:59 UTC (rev 4677)
+++ components/pc/trunk/portlet/pom.xml 2010-10-15 13:31:22 UTC (rev 4678)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06</version>
+ <version>2.2.0-CR01-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 2010-10-15 13:30:59 UTC (rev 4677)
+++ components/pc/trunk/samples/pom.xml 2010-10-15 13:31:22 UTC (rev 4678)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06</version>
+ <version>2.2.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-samples</artifactId>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2010-10-15 13:30:59 UTC (rev 4677)
+++ components/pc/trunk/test/pom.xml 2010-10-15 13:31:22 UTC (rev 4678)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06</version>
+ <version>2.2.0-CR01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test</artifactId>
14 years
gatein SVN: r4677 - components/pc/tags.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-15 09:30:59 -0400 (Fri, 15 Oct 2010)
New Revision: 4677
Added:
components/pc/tags/2.2.0-Beta06/
Log:
[maven-scm] copy for tag 2.2.0-Beta06
Copied: components/pc/tags/2.2.0-Beta06 (from rev 4676, components/pc/trunk)
14 years
gatein SVN: r4676 - in components/pc/trunk: api and 12 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-15 09:30:38 -0400 (Fri, 15 Oct 2010)
New Revision: 4676
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/pom.xml
Log:
[maven-release-plugin] prepare release 2.2.0-Beta06
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2010-10-15 06:18:01 UTC (rev 4675)
+++ components/pc/trunk/api/pom.xml 2010-10-15 13:30:38 UTC (rev 4676)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06-SNAPSHOT</version>
+ <version>2.2.0-Beta06</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 2010-10-15 06:18:01 UTC (rev 4675)
+++ components/pc/trunk/bridge/pom.xml 2010-10-15 13:30:38 UTC (rev 4676)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06-SNAPSHOT</version>
+ <version>2.2.0-Beta06</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-bridge</artifactId>
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2010-10-15 06:18:01 UTC (rev 4675)
+++ components/pc/trunk/controller/pom.xml 2010-10-15 13:30:38 UTC (rev 4676)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06-SNAPSHOT</version>
+ <version>2.2.0-Beta06</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-controller</artifactId>
Modified: components/pc/trunk/docs/pom.xml
===================================================================
--- components/pc/trunk/docs/pom.xml 2010-10-15 06:18:01 UTC (rev 4675)
+++ components/pc/trunk/docs/pom.xml 2010-10-15 13:30:38 UTC (rev 4676)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06-SNAPSHOT</version>
+ <version>2.2.0-Beta06</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 2010-10-15 06:18:01 UTC (rev 4675)
+++ components/pc/trunk/docs/user-guide/pom.xml 2010-10-15 13:30:38 UTC (rev 4676)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06-SNAPSHOT</version>
+ <version>2.2.0-Beta06</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 2010-10-15 06:18:01 UTC (rev 4675)
+++ components/pc/trunk/federation/pom.xml 2010-10-15 13:30:38 UTC (rev 4676)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06-SNAPSHOT</version>
+ <version>2.2.0-Beta06</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-federation</artifactId>
Modified: components/pc/trunk/jsr168api/pom.xml
===================================================================
--- components/pc/trunk/jsr168api/pom.xml 2010-10-15 06:18:01 UTC (rev 4675)
+++ components/pc/trunk/jsr168api/pom.xml 2010-10-15 13:30:38 UTC (rev 4676)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06-SNAPSHOT</version>
+ <version>2.2.0-Beta06</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-jsr168api</artifactId>
Modified: components/pc/trunk/management/pom.xml
===================================================================
--- components/pc/trunk/management/pom.xml 2010-10-15 06:18:01 UTC (rev 4675)
+++ components/pc/trunk/management/pom.xml 2010-10-15 13:30:38 UTC (rev 4676)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06-SNAPSHOT</version>
+ <version>2.2.0-Beta06</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-management</artifactId>
Modified: components/pc/trunk/mc/pom.xml
===================================================================
--- components/pc/trunk/mc/pom.xml 2010-10-15 06:18:01 UTC (rev 4675)
+++ components/pc/trunk/mc/pom.xml 2010-10-15 13:30:38 UTC (rev 4676)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06-SNAPSHOT</version>
+ <version>2.2.0-Beta06</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-mc</artifactId>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2010-10-15 06:18:01 UTC (rev 4675)
+++ components/pc/trunk/pom.xml 2010-10-15 13:30:38 UTC (rev 4676)
@@ -29,7 +29,7 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06-SNAPSHOT</version>
+ <version>2.2.0-Beta06</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.2.0-Be...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/tags/2.2.0-Beta06</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/pc/tags/2.2.0-Beta06</url>
</scm>
<properties>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2010-10-15 06:18:01 UTC (rev 4675)
+++ components/pc/trunk/portal/pom.xml 2010-10-15 13:30:38 UTC (rev 4676)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06-SNAPSHOT</version>
+ <version>2.2.0-Beta06</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portal</artifactId>
Modified: components/pc/trunk/portlet/pom.xml
===================================================================
--- components/pc/trunk/portlet/pom.xml 2010-10-15 06:18:01 UTC (rev 4675)
+++ components/pc/trunk/portlet/pom.xml 2010-10-15 13:30:38 UTC (rev 4676)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06-SNAPSHOT</version>
+ <version>2.2.0-Beta06</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portlet</artifactId>
Modified: components/pc/trunk/samples/pom.xml
===================================================================
--- components/pc/trunk/samples/pom.xml 2010-10-15 06:18:01 UTC (rev 4675)
+++ components/pc/trunk/samples/pom.xml 2010-10-15 13:30:38 UTC (rev 4676)
@@ -1,9 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/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">
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06-SNAPSHOT</version>
+ <version>2.2.0-Beta06</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-samples</artifactId>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2010-10-15 06:18:01 UTC (rev 4675)
+++ components/pc/trunk/test/pom.xml 2010-10-15 13:30:38 UTC (rev 4676)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta06-SNAPSHOT</version>
+ <version>2.2.0-Beta06</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test</artifactId>
14 years