You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2007/07/09 22:33:30 UTC

svn commit: r554756 - in /portals/jetspeed-2/trunk: ./ ant-tasks/ app-servers/ applications/ applications/demo/ applications/gems/ applications/j2-admin/ applications/rss/ applications/rss/rss-jar/ applications/rss/rss-war/ commons/ components/ compone...

Author: ate
Date: Mon Jul  9 13:33:26 2007
New Revision: 554756

URL: http://svn.apache.org/viewvc?view=rev&rev=554756
Log:
Switching trunk to 2.1.2-dev
Note: version 2.1.1 is pulled back and will not be released because of some blocking issues.
All 2.1.1 features and resolved issues are going to be merged with version 2.1.2

Modified:
    portals/jetspeed-2/trunk/ant-tasks/pom.xml
    portals/jetspeed-2/trunk/app-servers/pom.xml
    portals/jetspeed-2/trunk/applications/demo/pom.xml
    portals/jetspeed-2/trunk/applications/gems/pom.xml
    portals/jetspeed-2/trunk/applications/j2-admin/pom.xml
    portals/jetspeed-2/trunk/applications/pom.xml
    portals/jetspeed-2/trunk/applications/rss/pom.xml
    portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml
    portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml
    portals/jetspeed-2/trunk/commons/pom.xml
    portals/jetspeed-2/trunk/components/capability/pom.xml
    portals/jetspeed-2/trunk/components/cm/pom.xml
    portals/jetspeed-2/trunk/components/deploy-tool/pom.xml
    portals/jetspeed-2/trunk/components/file-cache/pom.xml
    portals/jetspeed-2/trunk/components/header-resource/pom.xml
    portals/jetspeed-2/trunk/components/id-generator/pom.xml
    portals/jetspeed-2/trunk/components/jetspeed/pom.xml
    portals/jetspeed-2/trunk/components/locator/pom.xml
    portals/jetspeed-2/trunk/components/page-manager/pom.xml
    portals/jetspeed-2/trunk/components/pom.xml
    portals/jetspeed-2/trunk/components/portal-site/pom.xml
    portals/jetspeed-2/trunk/components/portal/pom.xml
    portals/jetspeed-2/trunk/components/portlet-factory/pom.xml
    portals/jetspeed-2/trunk/components/prefs/pom.xml
    portals/jetspeed-2/trunk/components/profiler/pom.xml
    portals/jetspeed-2/trunk/components/rdbms/pom.xml
    portals/jetspeed-2/trunk/components/registry/pom.xml
    portals/jetspeed-2/trunk/components/rewriter/pom.xml
    portals/jetspeed-2/trunk/components/search/pom.xml
    portals/jetspeed-2/trunk/components/security-schema/pom.xml
    portals/jetspeed-2/trunk/components/security/pom.xml
    portals/jetspeed-2/trunk/components/serializer/pom.xml
    portals/jetspeed-2/trunk/components/sso/pom.xml
    portals/jetspeed-2/trunk/components/statistics/pom.xml
    portals/jetspeed-2/trunk/components/web-content/pom.xml
    portals/jetspeed-2/trunk/components/webapp-logging/pom.xml
    portals/jetspeed-2/trunk/enterprise/ear-full/pom.xml
    portals/jetspeed-2/trunk/enterprise/ear-min/pom.xml
    portals/jetspeed-2/trunk/enterprise/pom.xml
    portals/jetspeed-2/trunk/etc/import/pom.xml
    portals/jetspeed-2/trunk/etc/pom.xml
    portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config-demo.xml
    portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config.xml
    portals/jetspeed-2/trunk/installer/etc/ant-installer/build.xml
    portals/jetspeed-2/trunk/jetspeed-api/pom.xml
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/administration/PortalAdministration.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/administration/PortalAuthenticationConfiguration.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/administration/PortalConfiguration.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/aggregator/PortletContent.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/cache/ContentCacheKeyGenerator.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/cache/JetspeedCache.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/prefs/PreferencesProvider.java
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/request/RequestContext.java
    portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml
    portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml
    portals/jetspeed-2/trunk/layout-portlets/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/application/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/component/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal-component/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
    portals/jetspeed-2/trunk/maven-archetypes/shared-component/pom.xml
    portals/jetspeed-2/trunk/maven-plugin/project.xml
    portals/jetspeed-2/trunk/pom.xml
    portals/jetspeed-2/trunk/portal/pom.xml
    portals/jetspeed-2/trunk/project.properties
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/conf/jetspeed.properties
    portals/jetspeed-2/trunk/taglibs/pom.xml
    portals/jetspeed-2/trunk/taglibs/treecontrol/pom.xml
    portals/jetspeed-2/trunk/xdocs/download.xml
    portals/jetspeed-2/trunk/xdocs/getting-started-binary.xml
    portals/jetspeed-2/trunk/xdocs/getting-started-installer.xml
    portals/jetspeed-2/trunk/xdocs/getting-started-source.xml
    portals/jetspeed-2/trunk/xdocs/guides/guide-migration.xml
    portals/jetspeed-2/trunk/xdocs/guides/index.xml
    portals/jetspeed-2/trunk/xdocs/index.xml
    portals/jetspeed-2/trunk/xdocs/navigation.xml
    portals/jetspeed-2/trunk/xdocs/release-notes.xml

Modified: portals/jetspeed-2/trunk/ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/ant-tasks/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/ant-tasks/pom.xml (original)
+++ portals/jetspeed-2/trunk/ant-tasks/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/app-servers/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/app-servers/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/pom.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/applications/demo/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/demo/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/demo/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>applications</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>war</packaging>

Modified: portals/jetspeed-2/trunk/applications/gems/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/gems/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/applications/gems/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/gems/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>applications</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/applications/j2-admin/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>applications</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>war</packaging>

Modified: portals/jetspeed-2/trunk/applications/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/applications/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/applications/rss/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/rss/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>applications</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/rss-jar/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>rss-applications</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml (original)
+++ portals/jetspeed-2/trunk/applications/rss/rss-war/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>rss-applications</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>war</packaging>

Modified: portals/jetspeed-2/trunk/commons/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/commons/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/commons/pom.xml (original)
+++ portals/jetspeed-2/trunk/commons/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/capability/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/capability/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/capability/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/capability/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/cm/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/cm/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/deploy-tool/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/file-cache/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/file-cache/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/file-cache/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/file-cache/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/header-resource/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/header-resource/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/header-resource/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/header-resource/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/id-generator/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/id-generator/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/id-generator/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/id-generator/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/jetspeed/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/locator/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/locator/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/locator/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/locator/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/page-manager/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/components/portal-site/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal-site/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/portal-site/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/portal/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/portlet-factory/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portlet-factory/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/portlet-factory/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/portlet-factory/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/prefs/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/prefs/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/prefs/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/prefs/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/profiler/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/profiler/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/profiler/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/profiler/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/rdbms/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rdbms/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/rdbms/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/rdbms/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/registry/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/registry/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/rewriter/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rewriter/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/rewriter/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/rewriter/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/search/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/search/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/search/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/search/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/security-schema/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security-schema/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/security-schema/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/security-schema/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/security/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/security/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/security/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/serializer/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/serializer/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/sso/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/sso/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/sso/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/statistics/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/statistics/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/web-content/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/web-content/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/components/webapp-logging/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/webapp-logging/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/components/webapp-logging/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/webapp-logging/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>components</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/enterprise/ear-full/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/enterprise/ear-full/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/enterprise/ear-full/pom.xml (original)
+++ portals/jetspeed-2/trunk/enterprise/ear-full/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-enterprise</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>    
     <packaging>ear</packaging>

Modified: portals/jetspeed-2/trunk/enterprise/ear-min/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/enterprise/ear-min/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/enterprise/ear-min/pom.xml (original)
+++ portals/jetspeed-2/trunk/enterprise/ear-min/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-enterprise</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>    
     <packaging>ear</packaging>

Modified: portals/jetspeed-2/trunk/enterprise/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/enterprise/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/enterprise/pom.xml (original)
+++ portals/jetspeed-2/trunk/enterprise/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/etc/import/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/import/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/etc/import/pom.xml (original)
+++ portals/jetspeed-2/trunk/etc/import/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/etc/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/etc/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/etc/pom.xml (original)
+++ portals/jetspeed-2/trunk/etc/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config-demo.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config-demo.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config-demo.xml (original)
+++ portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config-demo.xml Mon Jul  9 13:33:26 2007
@@ -25,7 +25,7 @@
   windowIcon="/resources/feather-small.png" defaultImageResource="/resources/Jetspeed_blue_med.png" minJavaVersion="1.4"
   wide="700:250" antialiased="true">
 
-  <page type="input" name="intro" displayText="Welcome to the Jetspeed Enterprise Portal 2.1.1">
+  <page type="input" name="intro" displayText="Welcome to the Jetspeed Enterprise Portal 2.1.2">
     <comment displayText="" />
     <comment displayText="This installer will guide you through setting up the Jetspeed Portal Demo." />
   </page>
@@ -33,15 +33,15 @@
   <page type="license" name="license" displayText="License conditions" resource="/LICENSE.TXT"></page>
 
   <page type="input" name="properties" displayText="Installation location">
-    <directory property="installDir" defaultValue="${java.user.home}/Jetspeed-2.1.1"
-      defaultValueWin="C:\Apache\Jetspeed-2.1.1" displayText="Select an installation directory" create="true"
+    <directory property="installDir" defaultValue="${java.user.home}/Jetspeed-2.1.2"
+      defaultValueWin="C:\Apache\Jetspeed-2.1.2" displayText="Select an installation directory" create="true"
       checkExists="true" />
     <comment displayText=""/>
     <comment displayText="Warning: on Windows, the location must not contain spaces." bold="true"/>
   </page>
 
   <page type="input" name="requiredComponents" displayText="Components selection">
-    <comment displayText="Jetspeed Enterprise Portal version 2.1.1" bold="true" />
+    <comment displayText="Jetspeed Enterprise Portal version 2.1.2" bold="true" />
     <target displayText="Tomcat 5.5.20 Webserver" target="install" defaultValue="true" force="true" />
     <checkbox displayText="Jetspeed Portal" property="dummy" defaultValue="true" force="true" />
     <checkbox displayText="Layout Portlets" property="dummy" defaultValue="true" force="true" />

Modified: portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config.xml (original)
+++ portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config.xml Mon Jul  9 13:33:26 2007
@@ -23,11 +23,11 @@
   "http://antinstaller.sourceforge.net/dtd/antinstall-config-0.8.dtd">
 -->
 
-<installer ui="swing,text" verbose="false" lookAndFeel="jgoodies" name="Jetspeed Enterprise Portal 2.1.1 Installer"
+<installer ui="swing,text" verbose="false" lookAndFeel="jgoodies" name="Jetspeed Enterprise Portal 2.1.2 Installer"
   windowIcon="/resources/feather-small.png" defaultImageResource="/resources/Jetspeed_blue_med.png" minJavaVersion="1.4"
   wide="700:250" antialiased="true">
 
-  <page type="input" name="intro" displayText="Welcome to the Jetspeed Enterprise Portal 2.1.1">
+  <page type="input" name="intro" displayText="Welcome to the Jetspeed Enterprise Portal 2.1.2">
     <comment displayText="" />
     <comment displayText="This installer will guide you through setting up the Jetspeed Portal." />
   </page>
@@ -35,15 +35,15 @@
   <page type="license" name="license" displayText="License conditions" resource="/LICENSE.TXT"></page>
 
   <page type="input" name="properties" displayText="Installation location">
-    <directory property="installDir" defaultValue="${java.user.home}/Jetspeed-2.1.1"
-      defaultValueWin="C:\Apache\Jetspeed-2.1.1" displayText="Select an installation directory" create="true"
+    <directory property="installDir" defaultValue="${java.user.home}/Jetspeed-2.1.2"
+      defaultValueWin="C:\Apache\Jetspeed-2.1.2" displayText="Select an installation directory" create="true"
       checkExists="true" />
     <comment displayText=""/>
     <comment displayText="Warning: on Windows, the location must not contain spaces." bold="true"/>
   </page>
 
   <page type="input" name="requiredComponents" displayText="Components selection">
-    <comment displayText="Jetspeed Enterprise Portal version 2.1.1" bold="true" />
+    <comment displayText="Jetspeed Enterprise Portal version 2.1.2" bold="true" />
     <target displayText="Tomcat 5.5.20 Webserver" target="install" defaultValue="true" force="true" />
     <checkbox displayText="Jetspeed Portal" property="dummy" defaultValue="true" force="true" />
     <checkbox displayText="Layout Portlets" property="dummy" defaultValue="true" force="true" />

Modified: portals/jetspeed-2/trunk/installer/etc/ant-installer/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/ant-installer/build.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/installer/etc/ant-installer/build.xml (original)
+++ portals/jetspeed-2/trunk/installer/etc/ant-installer/build.xml Mon Jul  9 13:33:26 2007
@@ -35,7 +35,7 @@
       <fileset dir="${installDir}" includes="**/*"/>
     </delete>
 
-    <echo>Installing Jetspeed-2.1.1 Enterprise Portal</echo>
+    <echo>Installing Jetspeed-2.1.2 Enterprise Portal</echo>
     <unzip src="${antinstaller.jar}" dest="${installDir}">
       <patternset>
         <include name="portal.zip" />

Modified: portals/jetspeed-2/trunk/jetspeed-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/pom.xml (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/administration/PortalAdministration.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/administration/PortalAdministration.java?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/administration/PortalAdministration.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/administration/PortalAdministration.java Mon Jul  9 13:33:26 2007
@@ -52,7 +52,7 @@
      * @param folderTemplate The full PSML path name of a folder to be deep
      *               copied as the new user's set of folders, pages, links
      * @param subsite The subsite folder to place the new user in
-     * @since 2.1.1              
+     * @since 2.1.2              
      */
     void registerUser(String userName, 
                       String password, 

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/administration/PortalAuthenticationConfiguration.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/administration/PortalAuthenticationConfiguration.java?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/administration/PortalAuthenticationConfiguration.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/administration/PortalAuthenticationConfiguration.java Mon Jul  9 13:33:26 2007
@@ -22,7 +22,7 @@
  * 
  * 
  * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @since 2.1.1
+ * @since 2.1.2
  * @version $Id: $
  */
 public interface PortalAuthenticationConfiguration

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/administration/PortalConfiguration.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/administration/PortalConfiguration.java?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/administration/PortalConfiguration.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/administration/PortalConfiguration.java Mon Jul  9 13:33:26 2007
@@ -28,7 +28,7 @@
  * with the requirements of interface-driven development and zero dependencies in API
  * 
  * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @since 2.1.1
+ * @since 2.1.2
  * @version $Id: $
  */
 public interface PortalConfiguration

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/aggregator/PortletContent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/aggregator/PortletContent.java?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/aggregator/PortletContent.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/aggregator/PortletContent.java Mon Jul  9 13:33:26 2007
@@ -81,7 +81,7 @@
     
     /**
      * Get the cache key used to cache this content
-     * @since 2.1.1 
+     * @since 2.1.2 
      * @return
      */
     ContentCacheKey getCacheKey();

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/cache/ContentCacheKeyGenerator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/cache/ContentCacheKeyGenerator.java?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/cache/ContentCacheKeyGenerator.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/cache/ContentCacheKeyGenerator.java Mon Jul  9 13:33:26 2007
@@ -33,7 +33,7 @@
      * 
      * @param context
      * @param windowId The window id of the portlet to be cached.
-     * @since 2.1.1
+     * @since 2.1.2
      * @return
      */
     ContentCacheKey createCacheKey(RequestContext context, String windowId);

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/cache/JetspeedCache.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/cache/JetspeedCache.java?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/cache/JetspeedCache.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/cache/JetspeedCache.java Mon Jul  9 13:33:26 2007
@@ -106,7 +106,7 @@
      * 
      * @param rc
      * @param windowId
-     * @since 2.1.1
+     * @since 2.1.2
      * @return
      */
     ContentCacheKey createCacheKey(RequestContext rc, String windowId);

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/prefs/PreferencesProvider.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/prefs/PreferencesProvider.java?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/prefs/PreferencesProvider.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/prefs/PreferencesProvider.java Mon Jul  9 13:33:26 2007
@@ -72,7 +72,7 @@
      * @param name the name of the property to add to the node
      * @param value the value of the property to add to the node
      * @return the newly created property
-     * @since 2.1.1
+     * @since 2.1.2
      */
     Property createProperty(Node node, String name, Object value);
     

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/request/RequestContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/request/RequestContext.java?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/request/RequestContext.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/request/RequestContext.java Mon Jul  9 13:33:26 2007
@@ -444,7 +444,7 @@
      * Return a map of Jetspeed Request Context objects configured via Spring Map
      * 
      * @return a Map of request context objects
-     * @since 2.1.1
+     * @since 2.1.2
      */
     Map getObjects();
 }

Modified: portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml (original)
+++ portals/jetspeed-2/trunk/layout-portlets/layout-portlets-jar/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>layout-portlets</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml (original)
+++ portals/jetspeed-2/trunk/layout-portlets/layout-portlets-war/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>layout-portlets</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>war</packaging>

Modified: portals/jetspeed-2/trunk/layout-portlets/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/pom.xml (original)
+++ portals/jetspeed-2/trunk/layout-portlets/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/application/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/application/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/application/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/application/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>maven-archetypes</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/component/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/component/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/component/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/component/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>maven-archetypes</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal-component/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal-component/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal-component/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal-component/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>maven-archetypes</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal-resources/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>maven-archetypes</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>maven-archetypes</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/etc/dbpsml/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/portal/src/archetype/archetype-resources/pom.xml Mon Jul  9 13:33:26 2007
@@ -123,7 +123,7 @@
         <org.apache.pluto.version>1.0.1</org.apache.pluto.version>
         <org.apache.portals.bridges.common.version>1.0.2</org.apache.portals.bridges.common.version>
         <org.apache.portals.bridges.velocity.version>1.0.2</org.apache.portals.bridges.velocity.version>
-        <org.apache.portals.jetspeed-2.version>2.1.1</org.apache.portals.jetspeed-2.version>
+        <org.apache.portals.jetspeed-2.version>2.1.2-dev</org.apache.portals.jetspeed-2.version>
         <org.apache.portals.jetspeed-2.groupid>org.apache.portals.jetspeed-2</org.apache.portals.jetspeed-2.groupid>
         <portlet-api.version>1.0</portlet-api.version>
         <taglibs-request.version>1.0.1</taglibs-request.version>

Modified: portals/jetspeed-2/trunk/maven-archetypes/shared-component/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-archetypes/shared-component/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/maven-archetypes/shared-component/pom.xml (original)
+++ portals/jetspeed-2/trunk/maven-archetypes/shared-component/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>maven-archetypes</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/maven-plugin/project.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-plugin/project.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/project.xml (original)
+++ portals/jetspeed-2/trunk/maven-plugin/project.xml Mon Jul  9 13:33:26 2007
@@ -71,13 +71,13 @@
         <dependency>
             <groupId>org.apache.portals.jetspeed-2</groupId>
             <artifactId>jetspeed-api</artifactId>
-            <version>2.1.1</version>
+            <version>2.1.2-dev</version>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.portals.jetspeed-2</groupId>
             <artifactId>jetspeed-deploy-tools</artifactId>
-            <version>2.1.1</version>
+            <version>2.1.2-dev</version>
             <type>jar</type>
         </dependency>
         <dependency>

Modified: portals/jetspeed-2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/pom.xml (original)
+++ portals/jetspeed-2/trunk/pom.xml Mon Jul  9 13:33:26 2007
@@ -30,7 +30,7 @@
 
     <groupId>org.apache.portals.jetspeed-2</groupId>
     <artifactId>jetspeed-2</artifactId>
-    <version>2.1.1</version>
+    <version>2.1.2-dev</version>
     <packaging>pom</packaging>
     <name>Jetspeed-2 Enterprise Portal</name>
     <description>

Modified: portals/jetspeed-2/trunk/portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/portal/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/portal/pom.xml (original)
+++ portals/jetspeed-2/trunk/portal/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>war</packaging>

Modified: portals/jetspeed-2/trunk/project.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/project.properties?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/project.properties (original)
+++ portals/jetspeed-2/trunk/project.properties Mon Jul  9 13:33:26 2007
@@ -15,7 +15,7 @@
 
 # jetspeed.version is required is {user.home}/build.properties.
 # Other properties.
-jetspeed.version=2.1.1
+jetspeed.version=2.1.2-dev
 pluto.version=1.0.1
 portlet.api.version=1.0
 servlet.api.version=2.3

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/conf/jetspeed.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/conf/jetspeed.properties?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/conf/jetspeed.properties (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/conf/jetspeed.properties Mon Jul  9 13:33:26 2007
@@ -28,7 +28,7 @@
 include=override.properties
 
 portal.name = Jetspeed
-portal.version = 2.1.1
+portal.version = 2.1.2
 
 # By setting this to true, the Engine will create its own
 # JNDI context.  Not needed in deployment.  We use Tomcat's JNDI

Modified: portals/jetspeed-2/trunk/taglibs/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/taglibs/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/taglibs/pom.xml (original)
+++ portals/jetspeed-2/trunk/taglibs/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed-2</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

Modified: portals/jetspeed-2/trunk/taglibs/treecontrol/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/taglibs/treecontrol/pom.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/taglibs/treecontrol/pom.xml (original)
+++ portals/jetspeed-2/trunk/taglibs/treecontrol/pom.xml Mon Jul  9 13:33:26 2007
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.apache.portals.jetspeed-2</groupId>
         <artifactId>jetspeed2-taglibs</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.2-dev</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

Modified: portals/jetspeed-2/trunk/xdocs/download.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/download.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/download.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/download.xml Mon Jul  9 13:33:26 2007
@@ -33,7 +33,7 @@
 				</a>
 				.
 			</p>
-			<subsection name="Jetspeed-2.1.1 Installer Distribution">
+			<subsection name="Jetspeed-2.1.2 Installer Distribution">
 				<table>
 				<tr>
 					<th>Distribution</th>
@@ -43,15 +43,15 @@
 				</tr>
 				<tr>
 					<td>Jetspeed-2 Standard with only the required Administrative Portlets</td>
-					<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/binaries/jetspeed-2.1.1-installer.jar">jetspeed-2.1.1-installer.jar</a></td>
-					<td><a href="http://www.apache.org/dist/portals/jetspeed-2/binaries/jetspeed-2.1.1-installer.jar.md5">here</a></td>
-					<td><a href="http://www.apache.org/dist/portals/jetspeed-2/binaries/jetspeed-2.1.1-installer.jar.arc">here</a></td>
+					<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/binaries/jetspeed-2.1.2-installer.jar">jetspeed-2.1.2-installer.jar</a></td>
+					<td><a href="http://www.apache.org/dist/portals/jetspeed-2/binaries/jetspeed-2.1.2-installer.jar.md5">here</a></td>
+					<td><a href="http://www.apache.org/dist/portals/jetspeed-2/binaries/jetspeed-2.1.2-installer.jar.arc">here</a></td>
 				</tr>
 				<tr>
 					<td>Jetspeed-2 Demo With lots of demo Portlets: RSS, JSF, JPetstore and many more</td>
-					<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/binaries/jetspeed-2.1.1-demo-installer.jar">Jetspeed-2.1.1-demo-installer.jar</a></td>
-					<td><a href="http://www.apache.org/dist/portals/jetspeed-2/binaries/jetspeed-2.1.1-demo-installer.jar.md5">here</a></td>
-					<td><a href="http://www.apache.org/dist/portals/jetspeed-2/binaries/jetspeed-2.1.1-demo-installer.jar.arc">here</a></td>
+					<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/binaries/jetspeed-2.1.2-demo-installer.jar">Jetspeed-2.1.2-demo-installer.jar</a></td>
+					<td><a href="http://www.apache.org/dist/portals/jetspeed-2/binaries/jetspeed-2.1.2-demo-installer.jar.md5">here</a></td>
+					<td><a href="http://www.apache.org/dist/portals/jetspeed-2/binaries/jetspeed-2.1.2-demo-installer.jar.arc">here</a></td>
 				</tr>
 			</table>
 				<p>
@@ -62,7 +62,7 @@
 				</p>
 				<p>Complete instructions for getting started using the installer is available <a href="getting-started-installer.html">here</a>.</p> 				
 			</subsection>
-			<subsection name="Jetspeed-2.1.1 Source Distribution">
+			<subsection name="Jetspeed-2.1.2 Source Distribution">
 				<table>
 					<tr>
 						<th/>
@@ -71,22 +71,22 @@
 						<th>Signature</th>
 					</tr>
 					<tr>
-						<td>jetspeed-2.1.1-src.tar.bz2</td>
-						<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/sources/jetspeed-2.1.1-src.tar.bz2">here</a></td>
-						<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/sources/jetspeed-2.1.1-src.tar.bz2.md5">here</a></td>
-						<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/sources/jetspeed-2.1.1-src.tar.bz2.arc">here</a></td>
+						<td>jetspeed-2.1.2-src.tar.bz2</td>
+						<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/sources/jetspeed-2.1.2-src.tar.bz2">here</a></td>
+						<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/sources/jetspeed-2.1.2-src.tar.bz2.md5">here</a></td>
+						<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/sources/jetspeed-2.1.2-src.tar.bz2.arc">here</a></td>
 					</tr>
 					<tr>
-						<td>jetspeed-2.1.1-src.tar.gz</td>
-						<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/sources/jetspeed-2.1.1-src.tar.gz">here</a></td>
-						<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/sources/jetspeed-2.1.1-src.tar.gz.md5">here</a></td>
-						<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/sources/jetspeed-2.1.1-src.tar.gz.arc">here</a></td>
+						<td>jetspeed-2.1.2-src.tar.gz</td>
+						<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/sources/jetspeed-2.1.2-src.tar.gz">here</a></td>
+						<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/sources/jetspeed-2.1.2-src.tar.gz.md5">here</a></td>
+						<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/sources/jetspeed-2.1.2-src.tar.gz.arc">here</a></td>
 					</tr>
 					<tr>
-						<td>jetspeed-2.1.1-src.zip</td>
-						<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/sources/jetspeed-2.1.1-src.zip">here</a></td>
-						<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/sources/jetspeed-2.1.1-src.zip.md5">here</a></td>
-						<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/sources/jetspeed-2.1.1-src.zip.arc">here</a></td>
+						<td>jetspeed-2.1.2-src.zip</td>
+						<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/sources/jetspeed-2.1.2-src.zip">here</a></td>
+						<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/sources/jetspeed-2.1.2-src.zip.md5">here</a></td>
+						<td><a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/sources/jetspeed-2.1.2-src.zip.arc">here</a></td>
 					</tr>
 				</table>
 			</subsection>
@@ -97,7 +97,7 @@
 			</subsection>
 			<subsection name="Migrating Guide">
 				<p>
-					Important information for migrating existing Jetspeed-2.0 and Jetspeed-2.1 installations to Jetspeed-2.1.1 is provided in the <a href="guides/guide-migration.html">migration guide</a>.
+					Important information for migrating existing Jetspeed-2.0 and Jetspeed-2.1 installations to Jetspeed-2.1.2 is provided in the <a href="guides/guide-migration.html">migration guide</a>.
 				</p>
 			</subsection>
 		</section>

Modified: portals/jetspeed-2/trunk/xdocs/getting-started-binary.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/getting-started-binary.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/getting-started-binary.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/getting-started-binary.xml Mon Jul  9 13:33:26 2007
@@ -305,12 +305,12 @@
 						install the maven-plugin as follows:
 						<source>
 							<![CDATA[
-maven -DartifactId=maven-jetspeed2-plugin -DgroupId=org.apache.portals.jetspeed-2 -Dversion=2.1.1 plugin:download]]>
+maven -DartifactId=maven-jetspeed2-plugin -DgroupId=org.apache.portals.jetspeed-2 -Dversion=2.1.2 plugin:download]]>
 						</source>
 						<i>
 							Note: you must set the version to the
 							specific version you want to install,
-							"2.1.1" is just an example.
+							"2.1.2" is just an example.
 						</i>
 					</p>
 				</subsection>

Modified: portals/jetspeed-2/trunk/xdocs/getting-started-installer.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/getting-started-installer.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/getting-started-installer.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/getting-started-installer.xml Mon Jul  9 13:33:26 2007
@@ -29,32 +29,32 @@
 		<section name="Jetspeed-2 Installer">
 			<subsection name="Getting Started with the Installer">
 			<p>
-			Jetspeed 2.1.1 provides 2 installers:
+			Jetspeed 2.1.2 provides 2 installers:
 			<ul>
 			<li>The minimal installation, containing only the core portal and administrative portlets: 
-			<a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/binaries/jetspeed-2.1.1-installer.jar">Standard (Minimal) Installer</a></li>
+			<a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/binaries/jetspeed-2.1.2-installer.jar">Standard (Minimal) Installer</a></li>
 			<li>An installer for installing Jetspeed-2 on a third party database: 
-			<a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/binaries/jetspeed-2.1.1-demo-installer.jar">Jetspeed Demo Installer</a></li>
+			<a href="http://www.apache.org/dyn/closer.cgi/portals/jetspeed-2/binaries/jetspeed-2.1.2-demo-installer.jar">Jetspeed Demo Installer</a></li>
 			</ul>
 			</p>
 			<p>
 			To run the standard (minimal) installer:
 			</p>
 			<source>
-java -jar jetspeed-2.1.1-installer.jar
+java -jar jetspeed-2.1.2-installer.jar
             </source>
             <p>
 To run the Jetspeed Demo installer:
             </p>
             <source>
-java -jar jetspeed-2.1.1-demo-installer.jar
+java -jar jetspeed-2.1.2-demo-installer.jar
 			</source>
 			<p>	
 			The installers are capable of running on headless (i.e. no gui) machines, and will detect so automatically.<br/>
 			To force the installer in text mode manually, pass in the <b><i>text</i></b> parameter:
 			</p>
 			<source>
-java -jar jetspeed-2.1.1-installer.jar text	
+java -jar jetspeed-2.1.2-installer.jar text	
             </source>
 		    </subsection>
 		    <subsection name="Database Selection">
@@ -111,14 +111,14 @@
 			On linux, here is an example where you have installed to the default location:
 			</p>
 			<source>
-cd ~/jetspeed-2.1.1/bin
+cd ~/jetspeed-2.1.2/bin
 ./startup.sh
 			</source>
 			<p>
 			On windows, here is an example where you have installed to the default location:
 			</p>
    			<source>
-   cd C:\Apache\Jetspeed-2.1.1\bin
+   cd C:\Apache\Jetspeed-2.1.2\bin
    startup.bat
    			</source>
    			<p>

Modified: portals/jetspeed-2/trunk/xdocs/getting-started-source.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/getting-started-source.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/getting-started-source.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/getting-started-source.xml Mon Jul  9 13:33:26 2007
@@ -693,12 +693,12 @@
 					maven-plugin as follows:
 					<source>
 						<![CDATA[
-maven -DartifactId=maven-jetspeed2-plugin -DgroupId=org.apache.portals.jetspeed-2 -Dversion=2.1.1 plugin:download]]>
+maven -DartifactId=maven-jetspeed2-plugin -DgroupId=org.apache.portals.jetspeed-2 -Dversion=2.1.2 plugin:download]]>
 					</source>
 					<i>
 						Note: you can set the version flag to the
 						specific version you want to install,
-						2.1.1 is just an example here.
+						2.1.2 is just an example here.
 					</i>
 				</p>
 			</subsection>

Modified: portals/jetspeed-2/trunk/xdocs/guides/guide-migration.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/guides/guide-migration.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/guides/guide-migration.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/guides/guide-migration.xml Mon Jul  9 13:33:26 2007
@@ -25,8 +25,8 @@
 		</authors>
 	</properties>
 	<body>
-		<section name="Data Migrating from Jetspeed 2.1 to 2.1.1">
-			<p>The following tables describe database schema changes from version 2.1 to version 2.1.1.                                  
+		<section name="Data Migrating from Jetspeed 2.1 to 2.1.2">
+			<p>The following tables describe database schema changes from version 2.1 to version 2.1.2.                                  
 			</p>
 			<subsection name="Added Tables">
 				<table>

Modified: portals/jetspeed-2/trunk/xdocs/guides/index.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/guides/index.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/guides/index.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/guides/index.xml Mon Jul  9 13:33:26 2007
@@ -52,7 +52,7 @@
 			<li><a href="guide-profiler.html">Guide to using profilers</a></li>
 			<li><a href="guide-aggregation.html">Guide to Aggregation</a></li>
 			<li><a href="guide-subsites.html">Guide to Subsites</a></li>
-			<li><a href="guide-migration.html">Guide to Migration to 2.1.1</a></li>			
+			<li><a href="guide-migration.html">Guide to Migration to 2.1.2</a></li>			
 		</ul>
 		</subsection>
 		<subsection name="Portal Development Guides">

Modified: portals/jetspeed-2/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/index.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/index.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/index.xml Mon Jul  9 13:33:26 2007
@@ -27,14 +27,14 @@
 	<body>
 		<section name="Welcome to Jetspeed-2">
 			<div id="downloadbox">
-				<h5>Get Jetspeed 2.1.1</h5>
+				<h5>Get Jetspeed 2.1.2</h5>
 				<p>
 					<a href="download.html">
 						<img valign="top" src="images/folder-open.gif"
 							border="0" alt="" title="download" />
 						Download
 					</a>
-					Jetspeed 2.1.1
+					Jetspeed 2.1.2
 					<small>(33MB)</small>
 				</p>
 				<ul>
@@ -95,7 +95,7 @@
 			</subsection>
 			<subsection name="Jetspeed-2 Status">
 				<p>
-					The latest 2.1.1 production release of Jetspeed-2 was released
+					The latest 2.1.2 production release of Jetspeed-2 was released
 					on July 11, 2007.  Future development areas include alignment with the upcoming
 					<a href="http://www.jcp.org/en/jsr/detail?id=286">Java Portlet Standard 2.0, JSR-286</a>
 				    new portlet applications, WSRP support, further improvement of the design and user experience.

Modified: portals/jetspeed-2/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/navigation.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/navigation.xml Mon Jul  9 13:33:26 2007
@@ -33,7 +33,7 @@
     	    <item name="From Maven Plugin" href="getting-started-binary.html" />
     	    <item name="From Eclipse" href="jetspeed-eclipse.html" />            
     	</menu>
-    	<menu name="Get Jetspeed-2.1.1">
+    	<menu name="Get Jetspeed-2.1.2">
     		<item name="Download" href="download.html" />
     		<item name="Release Notes" href="release-notes.html" />
     	</menu>

Modified: portals/jetspeed-2/trunk/xdocs/release-notes.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/xdocs/release-notes.xml?view=diff&rev=554756&r1=554755&r2=554756
==============================================================================
--- portals/jetspeed-2/trunk/xdocs/release-notes.xml (original)
+++ portals/jetspeed-2/trunk/xdocs/release-notes.xml Mon Jul  9 13:33:26 2007
@@ -24,9 +24,9 @@
     </authors>
   </properties>
   <body>
-  	  <section name="Release Notes - Jetspeed 2 - Version 2.1.1">  
+  	  <section name="Release Notes - Jetspeed 2 - Version 2.1.2">  
   	  <p>
-  	  The list below outlines the issues that are addressed with release 2.1.1  For a full list of features, see the
+  	  The list below outlines the issues that are addressed with release 2.1.2  For a full list of features, see the
   	  <a href="features.html">features list</a>.
   	  </p>
   	  <p>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org