geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akulshresh...@apache.org
Subject svn commit: r495635 - in /geronimo/server/trunk: assemblies/geronimo-boilerplate-minimal/ configs/j2ee-deployer/ modules/ modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/ modules/geronimo-axis/ modules/geronimo-connector-bu...
Date Fri, 12 Jan 2007 16:46:44 GMT
Author: akulshreshtha
Date: Fri Jan 12 08:46:40 2007
New Revision: 495635

URL: http://svn.apache.org/viewvc?view=rev&rev=495635
Log:
GERONIMO-2723 Upgrade naming-builder and hence j2ee-builder to use javaee 5 schemas

Added:
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDTest.java   (with props)
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDUnpackedTest.java   (with props)
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedTest.java   (with props)
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedUnpackedTest.java   (with props)
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java   (with props)
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5UnpackedTest.java   (with props)
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/application-5.xml   (with props)
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverter.java
      - copied unchanged from r494306, geronimo/server/trunk/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverter.java
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WARConfiguration.java
      - copied unchanged from r494306, geronimo/server/trunk/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/WARConfiguration.java
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WARConfigurer.java
      - copied unchanged from r494306, geronimo/server/trunk/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/WARConfigurer.java
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigBean.java
      - copied unchanged from r494306, geronimo/server/trunk/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigBean.java
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigRoot.java
      - copied, changed from r494306, geronimo/server/trunk/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigRoot.java
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/schema/
      - copied from r494306, geronimo/server/trunk/modules/geronimo-web-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/schema/geronimo-web-1.2.xsd
      - copied unchanged from r495566, geronimo/server/trunk/modules/geronimo-web-builder/src/main/schema/geronimo-web-1.2.xsd
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/schema/xmlconfig.xml
      - copied unchanged from r495566, geronimo/server/trunk/modules/geronimo-web-builder/src/main/schema/xmlconfig.xml
Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
    geronimo/server/trunk/configs/j2ee-deployer/pom.xml
    geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
    geronimo/server/trunk/modules/geronimo-axis/pom.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
    geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
    geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java
    geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
    geronimo/server/trunk/modules/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java
    geronimo/server/trunk/modules/geronimo-j2ee-schema/src/main/resources/META-INF/geronimo-dependency.xml
    geronimo/server/trunk/modules/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
    geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
    geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ENCHelper.java
    geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
    geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-webservices/pom.xml
    geronimo/server/trunk/modules/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Fri Jan 12 08:46:40 2007
@@ -207,7 +207,7 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-web-builder</artifactId>
+                                    <artifactId>geronimo-web-2.5-builder</artifactId>
                                     <version>${version}</version>
                                 </artifactItem>
                                 <artifactItem>

Modified: geronimo/server/trunk/configs/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-deployer/pom.xml?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/configs/j2ee-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-deployer/pom.xml Fri Jan 12 08:46:40 2007
@@ -84,7 +84,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-web-builder</artifactId>
+            <artifactId>geronimo-web-2.5-builder</artifactId>
             <version>${version}</version>
         </dependency>
 
@@ -100,7 +100,7 @@
             <artifactId>geronimo-security-builder</artifactId>
             <version>${version}</version>
         </dependency>
-        
+
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java Fri Jan 12 08:46:40 2007
@@ -198,6 +198,15 @@
         return refMap;
     }
 
+    // This is temporary
+    private static String getStringValue(org.apache.geronimo.xbeans.j2ee.String string) {
+        if (string == null) {
+            return null;
+        }
+        String s = string.getStringValue();
+        return s == null ? null : s.trim();
+    }
+
     public static final GBeanInfo GBEAN_INFO;
 
     static {

Modified: geronimo/server/trunk/modules/geronimo-axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis/pom.xml?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-axis/pom.xml Fri Jan 12 08:46:40 2007
@@ -76,7 +76,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.4_spec</artifactId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
         </dependency>
         
         <dependency>

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml Fri Jan 12 08:46:40 2007
@@ -53,6 +53,11 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.schema</groupId>
+            <artifactId>geronimo-schema-j2ee_1.4</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-test-ddbean</artifactId>
             <version>${version}</version>

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java Fri Jan 12 08:46:40 2007
@@ -243,6 +243,14 @@
         return GER_ADMIN_OBJECT_REF_QNAME_SET;
     }
 
+    private static String getStringValue(org.apache.geronimo.xbeans.j2ee.String string) {
+        if (string == null) {
+            return null;
+        }
+        String s = string.getStringValue();
+        return s == null ? null : s.trim();
+    }
+
     public static final GBeanInfo GBEAN_INFO;
 
     static {

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java Fri Jan 12 08:46:40 2007
@@ -209,6 +209,14 @@
         return GER_RESOURCE_REF_QNAME_SET;
     }
 
+    protected static String getStringValue(org.apache.geronimo.xbeans.j2ee.String string) {
+        if (string == null) {
+            return null;
+        }
+        String s = string.getStringValue();
+        return s == null ? null : s.trim();
+    }
+
     public static final GBeanInfo GBEAN_INFO;
 
     static {

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml Fri Jan 12 08:46:40 2007
@@ -36,19 +36,19 @@
         
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-security</artifactId>
+            <artifactId>geronimo-j2ee-schema</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
+            <artifactId>geronimo-security</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-j2ee-schema</artifactId>
+            <artifactId>geronimo-service-builder</artifactId>
             <version>${version}</version>
         </dependency>
         
@@ -107,6 +107,25 @@
                                     -->
                                     <destFileName>test-ear-j2ee_1.4-naked.ear</destFileName>
                                 </artifactItem>
+
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.testsupport</groupId>
+                                    <artifactId>test-ear-javaee_5</artifactId>
+                                    <version>${version}</version>
+                                    <type>ear</type>
+                                    <destFileName>test-ear-javaee_5.ear</destFileName>
+                                </artifactItem>
+                                
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.testsupport</groupId>
+                                    <artifactId>test-ear-javaee_5</artifactId>
+                                    <version>${version}</version>
+                                    <type>ear</type>
+                                    <!--
+                                    FIXME: need to remove the geronimo-application.xml file from this ear.
+                                    -->
+                                    <destFileName>test-ear-javaee_5-naked.ear</destFileName>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>
@@ -128,11 +147,20 @@
                         </goals>
                         <configuration>
                             <tasks>
+                                <mkdir dir="${project.build.directory}/test-ear-javaee_5-unpacked.ear"/>
+                                <unzip src="${project.build.directory}/test-ear-javaee_5.ear"
+                                    dest="${project.build.directory}/test-ear-javaee_5-unpacked.ear"/>
+                                
+                                <mkdir dir="${project.build.directory}/test-ear-javaee_5-naked-unpacked.ear"/>
+                                <unzip src="${project.build.directory}/test-ear-javaee_5-naked.ear"
+                                    dest="${project.build.directory}/test-ear-javaee_5-naked-unpacked.ear"/>
+
+                                <!-- are these tests needed ? -->
                                 <mkdir dir="${project.build.directory}/test-ear-j2ee_1.4-unpacked.ear"/>
                                 <unzip src="${project.build.directory}/test-ear-j2ee_1.4.ear"
                                     dest="${project.build.directory}/test-ear-j2ee_1.4-unpacked.ear"/>
                                 
-                                <mkdir dir="${project.build.directory}/test-ear-j2ee_1.4-naked-unpacked.ear"/>
+                                <mkdir dir="${project.build.directory}/test-ear-javaee_5-naked-unpacked.ear"/>
                                 <unzip src="${project.build.directory}/test-ear-j2ee_1.4-naked.ear"
                                     dest="${project.build.directory}/test-ear-j2ee_1.4-naked-unpacked.ear"/>
                             </tasks>

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Fri Jan 12 08:46:40 2007
@@ -86,9 +86,9 @@
 import org.apache.geronimo.xbeans.geronimo.j2ee.GerExtModuleType;
 import org.apache.geronimo.xbeans.geronimo.j2ee.GerModuleType;
 import org.apache.geronimo.xbeans.geronimo.j2ee.GerSecurityDocument;
-import org.apache.geronimo.xbeans.j2ee.ApplicationType;
-import org.apache.geronimo.xbeans.j2ee.ModuleType;
-import org.apache.geronimo.xbeans.j2ee.ApplicationDocument;
+import org.apache.geronimo.xbeans.javaee.ApplicationType;
+import org.apache.geronimo.xbeans.javaee.ModuleType;
+import org.apache.geronimo.xbeans.javaee.ApplicationDocument;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlCursor;
@@ -422,14 +422,24 @@
         }
         XmlCursor cursor = xmlObject.newCursor();
         XmlCursor moveable = xmlObject.newCursor();
-        String schemaLocationURL = "http://java.sun.com/xml/ns/j2ee/application_1_4.xsd";
-        String version = "1.4";
+        String schemaLocationURL = "http://java.sun.com/xml/ns/javaee/application_5.xsd";
+        String version = "5";
         try {
-            SchemaConversionUtils.convertToSchema(cursor, SchemaConversionUtils.J2EE_NAMESPACE, schemaLocationURL, version);
             cursor.toStartDoc();
-            cursor.toChild(SchemaConversionUtils.J2EE_NAMESPACE, "application");
             cursor.toFirstChild();
-            SchemaConversionUtils.convertToDescriptionGroup(SchemaConversionUtils.J2EE_NAMESPACE, cursor, moveable);
+            if ("http://java.sun.com/xml/ns/j2ee".equals(cursor.getName().getNamespaceURI())) {
+                SchemaConversionUtils.convertSchemaVersion(cursor, SchemaConversionUtils.JAVAEE_NAMESPACE, schemaLocationURL, version);
+                XmlObject result = xmlObject.changeType(ApplicationDocument.type);
+                XmlBeansUtil.validateDD(result);
+                return (ApplicationDocument) result;
+            }
+            
+            // otherwise assume DTD
+            SchemaConversionUtils.convertToSchema(cursor, SchemaConversionUtils.JAVAEE_NAMESPACE, schemaLocationURL, version);
+            cursor.toStartDoc();
+            cursor.toChild(SchemaConversionUtils.JAVAEE_NAMESPACE, "application");
+            cursor.toFirstChild();
+            SchemaConversionUtils.convertToDescriptionGroup(SchemaConversionUtils.JAVAEE_NAMESPACE, cursor, moveable);
         } finally {
             cursor.dispose();
             moveable.dispose();

Added: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDTest.java?view=auto&rev=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDTest.java (added)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDTest.java Fri Jan 12 08:46:40 2007
@@ -0,0 +1,43 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You 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.
+ */
+package org.apache.geronimo.j2ee.deployment;
+
+import org.apache.geronimo.deployment.util.DeploymentUtil;
+
+/**
+ * EAR config builder tests for J2EE 1.4 using alt-dd..
+ *
+ * @version $Rev:386276 $ $Date$
+ */
+public class EARConfigBuilder5AltDDTest
+    extends EARConfigBuilderTestSupport
+{
+    protected void setUp() throws Exception {
+        earFile = DeploymentUtil.createJarFile(resolveFile("target/test-ear-javaee_5.ear"));
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar/", null, null, null, portMap);
+        webConfigBuilder.contextRoot = contextRoot;
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar", null, null, null);
+    }
+
+    protected void tearDown() {
+        DeploymentUtil.close(earFile);
+        close(ejbConfigBuilder.ejbModule);
+        close(webConfigBuilder.webModule);
+        close(connectorConfigBuilder.connectorModule);
+    }
+}

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDUnpackedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDUnpackedTest.java?view=auto&rev=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDUnpackedTest.java (added)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDUnpackedTest.java Fri Jan 12 08:46:40 2007
@@ -0,0 +1,43 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You 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.
+ */
+package org.apache.geronimo.j2ee.deployment;
+
+import org.apache.geronimo.deployment.util.DeploymentUtil;
+
+/**
+ * EAR config builder tests for J2EE 1.4 using alt-dd unpacked..
+ *
+ * @version $Rev:386276 $ $Date$
+ */
+public class EARConfigBuilder5AltDDUnpackedTest
+    extends EARConfigBuilderTestSupport
+{
+    protected void setUp() throws Exception {
+        earFile = DeploymentUtil.createJarFile(resolveFile("target/test-ear-javaee_5-unpacked.ear"));
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar/", null, null, null, portMap);
+        webConfigBuilder.contextRoot = contextRoot;
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar/", null, null, null);
+    }
+
+    protected void tearDown() {
+        DeploymentUtil.close(earFile);
+        close(ejbConfigBuilder.ejbModule);
+        close(webConfigBuilder.webModule);
+        close(connectorConfigBuilder.connectorModule);
+    }
+}

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDUnpackedTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDUnpackedTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5AltDDUnpackedTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedTest.java?view=auto&rev=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedTest.java (added)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedTest.java Fri Jan 12 08:46:40 2007
@@ -0,0 +1,47 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You 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.
+ */
+package org.apache.geronimo.j2ee.deployment;
+
+import org.apache.geronimo.deployment.util.DeploymentUtil;
+
+/**
+ * EAR config builder tests for naked JAVAEE 5.
+ *
+ * @version $Rev:386276 $ $Date$
+ */
+public class EARConfigBuilder5NakedTest
+    extends EARConfigBuilderTestSupport
+{
+    protected void setUp() throws Exception {
+        super.setUp();
+        
+        earFile = DeploymentUtil.createJarFile(resolveFile("target/test-ear-javaee_5-naked.ear"));
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "test-ejb-jar.jar", null, null, null, portMap);
+        webConfigBuilder.contextRoot = contextRoot;
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "test-rar.rar", null, null, null);
+    }
+
+    protected void tearDown() throws Exception {
+        DeploymentUtil.close(earFile);
+        close(ejbConfigBuilder.ejbModule);
+        close(webConfigBuilder.webModule);
+        close(connectorConfigBuilder.connectorModule);
+        
+        super.tearDown();
+    }
+}

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedUnpackedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedUnpackedTest.java?view=auto&rev=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedUnpackedTest.java (added)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedUnpackedTest.java Fri Jan 12 08:46:40 2007
@@ -0,0 +1,47 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You 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.
+ */
+package org.apache.geronimo.j2ee.deployment;
+
+import org.apache.geronimo.deployment.util.DeploymentUtil;
+
+/**
+ * EAR config builder tests for naked J2EE 1.4 unpacked.
+ *
+ * @version $Rev:386276 $ $Date$
+ */
+public class EARConfigBuilder5NakedUnpackedTest
+    extends EARConfigBuilderTestSupport
+{
+    protected void setUp() throws Exception {
+        super.setUp();
+        
+        earFile = DeploymentUtil.createJarFile(resolveFile("target/test-ear-javaee_5-naked-unpacked.ear"));
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar/", null, null, null, portMap);
+        webConfigBuilder.contextRoot = contextRoot;
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar/", null, null, null);
+    }
+
+    protected void tearDown() throws Exception {
+        DeploymentUtil.close(earFile);
+        close(ejbConfigBuilder.ejbModule);
+        close(webConfigBuilder.webModule);
+        close(connectorConfigBuilder.connectorModule);
+        
+        super.tearDown();
+    }
+}

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedUnpackedTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedUnpackedTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5NakedUnpackedTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java?view=auto&rev=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java (added)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java Fri Jan 12 08:46:40 2007
@@ -0,0 +1,47 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You 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.
+ */
+package org.apache.geronimo.j2ee.deployment;
+
+import org.apache.geronimo.deployment.util.DeploymentUtil;
+
+/**
+ * EAR config builder tests for J2EE 1.4.
+ *
+ * @version $Rev:386276 $ $Date$
+ */
+public class EARConfigBuilder5Test
+    extends EARConfigBuilderTestSupport
+{
+    protected void setUp() throws Exception {
+        super.setUp();
+        
+        earFile = DeploymentUtil.createJarFile(resolveFile("target/test-ear-javaee_5.ear"));
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar", null, null, null, portMap);
+        webConfigBuilder.contextRoot = contextRoot;
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar", null, null, null);
+    }
+
+    protected void tearDown() throws Exception {
+        DeploymentUtil.close(earFile);
+        close(ejbConfigBuilder.ejbModule);
+        close(webConfigBuilder.webModule);
+        close(connectorConfigBuilder.connectorModule);
+        
+        super.tearDown();
+    }
+}

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5UnpackedTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5UnpackedTest.java?view=auto&rev=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5UnpackedTest.java (added)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5UnpackedTest.java Fri Jan 12 08:46:40 2007
@@ -0,0 +1,47 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You 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.
+ */
+package org.apache.geronimo.j2ee.deployment;
+
+import org.apache.geronimo.deployment.util.DeploymentUtil;
+
+/**
+ * EAR config builder tests for J2EE 1.4 unpacked.
+ *
+ * @version $Rev:386276 $ $Date$
+ */
+public class EARConfigBuilder5UnpackedTest
+    extends EARConfigBuilderTestSupport
+{
+    protected void setUp() throws Exception {
+        super.setUp();
+        
+        earFile = DeploymentUtil.createJarFile(resolveFile("target/test-ear-javaee_5-unpacked.ear"));
+        ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "ejb.jar/", null, null, null, portMap);
+        webConfigBuilder.contextRoot = contextRoot;
+        webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
+        connectorConfigBuilder.connectorModule = new ConnectorModule(false, raModuleName, null, null, "rar.rar/", null, null, null);
+    }
+
+    protected void tearDown() throws Exception {
+        DeploymentUtil.close(earFile);
+        close(ejbConfigBuilder.ejbModule);
+        close(webConfigBuilder.webModule);
+        close(connectorConfigBuilder.connectorModule);
+        
+        super.tearDown();
+    }
+}

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5UnpackedTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5UnpackedTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5UnpackedTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java Fri Jan 12 08:46:40 2007
@@ -40,9 +40,9 @@
     private ClassLoader classLoader = this.getClass().getClassLoader();
 
 
-    public void testApplication13ToApplication14Transform() throws Exception {
+    public void testApplication13ToApplication5Transform() throws Exception {
         URL srcXml = classLoader.getResource("j2ee_1_3dtd/application-13.xml");
-        URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/application-14.xml");
+        URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/application-5.xml");
         XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
         XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
         XmlBeansUtil.validateDD(expected);
@@ -55,9 +55,38 @@
         //make sure trying to convert twice has no bad effects
         XmlCursor cursor2 = xmlObject.newCursor();
         try {
-            String schemaLocationURL = "http://java.sun.com/xml/ns/j2ee/application_1_4.xsd";
-            String version = "1.4";
-            assertFalse(SchemaConversionUtils.convertToSchema(cursor2, SchemaConversionUtils.J2EE_NAMESPACE, schemaLocationURL, version));
+            String schemaLocationURL = "http://java.sun.com/xml/ns/javaee/application_5.xsd";
+            String version = "5";
+            assertFalse(SchemaConversionUtils.convertToSchema(cursor2, SchemaConversionUtils.JAVAEE_NAMESPACE, schemaLocationURL, version));
+        } finally {
+            cursor2.dispose();
+        }
+        boolean ok2 = compareXmlObjects(xmlObject, expected, problems);
+        assertTrue("Differences after reconverting to schema: " + problems, ok2);
+        //do the whole transform twice...
+        xmlObject = EARConfigBuilder.convertToApplicationSchema(xmlObject);
+        boolean ok3 = compareXmlObjects(xmlObject, expected, problems);
+        assertTrue("Differences after reconverting to application schema: " + problems, ok3);
+    }
+
+    public void testApplication14ToApplication5Transform() throws Exception {
+        URL srcXml = classLoader.getResource("j2ee_1_3dtd/application-14.xml");
+        URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/application-5.xml");
+        XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
+        XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
+        XmlBeansUtil.validateDD(expected);
+        xmlObject = EARConfigBuilder.convertToApplicationSchema(xmlObject);
+//        log.debug(xmlObject.toString());
+//        log.debug(expected.toString());
+        List problems = new ArrayList();
+        boolean ok = compareXmlObjects(xmlObject, expected, problems);
+        assertTrue("Differences: " + problems, ok);
+        //make sure trying to convert twice has no bad effects
+        XmlCursor cursor2 = xmlObject.newCursor();
+        try {
+            String schemaLocationURL = "http://java.sun.com/xml/ns/javaee/application_5.xsd";
+            String version = "5";
+            assertFalse(SchemaConversionUtils.convertToSchema(cursor2, SchemaConversionUtils.JAVAEE_NAMESPACE, schemaLocationURL, version));
         } finally {
             cursor2.dispose();
         }

Added: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/application-5.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/application-5.xml?view=auto&rev=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/application-5.xml (added)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/application-5.xml Fri Jan 12 08:46:40 2007
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+<application xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://java.sun.com/xml/ns/javaee"
+    version="5">
+    <description>description</description>
+    <display-name>display-name</display-name>
+    <icon>
+        <small-icon>url/to/small/icon</small-icon>
+        <large-icon>url/to/large/icon</large-icon>
+    </icon>
+    <module>
+        <connector>connector.rar</connector>
+        <alt-dd>geronimo-ra.xml</alt-dd>
+    </module>
+    <module>
+        <ejb>ejb-jar.jar</ejb>
+    </module>
+    <module>
+        <java>client.jar</java>
+    </module>
+    <module>
+        <web>
+            <web-uri>web.war</web-uri>
+            <context-root>web-context</context-root>
+        </web>
+    </module>
+    <security-role>
+        <description>description</description>
+        <role-name>myrole</role-name>
+    </security-role>
+</application>

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/application-5.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/application-5.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/application-5.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml Fri Jan 12 08:46:40 2007
@@ -34,7 +34,7 @@
     
     <dependencies>
         
-        <!-- might not be necessary -->
+        <!-- XmlBeansUtil is needed --> 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-service-builder</artifactId>
@@ -58,9 +58,14 @@
         
         <dependency>
             <groupId>org.apache.geronimo.schema</groupId>
-            <artifactId>geronimo-schema-j2ee_1.4</artifactId>
+            <artifactId>geronimo-schema-jee_5</artifactId>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.schema</groupId>
+            <artifactId>geronimo-schema-j2ee_1.4</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/modules/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java Fri Jan 12 08:46:40 2007
@@ -22,11 +22,11 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.geronimo.xbeans.j2ee.ApplicationClientDocument;
-import org.apache.geronimo.xbeans.j2ee.ApplicationDocument;
-import org.apache.geronimo.xbeans.j2ee.ConnectorDocument;
-import org.apache.geronimo.xbeans.j2ee.EjbJarDocument;
-import org.apache.geronimo.xbeans.j2ee.WebAppDocument;
+import org.apache.geronimo.xbeans.javaee.ApplicationClientDocument;
+import org.apache.geronimo.xbeans.javaee.ApplicationDocument;
+//import org.apache.geronimo.xbeans.javaee.ConnectorDocument;
+import org.apache.geronimo.xbeans.javaee.EjbJarDocument;
+import org.apache.geronimo.xbeans.javaee.WebAppDocument;
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.xmlbeans.SchemaType;
 import org.apache.xmlbeans.XmlCursor;

Modified: geronimo/server/trunk/modules/geronimo-j2ee-schema/src/main/resources/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-schema/src/main/resources/META-INF/geronimo-dependency.xml?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-schema/src/main/resources/META-INF/geronimo-dependency.xml (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-schema/src/main/resources/META-INF/geronimo-dependency.xml Fri Jan 12 08:46:40 2007
@@ -21,6 +21,11 @@
 <dep:service xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <dep:dependency>
         <dep:groupId>org.apache.geronimo.schema</dep:groupId>
+        <dep:artifactId>geronimo-schema-jee_5</dep:artifactId>
+    </dep:dependency>
+
+    <dep:dependency>
+        <dep:groupId>org.apache.geronimo.schema</dep:groupId>
         <dep:artifactId>geronimo-schema-j2ee_1.4</dep:artifactId>
     </dep:dependency>
 </dep:service>

Modified: geronimo/server/trunk/modules/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java Fri Jan 12 08:46:40 2007
@@ -25,7 +25,7 @@
 
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlObject;
-import org.apache.geronimo.xbeans.j2ee.EjbJarType;
+import org.apache.geronimo.xbeans.javaee.EjbJarType;
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.testsupport.XmlBeansTestSupport;
 

Modified: geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml Fri Jan 12 08:46:40 2007
@@ -72,12 +72,6 @@
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-j2ee-schema</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-naming</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java Fri Jan 12 08:46:40 2007
@@ -175,7 +175,7 @@
         return result;
     }
 
-    protected static String getStringValue(org.apache.geronimo.xbeans.j2ee.String string) {
+    protected static String getStringValue(org.apache.geronimo.xbeans.javaee.String string) {
         if (string == null) {
             return null;
         }

Modified: geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ENCHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ENCHelper.java?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ENCHelper.java (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ENCHelper.java Fri Jan 12 08:46:40 2007
@@ -36,7 +36,7 @@
  */
 public class ENCHelper {
     static final SchemaTypeLoader SCHEMA_TYPE_LOADER = XmlBeans.typeLoaderUnion(new SchemaTypeLoader[]{
-        XmlBeans.typeLoaderForClassLoader(org.apache.geronimo.xbeans.j2ee.String.class.getClassLoader()),
+        XmlBeans.typeLoaderForClassLoader(org.apache.geronimo.xbeans.javaee.String.class.getClassLoader()),
     });
 
 

Modified: geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java Fri Jan 12 08:46:40 2007
@@ -31,7 +31,7 @@
 import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.naming.reference.KernelReference;
-import org.apache.geronimo.xbeans.j2ee.EnvEntryType;
+import org.apache.geronimo.xbeans.javaee.EnvEntryType;
 import org.apache.geronimo.schema.NamespaceElementConverter;
 import org.apache.xmlbeans.QNameSet;
 import org.apache.xmlbeans.XmlObject;
@@ -53,7 +53,7 @@
     }
 
     public void buildNaming(XmlObject specDD, XmlObject plan, Configuration localConfiguration, Configuration remoteConfiguration, Module module, Map componentContext) throws DeploymentException {
-        List<EnvEntryType> envEntriesUntyped = convert(specDD.selectChildren(envEntryQNameSet), J2EE_CONVERTER, EnvEntryType.class, EnvEntryType.type);
+        List<EnvEntryType> envEntriesUntyped = convert(specDD.selectChildren(envEntryQNameSet), JEE_CONVERTER, EnvEntryType.class, EnvEntryType.type);
         for (EnvEntryType envEntry: envEntriesUntyped) {
             String name = envEntry.getEnvEntryName().getStringValue().trim();
             String type = envEntry.getEnvEntryType().getStringValue().trim();

Modified: geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java Fri Jan 12 08:46:40 2007
@@ -39,9 +39,9 @@
  */
 public class EnvironmentEntryBuilderTest extends TestCase {
     private Map componentContext = new HashMap();
-    private NamingBuilder environmentEntryBuilder = new EnvironmentEntryBuilder(new String[] {AbstractNamingBuilder.J2EE_NAMESPACE});
+    private NamingBuilder environmentEntryBuilder = new EnvironmentEntryBuilder(new String[] {AbstractNamingBuilder.JEE_NAMESPACE});
 
-    private static final String TEST = "<tmp xmlns=\"http://java.sun.com/xml/ns/j2ee\">" +
+    private static final String TEST = "<tmp xmlns=\"http://java.sun.com/xml/ns/javaee\">" +
             "<env-entry>" +
             "<env-entry-name>string</env-entry-name>" +
             "<env-entry-type>java.lang.String</env-entry-type>" +

Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml Fri Jan 12 08:46:40 2007
@@ -36,7 +36,32 @@
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-web-builder</artifactId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-security-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-test-ddbean</artifactId>
             <version>${version}</version>
         </dependency>
 
@@ -51,6 +76,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.testsupport</groupId>
+            <artifactId>testsupport-common</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>taglibs</groupId>
             <artifactId>standard</artifactId>
         </dependency>
@@ -74,6 +105,39 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xmlbeans-maven-plugin</artifactId>
+                <configuration>
+                    <sourceSchemas>geronimo-web-1.2.xsd</sourceSchemas>
+                </configuration>
+            </plugin>
+            
+            <!--
+            HACK: Copy the generated XmlBeans bits for clover
+            -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <mkdir dir="${pom.basedir}/target/clover/classes"/>
+                                <copy todir="${pom.basedir}/target/clover/classes">
+                                    <fileset dir="${pom.basedir}/target/classes">
+                                        <include name="schemaorg_apache_xmlbeans/**"/>
+                                    </fileset>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

Copied: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigRoot.java (from r494306, geronimo/server/trunk/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigRoot.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigRoot.java?view=diff&rev=495635&p1=geronimo/server/trunk/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigRoot.java&r1=494306&p2=geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigRoot.java&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigRoot.java (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigRoot.java Fri Jan 12 08:46:40 2007
@@ -36,7 +36,7 @@
  */
 public class WebAppDConfigRoot extends DConfigBeanRootSupport {
     static final SchemaTypeLoader SCHEMA_TYPE_LOADER = XmlBeans.typeLoaderUnion(new SchemaTypeLoader[]{
-        XmlBeans.typeLoaderForClassLoader(org.apache.geronimo.xbeans.j2ee.String.class.getClassLoader()),
+        XmlBeans.typeLoaderForClassLoader(org.apache.geronimo.xbeans.javaee.String.class.getClassLoader()),
         XmlBeans.typeLoaderForClassLoader(GerWebAppDocument.class.getClassLoader())
     });
 

Modified: geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml Fri Jan 12 08:46:40 2007
@@ -39,36 +39,19 @@
             <artifactId>geronimo-webservices</artifactId>
             <version>${version}</version>
         </dependency>
-        
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-common</artifactId>
-            <version>${version}</version>
-        </dependency>
 
+        <!-- g-kernel, g-common, g-j2ee g-j2ee-schema coming from this -->
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
+            <artifactId>geronimo-naming-builder</artifactId>
             <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-j2ee-schema</artifactId>
-            <version>${version}</version>
+            <groupId>org.apache.geronimo.schema</groupId>
+            <artifactId>geronimo-schema-j2ee_1.4</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-naming-builder</artifactId>
-            <version>${version}</version>
-        </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -79,7 +62,7 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-saaj_1.1_spec</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>

Modified: geronimo/server/trunk/modules/geronimo-webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-webservices/pom.xml?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/geronimo-webservices/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-webservices/pom.xml Fri Jan 12 08:46:40 2007
@@ -59,7 +59,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.4_spec</artifactId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
         </dependency>
         
         <dependency>

Modified: geronimo/server/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/pom.xml?view=diff&rev=495635&r1=495634&r2=495635
==============================================================================
--- geronimo/server/trunk/modules/pom.xml (original)
+++ geronimo/server/trunk/modules/pom.xml Fri Jan 12 08:46:40 2007
@@ -89,11 +89,11 @@
         <module>geronimo-transaction</module>
         <module>geronimo-upgrade</module>
         <module>geronimo-util</module>
-        <module>geronimo-web-builder</module>
+<!--        <module>geronimo-web-builder</module> -->
         <module>geronimo-webservices</module>
         <module>geronimo-webservices-builder</module>
 
-        <!-- jee 5 modules -->
+        <!-- javaee 5 modules -->
         <module>geronimo-transformer</module>
         <module>geronimo-persistence-jpa10</module>
         <module>geronimo-persistence-jpa10-builder</module>



Mime
View raw message