svn commit: r1610031 - in /portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE: jetspeed-portal-resources/src/main/resources/ddl/mssql/create-schema.sql pom.xml

Author: taylor
Date: Sat Jul 12 19:52:13 2014
New Revision: 1610031

URL: http://svn.apache.org/r1610031
Log:
JS2-1273,JS2-1278: backporting changes to 2.2.3 from trunk

Modified:
    portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/jetspeed-portal-resources/src/main/resources/ddl/mssql/create-schema.sql
    portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/pom.xml

Modified: portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/jetspeed-portal-resources/src/main/resources/ddl/mssql/create-schema.sql
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/jetspeed-portal-resources/src/main/resources/ddl/mssql/create-schema.sql?rev=1610031&r1=1610030&r2=1610031&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/jetspeed-portal-resources/src/main/resources/ddl/mssql/create-schema.sql (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/jetspeed-portal-resources/src/main/resources/ddl/mssql/create-schema.sql Sat Jul 12 19:52:13 2014
@@ -943,6 +943,7 @@ CREATE TABLE PORTLET_DEFINITION
     RESOURCE_BUNDLE VARCHAR(255),
     PREFERENCE_VALIDATOR VARCHAR(255),
     SECURITY_REF VARCHAR(40),
+    CLONE_PARENT VARCHAR(80),
     CACHE_SCOPE VARCHAR(30),
     PRIMARY KEY (ID)
 );

Modified: portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/pom.xml?rev=1610031&r1=1610030&r2=1610031&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-BRANCH-2.2.2-POST-RELEASE/pom.xml Sat Jul 12 19:52:13 2014
@@ -279,7 +279,7 @@
     <org.apache.portals.applications.apa-gems.version>1.1</org.apache.portals.applications.apa-gems.version>
     <org.apache.portals.applications.apa-logging.version>1.0</org.apache.portals.applications.apa-logging.version>
     <org.apache.portals.applications.apa-rss.version>1.2</org.apache.portals.applications.apa-rss.version>
-    <org.apache.portals.applications.apa-webcontent.version>1.2</org.apache.portals.applications.apa-webcontent.version>
+    <org.apache.portals.applications.apa-webcontent.version>1.4-SNAPSHOT</org.apache.portals.applications.apa-webcontent.version>
     <org.apache.portals.applications.apa-dbbrowser.version>1.2</org.apache.portals.applications.apa-dbbrowser.version>
     <org.openid4java.version>0.9.5</org.openid4java.version>
     <oro.version>2.0.8</oro.version>