djencks 2004/08/01 13:14:21
Modified: modules/j2ee maven.xml modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment EARConfigBuilder.java modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment EARConfigBuilderTest.java modules/j2ee/src/test-ear/META-INF application.xml modules/j2ee/src/test-ear/test-ejb-jar/META-INF ejb-jar.xml openejb-jar.xml modules/jetty/src/java/org/apache/geronimo/jetty/deployment JettyModuleBuilder.java specs/schema/src/java/org/apache/geronimo/schema SchemaConversionUtils.java specs/schema/src/test/org/apache/geronimo/schema SchemaConversionUtilsTest.java specs/schema/src/test-data/j2ee_1_3dtd ejb-jar.xml Added: modules/j2ee/src/test-ear13/META-INF application.xml geronimo-application.xml modules/j2ee/src/test-ear13/test-ejb-jar/META-INF ejb-jar.xml openejb-jar.xml modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/bmp SimpleBMPEntity.java SimpleBMPEntityEJB.java SimpleBMPEntityHome.java SimpleBMPEntityLocal.java SimpleBMPEntityLocalHome.java modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/cmp SimpleCMPEntity.java SimpleCMPEntityEJB.java SimpleCMPEntityHome.java SimpleCMPEntityLocal.java SimpleCMPEntityLocalHome.java modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/sfsb SimpleStatefulSession.java SimpleStatefulSessionEJB.java SimpleStatefulSessionHome.java SimpleStatefulSessionLocal.java SimpleStatefulSessionLocalHome.java modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/slsb SimpleStatelessSession.java SimpleStatelessSessionEJB.java SimpleStatelessSessionHome.java SimpleStatelessSessionLocal.java SimpleStatelessSessionLocalHome.java modules/j2ee/src/test-ear13/test-war hello.txt modules/j2ee/src/test-ear13/test-war/WEB-INF geronimo-web.xml web.xml specs/schema/src/j2ee_1_3dtd application_1_3.dtd specs/schema/src/test-data/j2ee_1_3dtd application-13.xml application-14.xml Log: Convert application 1.3 dtd-based dds to application 1.4 schema based dds Revision Changes Path 1.4 +33 -21 incubator-geronimo/modules/j2ee/maven.xml http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/maven.xml.diff?r1=1.3&r2=1.4 1.17 +69 -57 incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java.diff?r1=1.16&r2=1.17 1.6 +36 -6 incubator-geronimo/modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java.diff?r1=1.5&r2=1.6 1.2 +24 -1 incubator-geronimo/modules/j2ee/src/test-ear/META-INF/application.xml http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/META-INF/application.xml.diff?r1=1.1&r2=1.2 1.3 +2 -2 incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/META-INF/ejb-jar.xml http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/META-INF/ejb-jar.xml.diff?r1=1.2&r2=1.3 1.2 +16 -1 incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/META-INF/openejb-jar.xml http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear/test-ejb-jar/META-INF/openejb-jar.xml.diff?r1=1.1&r2=1.2 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/META-INF/application.xml http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/META-INF/application.xml?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/META-INF/geronimo-application.xml http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/META-INF/geronimo-application.xml?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/META-INF/ejb-jar.xml http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/META-INF/ejb-jar.xml?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/META-INF/openejb-jar.xml http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/META-INF/openejb-jar.xml?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/bmp/SimpleBMPEntity.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/bmp/SimpleBMPEntity.java?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/bmp/SimpleBMPEntityEJB.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/bmp/SimpleBMPEntityEJB.java?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/bmp/SimpleBMPEntityHome.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/bmp/SimpleBMPEntityHome.java?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/bmp/SimpleBMPEntityLocal.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/bmp/SimpleBMPEntityLocal.java?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/bmp/SimpleBMPEntityLocalHome.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/bmp/SimpleBMPEntityLocalHome.java?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/cmp/SimpleCMPEntity.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/cmp/SimpleCMPEntity.java?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/cmp/SimpleCMPEntityEJB.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/cmp/SimpleCMPEntityEJB.java?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/cmp/SimpleCMPEntityHome.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/cmp/SimpleCMPEntityHome.java?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/cmp/SimpleCMPEntityLocal.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/cmp/SimpleCMPEntityLocal.java?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/cmp/SimpleCMPEntityLocalHome.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/cmp/SimpleCMPEntityLocalHome.java?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/sfsb/SimpleStatefulSession.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/sfsb/SimpleStatefulSession.java?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/sfsb/SimpleStatefulSessionEJB.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/sfsb/SimpleStatefulSessionEJB.java?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/sfsb/SimpleStatefulSessionHome.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/sfsb/SimpleStatefulSessionHome.java?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/sfsb/SimpleStatefulSessionLocal.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/sfsb/SimpleStatefulSessionLocal.java?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/sfsb/SimpleStatefulSessionLocalHome.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/sfsb/SimpleStatefulSessionLocalHome.java?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/slsb/SimpleStatelessSession.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/slsb/SimpleStatelessSession.java?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/slsb/SimpleStatelessSessionEJB.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/slsb/SimpleStatelessSessionEJB.java?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/slsb/SimpleStatelessSessionHome.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/slsb/SimpleStatelessSessionHome.java?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/slsb/SimpleStatelessSessionLocal.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/slsb/SimpleStatelessSessionLocal.java?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/slsb/SimpleStatelessSessionLocalHome.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-ejb-jar/org/openejb/test/simple/slsb/SimpleStatelessSessionLocalHome.java?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-war/hello.txt http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-war/hello.txt?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-war/WEB-INF/geronimo-web.xml http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-war/WEB-INF/geronimo-web.xml?rev=1.1 1.1 incubator-geronimo/modules/j2ee/src/test-ear13/test-war/WEB-INF/web.xml http://cvs.apache.org/viewcvs/incubator-geronimo/modules/j2ee/src/test-ear13/test-war/WEB-INF/web.xml?rev=1.1 1.18 +29 -18 incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java.diff?r1=1.17&r2=1.18 1.1 incubator-geronimo/specs/schema/src/j2ee_1_3dtd/application_1_3.dtd http://cvs.apache.org/viewcvs/incubator-geronimo/specs/schema/src/j2ee_1_3dtd/application_1_3.dtd?rev=1.1 1.5 +39 -1 incubator-geronimo/specs/schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java.diff?r1=1.4&r2=1.5 1.2 +36 -8 incubator-geronimo/specs/schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java http://cvs.apache.org/viewcvs/incubator-geronimo/specs/schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java.diff?r1=1.1&r2=1.2 1.4 +2 -2 incubator-geronimo/specs/schema/src/test-data/j2ee_1_3dtd/ejb-jar.xml http://cvs.apache.org/viewcvs/incubator-geronimo/specs/schema/src/test-data/j2ee_1_3dtd/ejb-jar.xml.diff?r1=1.3&r2=1.4 1.1 incubator-geronimo/specs/schema/src/test-data/j2ee_1_3dtd/application-13.xml http://cvs.apache.org/viewcvs/incubator-geronimo/specs/schema/src/test-data/j2ee_1_3dtd/application-13.xml?rev=1.1 1.1 incubator-geronimo/specs/schema/src/test-data/j2ee_1_3dtd/application-14.xml http://cvs.apache.org/viewcvs/incubator-geronimo/specs/schema/src/test-data/j2ee_1_3dtd/application-14.xml?rev=1.1