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/12/08 03:12:18 UTC
svn commit: r354933 - in /geronimo/trunk: modules/j2ee-schema/
modules/j2ee-schema/src/j2ee_1_2dtd/ modules/j2ee-schema/src/j2ee_1_3dtd/
modules/j2ee-schema/src/resources/
modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/
modules/j2ee-schema...
Author: djencks
Date: Wed Dec 7 18:12:10 2005
New Revision: 354933
URL: http://svn.apache.org/viewcvs?rev=354933&view=rev
Log:
Add the dtds into the schema dir in assemblies
Added:
geronimo/trunk/modules/j2ee-schema/src/resources/
geronimo/trunk/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/
geronimo/trunk/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/
geronimo/trunk/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/
geronimo/trunk/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/
geronimo/trunk/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/
geronimo/trunk/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/
- copied from r354862, geronimo/trunk/modules/j2ee-schema/src/j2ee_1_2dtd/
geronimo/trunk/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/application-client_1_2.dtd
- copied unchanged from r354932, geronimo/trunk/modules/j2ee-schema/src/j2ee_1_2dtd/application-client_1_2.dtd
geronimo/trunk/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/application_1_2.dtd
- copied unchanged from r354932, geronimo/trunk/modules/j2ee-schema/src/j2ee_1_2dtd/application_1_2.dtd
geronimo/trunk/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/ejb-jar_1_1.dtd
- copied unchanged from r354932, geronimo/trunk/modules/j2ee-schema/src/j2ee_1_2dtd/ejb-jar_1_1.dtd
geronimo/trunk/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/web-app_2_2.dtd
- copied unchanged from r354932, geronimo/trunk/modules/j2ee-schema/src/j2ee_1_2dtd/web-app_2_2.dtd
geronimo/trunk/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/web-jsptaglibrary_1_1.dtd
- copied unchanged from r354932, geronimo/trunk/modules/j2ee-schema/src/j2ee_1_2dtd/web-jsptaglibrary_1_1.dtd
geronimo/trunk/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/
- copied from r354862, geronimo/trunk/modules/j2ee-schema/src/j2ee_1_3dtd/
geronimo/trunk/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/application-client_1_3.dtd
- copied unchanged from r354932, geronimo/trunk/modules/j2ee-schema/src/j2ee_1_3dtd/application-client_1_3.dtd
geronimo/trunk/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/application_1_3.dtd
- copied unchanged from r354932, geronimo/trunk/modules/j2ee-schema/src/j2ee_1_3dtd/application_1_3.dtd
geronimo/trunk/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/connector_1_0.dtd
- copied unchanged from r354932, geronimo/trunk/modules/j2ee-schema/src/j2ee_1_3dtd/connector_1_0.dtd
geronimo/trunk/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/ejb-jar_2_0.dtd
- copied unchanged from r354932, geronimo/trunk/modules/j2ee-schema/src/j2ee_1_3dtd/ejb-jar_2_0.dtd
geronimo/trunk/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/web-app_2_3.dtd
- copied unchanged from r354932, geronimo/trunk/modules/j2ee-schema/src/j2ee_1_3dtd/web-app_2_3.dtd
geronimo/trunk/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/web-jsptaglibrary_1_2.dtd
- copied unchanged from r354932, geronimo/trunk/modules/j2ee-schema/src/j2ee_1_3dtd/web-jsptaglibrary_1_2.dtd
Removed:
geronimo/trunk/modules/j2ee-schema/src/j2ee_1_2dtd/
geronimo/trunk/modules/j2ee-schema/src/j2ee_1_3dtd/
Modified:
geronimo/trunk/modules/j2ee-schema/project.xml
geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
Modified: geronimo/trunk/modules/j2ee-schema/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-schema/project.xml?rev=354933&r1=354932&r2=354933&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/project.xml (original)
+++ geronimo/trunk/modules/j2ee-schema/project.xml Wed Dec 7 18:12:10 2005
@@ -63,7 +63,22 @@
</dependencies>
- <!--build>
- <sourceDirectory>${basedir}/src</sourceDirectory>
- </build-->
+<!--
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/j2ee_1_2dtd</directory>
+ <includes>
+ <include>**/*.dtd</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/j2ee_1_3dtd</directory>
+ <includes>
+ <include>**/*.dtd</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+-->
</project>
Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly?rev=354933&r1=354932&r2=354933&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly Wed Dec 7 18:12:10 2005
@@ -139,6 +139,8 @@
<ant:unjar dest="${maven.build.dir}/schema">
<ant:patternset>
<ant:include name="schemaorg_apache_xmlbeans/src/**/*.xsd"/>
+ <!-- we put the dtds in, not xmlbeans -->
+ <ant:include name="schemaorg_apache_xmlbeans/src/**/*.dtd"/>
</ant:patternset>
<ant:fileset dir="${geronimo.assembly.dest}/repository">
<ant:include name="*/jars/*-builder-*.jar"/>