You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/10/02 07:03:34 UTC
svn commit: r293072 - in /geronimo/trunk/modules: assembly/
jetty-builder/src/schema/ security-builder/src/schema/
tomcat-builder/src/schema/ web-builder/src/schema/
Author: djencks
Date: Sat Oct 1 22:03:29 2005
New Revision: 293072
URL: http://svn.apache.org/viewcvs?rev=293072&view=rev
Log:
GERONIMO-825 remove spurious schema/ path from schema imports. Also clean up maven.xml in assembly, including new schemas.
Modified:
geronimo/trunk/modules/assembly/maven.xml
geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty-1.0.xsd
geronimo/trunk/modules/security-builder/src/schema/geronimo-security-1.0.xsd
geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-1.0.xsd
geronimo/trunk/modules/web-builder/src/schema/geronimo-web-1.0.xsd
Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=293072&r1=293071&r2=293072&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Sat Oct 1 22:03:29 2005
@@ -133,6 +133,12 @@
<ant:fileset dir="${project.root}/modules/web-builder">
<ant:include name="src/schema/*.xsd"/>
</ant:fileset>
+ <ant:fileset dir="${project.root}/modules/jetty-builder">
+ <ant:include name="src/schema/*.xsd"/>
+ </ant:fileset>
+ <ant:fileset dir="${project.root}/modules/tomcat-builder">
+ <ant:include name="src/schema/*.xsd"/>
+ </ant:fileset>
<ant:fileset dir="${project.root}/modules/connector-builder">
<ant:include name="src/schema/*.xsd"/>
</ant:fileset>
@@ -172,23 +178,6 @@
</ant:fileset>
</ant:move>
<ant:delete dir="${geronimo.assembly.dir}/META-INF"/>
-
- <!-- update include paths in all schemas -->
- <ant:fileScanner var="schemaScanner">
- <ant:fileset dir="${geronimo.assembly.dir}/schema">
- <ant:include name="geronimo-application*.xsd"/>
- <ant:include name="geronimo-application-client*.xsd"/>
- <ant:include name="geronimo-jetty*.xsd"/>
- <ant:include name="geronimo-tomcat*.xsd"/>
- <ant:include name="geronimo-connector*.xsd"/>
- </ant:fileset>
- </ant:fileScanner>
- <j:forEach var="schema" items="${schemaScanner.iterator()}">
- <ant:replace file="${schema}" token="../../../naming-builder/src/schema/" value=""/>
- <ant:replace file="${schema}" token="../../../service-builder/src/schema/" value=""/>
- <ant:replace file="${schema}" token="../../../security-builder/src/schema/" value=""/>
- <ant:replace file="${schema}" token="../../../connector-builder/src/schema/" value=""/>
- </j:forEach>
<!-- copy in data files -->
<ant:copy todir="${geronimo.assembly.dir}/var">
Modified: geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty-1.0.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty-1.0.xsd?rev=293072&r1=293071&r2=293072&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty-1.0.xsd (original)
+++ geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty-1.0.xsd Sat Oct 1 22:03:29 2005
@@ -27,9 +27,9 @@
attributeFormDefault="unqualified"
version="1.0">
- <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.0" schemaLocation="schema/geronimo-naming-1.0.xsd"/>
- <xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.0" schemaLocation="schema/geronimo-security-1.0.xsd"/>
- <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.0" schemaLocation="schema/geronimo-config-1.0.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.0" schemaLocation="geronimo-naming-1.0.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.0" schemaLocation="geronimo-security-1.0.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.0" schemaLocation="geronimo-config-1.0.xsd"/>
<xs:element name="web-app" type="web:web-appType"/>
Modified: geronimo/trunk/modules/security-builder/src/schema/geronimo-security-1.0.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security-builder/src/schema/geronimo-security-1.0.xsd?rev=293072&r1=293071&r2=293072&view=diff
==============================================================================
--- geronimo/trunk/modules/security-builder/src/schema/geronimo-security-1.0.xsd (original)
+++ geronimo/trunk/modules/security-builder/src/schema/geronimo-security-1.0.xsd Sat Oct 1 22:03:29 2005
@@ -25,8 +25,6 @@
attributeFormDefault="unqualified"
version="1.0">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="schema/xml.xsd"/>
-
<xsd:element name="security" type="geronimo:securityType"/>
<xsd:element name="default-principal" type="geronimo:default-principalType"/>
Modified: geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-1.0.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-1.0.xsd?rev=293072&r1=293071&r2=293072&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-1.0.xsd (original)
+++ geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-1.0.xsd Sat Oct 1 22:03:29 2005
@@ -27,9 +27,9 @@
attributeFormDefault="unqualified"
version="1.0">
- <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.0" schemaLocation="schema/geronimo-naming-1.0.xsd"/>
- <xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.0" schemaLocation="schema/geronimo-security-1.0.xsd"/>
- <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.0" schemaLocation="schema/geronimo-config-1.0.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.0" schemaLocation="geronimo-naming-1.0.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.0" schemaLocation="geronimo-security-1.0.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.0" schemaLocation="geronimo-config-1.0.xsd"/>
<xs:element name="web-app" type="tomcat:web-appType"/>
Modified: geronimo/trunk/modules/web-builder/src/schema/geronimo-web-1.0.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/web-builder/src/schema/geronimo-web-1.0.xsd?rev=293072&r1=293071&r2=293072&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/src/schema/geronimo-web-1.0.xsd (original)
+++ geronimo/trunk/modules/web-builder/src/schema/geronimo-web-1.0.xsd Sat Oct 1 22:03:29 2005
@@ -27,9 +27,9 @@
attributeFormDefault="unqualified"
version="1.0">
- <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.0" schemaLocation="schema/geronimo-naming-1.0.xsd"/>
- <xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.0" schemaLocation="schema/geronimo-security-1.0.xsd"/>
- <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.0" schemaLocation="schema/geronimo-config-1.0.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.0" schemaLocation="geronimo-naming-1.0.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.0" schemaLocation="geronimo-security-1.0.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.0" schemaLocation="geronimo-config-1.0.xsd"/>
<xs:element name="web-app" type="web:web-appType"/>