portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r1622615 - in /portals/jetspeed-2/portal/trunk: ./ applications/jetspeed-demo/ applications/jetspeed/src/main/webapp/WEB-INF/pages/ applications/jetspeed/src/main/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_role/user/ applicati...
Date Fri, 05 Sep 2014 04:05:12 GMT
Author: woonsan
Date: Fri Sep  5 04:05:12 2014
New Revision: 1622615

URL: http://svn.apache.org/r1622615
Log:
JS2-1302: replace webcontent portlets by webcontent2 portlets

Modified:
    portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_role/user/roletest2.psml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/home.psml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_hostname/localhost/_role/user/roletest.psml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_hostname/localhost/_user/local/home.psml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/user/p003.psml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/iframes.psml
    portals/jetspeed-2/portal/trunk/enterprise/ear-full/build.xml
    portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml
    portals/jetspeed-2/portal/trunk/etc/remote-repository/portlet-repository.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
    portals/jetspeed-2/portal/trunk/pom.xml

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml?rev=1622615&r1=1622614&r2=1622615&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml Fri
Sep  5 04:05:12 2014
@@ -588,10 +588,10 @@
                       <delete>./rss</delete>
                     </deployment>
                     <deployment>
-                      <artifact>org.apache.portals.applications:apa-webcontent-war:war</artifact>
-                      <targetName>webcontent.war</targetName>
+                      <artifact>org.apache.portals.applications:apa-webcontent2-war:war</artifact>
+                      <targetName>webcontent2.war</targetName>
                       <infuse>true</infuse>
-                      <delete>./webcontent</delete>
+                      <delete>./webcontent2</delete>
                     </deployment>
                     <deployment>
                       <artifact>org.apache.portals.applications:apa-dbbrowser-war:war</artifact>
@@ -690,8 +690,8 @@
               </dependency>
               <dependency>
                 <groupId>org.apache.portals.applications</groupId>
-                <artifactId>apa-webcontent-war</artifactId>
-                <version>${org.apache.portals.applications.apa-webcontent.version}</version>
+                <artifactId>apa-webcontent2-war</artifactId>
+                <version>${org.apache.portals.applications.apa-webcontent2.version}</version>
                 <type>war</type>
               </dependency>
               <dependency>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_role/user/roletest2.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_role/user/roletest2.psml?rev=1622615&r1=1622614&r2=1622615&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_role/user/roletest2.psml
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_role/user/roletest2.psml
Fri Sep  5 04:05:12 2014
@@ -21,7 +21,7 @@ limitations under the License.
             <property name="row" value="0"/>
             <property name="column" value="0"/>
         </fragment>
-        <fragment id="role-test2-003" type="portlet" name="webcontent::IFramePortlet">
+        <fragment id="role-test2-003" type="portlet" name="webcontent2::IFramePortlet2">
             <property name="row" value="0"/>
             <property name="column" value="1"/>
         </fragment>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/home.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/home.psml?rev=1622615&r1=1622614&r2=1622615&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/home.psml
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/home.psml
Fri Sep  5 04:05:12 2014
@@ -21,7 +21,7 @@ limitations under the License.
             <property name="row" value="0"/>
             <property name="column" value="0"/>
         </fragment>
-        <fragment id="P-111c98bf047-10003" type="portlet" name="webcontent::IFramePortlet">
+        <fragment id="P-111c98bf047-10003" type="portlet" name="webcontent2::IFramePortlet2">
             <property name="row" value="0"/>
             <property name="column" value="1"/>
         </fragment>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_hostname/localhost/_role/user/roletest.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_hostname/localhost/_role/user/roletest.psml?rev=1622615&r1=1622614&r2=1622615&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_hostname/localhost/_role/user/roletest.psml
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_hostname/localhost/_role/user/roletest.psml
Fri Sep  5 04:05:12 2014
@@ -21,7 +21,7 @@ limitations under the License.
             <property name="row" value="0"/>
             <property name="column" value="0"/>
         </fragment>
-        <fragment id="role-test-003" type="portlet" name="webcontent::IFramePortlet">
+        <fragment id="role-test-003" type="portlet" name="webcontent2::IFramePortlet2">
             <property name="row" value="0"/>
             <property name="column" value="1"/>
         </fragment>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_hostname/localhost/_user/local/home.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_hostname/localhost/_user/local/home.psml?rev=1622615&r1=1622614&r2=1622615&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_hostname/localhost/_user/local/home.psml
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_hostname/localhost/_user/local/home.psml
Fri Sep  5 04:05:12 2014
@@ -21,7 +21,7 @@ limitations under the License.
             <property name="row" value="0"/>
             <property name="column" value="0"/>
         </fragment>
-        <fragment id="P-111c98bf046-10003" type="portlet" name="webcontent::IFramePortlet">
+        <fragment id="P-111c98bf046-10003" type="portlet" name="webcontent2::IFramePortlet2">
             <property name="row" value="0"/>
             <property name="column" value="1"/>
         </fragment>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/user/p003.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/user/p003.psml?rev=1622615&r1=1622614&r2=1622615&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/user/p003.psml
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/user/p003.psml
Fri Sep  5 04:05:12 2014
@@ -33,7 +33,7 @@ limitations under the License.
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
       </fragment>
-	  <fragment id="u3-xx6" type="portlet" name="webcontent::IFramePortlet">
+	  <fragment id="u3-xx6" type="portlet" name="webcontent2::IFramePortlet2">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="1" />
       </fragment>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml?rev=1622615&r1=1622614&r2=1622615&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml
Fri Sep  5 04:05:12 2014
@@ -57,11 +57,11 @@ limitations under the License.
       <property layout="TwoColumns" name="row" value="1" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>
-    <fragment id="dp-9" type="portlet" name="webcontent::ReverseProxyIFramePortlet" decorator="gray-gradient-noborder">
+    <fragment id="dp-9" type="portlet" name="webcontent2::ReverseProxyIFramePortlet2"
decorator="gray-gradient-noborder">
       <property layout="TwoColumns" name="row" value="2" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>
-    <fragment id="dp-10" type="portlet" name="webcontent::IFramePortlet" decorator="gray-gradient-noborder">
+    <fragment id="dp-10" type="portlet" name="webcontent2::IFramePortlet2" decorator="gray-gradient-noborder">
       <property layout="TwoColumns" name="row" value="3" />
       <property layout="TwoColumns" name="column" value="0" />
       <preference name="SRC">

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/iframes.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/iframes.psml?rev=1622615&r1=1622614&r2=1622615&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/iframes.psml
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/iframes.psml
Fri Sep  5 04:05:12 2014
@@ -22,11 +22,11 @@ limitations under the License.
   <title>Websites</title>
 
   <fragment id="js-websites1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
-    <fragment id="js-websites9" type="portlet" name="webcontent::ReverseProxyIFramePortlet">
+    <fragment id="js-websites9" type="portlet" name="webcontent2::ReverseProxyIFramePortlet2">
       <property name="row" value="0" />
       <property name="column" value="0" />
     </fragment>
-    <fragment id="js-websites10" type="portlet" name="webcontent::IFramePortlet" decorator="gray-gradient-noborder">
+    <fragment id="js-websites10" type="portlet" name="webcontent2::IFramePortlet2" decorator="gray-gradient-noborder">
       <property name="row" value="0" />
       <property name="column" value="1" />
       <preference name="SRC">

Modified: portals/jetspeed-2/portal/trunk/enterprise/ear-full/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-full/build.xml?rev=1622615&r1=1622614&r2=1622615&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/ear-full/build.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/ear-full/build.xml Fri Sep  5 04:05:12 2014
@@ -91,7 +91,7 @@
         <attribute name="Class-Path" value="${war.manifest.classpath}"/>
       </manifest>
     </jar>
-    <jar destfile="${project.build.directory}/package-skinny-wars/apa-webcontent-war-${org.apache.portals.applications.apa-webcontent.version}.war"
update="true">
+    <jar destfile="${project.build.directory}/package-skinny-wars/apa-webcontent2-war-${org.apache.portals.applications.apa-webcontent2.version}.war"
update="true">
       <manifest>
         <attribute name="Class-Path" value="${war.manifest.classpath}"/>
       </manifest>
@@ -114,14 +114,14 @@
       <arg value="rss"/>
     </java>
     <java classname="org.apache.jetspeed.tools.deploy.JetspeedDeploy">
-      <arg value="${project.build.directory}/package-skinny-wars/apa-webcontent-war-${org.apache.portals.applications.apa-webcontent.version}.war"/>
-      <arg value="${project.build.directory}/package-skinny-wars/apa-webcontent-war-${org.apache.portals.applications.apa-webcontent.version}.war"/>
-      <arg value="webcontent"/>
+      <arg value="${project.build.directory}/package-skinny-wars/apa-webcontent2-war-${org.apache.portals.applications.apa-webcontent2.version}.war"/>
+      <arg value="${project.build.directory}/package-skinny-wars/apa-webcontent2-war-${org.apache.portals.applications.apa-webcontent2.version}.war"/>
+      <arg value="webcontent2"/>
     </java>
     <java classname="org.apache.jetspeed.tools.deploy.JetspeedDeploy">
       <arg value="${project.build.directory}/package-skinny-wars/apa-dbbrowser-war-${org.apache.portals.applications.apa-dbbrowser.version}.war"/>
       <arg value="${project.build.directory}/package-skinny-wars/apa-dbbrowser-war-${org.apache.portals.applications.apa-dbbrowser.version}.war"/>
-      <arg value="webcontent"/>
+      <arg value="dbbrowser"/>
     </java>
 
     <!-- repackage EAR with skinny wars -->

Modified: portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml?rev=1622615&r1=1622614&r2=1622615&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml Fri Sep  5 04:05:12 2014
@@ -53,7 +53,7 @@
     </dependency>        
     <dependency>
       <groupId>org.apache.portals.applications</groupId>
-      <artifactId>apa-webcontent-war</artifactId>
+      <artifactId>apa-webcontent2-war</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
@@ -96,8 +96,8 @@
             </webModule>                       
             <webModule>
               <groupId>org.apache.portals.applications</groupId>
-              <artifactId>apa-webcontent-war</artifactId>
-              <contextRoot>/webcontent</contextRoot>
+              <artifactId>apa-webcontent2-war</artifactId>
+              <contextRoot>/webcontent2</contextRoot>
             </webModule>                       
             <webModule>
               <groupId>org.apache.portals.applications</groupId>
@@ -159,7 +159,7 @@
                   <property name="org.apache.portals.applications.apa-dbbrowser.version"
value="${org.apache.portals.applications.apa-dbbrowser.version}"/>
                   <property name="org.apache.portals.applications.apa-demo.version" value="${org.apache.portals.applications.apa-demo.version}"/>
                   <property name="org.apache.portals.applications.apa-rss.version" value="${org.apache.portals.applications.apa-rss.version}"/>
-                  <property name="org.apache.portals.applications.apa-webcontent.version"
value="${org.apache.portals.applications.apa-webcontent.version}"/>
+                  <property name="org.apache.portals.applications.apa-webcontent2.version"
value="${org.apache.portals.applications.apa-webcontent2.version}"/>
                   <property name="pom.version" value="${project.version}"/>
                   <property name="project.version" value="${project.version}"/>
                   <property name="project.build.directory" value="${project.build.directory}"/>

Modified: portals/jetspeed-2/portal/trunk/etc/remote-repository/portlet-repository.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/remote-repository/portlet-repository.xml?rev=1622615&r1=1622614&r2=1622615&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/remote-repository/portlet-repository.xml (original)
+++ portals/jetspeed-2/portal/trunk/etc/remote-repository/portlet-repository.xml Fri Sep 
5 04:05:12 2014
@@ -173,13 +173,13 @@
 		</portlet>
 	</portlets>
 	<portlets>
-		<portlet id="webcontent" group="org.apache.portals.jetspeed"
+		<portlet id="webcontent2" group="org.apache.portals.jetspeed"
 			version="2.2">
 			<portletSpecVersion>2.0</portletSpecVersion>
 			<packaging>war</packaging>
-			<name>webcontent</name>
+			<name>webcontent2</name>
 			<description>Web Content and IFrame Portlets from Apache Jetspeed</description>
-			<binaryURL>http://www.bluesunrise.com/rpa/jetspeed/2.2/webcontent.war</binaryURL>
+			<binaryURL>http://www.bluesunrise.com/rpa/jetspeed/2.2/webcontent2.war</binaryURL>
 			<sourceURL />
 			<imageURL />
 			<license>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml?rev=1622615&r1=1622614&r2=1622615&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml Fri Sep
 5 04:05:12 2014
@@ -179,7 +179,7 @@
       <fileset dir="${installDir}/webapps">
         <include name="demo.war" />      
         <include name="rss.war" />
-        <include name="webcontent.war" />
+        <include name="webcontent2.war" />
         <include name="dbbrowser.war" />
       </fileset>
     </delete>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml?rev=1622615&r1=1622614&r2=1622615&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
Fri Sep  5 04:05:12 2014
@@ -208,10 +208,10 @@
                       <delete>./rss</delete>
                     </deployment>
                     <deployment>
-                      <artifact>org.apache.portals.applications:apa-webcontent-war:war</artifact>
-                      <targetName>webcontent.war</targetName>
+                      <artifact>org.apache.portals.applications:apa-webcontent2-war:war</artifact>
+                      <targetName>webcontent2.war</targetName>
                       <infuse>true</infuse>
-                      <delete>./webcontent</delete>
+                      <delete>./webcontent2</delete>
                     </deployment>
              		<deployment>
                       <artifact>org.apache.portals.applications:apa-dbbrowser-war:war</artifact>
@@ -304,8 +304,8 @@
               </dependency>
               <dependency>
                 <groupId>org.apache.portals.applications</groupId>
-                <artifactId>apa-webcontent-war</artifactId>
-                <version>${org.apache.portals.applications.apa-webcontent.version}</version>
+                <artifactId>apa-webcontent2-war</artifactId>
+                <version>${org.apache.portals.applications.apa-webcontent2.version}</version>
                 <type>war</type>
               </dependency>
               <dependency>

Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=1622615&r1=1622614&r2=1622615&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Fri Sep  5 04:05:12 2014
@@ -282,7 +282,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.4-SNAPSHOT</org.apache.portals.applications.apa-webcontent.version>
+    <org.apache.portals.applications.apa-webcontent2.version>2.0-SNAPSHOT</org.apache.portals.applications.apa-webcontent2.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>
@@ -544,9 +544,9 @@
       </dependency>
       <dependency>
         <groupId>org.apache.portals.applications</groupId>
-        <artifactId>apa-webcontent-war</artifactId>
+        <artifactId>apa-webcontent2-war</artifactId>
         <type>war</type>
-        <version>${org.apache.portals.applications.apa-webcontent.version}</version>
+        <version>${org.apache.portals.applications.apa-webcontent2.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.portals.applications</groupId>



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


Mime
View raw message