portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r927659 [4/4] - in /portals/jetspeed-2/portal/trunk: applications/jetspeed/src/main/webapp/WEB-INF/min-pages/ applications/jetspeed/src/main/webapp/WEB-INF/min-pages/Administrative/choosers/ applications/jetspeed/src/main/webapp/WEB-INF/min...
Date Fri, 26 Mar 2010 01:00:18 GMT
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_hostname/dash/_user/joe/home.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_hostname/dash/_user/joe/home.psml?rev=927659&r1=927658&r2=927659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_hostname/dash/_user/joe/home.psml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_hostname/dash/_user/joe/home.psml
Fri Mar 26 01:00:12 2010
@@ -20,7 +20,7 @@ limitations under the License.
 <page id="page0"
     xmlns="http://portals.apache.org/jetspeed"
     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">
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.2/schemas/psml.xsd">
 
   <title>/page0.psml</title>
   <fragment id="fake" name="fake" type="fake"/>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_role/role0/page2.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_role/role0/page2.psml?rev=927659&r1=927658&r2=927659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_role/role0/page2.psml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_role/role0/page2.psml
Fri Mar 26 01:00:12 2010
@@ -20,7 +20,7 @@ limitations under the License.
 <page id="_role-role0-page2"
     xmlns="http://portals.apache.org/jetspeed"
     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">
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.2/schemas/psml.xsd">
 
   <title>/page2.psml</title>
   <fragment id="fake" name="fake" type="fake"/>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_role/role1/page2.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_role/role1/page2.psml?rev=927659&r1=927658&r2=927659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_role/role1/page2.psml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_role/role1/page2.psml
Fri Mar 26 01:00:12 2010
@@ -20,7 +20,7 @@ limitations under the License.
 <page id="_role-role1-page2"
     xmlns="http://portals.apache.org/jetspeed"
     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">
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.2/schemas/psml.xsd">
 
   <title>/page2.psml</title>
   <fragment id="fake" name="fake" type="fake"/>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/_mediatype/html/page2.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/_mediatype/html/page2.psml?rev=927659&r1=927658&r2=927659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/_mediatype/html/page2.psml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/_mediatype/html/page2.psml
Fri Mar 26 01:00:12 2010
@@ -20,7 +20,7 @@ limitations under the License.
 <page id="_user-user-_mediatype-html-page2"
     xmlns="http://portals.apache.org/jetspeed"
     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">
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.2/schemas/psml.xsd">
 
   <title>/page2.psml</title>
   <fragment id="fake" name="fake" type="fake"/>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/folder1/page0.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/folder1/page0.psml?rev=927659&r1=927658&r2=927659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/folder1/page0.psml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/folder1/page0.psml
Fri Mar 26 01:00:12 2010
@@ -20,7 +20,7 @@ limitations under the License.
 <page id="_user-user-folder1-page0"
     xmlns="http://portals.apache.org/jetspeed"
     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">
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.2/schemas/psml.xsd">
 
   <title>/folder1/page0.psml</title>
   <fragment id="fake" name="fake" type="fake"/>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/page2.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/page2.psml?rev=927659&r1=927658&r2=927659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/page2.psml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/_user/user/page2.psml
Fri Mar 26 01:00:12 2010
@@ -20,7 +20,7 @@ limitations under the License.
 <page id="_user-user-page2"
     xmlns="http://portals.apache.org/jetspeed"
     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">
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.2/schemas/psml.xsd">
 
   <title>/page2.psml</title>
   <menu name="top" options="/" depth="1" skin="dhtml-pull-down"/>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder0/page0.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder0/page0.psml?rev=927659&r1=927658&r2=927659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder0/page0.psml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder0/page0.psml
Fri Mar 26 01:00:12 2010
@@ -20,7 +20,7 @@ limitations under the License.
 <page id="folder0-page0"
     xmlns="http://portals.apache.org/jetspeed"
     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">
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.2/schemas/psml.xsd">
 
   <title>/folder0/page0.psml</title>
 <menu name="override-hidden"/>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder1/folder/page0.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder1/folder/page0.psml?rev=927659&r1=927658&r2=927659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder1/folder/page0.psml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder1/folder/page0.psml
Fri Mar 26 01:00:12 2010
@@ -20,7 +20,7 @@ limitations under the License.
 <page id="folder1-folder-page0"
     xmlns="http://portals.apache.org/jetspeed"
     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">
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.2/schemas/psml.xsd">
 
   <title>/folder1/folder/page0.psml</title>
   <fragment id="fake" name="fake" type="fake"/>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder1/page0.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder1/page0.psml?rev=927659&r1=927658&r2=927659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder1/page0.psml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder1/page0.psml
Fri Mar 26 01:00:12 2010
@@ -20,7 +20,7 @@ limitations under the License.
 <page id="folder1-page0"
     xmlns="http://portals.apache.org/jetspeed"
     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">
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.2/schemas/psml.xsd">
 
   <title>/folder1/page0.psml</title>
   <fragment id="fake" name="fake" type="fake"/>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder3/default-folder1/page0.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder3/default-folder1/page0.psml?rev=927659&r1=927658&r2=927659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder3/default-folder1/page0.psml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder3/default-folder1/page0.psml
Fri Mar 26 01:00:12 2010
@@ -20,7 +20,7 @@ limitations under the License.
 <page id="folder3-default-folder1-page0"
     xmlns="http://portals.apache.org/jetspeed"
     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">
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.2/schemas/psml.xsd">
 
   <title>/folder3/default-folder1/page0.psml</title>
   <fragment id="fake" name="fake" type="fake"/>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder3/default-folder1/page1.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder3/default-folder1/page1.psml?rev=927659&r1=927658&r2=927659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder3/default-folder1/page1.psml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder3/default-folder1/page1.psml
Fri Mar 26 01:00:12 2010
@@ -20,7 +20,7 @@ limitations under the License.
 <page id="folder3-default-folder1-page1"
     xmlns="http://portals.apache.org/jetspeed"
     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">
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.2/schemas/psml.xsd">
 
   <title>/folder3/default-folder1/page0.psml</title>
   <fragment id="fake" name="fake" type="fake"/>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder4/folder/page0.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder4/folder/page0.psml?rev=927659&r1=927658&r2=927659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder4/folder/page0.psml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/folder4/folder/page0.psml
Fri Mar 26 01:00:12 2010
@@ -20,7 +20,7 @@ limitations under the License.
 <page id="folder4-folder-page0"
     xmlns="http://portals.apache.org/jetspeed"
     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">
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.2/schemas/psml.xsd">
 
   <title>/folder4/folder/page0.psml</title>
   <fragment id="fake" name="fake" type="fake"/>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/hidden.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/hidden.psml?rev=927659&r1=927658&r2=927659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/hidden.psml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/hidden.psml
Fri Mar 26 01:00:12 2010
@@ -20,7 +20,7 @@ limitations under the License.
 <page id="hidden" hidden="true"
     xmlns="http://portals.apache.org/jetspeed"
     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">
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.2/schemas/psml.xsd">
 
   <title>/hidden.psml</title>
   <fragment id="fake" name="fake" type="fake"/>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page0.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page0.psml?rev=927659&r1=927658&r2=927659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page0.psml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page0.psml
Fri Mar 26 01:00:12 2010
@@ -20,7 +20,7 @@ limitations under the License.
 <page id="page0"
     xmlns="http://portals.apache.org/jetspeed"
     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">
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.2/schemas/psml.xsd">
 
   <title>/page0.psml</title>
   <fragment id="fake" name="fake" type="fake"/>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page1.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page1.psml?rev=927659&r1=927658&r2=927659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page1.psml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page1.psml
Fri Mar 26 01:00:12 2010
@@ -20,7 +20,7 @@ limitations under the License.
 <page id="page1"
     xmlns="http://portals.apache.org/jetspeed"
     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">
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.2/schemas/psml.xsd">
 
   <title>/page1.psml</title>
   <fragment id="fake" name="fake" type="fake"/>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page2.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page2.psml?rev=927659&r1=927658&r2=927659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page2.psml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/resources/webapp/WEB-INF/pages/page2.psml
Fri Mar 26 01:00:12 2010
@@ -19,7 +19,7 @@ limitations under the License.
 <page id="page2"
     xmlns="http://portals.apache.org/jetspeed"
     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">
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.2/schemas/psml.xsd">
 
   <title>/page2.psml</title>
   <fragment id="fake" name="fake" type="fake">

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/pages/grid.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/pages/grid.psml?rev=927659&r1=927658&r2=927659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/pages/grid.psml
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/resources/webapp/WEB-INF/pages/grid.psml
Fri Mar 26 01:00:12 2010
@@ -18,7 +18,7 @@ limitations under the License.
 <page id="grid.psml"
     xmlns="http://portals.apache.org/jetspeed"
     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">

+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.2/schemas/psml.xsd">

     <title>Welcome to Jetspeed 2</title>
     <short-title>Welcome to Jetspeed 2</short-title>
     <fragment id="dp-0" type="layout" name="jetspeed-layouts::VelocityTwoColumns">

Modified: portals/jetspeed-2/portal/trunk/etc/xsd/psml.xsd
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/xsd/psml.xsd?rev=927659&r1=927658&r2=927659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/xsd/psml.xsd (original)
+++ portals/jetspeed-2/portal/trunk/etc/xsd/psml.xsd Fri Mar 26 01:00:12 2010
@@ -1,106 +1,177 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
+	<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to You under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"

-	targetNamespace="http://portals.apache.org/jetspeed"
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+	-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified" targetNamespace="http://portals.apache.org/jetspeed"
 	xmlns:tns="http://portals.apache.org/jetspeed">
-  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-  <xs:element name="page">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="tns:defaults"/>
-        <xs:element minOccurs="0" ref="tns:title"/>
-        <xs:element minOccurs="0" ref="tns:short-title"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:metadata"/>
-        <xs:element ref="tns:fragment"/>
-        <xs:element minOccurs="0" ref="tns:security-constraints"/>
-      </xs:sequence>
-      <xs:attribute name="id" use="required" type="xs:ID"/>
-      <xs:attribute name="hidden" use="optional" type="xs:boolean"/>
-      <xs:attribute name="version" use="optional" type="xs:double"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="defaults">
-    <xs:complexType>
-      <xs:attribute name="layout-decorator" use="required" type="xs:string"/>
-      <xs:attribute name="portlet-decorator" use="required" type="xs:string"/>
-      <xs:attribute name="skin" use="optional" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="title" type="xs:string"/>
-  <xs:element name="short-title" type="xs:string"/>
-  <xs:element name="metadata">
-    <xs:complexType mixed="true">
-      <xs:attribute name="name" use="required" type="xs:string"/>
-      <xs:attribute ref="xml:lang" use="optional"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="owner" type="xs:string"/>
-  <xs:element name="security-constraints">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="tns:owner"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:security-constraint"/>
-        <xs:element minOccurs="0" ref="tns:security-constraints-ref"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="security-constraint">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="tns:users"/>
-        <xs:element minOccurs="0" ref="tns:groups"/>
-        <xs:element minOccurs="0" ref="tns:roles"/>
-        <xs:element minOccurs="0" ref="tns:permissions"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="users" type="xs:string"/>
-  <xs:element name="groups" type="xs:string"/>
-  <xs:element name="roles" type="xs:string"/>
-  <xs:element name="permissions" type="xs:string"/>
-  <xs:element name="security-constraints-ref" type="xs:string"/>
-  <xs:element name="fragment">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:property"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:fragment" />
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:preference"/>
-      </xs:sequence>
-      <xs:attribute name="id" use="required" type="xs:ID"/>
-      <xs:attribute name="name" use="required" type="xs:string"/>
-      <xs:attribute name="type" use="required" type="xs:string"/>
-      <xs:attribute name="decorator" use="optional" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="property">
-    <xs:complexType>
-      <xs:attribute name="layout" use="optional" type="xs:string"/>
-      <xs:attribute name="name" use="required" type="xs:string"/>
-      <xs:attribute name="value" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="value" type="xs:string"/>
-  <xs:element name="preference">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:value"/>
-      </xs:sequence>
-      <xs:attribute name="name" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
+	<xs:import namespace="http://www.w3.org/XML/1998/namespace"
+		schemaLocation="http://www.w3.org/2001/xml.xsd" />
+	<xs:element name="page">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element minOccurs="0" ref="tns:defaults" />
+				<xs:element minOccurs="0" ref="tns:title" />
+				<xs:element minOccurs="0" ref="tns:short-title" />
+				<xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:metadata" />
+				<xs:element ref="tns:fragment" />
+				<xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:menu" />
+				<xs:element minOccurs="0" ref="tns:security-constraints" />
+			</xs:sequence>
+			<xs:attribute name="id" use="required" type="xs:ID" />
+			<xs:attribute name="hidden" use="optional" type="xs:boolean" />
+			<xs:attribute name="version" use="optional" type="xs:double" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="defaults">
+		<xs:complexType>
+			<xs:attribute name="layout-decorator" use="required"
+				type="xs:string" />
+			<xs:attribute name="portlet-decorator" use="required"
+				type="xs:string" />
+			<xs:attribute name="skin" use="optional" type="xs:string" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="title" type="xs:string" />
+	<xs:element name="short-title" type="xs:string" />
+	<xs:element name="metadata">
+		<xs:complexType mixed="true">
+			<xs:attribute name="name" use="required" type="xs:string" />
+			<xs:attribute ref="xml:lang" use="optional" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="owner" type="xs:string" />
+	<xs:element name="security-constraints">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element minOccurs="0" ref="tns:owner" />
+				<xs:element minOccurs="0" maxOccurs="unbounded"
+					ref="tns:security-constraint" />
+				<xs:element minOccurs="0" ref="tns:security-constraints-ref" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="security-constraint">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element minOccurs="0" ref="tns:users" />
+				<xs:element minOccurs="0" ref="tns:groups" />
+				<xs:element minOccurs="0" ref="tns:roles" />
+				<xs:element minOccurs="0" ref="tns:permissions" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="users" type="xs:string" />
+	<xs:element name="groups" type="xs:string" />
+	<xs:element name="roles" type="xs:string" />
+	<xs:element name="permissions" type="xs:string" />
+	<xs:element name="security-constraints-ref" type="xs:string" />
+	<xs:element name="fragment">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:property" />
+				<xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:preference" />
+				<xs:choice minOccurs="0" maxOccurs="unbounded">		        
+				  <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:fragment" />
+				  <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:fragment-reference" />
			
+				</xs:choice>
+				<xs:element minOccurs="0" maxOccurs="1" ref="tns:security-constraints" />
+			</xs:sequence>
+			<xs:attribute name="id" use="required" type="xs:ID" />
+			<xs:attribute name="name" use="required" type="xs:string" />
+			<xs:attribute name="type" use="required" type="xs:string" />
+			<xs:attribute name="decorator" use="optional" type="xs:string" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="fragment-reference">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:property" />
+				<xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:preference" />
+				<xs:element minOccurs="0" maxOccurs="1" ref="tns:security-constraints" />
+			</xs:sequence>
+			<xs:attribute name="id" use="required" type="xs:ID" />
+			<xs:attribute name="refid" use="required" type="xs:string" />
+			<xs:attribute name="decorator" use="optional" type="xs:string" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="property">
+		<xs:complexType>
+			<xs:attribute name="layout" use="optional" type="xs:string" />
+			<xs:attribute name="name" use="required" type="xs:string" />
+			<xs:attribute name="value" use="required" type="xs:string" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="value" type="xs:string" />
+	<xs:element name="preference">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:value" />
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="menu">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="tns:title" minOccurs="0" />
+				<xs:element ref="tns:short-title" minOccurs="0" />
+				<xs:element ref="tns:metadata" minOccurs="0" maxOccurs="unbounded" />
+				<xs:choice minOccurs="0" maxOccurs="unbounded">
+					<xs:element ref="tns:menu" minOccurs="0" maxOccurs="unbounded" />
+					<xs:element ref="tns:options" />
+					<xs:element ref="tns:separator" />
+					<xs:element ref="tns:exclude" />
+					<xs:element ref="tns:include" />
+				</xs:choice>
+			</xs:sequence>
+			<xs:attribute name="name" use="optional" type="xs:string" />
+			<xs:attribute name="depth" use="optional" type="xs:integer" />
+			<xs:attribute name="options" use="optional" type="xs:string" />
+			<xs:attribute name="regexp" use="optional" type="xs:boolean" />
+			<xs:attribute name="skin" use="optional" type="xs:string" />
+			<xs:attribute name="profile" use="optional" type="xs:string" />
+			<xs:attribute name="order" use="optional" type="xs:string" />
+			<xs:attribute name="paths" use="optional" type="xs:string" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="exclude" type="xs:string" />
+	<xs:element name="include">
+		<xs:complexType mixed="true">
+			<xs:attribute name="nest" type="xs:boolean" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="options">
+		<xs:complexType mixed="true">
+			<xs:attribute name="profile" use="optional" type="xs:string" />
+			<xs:attribute name="regexp" use="optional" type="xs:boolean" />
+			<xs:attribute name="depth" use="optional" type="xs:integer" />
+			<xs:attribute name="order" use="optional" type="xs:string" />
+			<xs:attribute name="skin" use="optional" type="xs:string" />
+			<xs:attribute name="paths" use="optional" type="xs:string" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="separator">
+		<xs:complexType mixed="true">
+			<xs:sequence>
+				<xs:element ref="tns:text" minOccurs="0" />
+				<xs:element ref="tns:title" minOccurs="0" />
+				<xs:element ref="tns:metadata" minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+			<xs:attribute name="skin" use="optional" type="xs:string" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="text" type="xs:string" />
 </xs:schema>

Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/pages/default-page.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/pages/default-page.psml?rev=927659&r1=927658&r2=927659&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/pages/default-page.psml
(original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/pages/default-page.psml
Fri Mar 26 01:00:12 2010
@@ -18,7 +18,7 @@
 <page id="default-page"
     xmlns="http://portals.apache.org/jetspeed"
     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">
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.2/schemas/psml.xsd">
   <defaults
      layout-decorator="jetspeed"
      portlet-decorator="jetspeed"



---------------------------------------------------------------------
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