You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2004/11/14 01:42:32 UTC
svn commit: rev 65556 - in geronimo/trunk/modules: assembly client-builder/src/schema jetty-builder/src/schema
Author: ammulder
Date: Sat Nov 13 16:42:32 2004
New Revision: 65556
Modified:
geronimo/trunk/modules/assembly/maven.xml
geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd
geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd
Log:
More cleanup after rearranging modules and stuff
Modified: geronimo/trunk/modules/assembly/maven.xml
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Sat Nov 13 16:42:32 2004
@@ -120,14 +120,16 @@
<ant:fileScanner var="schemaScanner">
<ant:fileset dir="${distDir}/schema">
<ant:include name="geronimo-application.xsd"/>
+ <ant:include name="geronimo-application-client.xsd"/>
<ant:include name="geronimo-jetty.xsd"/>
<ant:include name="geronimo-connector_1_5.xsd"/>
</ant:fileset>
</ant:fileScanner>
<j:forEach var="schema" items="${schemaScanner.iterator()}">
- <ant:replace file="${schema}" token="../../../naming/src/schema/" value=""/>
+ <ant:replace file="${schema}" token="../../../naming-builder/src/schema/" value=""/>
<ant:replace file="${schema}" token="../../../deployment/src/schema/" value=""/>
- <ant:replace file="${schema}" token="../../../security/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 -->
Modified: geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd
==============================================================================
--- geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd (original)
+++ geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd Sat Nov 13 16:42:32 2004
@@ -26,7 +26,7 @@
attributeFormDefault="unqualified"
version="1.0">
- <xs:import namespace="http://geronimo.apache.org/xml/ns/naming" schemaLocation="../../../naming/src/schema/geronimo-naming.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/naming" schemaLocation="../../../naming-builder/src/schema/geronimo-naming.xsd"/>
<xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/connector" schemaLocation="../../../connector-builder/src/schema/geronimo-connector_1_5.xsd"/>
<!--xs:include schemaLocation="../../../naming/src/schema/geronimo-naming.xsd"/-->
<xs:include schemaLocation="../../../deployment/src/schema/geronimo-common.xsd"/>
@@ -46,7 +46,7 @@
<!--xs:group ref="naming:jndiEnvironmentRefsGroup"/-->
<xs:element ref="naming:ejb-ref" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element ref="naming:ejb-local-ref" minOccurs="0" maxOccurs="unbounded"/>
+ <!--<xs:element ref="naming:ejb-local-ref" minOccurs="0" maxOccurs="unbounded"/>-->
<!-- leave web services out until I know what they do -->
<!--xs:group ref="service-refGroup"/-->
<xs:element ref="naming:resource-ref" minOccurs="0" maxOccurs="unbounded"/>
Modified: geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd (original)
+++ geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd Sat Nov 13 16:42:32 2004
@@ -26,11 +26,10 @@
attributeFormDefault="unqualified"
version="1.0">
- <xs:import namespace="http://geronimo.apache.org/xml/ns/naming" schemaLocation="../../../naming/src/schema/geronimo-naming.xsd"/>
- <xs:import namespace="http://geronimo.apache.org/xml/ns/security" schemaLocation="../../../naming/src/schema/geronimo-security.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/naming" schemaLocation="../../../naming-builder/src/schema/geronimo-naming.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/security" schemaLocation="../../../security-builder/src/schema/geronimo-security.xsd"/>
<xs:include schemaLocation="../../../deployment/src/schema/geronimo-common.xsd"/>
-<!-- <xs:include schemaLocation="../../../security/src/schema/geronimo-security.xsd"/>-->
<xs:element name="web-app" type="jetty:web-appType"/>
Re: svn commit: rev 65556 - in geronimo/trunk/modules: assembly
client-builder/src/schema jetty-builder/src/schema
Posted by Aaron Mulder <am...@alumni.princeton.edu>.
I also took ejb-local-refs away from J2EE clients in this change.
Aaron
On Sat, 14 Nov 2004 ammulder@apache.org wrote:
> Author: ammulder
> Date: Sat Nov 13 16:42:32 2004
> New Revision: 65556
>
> Modified:
> geronimo/trunk/modules/assembly/maven.xml
> geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd
> geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd
> Log:
> More cleanup after rearranging modules and stuff
>
>
> Modified: geronimo/trunk/modules/assembly/maven.xml
> ==============================================================================
> --- geronimo/trunk/modules/assembly/maven.xml (original)
> +++ geronimo/trunk/modules/assembly/maven.xml Sat Nov 13 16:42:32 2004
> @@ -120,14 +120,16 @@
> <ant:fileScanner var="schemaScanner">
> <ant:fileset dir="${distDir}/schema">
> <ant:include name="geronimo-application.xsd"/>
> + <ant:include name="geronimo-application-client.xsd"/>
> <ant:include name="geronimo-jetty.xsd"/>
> <ant:include name="geronimo-connector_1_5.xsd"/>
> </ant:fileset>
> </ant:fileScanner>
> <j:forEach var="schema" items="${schemaScanner.iterator()}">
> - <ant:replace file="${schema}" token="../../../naming/src/schema/" value=""/>
> + <ant:replace file="${schema}" token="../../../naming-builder/src/schema/" value=""/>
> <ant:replace file="${schema}" token="../../../deployment/src/schema/" value=""/>
> - <ant:replace file="${schema}" token="../../../security/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 -->
>
> Modified: geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd
> ==============================================================================
> --- geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd (original)
> +++ geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd Sat Nov 13 16:42:32 2004
> @@ -26,7 +26,7 @@
> attributeFormDefault="unqualified"
> version="1.0">
>
> - <xs:import namespace="http://geronimo.apache.org/xml/ns/naming" schemaLocation="../../../naming/src/schema/geronimo-naming.xsd"/>
> + <xs:import namespace="http://geronimo.apache.org/xml/ns/naming" schemaLocation="../../../naming-builder/src/schema/geronimo-naming.xsd"/>
> <xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/connector" schemaLocation="../../../connector-builder/src/schema/geronimo-connector_1_5.xsd"/>
> <!--xs:include schemaLocation="../../../naming/src/schema/geronimo-naming.xsd"/-->
> <xs:include schemaLocation="../../../deployment/src/schema/geronimo-common.xsd"/>
> @@ -46,7 +46,7 @@
> <!--xs:group ref="naming:jndiEnvironmentRefsGroup"/-->
>
> <xs:element ref="naming:ejb-ref" minOccurs="0" maxOccurs="unbounded"/>
> - <xs:element ref="naming:ejb-local-ref" minOccurs="0" maxOccurs="unbounded"/>
> + <!--<xs:element ref="naming:ejb-local-ref" minOccurs="0" maxOccurs="unbounded"/>-->
> <!-- leave web services out until I know what they do -->
> <!--xs:group ref="service-refGroup"/-->
> <xs:element ref="naming:resource-ref" minOccurs="0" maxOccurs="unbounded"/>
>
> Modified: geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd
> ==============================================================================
> --- geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd (original)
> +++ geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd Sat Nov 13 16:42:32 2004
> @@ -26,11 +26,10 @@
> attributeFormDefault="unqualified"
> version="1.0">
>
> - <xs:import namespace="http://geronimo.apache.org/xml/ns/naming" schemaLocation="../../../naming/src/schema/geronimo-naming.xsd"/>
> - <xs:import namespace="http://geronimo.apache.org/xml/ns/security" schemaLocation="../../../naming/src/schema/geronimo-security.xsd"/>
> + <xs:import namespace="http://geronimo.apache.org/xml/ns/naming" schemaLocation="../../../naming-builder/src/schema/geronimo-naming.xsd"/>
> + <xs:import namespace="http://geronimo.apache.org/xml/ns/security" schemaLocation="../../../security-builder/src/schema/geronimo-security.xsd"/>
>
> <xs:include schemaLocation="../../../deployment/src/schema/geronimo-common.xsd"/>
> -<!-- <xs:include schemaLocation="../../../security/src/schema/geronimo-security.xsd"/>-->
>
> <xs:element name="web-app" type="jetty:web-appType"/>
>
>