Author: vkumar
Date: Mon Apr 27 11:17:47 2009
New Revision: 768924
URL: http://svn.apache.org/viewvc?rev=768924&view=rev
Log:
Applying patch provided by Jeroen in
http://issues.apache.org/jira/browse/JS2-977
Removed:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/jpetstore.psml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/jsf-demo.psml
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/Public/public.psml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/manager/default-page.psml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/more/one-more-page.psml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/template-dev/default-page.psml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/template/default-page.psml
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=768924&r1=768923&r2=768924&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
Mon Apr 27 11:17:47 2009
@@ -591,17 +591,6 @@
<targetName>webcontent.war</targetName>
<delete>./webcontent</delete>
</deployment>
- <deployment>
-
<artifact>org.apache.portals.bridges:jpetstore:war</artifact>
- <infuse>true</infuse>
- <delete>./jpetstore</delete>
- </deployment>
- <deployment>
-
<artifact>org.apache.portals.bridges:jsf-demo:war</artifact>
- <infuse>true</infuse>
- <expand>true</expand>
- <delete>./jsf-demo</delete>
- </deployment>
</deployments>
</configuration>
</execution>
@@ -683,18 +672,6 @@
<version>1.0-SNAPSHOT</version>
<type>war</type>
</dependency>
- <dependency>
- <groupId>org.apache.portals.bridges</groupId>
- <artifactId>jsf-demo</artifactId>
- <version>1.0.4</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.bridges</groupId>
- <artifactId>jpetstore</artifactId>
- <version>1.0.4</version>
- <type>war</type>
- </dependency>
<!-- plugin own dependencies -->
<dependency>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Public/public.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Public/public.psml?rev=768924&r1=768923&r2=768924&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Public/public.psml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Public/public.psml
Mon Apr 27 11:17:47 2009
@@ -21,12 +21,12 @@
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd";>
<title>Public Share</title>
- <metadata name="title" xml:lang="ja">ä¸è¬å
±æ</metadata>
+ <metadata name="title" xml:lang="ja">ä¸â¬Ã¨ËŒâ¦Â±Ã¦Åâ°</metadata>
<metadata name="title" xml:lang="es">Carpeta compartida</metadata>
- <metadata name="title" xml:lang="hu">Nyilvános megosztás</metadata>
- <metadata name="title" xml:lang="zh">å
¬å¼å
񄧮</metadata>
- <metadata name="title" xml:lang="zh-TW">å
¬éå
±ç¨</metadata>
- <metadata name="title" xml:lang="ko">ì¼ë° ê³µì </metadata>
+ <metadata name="title" xml:lang="hu">Nyilvános megosztás</metadata>
+ <metadata name="title" xml:lang="zh">Ã¥â¦Â¬Ã¥Â¼â¬Ã¥â¦Â±Ã¤ÂºÂ«</metadata>
+ <metadata name="title"
xml:lang="zh-TW">Ã¥â¦Â¬Ã©ââ¹Ã¥â¦Â±Ã§â¨</metadata>
+ <metadata name="title" xml:lang="ko">Ã¬ï¿½Â¼Ã«Â°Ë ÃªÂ³ÂµÃ¬Å </metadata>
<fragment id="ps-1000" type="layout"
name="jetspeed-layouts::VelocityTwoColumns">
<fragment id="ps-1001" type="portlet" name="rss::RSS">
@@ -37,10 +37,6 @@
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="1" />
</fragment>
- <fragment id="ps-1003" type="portlet" name="jsf-demo::CalendarPortlet">
- <property layout="TwoColumns" name="row" value="1" />
- <property layout="TwoColumns" name="column" value="1" />
- </fragment>
</fragment>
</page>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/manager/default-page.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/manager/default-page.psml?rev=768924&r1=768923&r2=768924&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/manager/default-page.psml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/manager/default-page.psml
Mon Apr 27 11:17:47 2009
@@ -17,7 +17,7 @@
-->
<page id="_role-manager-default-page"
xmlns="http://portals.apache.org/jetspeed";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd";>
<title>Manager Role Page</title>
<metadata name="title"
xml:lang="ja">ããã¼ã¸ã£ãã¼ã«ãã¼ã¸</metadata>
@@ -31,13 +31,9 @@
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
</fragment>
- <fragment id="mrp-xx5" type="portlet" name="jsf-demo::CalendarPortlet">
+ <fragment id="mrp-xx6" type="portlet" name="j2-admin::LoginPortlet">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="1" />
</fragment>
- <fragment id="mrp-xx6" type="portlet" name="j2-admin::LoginPortlet">
- <property layout="TwoColumns" name="row" value="0" />
- <property layout="TwoColumns" name="column" value="2" />
- </fragment>
</fragment>
</page>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/more/one-more-page.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/more/one-more-page.psml?rev=768924&r1=768923&r2=768924&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/more/one-more-page.psml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/more/one-more-page.psml
Mon Apr 27 11:17:47 2009
@@ -17,7 +17,7 @@
-->
<page id="_role-user-top-links-more-one-more-page"
xmlns="http://portals.apache.org/jetspeed";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd";>
<title>[USER] One More Page</title>
<metadata name="title" xml:lang="ja">[ã¦ã¼ã¶ã¼]
追å ãã¼ã¸</metadata>
@@ -27,14 +27,9 @@
<metadata name="title" xml:lang="zh-TW">[ç¨æ¶] 追å é </metadata>
<metadata name="title" xml:lang="ko">[ì¬ì©ì] ì¶ê° íì´ì§</metadata>
- <fragment id="utp-1" type="layout"
name="jetspeed-layouts::VelocityTwoColumns">
+ <fragment id="utp-1" type="layout"
name="jetspeed-layouts::VelocityOneColumn">
<fragment id="utp-4" type="portlet" name="demo::BookmarkPortlet">
<property layout="TwoColumns" name="row" value="0" />
- <property layout="TwoColumns" name="column" value="1" />
- </fragment>
- <fragment id="utp-5" type="portlet" name="jsf-demo::CalendarPortlet">
- <property layout="TwoColumns" name="row" value="0" />
- <property layout="TwoColumns" name="column" value="1" />
- </fragment>
+ </fragment>
</fragment>
</page>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml?rev=768924&r1=768923&r2=768924&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml
Mon Apr 27 11:17:47 2009
@@ -17,7 +17,7 @@
-->
<page id="_role-user-top-links-top-page"
xmlns="http://portals.apache.org/jetspeed";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd";>
<title>[USER] Top Page</title>
<metadata name="title" xml:lang="ja">[ã¦ã¼ã¶ã¼]
ããããã¼ã¸</metadata>
@@ -31,18 +31,14 @@
<fragment id="utp-2" type="portlet" name="j2-admin::LoginPortlet">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="0" />
- </fragment>
+ </fragment>
<fragment id="utp-3" type="portlet" name="demo::UserInfoTest">
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="1" />
- </fragment>
+ </fragment>
<fragment id="utp-4" type="portlet" name="demo::BookmarkPortlet">
- <property layout="TwoColumns" name="row" value="0" />
- <property layout="TwoColumns" name="column" value="1" />
- </fragment>
- <fragment id="utp-5" type="portlet" name="jsf-demo::CalendarPortlet">
- <property layout="TwoColumns" name="row" value="0" />
+ <property layout="TwoColumns" name="row" value="1" />
<property layout="TwoColumns" name="column" value="1" />
- </fragment>
+ </fragment>
</fragment>
</page>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/template-dev/default-page.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/template-dev/default-page.psml?rev=768924&r1=768923&r2=768924&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/template-dev/default-page.psml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/template-dev/default-page.psml
Mon Apr 27 11:17:47 2009
@@ -34,12 +34,8 @@
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="1" />
</fragment>
- <fragment id="devtemp-1011" type="portlet"
name="jsf-demo::CalendarPortlet">
- <property layout="TwoColumns" name="row" value="1" />
- <property layout="TwoColumns" name="column" value="1" />
- </fragment>
<fragment id="devtemp-1012" type="portlet" name="demo::BookmarkPortlet">
- <property layout="TwoColumns" name="row" value="2" />
+ <property layout="TwoColumns" name="row" value="1" />
<property layout="TwoColumns" name="column" value="1" />
</fragment>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/template/default-page.psml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/template/default-page.psml?rev=768924&r1=768923&r2=768924&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/template/default-page.psml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/template/default-page.psml
Mon Apr 27 11:17:47 2009
@@ -18,12 +18,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd";>
<title>User Home</title>
- <metadata name="title" xml:lang="ja">ã¦ã¼ã¶ã¼ãã¼ã </metadata>
+ <metadata name="title"
xml:lang="ja">ãƦãƼãâ¶ãƼãÆâºÃ£Æ¼ãÆ </metadata>
<metadata name="title" xml:lang="es">Carpeta de Usuario</metadata>
- <metadata name="title" xml:lang="hu">Felhasználó HOME-ja</metadata>
- <metadata name="title" xml:lang="zh">ç¨æ·ä¸»é¡µ</metadata>
- <metadata name="title" xml:lang="zh-TW">ç¨æ¶ä¸»é </metadata>
- <metadata name="title" xml:lang="ko">ì¬ì©ì í</metadata>
+ <metadata name="title" xml:lang="hu">Felhasználó HOME-ja</metadata>
+ <metadata name="title" xml:lang="zh">çâ¨æ˷主页</metadata>
+ <metadata name="title" xml:lang="zh-TW">çâ¨æ˶主é �</metadata>
+ <metadata name="title" xml:lang="ko">ìâ¬ìš©ìž� Ãâ¢Ë</metadata>
<fragment id="uhtemp-1000" type="layout"
name="jetspeed-layouts::VelocityTwoColumns">
<fragment id="uhtemp-1001" type="portlet" name="rss::RSS">
@@ -34,12 +34,8 @@
<property layout="TwoColumns" name="row" value="0" />
<property layout="TwoColumns" name="column" value="1" />
</fragment>
- <fragment id="uhtemp-1011" type="portlet" name="jsf-demo::CalendarPortlet">
- <property layout="TwoColumns" name="row" value="1" />
- <property layout="TwoColumns" name="column" value="1" />
- </fragment>
<fragment id="uhtemp-1012" type="portlet" name="demo::BookmarkPortlet">
- <property layout="TwoColumns" name="row" value="2" />
+ <property layout="TwoColumns" name="row" value="1" />
<property layout="TwoColumns" name="column" value="1" />
</fragment>
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=768924&r1=768923&r2=768924&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
Mon Apr 27 11:17:47 2009
@@ -352,32 +352,24 @@
<deployment>
<artifact>org.apache.portals.jetspeed-2:j2-admin:war</artifact>
<expand>true</expand>
+ <infuse>true</infuse>
<delete>./j2-admin</delete>
</deployment>
<!-- demo pa's, not for minimal! -->
<deployment>
-
<artifact>org.apache.portals.applications:demo:war</artifact>
- <expand>true</expand>
- <infuse>true</infuse>
+
<artifact>org.apache.portals.applications:apa-demo:war</artifact>
+ <targetName>demo.war</targetName>
<delete>./demo</delete>
</deployment>
<deployment>
-
<artifact>org.apache.portals.applications:rss:war</artifact>
- <infuse>true</infuse>
- <expand>true</expand>
+
<artifact>org.apache.portals.applications:apa-rss-war:war</artifact>
+ <targetName>rss.war</targetName>
<delete>./rss</delete>
</deployment>
<deployment>
-
<artifact>org.apache.portals.bridges:jpetstore:war</artifact>
- <infuse>true</infuse>
- <expand>true</expand>
- <delete>./jpetstore</delete>
- </deployment>
- <deployment>
-
<artifact>org.apache.portals.bridges:jsf-demo:war</artifact>
- <infuse>true</infuse>
- <expand>true</expand>
- <delete>./jsf-demo</delete>
+
<artifact>org.apache.portals.applications:apa-webcontent-war:war</artifact>
+ <targetName>webcontent.war</targetName>
+ <delete>./webcontent</delete>
</deployment>
</deployments>
</configuration>
@@ -439,29 +431,23 @@
<!-- demo pa's, not for minimal! -->
<dependency>
<groupId>org.apache.portals.applications</groupId>
- <artifactId>demo</artifactId>
- <version>${org.apache.portals.jetspeed.version}</version>
+ <artifactId>apa-rss-war</artifactId>
+ <version>1.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.portals.applications</groupId>
- <artifactId>rss</artifactId>
- <version>${org.apache.portals.jetspeed.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.bridges</groupId>
- <artifactId>jsf-demo</artifactId>
- <version>1.0.4</version>
+ <artifactId>apa-demo</artifactId>
+ <version>1.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
- <groupId>org.apache.portals.bridges</groupId>
- <artifactId>jpetstore</artifactId>
- <version>1.0.4</version>
+ <groupId>org.apache.portals.applications</groupId>
+ <artifactId>apa-webcontent-war</artifactId>
+ <version>1.0-SNAPSHOT</version>
<type>war</type>
</dependency>
-
+
<!-- plugin own dependencies -->
<dependency>
<groupId>org.apache.portals.jetspeed-2</groupId>
Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=768924&r1=768923&r2=768924&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Mon Apr 27 11:17:47 2009
@@ -310,9 +310,6 @@
<org.apache.pluto.version>2.0.0-SNAPSHOT</org.apache.pluto.version>
<org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
<org.apache.portals.bridges.frameworks.version>1.0.4</org.apache.portals.bridges.frameworks.version>
-
<org.apache.portals.bridges.jpetstore.version>1.0.4</org.apache.portals.bridges.jpetstore.version>
-
<org.apache.portals.bridges.jsf-demo.version>1.0.4</org.apache.portals.bridges.jsf-demo.version>
-
<org.apache.portals.bridges.jsf.version>1.0.4</org.apache.portals.bridges.jsf.version>
<org.apache.portals.bridges.velocity.version>1.0.4</org.apache.portals.bridges.velocity.version>
<org.apache.portals.bridges.groovy.version>1.0.4</org.apache.portals.bridges.groovy.version>
<org.apache.portals.bridges.portletfilter.version>1.0.4</org.apache.portals.bridges.portletfilter.version>
@@ -1242,11 +1239,6 @@
</dependency>
<dependency>
<groupId>org.apache.portals.bridges</groupId>
- <artifactId>portals-bridges-jsf</artifactId>
- <version>${org.apache.portals.bridges.jsf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.bridges</groupId>
<artifactId>portals-bridges-groovy</artifactId>
<version>${org.apache.portals.bridges.groovy.version}</version>
</dependency>
@@ -1256,20 +1248,6 @@
<version>${org.apache.portals.bridges.portletfilter.version}</version>
</dependency>
- <!-- Portals Bridges Applications -->
- <dependency>
- <groupId>org.apache.portals.bridges</groupId>
- <artifactId>jpetstore</artifactId>
- <type>war</type>
- <version>${org.apache.portals.bridges.jpetstore.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.portals.bridges</groupId>
- <artifactId>jsf-demo</artifactId>
- <type>war</type>
- <version>${org.apache.portals.bridges.jsf-demo.version}</version>
- </dependency>
-
<!-- MyFaces -->
<dependency>
<groupId>myfaces</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
