gatein SVN: r7804 - components/pc/tags.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-10-20 12:32:33 -0400 (Thu, 20 Oct 2011)
New Revision: 7804
Added:
components/pc/tags/2.3.0-Beta08/
Log:
[maven-release-plugin] copy for tag 2.3.0-Beta08
14 years, 6 months
gatein SVN: r7803 - in components/pc/trunk: api and 19 other directories.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-10-20 12:32:22 -0400 (Thu, 20 Oct 2011)
New Revision: 7803
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/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/jboss42/pom.xml
components/pc/trunk/test/servers/jboss51/pom.xml
components/pc/trunk/test/servers/jboss6/pom.xml
components/pc/trunk/test/servers/jetty6/pom.xml
components/pc/trunk/test/servers/pom.xml
components/pc/trunk/test/servers/tomcat6/pom.xml
components/pc/trunk/test/servers/tomcat7/pom.xml
Log:
[maven-release-plugin] prepare release 2.3.0-Beta08
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2011-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/api/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</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-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/bridge/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</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-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/controller/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</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-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/docs/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</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-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/docs/user-guide/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>docs-aggregator</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</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-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/federation/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</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-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/jsr168api/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</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-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/management/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-management</artifactId>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2011-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -33,7 +33,7 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</version>
<packaging>pom</packaging>
<name>GateIn - Portlet Container</name>
@@ -49,9 +49,9 @@
</issueManagement>
<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-Beta08</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/pc/tags/2.3.0-Beta08</url>
</scm>
<properties>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2011-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/portal/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</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-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/portlet/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</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-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/samples/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</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-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/test/core/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</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-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/test/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test</artifactId>
Modified: components/pc/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/pom.xml 2011-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/test/servers/jboss42/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss42</artifactId>
Modified: components/pc/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/pom.xml 2011-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/test/servers/jboss51/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss51</artifactId>
Modified: components/pc/trunk/test/servers/jboss6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/pom.xml 2011-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/test/servers/jboss6/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss6</artifactId>
Modified: components/pc/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/pom.xml 2011-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/test/servers/jetty6/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jetty6</artifactId>
Modified: components/pc/trunk/test/servers/pom.xml
===================================================================
--- components/pc/trunk/test/servers/pom.xml 2011-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/test/servers/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-servers</artifactId>
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-tomcat6</artifactId>
Modified: components/pc/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/pom.xml 2011-10-20 16:20:55 UTC (rev 7802)
+++ components/pc/trunk/test/servers/tomcat7/pom.xml 2011-10-20 16:32:22 UTC (rev 7803)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta08-SNAPSHOT</version>
+ <version>2.3.0-Beta08</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-tomcat7</artifactId>
14 years, 6 months
gatein SVN: r7802 - in components/pc/trunk: test and 8 other directories.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-10-20 12:20:55 -0400 (Thu, 20 Oct 2011)
New Revision: 7802
Modified:
components/pc/trunk/
components/pc/trunk/pom.xml
components/pc/trunk/test/core/pom.xml
components/pc/trunk/test/pom.xml
components/pc/trunk/test/servers/jboss42/pom.xml
components/pc/trunk/test/servers/jboss51/pom.xml
components/pc/trunk/test/servers/jboss6/pom.xml
components/pc/trunk/test/servers/jetty6/pom.xml
components/pc/trunk/test/servers/pom.xml
components/pc/trunk/test/servers/tomcat6/pom.xml
components/pc/trunk/test/servers/tomcat7/pom.xml
Log:
update dep and parent depdendencies and fix broken version in pom after last release
Property changes on: components/pc/trunk
___________________________________________________________________
Modified: svn:ignore
- target
.settings
.project
.idea
*.iml
+ target
.settings
.project
.idea
*.iml
*.iws
*.ipr
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
+++ components/pc/trunk/pom.xml 2011-10-20 16:20:55 UTC (rev 7802)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.1.0-Beta02</version>
+ <version>1.1.0-GA</version>
</parent>
<groupId>org.gatein.pc</groupId>
@@ -117,7 +117,7 @@
<dependency>
<groupId>org.gatein</groupId>
<artifactId>gatein-dep</artifactId>
- <version>1.1.0-Beta06</version>
+ <version>1.1.0-GA</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Modified: components/pc/trunk/test/core/pom.xml
===================================================================
--- components/pc/trunk/test/core/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
+++ components/pc/trunk/test/core/pom.xml 2011-10-20 16:20:55 UTC (rev 7802)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta08-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-10-20 15:32:36 UTC (rev 7801)
+++ components/pc/trunk/test/pom.xml 2011-10-20 16:20:55 UTC (rev 7802)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test</artifactId>
Modified: components/pc/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
+++ components/pc/trunk/test/servers/jboss42/pom.xml 2011-10-20 16:20:55 UTC (rev 7802)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss42</artifactId>
Modified: components/pc/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
+++ components/pc/trunk/test/servers/jboss51/pom.xml 2011-10-20 16:20:55 UTC (rev 7802)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss51</artifactId>
Modified: components/pc/trunk/test/servers/jboss6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
+++ components/pc/trunk/test/servers/jboss6/pom.xml 2011-10-20 16:20:55 UTC (rev 7802)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss6</artifactId>
Modified: components/pc/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
+++ components/pc/trunk/test/servers/jetty6/pom.xml 2011-10-20 16:20:55 UTC (rev 7802)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jetty6</artifactId>
Modified: components/pc/trunk/test/servers/pom.xml
===================================================================
--- components/pc/trunk/test/servers/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
+++ components/pc/trunk/test/servers/pom.xml 2011-10-20 16:20:55 UTC (rev 7802)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-servers</artifactId>
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-10-20 16:20:55 UTC (rev 7802)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-tomcat6</artifactId>
Modified: components/pc/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
+++ components/pc/trunk/test/servers/tomcat7/pom.xml 2011-10-20 16:20:55 UTC (rev 7802)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-tomcat7</artifactId>
14 years, 6 months
gatein SVN: r7801 - in components/pc/trunk: api and 10 other directories.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-10-20 11:32:36 -0400 (Thu, 20 Oct 2011)
New Revision: 7801
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/pom.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portlet/pom.xml
components/pc/trunk/samples/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-10-20 15:32:22 UTC (rev 7800)
+++ components/pc/trunk/api/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07</version>
+ <version>2.3.0-Beta08-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-10-20 15:32:22 UTC (rev 7800)
+++ components/pc/trunk/bridge/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07</version>
+ <version>2.3.0-Beta08-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-10-20 15:32:22 UTC (rev 7800)
+++ components/pc/trunk/controller/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07</version>
+ <version>2.3.0-Beta08-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-10-20 15:32:22 UTC (rev 7800)
+++ components/pc/trunk/docs/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07</version>
+ <version>2.3.0-Beta08-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-10-20 15:32:22 UTC (rev 7800)
+++ components/pc/trunk/docs/user-guide/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>docs-aggregator</artifactId>
- <version>2.3.0-Beta07</version>
+ <version>2.3.0-Beta08-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-10-20 15:32:22 UTC (rev 7800)
+++ components/pc/trunk/federation/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07</version>
+ <version>2.3.0-Beta08-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-10-20 15:32:22 UTC (rev 7800)
+++ components/pc/trunk/jsr168api/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07</version>
+ <version>2.3.0-Beta08-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-10-20 15:32:22 UTC (rev 7800)
+++ components/pc/trunk/management/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07</version>
+ <version>2.3.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-management</artifactId>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2011-10-20 15:32:22 UTC (rev 7800)
+++ components/pc/trunk/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
@@ -33,7 +33,7 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07</version>
+ <version>2.3.0-Beta08-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GateIn - Portlet Container</name>
@@ -49,9 +49,9 @@
</issueManagement>
<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-Beta07</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/pc/tags/2.3.0-Beta07</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-10-20 15:32:22 UTC (rev 7800)
+++ components/pc/trunk/portal/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07</version>
+ <version>2.3.0-Beta08-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-10-20 15:32:22 UTC (rev 7800)
+++ components/pc/trunk/portlet/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07</version>
+ <version>2.3.0-Beta08-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-10-20 15:32:22 UTC (rev 7800)
+++ components/pc/trunk/samples/pom.xml 2011-10-20 15:32:36 UTC (rev 7801)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07</version>
+ <version>2.3.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-samples</artifactId>
14 years, 6 months
gatein SVN: r7800 - components/pc/tags.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-10-20 11:32:22 -0400 (Thu, 20 Oct 2011)
New Revision: 7800
Added:
components/pc/tags/2.3.0-Beta07/
Log:
[maven-release-plugin] copy for tag 2.3.0-Beta07
14 years, 6 months
gatein SVN: r7799 - in components/pc/trunk: api and 10 other directories.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-10-20 11:32:10 -0400 (Thu, 20 Oct 2011)
New Revision: 7799
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/pom.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portlet/pom.xml
components/pc/trunk/samples/pom.xml
Log:
[maven-release-plugin] prepare release 2.3.0-Beta07
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2011-10-20 13:07:31 UTC (rev 7798)
+++ components/pc/trunk/api/pom.xml 2011-10-20 15:32:10 UTC (rev 7799)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta07</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-10-20 13:07:31 UTC (rev 7798)
+++ components/pc/trunk/bridge/pom.xml 2011-10-20 15:32:10 UTC (rev 7799)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta07</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-10-20 13:07:31 UTC (rev 7798)
+++ components/pc/trunk/controller/pom.xml 2011-10-20 15:32:10 UTC (rev 7799)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta07</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-10-20 13:07:31 UTC (rev 7798)
+++ components/pc/trunk/docs/pom.xml 2011-10-20 15:32:10 UTC (rev 7799)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta07</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-10-20 13:07:31 UTC (rev 7798)
+++ components/pc/trunk/docs/user-guide/pom.xml 2011-10-20 15:32:10 UTC (rev 7799)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>docs-aggregator</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta07</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-10-20 13:07:31 UTC (rev 7798)
+++ components/pc/trunk/federation/pom.xml 2011-10-20 15:32:10 UTC (rev 7799)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta07</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-10-20 13:07:31 UTC (rev 7798)
+++ components/pc/trunk/jsr168api/pom.xml 2011-10-20 15:32:10 UTC (rev 7799)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta07</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-10-20 13:07:31 UTC (rev 7798)
+++ components/pc/trunk/management/pom.xml 2011-10-20 15:32:10 UTC (rev 7799)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-management</artifactId>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2011-10-20 13:07:31 UTC (rev 7798)
+++ components/pc/trunk/pom.xml 2011-10-20 15:32:10 UTC (rev 7799)
@@ -33,7 +33,7 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta07</version>
<packaging>pom</packaging>
<name>GateIn - Portlet Container</name>
@@ -49,9 +49,9 @@
</issueManagement>
<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-Beta07</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/pc/tags/2.3.0-Beta07</url>
</scm>
<properties>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2011-10-20 13:07:31 UTC (rev 7798)
+++ components/pc/trunk/portal/pom.xml 2011-10-20 15:32:10 UTC (rev 7799)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta07</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-10-20 13:07:31 UTC (rev 7798)
+++ components/pc/trunk/portlet/pom.xml 2011-10-20 15:32:10 UTC (rev 7799)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta07</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-10-20 13:07:31 UTC (rev 7798)
+++ components/pc/trunk/samples/pom.xml 2011-10-20 15:32:10 UTC (rev 7799)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Beta07-SNAPSHOT</version>
+ <version>2.3.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-samples</artifactId>
14 years, 6 months
gatein SVN: r7798 - in epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools: src/brewscripts and 1 other directory.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-10-20 09:07:31 -0400 (Thu, 20 Oct 2011)
New Revision: 7798
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wci/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/src/brewscripts/get-maven-artifacts
Log:
JBEPP-1296 WCI update
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wci/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wci/pom.xml 2011-10-20 12:42:28 UTC (rev 7797)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wci/pom.xml 2011-10-20 13:07:31 UTC (rev 7798)
@@ -15,14 +15,16 @@
<packaging>pom</packaging>
<properties>
-
+ <!-- TODO: upgrade to maven 3 -->
+ <mead.target>jboss-epp-5-maven2</mead.target>
+
<mead.svn.base>${svn.base}</mead.svn.base>
<mead.svn.repo>${svn.gatein.repo}</mead.svn.repo>
<mead.svn.path>${gatein-wci.svnpath}</mead.svn.path>
<mead.build.profiles>jboss51</mead.build.profiles>
<mead.build.properties>container.unpack.dir=/maven/build/test-containers JBOSS_5_1_HOME=/maven/build/test-containers/jboss-5.1.0.GA tests.failOnError=true</mead.build.properties>
- <mead.patch.path>patches/org.gatein.wci-wci-parent/tags/2.0.0-GA</mead.patch.path>
+ <mead.patch.path>patches/org.gatein.wci-wci-parent/tags/2.1.0-GA</mead.patch.path>
</properties>
</project>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/src/brewscripts/get-maven-artifacts
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/src/brewscripts/get-maven-artifacts 2011-10-20 12:42:28 UTC (rev 7797)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/src/brewscripts/get-maven-artifacts 2011-10-20 13:07:31 UTC (rev 7798)
@@ -12,12 +12,13 @@
MAVEN_BASE = 'http://repo1.maven.org/maven2'
JBOSS_BASE = 'http://repository.jboss.org/nexus/content/groups/public-jboss'
OLD_JBOSS_BASE = 'http://repository.jboss.org/maven2'
+EXO_MAVEN = 'http://maven2.exoplatform.org/content/repositories/public/'
LINK_RE = re.compile(r'href="([^"]+)"')
parser = optparse.OptionParser(usage='%prog groupId:artifactId:type:version')
parser.add_option('--repo', dest='repos', help='Additional repo to check', action='append',
- default=[MAVEN_BASE, JBOSS_BASE, OLD_JBOSS_BASE])
+ default=[MAVEN_BASE, JBOSS_BASE, OLD_JBOSS_BASE, EXO_MAVEN])
options, args = parser.parse_args()
SUPPORTED_EXTS = []
14 years, 6 months
gatein SVN: r7797 - in epp/portal/branches/EPP_5_2_Branch: component/identity/src/main/java/org/exoplatform/services/organization/idm and 1 other directory.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-10-20 08:42:28 -0400 (Thu, 20 Oct 2011)
New Revision: 7797
Modified:
epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMMembershipListAccess.java
epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java
epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java
epp/portal/branches/EPP_5_2_Branch/pom.xml
Log:
JBEPP-1292 Unable to create new group when using LDAP
JBEPP-1060 Incorrect number of users returned by PersistenceManager.getUserCount() when using both DB and LDAP
JBEPP-908 Inefficient search by atrributes (email) when create or update user
Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMMembershipListAccess.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMMembershipListAccess.java 2011-10-20 12:33:14 UTC (rev 7796)
+++ epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMMembershipListAccess.java 2011-10-20 12:42:28 UTC (rev 7797)
@@ -53,6 +53,8 @@
private int size = -1;
+ private Membership lastExisting;
+
public IDMMembershipListAccess(Group group)
{
this.group = group;
@@ -95,9 +97,13 @@
roles = new LinkedList<Role>(getIDMService().getIdentitySession().getRoleManager().findRoles(user, null, crit));
}
- Membership[] memberships = new Membership[roles.size()];
- for (int i = 0; i < roles.size(); i++)
+ Membership[] memberships = new Membership[length];
+
+ //
+ int i = 0;
+
+ for (; i < roles.size(); i++)
{
Role role = roles.get(i);
@@ -108,11 +114,31 @@
MembershipImpl memb = new MembershipImpl();
memb.setGroupId(exoGroup.getId());
memb.setUserName(role.getUser().getId());
- memb.setMembershipType(role.getRoleType().getName());
+
+ // LDAP store may return raw membership type as role type
+ if(role.getRoleType().getName().equals("JBOSS_IDENTITY_MEMBERSHIP"))
+ {
+ memb.setMembershipType(getOrganizationService().getConfiguration().getAssociationMembershipType());
+ }
+ else
+ {
+ memb.setMembershipType(role.getRoleType().getName());
+ }
+
+ lastExisting = memb;
memberships[i] = memb;
}
+ // Size can be greater then number of existing memberships
+ if (length > roles.size())
+ {
+ for (; i < length; i++)
+ {
+ memberships[i] = lastExisting;
+ }
+ }
+
if (log.isTraceEnabled())
{
Tools.logMethodOut(
Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java 2011-10-20 12:33:14 UTC (rev 7796)
+++ epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java 2011-10-20 12:42:28 UTC (rev 7797)
@@ -53,6 +53,8 @@
private int size = -1;
+ private User lastExisting;
+
public IDMUserListAccess(UserQueryBuilder userQueryBuilder, int pageSize, boolean countAll)
{
this.userQueryBuilder = userQueryBuilder;
@@ -90,9 +92,11 @@
users = fullResults.subList(index, index + length);
}
- User[] exoUsers = new User[users.size()];
+ User[] exoUsers = new User[length];
- for (int i = 0; i < users.size(); i++)
+ int i = 0;
+
+ for (; i < users.size(); i++)
{
org.picketlink.idm.api.User user = users.get(i);
@@ -100,8 +104,18 @@
((UserDAOImpl)getOrganizationService().getUserHandler())
.populateUser(gtnUser, getIDMService().getIdentitySession());
exoUsers[i] = gtnUser;
+ lastExisting = gtnUser;
}
+ if (length > users.size())
+ {
+
+ for(; i < length; i++)
+ {
+ exoUsers[i] = lastExisting;
+ }
+ }
+
if (log.isTraceEnabled())
{
Tools.logMethodOut(
Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java 2011-10-20 12:33:14 UTC (rev 7796)
+++ epp/portal/branches/EPP_5_2_Branch/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java 2011-10-20 12:42:28 UTC (rev 7797)
@@ -491,6 +491,21 @@
}
};
}
+ else if (!q.getEmail().contains("*"))
+ {
+ return new ListAccess<User>()
+ {
+ public User[] load(int index, int length) throws Exception, IllegalArgumentException
+ {
+ return new User[0];
+ }
+
+ public int getSize() throws Exception
+ {
+ return 0;
+ }
+ };
+ }
}
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-20 12:33:14 UTC (rev 7796)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-20 12:42:28 UTC (rev 7797)
@@ -52,7 +52,7 @@
<org.gatein.dep.version>1.1.0-GA</org.gatein.dep.version>
<org.gatein.wci.version>2.1.0-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.3.0-Beta06</org.gatein.pc.version>
- <org.picketlink.idm>1.3.0.Alpha08</org.picketlink.idm>
+ <org.picketlink.idm>1.3.0.Alpha09</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.0-Beta07-EPP520</org.gatein.wsrp.version>
<org.gatein.mop.version>1.1.0-Beta07</org.gatein.mop.version>
<org.gatein.mgmt.version>1.0.0-Beta04</org.gatein.mgmt.version>
14 years, 6 months
gatein SVN: r7796 - in portal/trunk: component/identity/src/main/java/org/exoplatform/services/organization/idm and 1 other directory.
by do-not-reply＠jboss.org
Author: bdaw
Date: 2011-10-20 08:33:14 -0400 (Thu, 20 Oct 2011)
New Revision: 7796
Modified:
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMMembershipListAccess.java
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java
portal/trunk/pom.xml
Log:
GTNPORTAL-1913 Incorrect number of users returned by PersistenceManager.getUserCount() when using both DB and LDAP
GTNPORTAL-1887 Inefficient search by atrributes (email) when create or update user
GTNPORTAL-2226 Unable to create new group when using LDAP
Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMMembershipListAccess.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMMembershipListAccess.java 2011-10-20 09:26:03 UTC (rev 7795)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMMembershipListAccess.java 2011-10-20 12:33:14 UTC (rev 7796)
@@ -53,6 +53,8 @@
private int size = -1;
+ private Membership lastExisting;
+
public IDMMembershipListAccess(Group group)
{
this.group = group;
@@ -95,9 +97,13 @@
roles = new LinkedList<Role>(getIDMService().getIdentitySession().getRoleManager().findRoles(user, null, crit));
}
- Membership[] memberships = new Membership[roles.size()];
- for (int i = 0; i < roles.size(); i++)
+ Membership[] memberships = new Membership[length];
+
+ //
+ int i = 0;
+
+ for (; i < roles.size(); i++)
{
Role role = roles.get(i);
@@ -108,11 +114,31 @@
MembershipImpl memb = new MembershipImpl();
memb.setGroupId(exoGroup.getId());
memb.setUserName(role.getUser().getId());
- memb.setMembershipType(role.getRoleType().getName());
+
+ // LDAP store may return raw membership type as role type
+ if(role.getRoleType().getName().equals("JBOSS_IDENTITY_MEMBERSHIP"))
+ {
+ memb.setMembershipType(getOrganizationService().getConfiguration().getAssociationMembershipType());
+ }
+ else
+ {
+ memb.setMembershipType(role.getRoleType().getName());
+ }
+
+ lastExisting = memb;
memberships[i] = memb;
}
+ // Size can be greater then number of existing memberships
+ if (length > roles.size())
+ {
+ for (; i < length; i++)
+ {
+ memberships[i] = lastExisting;
+ }
+ }
+
if (log.isTraceEnabled())
{
Tools.logMethodOut(
Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java 2011-10-20 09:26:03 UTC (rev 7795)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java 2011-10-20 12:33:14 UTC (rev 7796)
@@ -53,6 +53,8 @@
private int size = -1;
+ private User lastExisting;
+
public IDMUserListAccess(UserQueryBuilder userQueryBuilder, int pageSize, boolean countAll)
{
this.userQueryBuilder = userQueryBuilder;
@@ -90,9 +92,11 @@
users = fullResults.subList(index, index + length);
}
- User[] exoUsers = new User[users.size()];
+ User[] exoUsers = new User[length];
- for (int i = 0; i < users.size(); i++)
+ int i = 0;
+
+ for (; i < users.size(); i++)
{
org.picketlink.idm.api.User user = users.get(i);
@@ -100,8 +104,18 @@
((UserDAOImpl)getOrganizationService().getUserHandler())
.populateUser(gtnUser, getIDMService().getIdentitySession());
exoUsers[i] = gtnUser;
+ lastExisting = gtnUser;
}
+ if (length > users.size())
+ {
+
+ for(; i < length; i++)
+ {
+ exoUsers[i] = lastExisting;
+ }
+ }
+
if (log.isTraceEnabled())
{
Tools.logMethodOut(
Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java 2011-10-20 09:26:03 UTC (rev 7795)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java 2011-10-20 12:33:14 UTC (rev 7796)
@@ -491,6 +491,21 @@
}
};
}
+ else if (!q.getEmail().contains("*"))
+ {
+ return new ListAccess<User>()
+ {
+ public User[] load(int index, int length) throws Exception, IllegalArgumentException
+ {
+ return new User[0];
+ }
+
+ public int getSize() throws Exception
+ {
+ return 0;
+ }
+ };
+ }
}
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-10-20 09:26:03 UTC (rev 7795)
+++ portal/trunk/pom.xml 2011-10-20 12:33:14 UTC (rev 7796)
@@ -46,7 +46,7 @@
<org.gatein.common.version>2.0.4-GA</org.gatein.common.version>
<org.gatein.wci.version>2.1.0-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.3.0-Beta06</org.gatein.pc.version>
- <org.picketlink.idm>1.3.0.Alpha08</org.picketlink.idm>
+ <org.picketlink.idm>1.3.0.Alpha09</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.0-Beta07</org.gatein.wsrp.version>
<org.gatein.mop.version>1.1.0-Beta06</org.gatein.mop.version>
<org.gatein.mgmt.version>1.0.0-Beta04</org.gatein.mgmt.version>
14 years, 6 months
gatein SVN: r7795 - epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-10-20 05:26:03 -0400 (Thu, 20 Oct 2011)
New Revision: 7795
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml
Log:
JBEPP-1091 Nicer distribution path in repo
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-10-20 02:34:43 UTC (rev 7794)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-10-20 09:26:03 UTC (rev 7795)
@@ -10,7 +10,8 @@
<version>5.2.0.ER05-SNAPSHOT</version>
</parent>
- <artifactId>distribution</artifactId>
+ <groupId>org.jboss.portal</groupId>
+ <artifactId>jboss-eap</artifactId>
<packaging>pom</packaging>
<name>Distribution</name>
<modules>
14 years, 6 months