Author: taylor
Date: Thu Apr 1 22:52:54 2010
New Revision: 930126
URL: http://svn.apache.org/viewvc?rev=930126&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1165
xsds copied out to apache.org under
http://portals.apache.org/jetspeed-2/2.2/schemas/
(still need to replicate)
Added:
portals/jetspeed-2/portal/trunk/etc/xsd/dpsml.xsd (with props)
portals/jetspeed-2/portal/trunk/etc/xsd/fpsml.xsd (with props)
portals/jetspeed-2/portal/trunk/etc/xsd/psml-core.xsd (with props)
portals/jetspeed-2/portal/trunk/etc/xsd/tpsml.xsd (with props)
portals/jetspeed-2/portal/trunk/maven/jetspeed-archetype/
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/Administrative/choosers/template.tpsml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/template.tpsml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-content.dpsml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/definition.fpsml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/Administrative/choosers/template.tpsml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/default-content.dpsml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/definition.fpsml
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/template.tpsml
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/contentpage.dpsml
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/definition0.fpsml
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/definition1.fpsml
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/docpage.dpsml
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/template.tpsml
portals/jetspeed-2/portal/trunk/etc/xsd/psml.xsd
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/Administrative/choosers/template.tpsml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/Administrative/choosers/template.tpsml?rev=930126&r1=930125&r2=930126&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/Administrative/choosers/template.tpsml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/Administrative/choosers/template.tpsml
Thu Apr 1 22:52:54 2010
@@ -16,7 +16,7 @@ limitations under the License.
<page-template id="/Administrative/choosers/definition"
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.2/schemas/psml.xsd";>
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.2/schemas/tpsml.xsd";>
<title>Administrative choosers TEMPLATE</title>
<fragment id="template-top2" type="layout"
name="jetspeed-layouts::VelocityOneColumn">
<property name="row" value="0"></property>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/template.tpsml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/template.tpsml?rev=930126&r1=930125&r2=930126&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/template.tpsml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/min-ui-pages/template.tpsml
Thu Apr 1 22:52:54 2010
@@ -16,7 +16,7 @@ limitations under the License.
<page-template id="definition"
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.2/schemas/psml.xsd";>
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.2/schemas/tpsml.xsd";>
<title>TEMPLATE</title>
<fragment id="template-top2" type="layout"
name="jetspeed-layouts::VelocityThreeColumns">
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-content.dpsml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-content.dpsml?rev=930126&r1=930125&r2=930126&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-content.dpsml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-content.dpsml
Thu Apr 1 22:52:54 2010
@@ -18,7 +18,7 @@ limitations under the License.
<dynamic-page id="default-content" content-type="*"
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.2/schemas/psml.xsd";>
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.2/schemas/dpsml.xsd";>
<title>Jetspeed 2 Portals Content</title>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/definition.fpsml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/definition.fpsml?rev=930126&r1=930125&r2=930126&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/definition.fpsml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/definition.fpsml
Thu Apr 1 22:52:54 2010
@@ -2,7 +2,7 @@
<fragment-definition id="definition"
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.2/schemas/psml.xsd";>
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.2/schemas/fpsml.xsd";>
<title>DEFINITION</title>
<fragment id="wp-definition" type="portlet" name="demo::WeatherPortlet"/>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/Administrative/choosers/template.tpsml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/Administrative/choosers/template.tpsml?rev=930126&r1=930125&r2=930126&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/Administrative/choosers/template.tpsml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/Administrative/choosers/template.tpsml
Thu Apr 1 22:52:54 2010
@@ -16,7 +16,7 @@ limitations under the License.
<page-template id="/Administrative/choosers/definition"
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.2/schemas/psml.xsd";>
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.2/schemas/tpsml.xsd";>
<title>Administrative choosers TEMPLATE</title>
<fragment id="template-top2" type="layout"
name="jetspeed-layouts::VelocityOneColumn">
<property name="row" value="0"></property>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/default-content.dpsml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/default-content.dpsml?rev=930126&r1=930125&r2=930126&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/default-content.dpsml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/default-content.dpsml
Thu Apr 1 22:52:54 2010
@@ -18,7 +18,7 @@ limitations under the License.
<dynamic-page id="default-content" content-type="*"
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.2/schemas/psml.xsd";>
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.2/schemas/dpsml.xsd";>
<title>Jetspeed 2 Portals Content</title>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/definition.fpsml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/definition.fpsml?rev=930126&r1=930125&r2=930126&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/definition.fpsml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/definition.fpsml
Thu Apr 1 22:52:54 2010
@@ -2,7 +2,7 @@
<fragment-definition id="definition"
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.2/schemas/psml.xsd";>
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.2/schemas/fpsml.xsd";>
<title>DEFINITION</title>
<fragment id="wp-definition" type="portlet" name="demo::WeatherPortlet"/>
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/template.tpsml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/template.tpsml?rev=930126&r1=930125&r2=930126&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/template.tpsml
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/ui-pages/template.tpsml
Thu Apr 1 22:52:54 2010
@@ -16,7 +16,7 @@ limitations under the License.
<page-template id="definition"
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.2/schemas/psml.xsd";>
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.2/schemas/tpsml.xsd";>
<title>TEMPLATE</title>
<fragment id="template-top2" type="layout"
name="jetspeed-layouts::VelocityThreeColumns">
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/contentpage.dpsml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/contentpage.dpsml?rev=930126&r1=930125&r2=930126&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/contentpage.dpsml
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/contentpage.dpsml
Thu Apr 1 22:52:54 2010
@@ -19,7 +19,7 @@ limitations under the License.
<dynamic-page id="contentpage" content-type="*"
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.2/schemas/psml.xsd";>
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.2/schemas/dpsml.xsd";>
<title>/contentpage.dpsml</title>
<fragment id="fake" name="fake" type="layout"/>
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/definition0.fpsml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/definition0.fpsml?rev=930126&r1=930125&r2=930126&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/definition0.fpsml
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/definition0.fpsml
Thu Apr 1 22:52:54 2010
@@ -19,7 +19,7 @@ limitations under the License.
<fragment-definition id="definition0"
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.2/schemas/psml.xsd";>
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.2/schemas/fpsml.xsd";>
<title>/definition0.fpsml</title>
<fragment id="fake-fragment-definition-0" name="fake-fragment-definition-0"
type="portlet"/>
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/definition1.fpsml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/definition1.fpsml?rev=930126&r1=930125&r2=930126&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/definition1.fpsml
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/definition1.fpsml
Thu Apr 1 22:52:54 2010
@@ -19,7 +19,7 @@ limitations under the License.
<fragment-definition id="definition1"
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.2/schemas/psml.xsd";>
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.2/schemas/fpsml.xsd";>
<title>/definition1.fpsml</title>
<fragment id="fake-fragment-definition-1" name="fake-fragment-definition-1"
type="portlet"/>
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/docpage.dpsml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/docpage.dpsml?rev=930126&r1=930125&r2=930126&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/docpage.dpsml
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/docpage.dpsml
Thu Apr 1 22:52:54 2010
@@ -19,7 +19,7 @@ limitations under the License.
<dynamic-page id="docpage" content-type="doc-type"
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.2/schemas/psml.xsd";>
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.2/schemas/dpsml.xsd";>
<title>/docpage.dpsml</title>
<fragment id="fake" name="fake" type="layout"/>
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/template.tpsml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/template.tpsml?rev=930126&r1=930125&r2=930126&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/template.tpsml
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/resources/webapp/WEB-INF/pages/template.tpsml
Thu Apr 1 22:52:54 2010
@@ -19,7 +19,7 @@ limitations under the License.
<page-template id="template"
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.2/schemas/psml.xsd";>
+ xsi:schemaLocation="http://portals.apache.org/jetspeed
http://portals.apache.org/jetspeed-2/2.2/schemas/tpsml.xsd";>
<title>/template.tpsml</title>
<fragment id="fake-template" name="fake-template" type="layout">
Added: portals/jetspeed-2/portal/trunk/etc/xsd/dpsml.xsd
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/xsd/dpsml.xsd?rev=930126&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/xsd/dpsml.xsd (added)
+++ portals/jetspeed-2/portal/trunk/etc/xsd/dpsml.xsd Thu Apr 1 22:52:54 2010
@@ -0,0 +1,39 @@
+<?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
+
+ 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:include schemaLocation="psml-core.xsd"/>
+ <xs:element name="dynamic-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:schema>
Propchange: portals/jetspeed-2/portal/trunk/etc/xsd/dpsml.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/trunk/etc/xsd/dpsml.xsd
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/portal/trunk/etc/xsd/fpsml.xsd
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/xsd/fpsml.xsd?rev=930126&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/xsd/fpsml.xsd (added)
+++ portals/jetspeed-2/portal/trunk/etc/xsd/fpsml.xsd Thu Apr 1 22:52:54 2010
@@ -0,0 +1,36 @@
+<?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
+
+ 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:include schemaLocation="psml-core.xsd"/>
+ <xs:element name="fragment-definition">
+ <xs:complexType>
+ <xs:sequence>
+ <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="version" use="optional"
type="xs:double" />
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
Propchange: portals/jetspeed-2/portal/trunk/etc/xsd/fpsml.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/trunk/etc/xsd/fpsml.xsd
------------------------------------------------------------------------------
svn:keywords = Id
Added: portals/jetspeed-2/portal/trunk/etc/xsd/psml-core.xsd
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/xsd/psml-core.xsd?rev=930126&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/xsd/psml-core.xsd (added)
+++ portals/jetspeed-2/portal/trunk/etc/xsd/psml-core.xsd Thu Apr 1 22:52:54
2010
@@ -0,0 +1,161 @@
+<?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
+
+ 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="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>
Propchange: portals/jetspeed-2/portal/trunk/etc/xsd/psml-core.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/trunk/etc/xsd/psml-core.xsd
------------------------------------------------------------------------------
svn:keywords = Id
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=930126&r1=930125&r2=930126&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/xsd/psml.xsd (original)
+++ portals/jetspeed-2/portal/trunk/etc/xsd/psml.xsd Thu Apr 1 22:52:54 2010
@@ -19,6 +19,7 @@
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:include schemaLocation="psml-core.xsd"/>
<xs:element name="page">
<xs:complexType>
<xs:sequence>
@@ -35,143 +36,4 @@
<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>
Added: portals/jetspeed-2/portal/trunk/etc/xsd/tpsml.xsd
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/xsd/tpsml.xsd?rev=930126&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/xsd/tpsml.xsd (added)
+++ portals/jetspeed-2/portal/trunk/etc/xsd/tpsml.xsd Thu Apr 1 22:52:54 2010
@@ -0,0 +1,70 @@
+<?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
+
+ 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:include schemaLocation="psml-core.xsd"/>
+ <xs:element name="page-template">
+ <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="version" use="optional"
type="xs:double" />
+ </xs:complexType>
+ </xs:element>
+ <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:element minOccurs="0" maxOccurs="1"
ref="tns:page-fragment" />
+ </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="page-fragment">
+ <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="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:schema>
Propchange: portals/jetspeed-2/portal/trunk/etc/xsd/tpsml.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/trunk/etc/xsd/tpsml.xsd
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
