Author: aheritier
Date: Thu Sep 15 15:32:23 2005
New Revision: 289327
URL: http://svn.apache.org/viewcvs?rev=289327&view=rev
Log:
MAVEN-1685 : http://maven.apache.org/maven-navigation-1.0.xsd is now
deprecated. It's replaced by
http://maven.apache.org/reference/plugins/xdoc/maven-navigation-${maven-xdoc-plugin-release}.xsd
Added:
maven/maven-1/plugins/trunk/xdoc/maven.xml
maven/maven-1/plugins/trunk/xdoc/src/xsd/
maven/maven-1/plugins/trunk/xdoc/src/xsd/README.txt
maven/maven-1/plugins/trunk/xdoc/src/xsd/archives/
maven/maven-1/plugins/trunk/xdoc/src/xsd/archives/maven-navigation-1.10.xsd
maven/maven-1/plugins/trunk/xdoc/src/xsd/maven-navigation.xsd
Added: maven/maven-1/plugins/trunk/xdoc/maven.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/maven.xml?rev=289327&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/maven.xml (added)
+++ maven/maven-1/plugins/trunk/xdoc/maven.xml Thu Sep 15 15:32:23 2005
@@ -0,0 +1,43 @@
+<!--
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+ -->
+<project xmlns:j="jelly:core" xmlns:u="jelly:util" xmlns:x="jelly:xml"
xmlns:ant="jelly:ant" xmlns:maven="jelly:maven">
+ <postGoal name="site">
+ <!-- copy xsd files to the web site -->
+ <ant:copy todir="${maven.docs.dest}">
+ <ant:fileset dir="${basedir}/src/xsd/archives">
+ <ant:include name="*.xsd"/>
+ </ant:fileset>
+ </ant:copy>
+ </postGoal>
+ <preGoal name="plugin:plugin">
+ <!-- Create / Update xsd for navigation.xml -->
+ <!-- Remove SNAPSHOT -->
+ <j:choose>
+ <j:when test="${pom.currentVersion.endsWith('-SNAPSHOT')}">
+ <j:set var="currentRelease"
value="${pom.currentVersion.substring(0,pom.currentVersion.length()-9)}"/>
+ </j:when>
+ <j:otherwise>
+ <j:set var="currentRelease" value="${pom.currentVersion}"/>
+ </j:otherwise>
+ </j:choose>
+ <!-- We must work on maven-navigation.xsd but we publish
maven-navigation-${currentRelease}.xsd -->
+ <j:set
var="currentNavigationXSD">${basedir}/src/xsd/archives/maven-navigation-${currentRelease}.xsd</j:set>
+ <j:set
var="defaultNavigationXSD">${basedir}/src/xsd/maven-navigation.xsd</j:set>
+ <ant:copy file="${defaultNavigationXSD}" tofile="${currentNavigationXSD}"/>
+ </preGoal>
+</project>
Added: maven/maven-1/plugins/trunk/xdoc/src/xsd/README.txt
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/xsd/README.txt?rev=289327&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/xsd/README.txt (added)
+++ maven/maven-1/plugins/trunk/xdoc/src/xsd/README.txt Thu Sep 15 15:32:23 2005
@@ -0,0 +1,2 @@
+We must edit maven-navigation.xsd in this directory but never
maven-navigation-${currentRelease}.xsd in archives.
+We store maven-navigation-${currentRelease}.xsd in the SCM to be able to
re-publish them if necessary.
\ No newline at end of file
Added:
maven/maven-1/plugins/trunk/xdoc/src/xsd/archives/maven-navigation-1.10.xsd
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/xsd/archives/maven-navigation-1.10.xsd?rev=289327&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/xsd/archives/maven-navigation-1.10.xsd
(added)
+++ maven/maven-1/plugins/trunk/xdoc/src/xsd/archives/maven-navigation-1.10.xsd
Thu Sep 15 15:32:23 2005
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed 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";>
+ <xs:element name="project">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="title"/>
+ <xs:element ref="head" minOccurs="0"/>
+ <xs:element ref="body"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="title" type="xs:string"/>
+ <xs:element name="head"/>
+ <xs:element name="body">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="breadcrumbs" minOccurs="0"/>
+ <xs:element ref="links" minOccurs="0"/>
+ <xs:element ref="menu" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="links">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="item" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="breadcrumbs">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="item" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="menu">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="item" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string"/>
+ <xs:attribute name="type" type="xs:string"/>
+ <!-- type is an optional entry that defines where the menu is destined
for.
+ Values - left-header (default), left-footer -->
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="item">
+ <xs:complexType>
+ <xs:sequence>
+ <!-- items can have other items -->
+ <xs:element ref="item" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string"/>
+ <xs:attribute name="href" type="xs:string"/>
+ <xs:attribute name="collapse" type="xs:boolean"/>
+ <xs:attribute name="target" type="xs:string"/>
+ <xs:attribute name="img" type="xs:string"/>
+ <!-- img is an href that will be used as the image for link -->
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
Added: maven/maven-1/plugins/trunk/xdoc/src/xsd/maven-navigation.xsd
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/xsd/maven-navigation.xsd?rev=289327&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/xsd/maven-navigation.xsd (added)
+++ maven/maven-1/plugins/trunk/xdoc/src/xsd/maven-navigation.xsd Thu Sep 15
15:32:23 2005
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed 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";>
+ <xs:element name="project">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="title"/>
+ <xs:element ref="head" minOccurs="0"/>
+ <xs:element ref="body"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="title" type="xs:string"/>
+ <xs:element name="head"/>
+ <xs:element name="body">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="breadcrumbs" minOccurs="0"/>
+ <xs:element ref="links" minOccurs="0"/>
+ <xs:element ref="menu" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="links">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="item" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="breadcrumbs">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="item" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="menu">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="item" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string"/>
+ <xs:attribute name="type" type="xs:string"/>
+ <!-- type is an optional entry that defines where the menu is destined
for.
+ Values - left-header (default), left-footer -->
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="item">
+ <xs:complexType>
+ <xs:sequence>
+ <!-- items can have other items -->
+ <xs:element ref="item" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string"/>
+ <xs:attribute name="href" type="xs:string"/>
+ <xs:attribute name="collapse" type="xs:boolean"/>
+ <xs:attribute name="target" type="xs:string"/>
+ <xs:attribute name="img" type="xs:string"/>
+ <!-- img is an href that will be used as the image for link -->
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
