geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r652419 [1/2] - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/application/ org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/applica...
Date Thu, 01 May 2008 02:09:33 GMT
Author: mcconne
Date: Wed Apr 30 19:09:32 2008
New Revision: 652419

URL: http://svn.apache.org/viewvc?rev=652419&view=rev
Log:
GERONIMODEVTOOLS-326 Use more intuitive customized namespace prefixes in JAXB-generated deployment plans -- Thanks to BJ Reed for this patch !!

Added:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespaceFilter.java   (with props)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespacePrefixMapperImpl.java   (with props)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespacePrefixMapperImpl.java   (with props)
Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/application/GeronimoApplicationTest.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/applicationclient/GeronimoApplicationClientTest.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/connector/GeronimoRaTest.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/openejb/OpenEjbJarTest.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/web/GeronimoWebTest.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/application/geronimo-application-expected-11.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/applicationclient/geronimo-application-client-expected-11.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/connector/geronimo-ra-expected-11.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-expected-11.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/web/geronimo-web-expected-11.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/JAXBUtils.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespaceFilter.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/application/GeronimoApplicationTest.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/application/GeronimoApplicationTest.java?rev=652419&r1=652418&r2=652419&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/application/GeronimoApplicationTest.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/application/GeronimoApplicationTest.java Wed Apr 30 19:09:32 2008
@@ -34,6 +34,8 @@
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 
+import org.apache.geronimo.jee.common.NamespaceFilter;
+import org.apache.geronimo.jee.common.NamespacePrefixMapperImpl;
 import org.apache.geronimo.jee.deployment.Artifact;
 import org.apache.geronimo.jee.deployment.Dependencies;
 import org.apache.geronimo.jee.deployment.Dependency;
@@ -50,11 +52,7 @@
 import org.apache.geronimo.jee.security.Security;
 import org.apache.geronimo.jee.security.SubjectInfo;
 import org.custommonkey.xmlunit.Diff;
-import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLFilterImpl;
 
 /**
  * <strong>GeronimoApplicationTest</strong> is used to test various JAXB 
@@ -121,6 +119,7 @@
         Marshaller marshaller = jaxbContext.createMarshaller();
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
         marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
+        marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", new NamespacePrefixMapperImpl());
 
         // 
         // Read example and expected XML files
@@ -175,6 +174,7 @@
         Marshaller marshaller = jaxbContext.createMarshaller();
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
         marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
+        marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", new NamespacePrefixMapperImpl());
 
         // 
         // Create SAXParser
@@ -391,6 +391,7 @@
         Marshaller marshaller = jaxbContext.createMarshaller();
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
         marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
+        marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", new NamespacePrefixMapperImpl());
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         marshaller.marshal(jaxbElement, baos);
         String actual = new String(baos.toByteArray());
@@ -420,45 +421,4 @@
         String content = sb.toString();
         return content;
     }
-
-
-    private class NamespaceFilter extends XMLFilterImpl {
-
-        public NamespaceFilter(XMLReader xmlReader) {
-            super(xmlReader);
-        }
-
-        public void startElement(String uri, String localName, String qname, Attributes atts) throws SAXException {
-
-            if (uri.equals("http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/deployment-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/deployment-1.2";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/naming-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/naming-1.2";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/j2ee/application-1.2")) {
-                uri = "http://geronimo.apache.org/xml/ns/j2ee/application-2.0";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/security-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/security-2.0";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/security-1.2")) {
-                uri = "http://geronimo.apache.org/xml/ns/security-2.0";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/j2ee/web-2.0")) {
-                uri = "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/j2ee/web-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/j2ee/connector-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/j2ee/connector-1.2";
-            }
-
-            super.startElement(uri, localName, qname, atts);
-        }
-    }
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/applicationclient/GeronimoApplicationClientTest.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/applicationclient/GeronimoApplicationClientTest.java?rev=652419&r1=652418&r2=652419&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/applicationclient/GeronimoApplicationClientTest.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/applicationclient/GeronimoApplicationClientTest.java Wed Apr 30 19:09:32 2008
@@ -34,6 +34,8 @@
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 
+import org.apache.geronimo.jee.common.NamespaceFilter;
+import org.apache.geronimo.jee.common.NamespacePrefixMapperImpl;
 import org.apache.geronimo.jee.connector.Adminobject;
 import org.apache.geronimo.jee.connector.AdminobjectInstance;
 import org.apache.geronimo.jee.connector.ConfigPropertySetting;
@@ -66,11 +68,7 @@
 import org.apache.geronimo.jee.security.Description;
 import org.apache.geronimo.jee.security.SubjectInfo;
 import org.custommonkey.xmlunit.Diff;
-import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLFilterImpl;
 
 /**
  * <strong>GeronimoApplicationClientTest</strong> is used to test various JAXB 
@@ -139,6 +137,7 @@
         Marshaller marshaller = jaxbContext.createMarshaller();
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
         marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
+        marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", new NamespacePrefixMapperImpl());
 
         // 
         // Read example and expected XML files
@@ -194,6 +193,7 @@
         Marshaller marshaller = jaxbContext.createMarshaller();
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
         marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
+        marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", new NamespacePrefixMapperImpl());
 
         // 
         // Create SAXParser
@@ -535,6 +535,7 @@
         Marshaller marshaller = jaxbContext.createMarshaller();
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
         marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
+        marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", new NamespacePrefixMapperImpl());
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         marshaller.marshal(jaxbElement, baos);
         String actual = new String(baos.toByteArray());
@@ -564,45 +565,4 @@
         String content = sb.toString();
         return content;
     }
-
-
-    private class NamespaceFilter extends XMLFilterImpl {
-
-        public NamespaceFilter(XMLReader xmlReader) {
-            super(xmlReader);
-        }
-
-        public void startElement(String uri, String localName, String qname, Attributes atts) throws SAXException {
-
-            if (uri.equals("http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/deployment-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/deployment-1.2";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/naming-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/naming-1.2";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/j2ee/application-1.2")) {
-                uri = "http://geronimo.apache.org/xml/ns/j2ee/application-2.0";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/security-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/security-2.0";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/security-1.2")) {
-                uri = "http://geronimo.apache.org/xml/ns/security-2.0";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/j2ee/web-2.0")) {
-                uri = "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/j2ee/web-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/j2ee/connector-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/j2ee/connector-1.2";
-            }
-
-            super.startElement(uri, localName, qname, atts);
-        }
-    }
 }

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespaceFilter.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespaceFilter.java?rev=652419&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespaceFilter.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespaceFilter.java Wed Apr 30 19:09:32 2008
@@ -0,0 +1,85 @@
+/**
+ * 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.jee.common;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLFilterImpl;
+
+/**
+ * <strong>NamespaceFilter</strong> is used to filter out older versions (e.g., 
+ * v1.1) of Geronimo namespaces and replace them with the more current versions 
+ * (e.g., v2.1)<p>
+ * 
+ * This is a test version of the class that is found in org.apache.geronimo.st.core.jaxb
+ * 
+ * @version $Rev$ $Date$
+ */
+public class NamespaceFilter extends XMLFilterImpl {
+
+    private static Map<String, String> namespace = new HashMap<String, String>();
+
+    static {
+        namespace.put("http://geronimo.apache.org/xml/ns/deployment-1.1", 
+                      "http://geronimo.apache.org/xml/ns/deployment-1.2");
+
+        namespace.put("http://geronimo.apache.org/xml/ns/j2ee/application-1.2", 
+                      "http://geronimo.apache.org/xml/ns/j2ee/application-2.0");
+
+        namespace.put("http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1", 
+                      "http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0");
+
+        namespace.put("http://geronimo.apache.org/xml/ns/j2ee/connector-1.1", 
+                      "http://geronimo.apache.org/xml/ns/j2ee/connector-1.2");
+
+        namespace.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.1", 
+                      "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+
+        namespace.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.2", 
+                      "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+
+        namespace.put("http://geronimo.apache.org/xml/ns/j2ee/web-2.0", 
+                      "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+
+        namespace.put("http://geronimo.apache.org/xml/ns/naming-1.1", 
+                      "http://geronimo.apache.org/xml/ns/naming-1.2");
+
+        namespace.put("http://geronimo.apache.org/xml/ns/security-1.1", 
+                      "http://geronimo.apache.org/xml/ns/security-2.0");
+
+        namespace.put("http://geronimo.apache.org/xml/ns/security-1.2", 
+                      "http://geronimo.apache.org/xml/ns/security-2.0");
+    }
+
+    public NamespaceFilter(XMLReader xmlReader) {
+        super(xmlReader);
+    }
+
+    public void startElement(String uri, String localName, String qname, Attributes atts) throws SAXException {
+
+        if (namespace.containsKey( uri )) {
+            uri = namespace.get( uri );
+        }
+
+        super.startElement(uri, localName, qname, atts);
+    }
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespaceFilter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespaceFilter.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespaceFilter.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespacePrefixMapperImpl.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespacePrefixMapperImpl.java?rev=652419&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespacePrefixMapperImpl.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespacePrefixMapperImpl.java Wed Apr 30 19:09:32 2008
@@ -0,0 +1,57 @@
+/**
+ * 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.jee.common;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.sun.xml.bind.marshaller.NamespacePrefixMapper;
+
+/**
+ * <strong>NamespacePrefixMapperImpl</strong> is used to map XML namespaces 
+ * to a set of predetermined values.
+ * 
+ *  This is a test version of the class that is found in org.apache.geronimo.st.core.jaxb
+ * 
+ * @version $Rev$ $Date$
+ */
+public class NamespacePrefixMapperImpl extends NamespacePrefixMapper {
+
+    private static Map<String, String> prefixMap = new HashMap<String, String>();
+
+    static {
+        prefixMap.put("http://geronimo.apache.org/xml/ns/deployment-1.2", "dep");
+        prefixMap.put("http://geronimo.apache.org/xml/ns/j2ee/application-2.0", "app");
+        prefixMap.put("http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0", "client");
+        prefixMap.put("http://geronimo.apache.org/xml/ns/j2ee/connector-1.2", "conn");
+        prefixMap.put("http://openejb.apache.org/xml/ns/openejb-jar-2.2", "ejb");
+        prefixMap.put("http://java.sun.com/xml/ns/persistence", "pers");
+        prefixMap.put("http://openejb.apache.org/xml/ns/pkgen-2.1", "pkgen");
+        prefixMap.put("http://geronimo.apache.org/xml/ns/naming-1.2", "name");
+        prefixMap.put("http://geronimo.apache.org/xml/ns/security-2.0", "sec");
+        prefixMap.put("http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1", "web");
+    }
+
+    public String getPreferredPrefix(String namespaceUri, String suggestion, boolean requirePrefix) {
+
+        if (prefixMap.containsKey(namespaceUri))
+            return prefixMap.get(namespaceUri);
+
+        return suggestion;
+    }
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespacePrefixMapperImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespacePrefixMapperImpl.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespacePrefixMapperImpl.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/connector/GeronimoRaTest.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/connector/GeronimoRaTest.java?rev=652419&r1=652418&r2=652419&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/connector/GeronimoRaTest.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/connector/GeronimoRaTest.java Wed Apr 30 19:09:32 2008
@@ -34,6 +34,8 @@
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 
+import org.apache.geronimo.jee.common.NamespaceFilter;
+import org.apache.geronimo.jee.common.NamespacePrefixMapperImpl;
 import org.apache.geronimo.jee.deployment.Artifact;
 import org.apache.geronimo.jee.deployment.Dependencies;
 import org.apache.geronimo.jee.deployment.Dependency;
@@ -42,11 +44,7 @@
 import org.apache.geronimo.jee.naming.GbeanLocator;
 import org.apache.geronimo.jee.naming.Pattern;
 import org.custommonkey.xmlunit.Diff;
-import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLFilterImpl;
 
 /**
  * <strong>GeronimoRaTest</strong> is used to test various JAXB operations on
@@ -113,6 +111,7 @@
         Marshaller marshaller = jaxbContext.createMarshaller();
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
         marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
+        marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", new NamespacePrefixMapperImpl());
 
         // 
         // Read example and expected XML files
@@ -167,6 +166,7 @@
         Marshaller marshaller = jaxbContext.createMarshaller();
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
         marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
+        marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", new NamespacePrefixMapperImpl());
 
         // 
         // Create SAXParser
@@ -339,6 +339,7 @@
         Marshaller marshaller = jaxbContext.createMarshaller();
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
         marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
+        marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", new NamespacePrefixMapperImpl());
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         marshaller.marshal(jaxbElement, baos);
         String actual = new String(baos.toByteArray());
@@ -368,45 +369,4 @@
         String content = sb.toString();
         return content;
     }
-
-
-    private class NamespaceFilter extends XMLFilterImpl {
-
-        public NamespaceFilter(XMLReader xmlReader) {
-            super(xmlReader);
-        }
-
-        public void startElement(String uri, String localName, String qname, Attributes atts) throws SAXException {
-
-            if (uri.equals("http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/deployment-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/deployment-1.2";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/naming-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/naming-1.2";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/j2ee/application-1.2")) {
-                uri = "http://geronimo.apache.org/xml/ns/j2ee/application-2.0";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/security-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/security-2.0";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/security-1.2")) {
-                uri = "http://geronimo.apache.org/xml/ns/security-2.0";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/j2ee/web-2.0")) {
-                uri = "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/j2ee/web-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/j2ee/connector-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/j2ee/connector-1.2";
-            }
-
-            super.startElement(uri, localName, qname, atts);
-        }
-    }
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/openejb/OpenEjbJarTest.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/openejb/OpenEjbJarTest.java?rev=652419&r1=652418&r2=652419&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/openejb/OpenEjbJarTest.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/openejb/OpenEjbJarTest.java Wed Apr 30 19:09:32 2008
@@ -31,6 +31,7 @@
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 
+import org.apache.geronimo.jee.common.NamespacePrefixMapperImpl;
 import org.apache.geronimo.jee.deployment.Artifact;
 import org.apache.geronimo.jee.deployment.Dependencies;
 import org.apache.geronimo.jee.deployment.Dependency;
@@ -116,6 +117,7 @@
         Marshaller marshaller = jaxbContext.createMarshaller();
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
         marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
+        marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", new NamespacePrefixMapperImpl());
 
         // 
         // Read example and expected XML files
@@ -443,6 +445,7 @@
         Marshaller marshaller = jaxbContext.createMarshaller();
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
         marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
+        marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", new NamespacePrefixMapperImpl());
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         marshaller.marshal(jaxbElement, baos);
         String actual = new String(baos.toByteArray());

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/web/GeronimoWebTest.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/web/GeronimoWebTest.java?rev=652419&r1=652418&r2=652419&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/web/GeronimoWebTest.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/web/GeronimoWebTest.java Wed Apr 30 19:09:32 2008
@@ -34,6 +34,8 @@
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 
+import org.apache.geronimo.jee.common.NamespaceFilter;
+import org.apache.geronimo.jee.common.NamespacePrefixMapperImpl;
 import org.apache.geronimo.jee.deployment.Artifact;
 import org.apache.geronimo.jee.deployment.Dependencies;
 import org.apache.geronimo.jee.deployment.Dependency;
@@ -61,11 +63,7 @@
 import org.apache.geronimo.jee.security.Security;
 import org.apache.geronimo.jee.security.SubjectInfo;
 import org.custommonkey.xmlunit.Diff;
-import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLFilterImpl;
 
 /**
  * <strong>GeronimoWebTest</strong> is used to test various JAXB operations on
@@ -136,6 +134,7 @@
         Marshaller marshaller = jaxbContext.createMarshaller();
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
         marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
+        marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", new NamespacePrefixMapperImpl());
 
         // 
         // Read example and expected XML files
@@ -193,6 +192,7 @@
         Marshaller marshaller = jaxbContext.createMarshaller();
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
         marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
+        marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", new NamespacePrefixMapperImpl());
 
         // 
         // Create SAXParser
@@ -512,6 +512,7 @@
         Marshaller marshaller = jaxbContext.createMarshaller();
         marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
         marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
+        marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", new NamespacePrefixMapperImpl());
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         marshaller.marshal(jaxbElement, baos);
         String actual = new String(baos.toByteArray());
@@ -541,45 +542,4 @@
         String content = sb.toString();
         return content;
     }
-
-
-    private class NamespaceFilter extends XMLFilterImpl {
-
-        public NamespaceFilter(XMLReader xmlReader) {
-            super(xmlReader);
-        }
-
-        public void startElement(String uri, String localName, String qname, Attributes atts) throws SAXException {
-
-            if (uri.equals("http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/deployment-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/deployment-1.2";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/naming-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/naming-1.2";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/j2ee/application-1.2")) {
-                uri = "http://geronimo.apache.org/xml/ns/j2ee/application-2.0";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/security-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/security-2.0";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/security-1.2")) {
-                uri = "http://geronimo.apache.org/xml/ns/security-2.0";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/j2ee/web-2.0")) {
-                uri = "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/j2ee/web-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1";
-            }
-            else if (uri.equals("http://geronimo.apache.org/xml/ns/j2ee/connector-1.1")) {
-                uri = "http://geronimo.apache.org/xml/ns/j2ee/connector-1.2";
-            }
-
-            super.startElement(uri, localName, qname, atts);
-        }
-    }
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/application/geronimo-application-expected-11.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/application/geronimo-application-expected-11.xml?rev=652419&r1=652418&r2=652419&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/application/geronimo-application-expected-11.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/application/geronimo-application-expected-11.xml Wed Apr 30 19:09:32 2008
@@ -18,81 +18,81 @@
 
 <!-- @version $Rev$ $Date$ -->
 
-<ns2:application xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:ns3="http://geronimo.apache.org/xml/ns/security-2.0" application-name="test-app-name">
-    <environment>
-        <moduleId>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>agent-ear</artifactId>
-            <version>2.2-SNAPSHOT</version>
-            <type>ear</type>
-        </moduleId>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.geronimo.testsuite</groupId>
-                <artifactId>agent-ds</artifactId>
-                <version>2.2-SNAPSHOT</version>
-                <type>car</type>
-            </dependency>
-        </dependencies>
-    </environment>
-    <ns2:module>
-        <ns2:connector id="module-connector-path-id">module-connector-path-value</ns2:connector>
-        <ns2:ejb id="module-ejb-path-id">module-ejb-path-value</ns2:ejb>
-        <ns2:java id="module-java-path-id">module-java-path-value</ns2:java>
-        <ns2:web id="module-web-path-id">module-web-path-value</ns2:web>
-        <ns2:alt-dd id="module-altdd-path-id">module-altdd-path-value</ns2:alt-dd>
-    </ns2:module>
-    <ns2:ext-module>
-        <ns2:connector id="extmodule-connector-path-id">extmodule-connector-path-value</ns2:connector>
-        <ns2:ejb id="extmodule-ejb-path-id">extmodule-ejb-path-value</ns2:ejb>
-        <ns2:java id="extmodule-java-path-id">extmodule-java-path-value</ns2:java>
-        <ns2:web id="extmodule-web-path-id">extmodule-web-path-value</ns2:web>
-        <ns2:internal-path>extmodule-internalpath</ns2:internal-path>
-        <ns2:external-path>
-            <groupId>extmodule-externalpath-groupid</groupId>
-            <artifactId>extmodule-externalpath-artifactid</artifactId>
-            <version>extmodule-externalpath-version</version>
-            <module>extmodule-externalpath-module</module>
-            <type>extmodule-externalpath-type</type>
-            <name>extmodule-externalpath-customfoo</name>
-        </ns2:external-path>
-    </ns2:ext-module>
-    <ns2:security xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns3:securityType" use-context-handler="true" doas-current-caller="true" default-role="security-role">
-        <ns3:credential-store-ref>
-            <groupId>security-credentialstoreref-groupid</groupId>
-            <artifactId>security-credentialstoreref-artifactid</artifactId>
-            <version>security-credentialstoreref-version</version>
-            <module>security-credentialstoreref-module</module>
-            <type>security-credentialstoreref-type</type>
-            <name>security-credentialstoreref-customfoo</name>
-        </ns3:credential-store-ref>
-        <ns3:default-subject>
-            <ns3:description>security-subjectinfo-description</ns3:description>
-            <ns3:realm>security-subjectinfo-realm</ns3:realm>
-            <ns3:id>security-subjectinfo-id</ns3:id>
-        </ns3:default-subject>
-        <ns3:role-mappings>
-            <ns3:role role-name="security-role">
-                <ns3:description>security-role-description</ns3:description>
-                <ns3:run-as-subject>
-                    <ns3:description>security-role-subjectinfo-description</ns3:description>
-                    <ns3:realm>security-role-subjectinfo-realm</ns3:realm>
-                    <ns3:id>security-role-subjectinfo-id</ns3:id>
-                </ns3:run-as-subject>
-                <ns3:realm-principal name="security-role-realmprincipal-name" class="security-role-realmprincipal-class">
-                    <ns3:description>security-role-realmprincipal-description</ns3:description>
-                </ns3:realm-principal>
-                <ns3:login-domain-principal domain-name="security-role-logindomainprincipal-domainname" name="security-role-logindomainprincipal-name" class="security-role-logindomainprincipal-class">
-                    <ns3:description>security-role-logindomainprincipal-description</ns3:description>
-                </ns3:login-domain-principal>
-                <ns3:principal name="security-role-principal-name" class="security-role-principal-class">
-                    <ns3:description>security-role-principal-description</ns3:description>
-                </ns3:principal>
-                <ns3:distinguished-name name="security-role-distinguishedname">
-                    <ns3:description>security-role-distinguished-name-description</ns3:description>
-                </ns3:distinguished-name>
-            </ns3:role>
-        </ns3:role-mappings>
-    </ns2:security>
-    <gbean name="gbean-name" class="gbean-class"/>
-</ns2:application>
\ No newline at end of file
+<app:application xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" application-name="test-app-name">
+    <dep:environment>
+        <dep:moduleId>
+            <dep:groupId>org.apache.geronimo.testsuite</dep:groupId>
+            <dep:artifactId>agent-ear</dep:artifactId>
+            <dep:version>2.2-SNAPSHOT</dep:version>
+            <dep:type>ear</dep:type>
+        </dep:moduleId>
+        <dep:dependencies>
+            <dep:dependency>
+                <dep:groupId>org.apache.geronimo.testsuite</dep:groupId>
+                <dep:artifactId>agent-ds</dep:artifactId>
+                <dep:version>2.2-SNAPSHOT</dep:version>
+                <dep:type>car</dep:type>
+            </dep:dependency>
+        </dep:dependencies>
+    </dep:environment>
+    <app:module>
+        <app:connector id="module-connector-path-id">module-connector-path-value</app:connector>
+        <app:ejb id="module-ejb-path-id">module-ejb-path-value</app:ejb>
+        <app:java id="module-java-path-id">module-java-path-value</app:java>
+        <app:web id="module-web-path-id">module-web-path-value</app:web>
+        <app:alt-dd id="module-altdd-path-id">module-altdd-path-value</app:alt-dd>
+    </app:module>
+    <app:ext-module>
+        <app:connector id="extmodule-connector-path-id">extmodule-connector-path-value</app:connector>
+        <app:ejb id="extmodule-ejb-path-id">extmodule-ejb-path-value</app:ejb>
+        <app:java id="extmodule-java-path-id">extmodule-java-path-value</app:java>
+        <app:web id="extmodule-web-path-id">extmodule-web-path-value</app:web>
+        <app:internal-path>extmodule-internalpath</app:internal-path>
+        <app:external-path>
+            <dep:groupId>extmodule-externalpath-groupid</dep:groupId>
+            <dep:artifactId>extmodule-externalpath-artifactid</dep:artifactId>
+            <dep:version>extmodule-externalpath-version</dep:version>
+            <dep:module>extmodule-externalpath-module</dep:module>
+            <dep:type>extmodule-externalpath-type</dep:type>
+            <dep:name>extmodule-externalpath-customfoo</dep:name>
+        </app:external-path>
+    </app:ext-module>
+    <app:security xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="sec:securityType" use-context-handler="true" doas-current-caller="true" default-role="security-role">
+        <sec:credential-store-ref>
+            <dep:groupId>security-credentialstoreref-groupid</dep:groupId>
+            <dep:artifactId>security-credentialstoreref-artifactid</dep:artifactId>
+            <dep:version>security-credentialstoreref-version</dep:version>
+            <dep:module>security-credentialstoreref-module</dep:module>
+            <dep:type>security-credentialstoreref-type</dep:type>
+            <dep:name>security-credentialstoreref-customfoo</dep:name>
+        </sec:credential-store-ref>
+        <sec:default-subject>
+            <sec:description>security-subjectinfo-description</sec:description>
+            <sec:realm>security-subjectinfo-realm</sec:realm>
+            <sec:id>security-subjectinfo-id</sec:id>
+        </sec:default-subject>
+        <sec:role-mappings>
+            <sec:role role-name="security-role">
+                <sec:description>security-role-description</sec:description>
+                <sec:run-as-subject>
+                    <sec:description>security-role-subjectinfo-description</sec:description>
+                    <sec:realm>security-role-subjectinfo-realm</sec:realm>
+                    <sec:id>security-role-subjectinfo-id</sec:id>
+                </sec:run-as-subject>
+                <sec:realm-principal name="security-role-realmprincipal-name" class="security-role-realmprincipal-class">
+                    <sec:description>security-role-realmprincipal-description</sec:description>
+                </sec:realm-principal>
+                <sec:login-domain-principal domain-name="security-role-logindomainprincipal-domainname" name="security-role-logindomainprincipal-name" class="security-role-logindomainprincipal-class">
+                    <sec:description>security-role-logindomainprincipal-description</sec:description>
+                </sec:login-domain-principal>
+                <sec:principal name="security-role-principal-name" class="security-role-principal-class">
+                    <sec:description>security-role-principal-description</sec:description>
+                </sec:principal>
+                <sec:distinguished-name name="security-role-distinguishedname">
+                    <sec:description>security-role-distinguished-name-description</sec:description>
+                </sec:distinguished-name>
+            </sec:role>
+        </sec:role-mappings>
+    </app:security>
+    <dep:gbean name="gbean-name" class="gbean-class"/>
+</app:application>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/applicationclient/geronimo-application-client-expected-11.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/applicationclient/geronimo-application-client-expected-11.xml?rev=652419&r1=652418&r2=652419&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/applicationclient/geronimo-application-client-expected-11.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/applicationclient/geronimo-application-client-expected-11.xml Wed Apr 30 19:09:32 2008
@@ -18,234 +18,234 @@
    
 <!-- @version $Rev$ $Date$ -->
    
-<ns4:application-client xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns3="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
-    <client-environment>
-        <moduleId>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>agent-ear</artifactId>
-            <version>2.2-SNAPSHOT</version>
-            <type>ear</type>
-        </moduleId>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.geronimo.testsuite</groupId>
-                <artifactId>agent-ds</artifactId>
-                <version>2.2-SNAPSHOT</version>
-                <type>car</type>
-            </dependency>
-        </dependencies>
-    </client-environment>
-    <server-environment>
-        <moduleId>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>agent-ear</artifactId>
-            <version>2.2-SNAPSHOT</version>
-            <type>ear</type>
-        </moduleId>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.geronimo.testsuite</groupId>
-                <artifactId>agent-ds</artifactId>
-                <version>2.2-SNAPSHOT</version>
-                <type>car</type>
-            </dependency>
-        </dependencies>
-    </server-environment>
-    <ns2:gbean-ref>
-        <ns2:ref-name>gbeanref-name</ns2:ref-name>
-        <ns2:ref-type>gbeanref-reftype</ns2:ref-type>
-        <ns2:pattern>
-            <ns2:groupId>gbeanref-pattern-groupid</ns2:groupId>
-            <ns2:artifactId>gbeanref-pattern-artifactid</ns2:artifactId>
-            <ns2:version>gbeanref-pattern-version</ns2:version>
-            <ns2:module>gbeanref-pattern-module</ns2:module>
-            <ns2:name>gbeanref-pattern-name</ns2:name>
-        </ns2:pattern>
-    </ns2:gbean-ref>
-    <ns2:ejb-ref>
-        <ns2:ref-name>ejbref-refname</ns2:ref-name>
-        <ns2:pattern>
-            <ns2:groupId>ejbref-pattern-groupid</ns2:groupId>
-            <ns2:artifactId>ejbref-pattern-artifactid</ns2:artifactId>
-            <ns2:version>ejbref-pattern-version</ns2:version>
-            <ns2:module>ejbref-pattern-module</ns2:module>
-            <ns2:name>ejbref-pattern-name</ns2:name>
-        </ns2:pattern>
-        <ns2:ns-corbaloc>ejbref-nscorbaloc</ns2:ns-corbaloc>
-        <ns2:name>ejbref-name</ns2:name>
-        <ns2:css>
-            <ns2:groupId>ejbref-css-groupid</ns2:groupId>
-            <ns2:artifactId>ejbref-css-artifactid</ns2:artifactId>
-            <ns2:version>ejbref-css-version</ns2:version>
-            <ns2:module>ejbref-css-module</ns2:module>
-            <ns2:name>ejbref-css-name</ns2:name>
-        </ns2:css>
-        <ns2:css-link>ejbref-csslink</ns2:css-link>
-        <ns2:ejb-link>ejbref-ejblink</ns2:ejb-link>
-    </ns2:ejb-ref>
-    <ns2:service-ref>
-        <ns2:service-ref-name>serviceref-refname</ns2:service-ref-name>
-        <ns2:service-completion>
-            <ns2:service-name>serviceref-servicecompletion-servicename</ns2:service-name>
-            <ns2:port-completion>
-                <ns2:port>
-                    <ns2:port-name>serviceref-servicecompletion-portcompletion-port-portname</ns2:port-name>
-                    <ns2:protocol>serviceref-servicecompletion-portcompletion-port-protocol</ns2:protocol>
-                    <ns2:host>serviceref-servicecompletion-portcompletion-port-host</ns2:host>
-                    <ns2:port>0</ns2:port>
-                    <ns2:uri>serviceref-servicecompletion-portcompletion-port-uri</ns2:uri>
-                    <ns2:credentials-name>serviceref-servicecompletion-portcompletion-port-credentialsname</ns2:credentials-name>
-                </ns2:port>
-                <ns2:binding-name>serviceref-servicecompletion-portcompletion-bindingname</ns2:binding-name>
-            </ns2:port-completion>
-        </ns2:service-completion>
-        <ns2:port>
-            <ns2:port-name>serviceref-port-portname</ns2:port-name>
-            <ns2:protocol>serviceref-port-protocol</ns2:protocol>
-            <ns2:host>serviceref-port-host</ns2:host>
-            <ns2:port>0</ns2:port>
-            <ns2:uri>serviceref-port-uri</ns2:uri>
-            <ns2:credentials-name>serviceref-port-credentialsname</ns2:credentials-name>
-        </ns2:port>
-    </ns2:service-ref>
-    <ns2:resource-ref>
-        <ns2:ref-name>resourceref-refname</ns2:ref-name>
-        <ns2:pattern>
-            <ns2:groupId>resourceref-pattern-groupid</ns2:groupId>
-            <ns2:artifactId>resourceref-pattern-artifactid</ns2:artifactId>
-            <ns2:version>resourceref-pattern-version</ns2:version>
-            <ns2:module>resourcref-pattern-module</ns2:module>
-            <ns2:name>resourceref-pattern-name</ns2:name>
-        </ns2:pattern>
-        <ns2:resource-link>resourceref-resourcelink</ns2:resource-link>
-        <ns2:url>resourceref-url</ns2:url>
-    </ns2:resource-ref>
-    <ns2:resource-env-ref>
-        <ns2:ref-name>resourceenvref-refname</ns2:ref-name>
-        <ns2:pattern>
-            <ns2:groupId>resourceenvref-pattern-groupid</ns2:groupId>
-            <ns2:artifactId>resourceenvref-pattern-artifactid</ns2:artifactId>
-            <ns2:version>resourceenvref-pattern-version</ns2:version>
-            <ns2:module>resourceenvref-pattern-module</ns2:module>
-            <ns2:name>resourceenvref-pattern-name</ns2:name>
-        </ns2:pattern>
-        <ns2:message-destination-link>resourceenvref-messagedestinationlink</ns2:message-destination-link>
-        <ns2:admin-object-module>resourceenvref-adminobjectmodule</ns2:admin-object-module>
-        <ns2:admin-object-link>resourceenvref-adminobjectlink</ns2:admin-object-link>
-    </ns2:resource-env-ref>
-    <ns2:message-destination>
-        <ns2:message-destination-name>messagedestination-name</ns2:message-destination-name>
-        <ns2:pattern>
-            <ns2:groupId>messagedestination-pattern-groupid</ns2:groupId>
-            <ns2:artifactId>messagedestination-pattern-artifactid</ns2:artifactId>
-            <ns2:version>messagedestination-pattern-version</ns2:version>
-            <ns2:module>messagedestination-pattern-module</ns2:module>
-            <ns2:name>messagedestination-pattern-name</ns2:name>
-        </ns2:pattern>
-        <ns2:admin-object-module>messagedestination-adminobjectmodule</ns2:admin-object-module>
-        <ns2:admin-object-link>messagedestination-adminobjectlink</ns2:admin-object-link>
-    </ns2:message-destination>
-    <ns3:default-subject>
-        <ns3:description>subjectinfo-description</ns3:description>
-        <ns3:realm>subjectinfo-realm</ns3:realm>
-        <ns3:id>subjectinfo-id</ns3:id>
-    </ns3:default-subject>
-    <ns4:realm-name>realmname</ns4:realm-name>
-    <ns4:callback-handler>callbackhandler</ns4:callback-handler>
-    <ns4:resource>
-        <ns4:external-rar>
-            <groupId>resource-externalrar-groupid</groupId>
-            <artifactId>resource-externalrar-artifactid</artifactId>
-            <version>resource-externalrar-version</version>
-            <module>resource-externalrar-module</module>
-            <type>resource-externalrar-type</type>
-            <name>resource-externalrar-customfoo</name>
-        </ns4:external-rar>
-        <ns4:internal-rar>resource-internalrar</ns4:internal-rar>
-        <ns5:connector>
-            <environment>
-                <moduleId>
-                    <groupId>org.apache.geronimo.testsuite</groupId>
-                    <artifactId>agent-ear</artifactId>
-                    <version>2.2-SNAPSHOT</version>
-                    <type>ear</type>
-                </moduleId>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.geronimo.testsuite</groupId>
-                        <artifactId>agent-ds</artifactId>
-                        <version>2.2-SNAPSHOT</version>
-                        <type>car</type>
-                    </dependency>
-                </dependencies>
-            </environment>
-            <ns5:resourceadapter>
-                <ns5:resourceadapter-instance>
-                    <ns5:resourceadapter-name>resource-connector-resourceadapter-name</ns5:resourceadapter-name>
-                    <ns5:config-property-setting name="resource-connector-resourceadapter-instance-name">resource-connector-resourceadapter-instance-value</ns5:config-property-setting>
-                    <ns2:workmanager>
-                        <ns2:pattern>
-                            <ns2:groupId>connector-resourceadapter-workmanager-pattern-groupid</ns2:groupId>
-                            <ns2:artifactId>connector-resourceadapter-workmanager-pattern-artifactid</ns2:artifactId>
-                            <ns2:version>connector-resourceadapter-workmanager-pattern-version</ns2:version>
-                            <ns2:module>connector-resourceadapter-workmanager-pattern-module</ns2:module>
-                            <ns2:name>connector-resourceadapter-workmanager-pattern-name</ns2:name>
-                        </ns2:pattern>
-                        <ns2:gbean-link>connector-resourceadapter-workmanager-gbeanlink</ns2:gbean-link>
-                    </ns2:workmanager>
-                </ns5:resourceadapter-instance>
-                <ns5:outbound-resourceadapter>
-                    <ns5:connection-definition>
-                        <ns5:connectionfactory-interface>resource-connector-resourceadapter-outbound-connectiondefinition-interface</ns5:connectionfactory-interface>
-                        <ns5:connectiondefinition-instance>
-                            <ns5:name>resource-connector-resourceadapter-outbound-connectiondefinition-instance-name</ns5:name>
-                            <ns5:implemented-interface>resource-connector-resourceadapter-outbound-connectiondefinition-instance-implementedinterface</ns5:implemented-interface>
-                            <ns5:config-property-setting name="resource-connector-resourceadapter-outbound-connectiondefinition-instance-name">resource-connector-resourceadapter-outbound-connectiondefinition-instance-value</ns5:config-property-setting>
-                            <ns5:connectionmanager>
-<ns5:container-managed-security/>
-<ns5:no-transaction/>
-<ns5:local-transaction/>
-<ns5:xa-transaction>
-    <ns5:transaction-caching/>
-    <ns5:thread-caching/>
-</ns5:xa-transaction>
-<ns5:transaction-log/>
-<ns5:no-pool/>
-<ns5:single-pool>
-    <ns5:max-size>0</ns5:max-size>
-    <ns5:min-size>0</ns5:min-size>
-    <ns5:blocking-timeout-milliseconds>0</ns5:blocking-timeout-milliseconds>
-    <ns5:idle-timeout-minutes>0</ns5:idle-timeout-minutes>
-    <ns5:match-one/>
-    <ns5:match-all/>
-    <ns5:select-one-assume-match/>
-</ns5:single-pool>
-<ns5:partitioned-pool>
-    <ns5:max-size>0</ns5:max-size>
-    <ns5:min-size>0</ns5:min-size>
-    <ns5:blocking-timeout-milliseconds>0</ns5:blocking-timeout-milliseconds>
-    <ns5:idle-timeout-minutes>0</ns5:idle-timeout-minutes>
-    <ns5:match-one/>
-    <ns5:match-all/>
-    <ns5:select-one-assume-match/>
-    <ns5:partition-by-subject/>
-    <ns5:partition-by-connectionrequestinfo/>
-</ns5:partitioned-pool>
-                            </ns5:connectionmanager>
-                        </ns5:connectiondefinition-instance>
-                    </ns5:connection-definition>
-                </ns5:outbound-resourceadapter>
-            </ns5:resourceadapter>
-            <ns5:adminobject>
-                <ns5:adminobject-interface>resource-connector-adminobject-adminobjectinterface</ns5:adminobject-interface>
-                <ns5:adminobject-class>resource-connector-adminobject-adminobjectclass</ns5:adminobject-class>
-                <ns5:adminobject-instance>
-                    <ns5:message-destination-name>resource-connector-adminobject-instance-messagedestinationname</ns5:message-destination-name>
-                    <ns5:config-property-setting name="resource-connector-adminobject-instance-name">resource-connector-adminobject-instance-value</ns5:config-property-setting>
-                </ns5:adminobject-instance>
-            </ns5:adminobject>
-            <gbean name="resource-connector-gbean-name" class="resource-connector-gbean-class"/>
-        </ns5:connector>
-    </ns4:resource>
-    <gbean name="service-gbean-name" class="service-gbean-class"/>
-</ns4:application-client>
\ No newline at end of file
+<client:application-client xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:name="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:client="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0" xmlns:conn="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+    <dep:client-environment>
+        <dep:moduleId>
+            <dep:groupId>org.apache.geronimo.testsuite</dep:groupId>
+            <dep:artifactId>agent-ear</dep:artifactId>
+            <dep:version>2.2-SNAPSHOT</dep:version>
+            <dep:type>ear</dep:type>
+        </dep:moduleId>
+        <dep:dependencies>
+            <dep:dependency>
+                <dep:groupId>org.apache.geronimo.testsuite</dep:groupId>
+                <dep:artifactId>agent-ds</dep:artifactId>
+                <dep:version>2.2-SNAPSHOT</dep:version>
+                <dep:type>car</dep:type>
+            </dep:dependency>
+        </dep:dependencies>
+    </dep:client-environment>
+    <dep:server-environment>
+        <dep:moduleId>
+            <dep:groupId>org.apache.geronimo.testsuite</dep:groupId>
+            <dep:artifactId>agent-ear</dep:artifactId>
+            <dep:version>2.2-SNAPSHOT</dep:version>
+            <dep:type>ear</dep:type>
+        </dep:moduleId>
+        <dep:dependencies>
+            <dep:dependency>
+                <dep:groupId>org.apache.geronimo.testsuite</dep:groupId>
+                <dep:artifactId>agent-ds</dep:artifactId>
+                <dep:version>2.2-SNAPSHOT</dep:version>
+                <dep:type>car</dep:type>
+            </dep:dependency>
+        </dep:dependencies>
+    </dep:server-environment>
+    <name:gbean-ref>
+        <name:ref-name>gbeanref-name</name:ref-name>
+        <name:ref-type>gbeanref-reftype</name:ref-type>
+        <name:pattern>
+            <name:groupId>gbeanref-pattern-groupid</name:groupId>
+            <name:artifactId>gbeanref-pattern-artifactid</name:artifactId>
+            <name:version>gbeanref-pattern-version</name:version>
+            <name:module>gbeanref-pattern-module</name:module>
+            <name:name>gbeanref-pattern-name</name:name>
+        </name:pattern>
+    </name:gbean-ref>
+    <name:ejb-ref>
+        <name:ref-name>ejbref-refname</name:ref-name>
+        <name:pattern>
+            <name:groupId>ejbref-pattern-groupid</name:groupId>
+            <name:artifactId>ejbref-pattern-artifactid</name:artifactId>
+            <name:version>ejbref-pattern-version</name:version>
+            <name:module>ejbref-pattern-module</name:module>
+            <name:name>ejbref-pattern-name</name:name>
+        </name:pattern>
+        <name:ns-corbaloc>ejbref-nscorbaloc</name:ns-corbaloc>
+        <name:name>ejbref-name</name:name>
+        <name:css>
+            <name:groupId>ejbref-css-groupid</name:groupId>
+            <name:artifactId>ejbref-css-artifactid</name:artifactId>
+            <name:version>ejbref-css-version</name:version>
+            <name:module>ejbref-css-module</name:module>
+            <name:name>ejbref-css-name</name:name>
+        </name:css>
+        <name:css-link>ejbref-csslink</name:css-link>
+        <name:ejb-link>ejbref-ejblink</name:ejb-link>
+    </name:ejb-ref>
+    <name:service-ref>
+        <name:service-ref-name>serviceref-refname</name:service-ref-name>
+        <name:service-completion>
+            <name:service-name>serviceref-servicecompletion-servicename</name:service-name>
+            <name:port-completion>
+                <name:port>
+                    <name:port-name>serviceref-servicecompletion-portcompletion-port-portname</name:port-name>
+                    <name:protocol>serviceref-servicecompletion-portcompletion-port-protocol</name:protocol>
+                    <name:host>serviceref-servicecompletion-portcompletion-port-host</name:host>
+                    <name:port>0</name:port>
+                    <name:uri>serviceref-servicecompletion-portcompletion-port-uri</name:uri>
+                    <name:credentials-name>serviceref-servicecompletion-portcompletion-port-credentialsname</name:credentials-name>
+                </name:port>
+                <name:binding-name>serviceref-servicecompletion-portcompletion-bindingname</name:binding-name>
+            </name:port-completion>
+        </name:service-completion>
+        <name:port>
+            <name:port-name>serviceref-port-portname</name:port-name>
+            <name:protocol>serviceref-port-protocol</name:protocol>
+            <name:host>serviceref-port-host</name:host>
+            <name:port>0</name:port>
+            <name:uri>serviceref-port-uri</name:uri>
+            <name:credentials-name>serviceref-port-credentialsname</name:credentials-name>
+        </name:port>
+    </name:service-ref>
+    <name:resource-ref>
+        <name:ref-name>resourceref-refname</name:ref-name>
+        <name:pattern>
+            <name:groupId>resourceref-pattern-groupid</name:groupId>
+            <name:artifactId>resourceref-pattern-artifactid</name:artifactId>
+            <name:version>resourceref-pattern-version</name:version>
+            <name:module>resourcref-pattern-module</name:module>
+            <name:name>resourceref-pattern-name</name:name>
+        </name:pattern>
+        <name:resource-link>resourceref-resourcelink</name:resource-link>
+        <name:url>resourceref-url</name:url>
+    </name:resource-ref>
+    <name:resource-env-ref>
+        <name:ref-name>resourceenvref-refname</name:ref-name>
+        <name:pattern>
+            <name:groupId>resourceenvref-pattern-groupid</name:groupId>
+            <name:artifactId>resourceenvref-pattern-artifactid</name:artifactId>
+            <name:version>resourceenvref-pattern-version</name:version>
+            <name:module>resourceenvref-pattern-module</name:module>
+            <name:name>resourceenvref-pattern-name</name:name>
+        </name:pattern>
+        <name:message-destination-link>resourceenvref-messagedestinationlink</name:message-destination-link>
+        <name:admin-object-module>resourceenvref-adminobjectmodule</name:admin-object-module>
+        <name:admin-object-link>resourceenvref-adminobjectlink</name:admin-object-link>
+    </name:resource-env-ref>
+    <name:message-destination>
+        <name:message-destination-name>messagedestination-name</name:message-destination-name>
+        <name:pattern>
+            <name:groupId>messagedestination-pattern-groupid</name:groupId>
+            <name:artifactId>messagedestination-pattern-artifactid</name:artifactId>
+            <name:version>messagedestination-pattern-version</name:version>
+            <name:module>messagedestination-pattern-module</name:module>
+            <name:name>messagedestination-pattern-name</name:name>
+        </name:pattern>
+        <name:admin-object-module>messagedestination-adminobjectmodule</name:admin-object-module>
+        <name:admin-object-link>messagedestination-adminobjectlink</name:admin-object-link>
+    </name:message-destination>
+    <sec:default-subject>
+        <sec:description>subjectinfo-description</sec:description>
+        <sec:realm>subjectinfo-realm</sec:realm>
+        <sec:id>subjectinfo-id</sec:id>
+    </sec:default-subject>
+    <client:realm-name>realmname</client:realm-name>
+    <client:callback-handler>callbackhandler</client:callback-handler>
+    <client:resource>
+        <client:external-rar>
+            <dep:groupId>resource-externalrar-groupid</dep:groupId>
+            <dep:artifactId>resource-externalrar-artifactid</dep:artifactId>
+            <dep:version>resource-externalrar-version</dep:version>
+            <dep:module>resource-externalrar-module</dep:module>
+            <dep:type>resource-externalrar-type</dep:type>
+            <dep:name>resource-externalrar-customfoo</dep:name>
+        </client:external-rar>
+        <client:internal-rar>resource-internalrar</client:internal-rar>
+        <conn:connector>
+            <dep:environment>
+                <dep:moduleId>
+                    <dep:groupId>org.apache.geronimo.testsuite</dep:groupId>
+                    <dep:artifactId>agent-ear</dep:artifactId>
+                    <dep:version>2.2-SNAPSHOT</dep:version>
+                    <dep:type>ear</dep:type>
+                </dep:moduleId>
+                <dep:dependencies>
+                    <dep:dependency>
+                        <dep:groupId>org.apache.geronimo.testsuite</dep:groupId>
+                        <dep:artifactId>agent-ds</dep:artifactId>
+                        <dep:version>2.2-SNAPSHOT</dep:version>
+                        <dep:type>car</dep:type>
+                    </dep:dependency>
+                </dep:dependencies>
+            </dep:environment>
+            <conn:resourceadapter>
+                <conn:resourceadapter-instance>
+                    <conn:resourceadapter-name>resource-connector-resourceadapter-name</conn:resourceadapter-name>
+                    <conn:config-property-setting name="resource-connector-resourceadapter-instance-name">resource-connector-resourceadapter-instance-value</conn:config-property-setting>
+                    <name:workmanager>
+                        <name:pattern>
+                            <name:groupId>connector-resourceadapter-workmanager-pattern-groupid</name:groupId>
+                            <name:artifactId>connector-resourceadapter-workmanager-pattern-artifactid</name:artifactId>
+                            <name:version>connector-resourceadapter-workmanager-pattern-version</name:version>
+                            <name:module>connector-resourceadapter-workmanager-pattern-module</name:module>
+                            <name:name>connector-resourceadapter-workmanager-pattern-name</name:name>
+                        </name:pattern>
+                        <name:gbean-link>connector-resourceadapter-workmanager-gbeanlink</name:gbean-link>
+                    </name:workmanager>
+                </conn:resourceadapter-instance>
+                <conn:outbound-resourceadapter>
+                    <conn:connection-definition>
+                        <conn:connectionfactory-interface>resource-connector-resourceadapter-outbound-connectiondefinition-interface</conn:connectionfactory-interface>
+                        <conn:connectiondefinition-instance>
+                            <conn:name>resource-connector-resourceadapter-outbound-connectiondefinition-instance-name</conn:name>
+                            <conn:implemented-interface>resource-connector-resourceadapter-outbound-connectiondefinition-instance-implementedinterface</conn:implemented-interface>
+                            <conn:config-property-setting name="resource-connector-resourceadapter-outbound-connectiondefinition-instance-name">resource-connector-resourceadapter-outbound-connectiondefinition-instance-value</conn:config-property-setting>
+                            <conn:connectionmanager>
+<conn:container-managed-security/>
+<conn:no-transaction/>
+<conn:local-transaction/>
+<conn:xa-transaction>
+    <conn:transaction-caching/>
+    <conn:thread-caching/>
+</conn:xa-transaction>
+<conn:transaction-log/>
+<conn:no-pool/>
+<conn:single-pool>
+    <conn:max-size>0</conn:max-size>
+    <conn:min-size>0</conn:min-size>
+    <conn:blocking-timeout-milliseconds>0</conn:blocking-timeout-milliseconds>
+    <conn:idle-timeout-minutes>0</conn:idle-timeout-minutes>
+    <conn:match-one/>
+    <conn:match-all/>
+    <conn:select-one-assume-match/>
+</conn:single-pool>
+<conn:partitioned-pool>
+    <conn:max-size>0</conn:max-size>
+    <conn:min-size>0</conn:min-size>
+    <conn:blocking-timeout-milliseconds>0</conn:blocking-timeout-milliseconds>
+    <conn:idle-timeout-minutes>0</conn:idle-timeout-minutes>
+    <conn:match-one/>
+    <conn:match-all/>
+    <conn:select-one-assume-match/>
+    <conn:partition-by-subject/>
+    <conn:partition-by-connectionrequestinfo/>
+</conn:partitioned-pool>
+                            </conn:connectionmanager>
+                        </conn:connectiondefinition-instance>
+                    </conn:connection-definition>
+                </conn:outbound-resourceadapter>
+            </conn:resourceadapter>
+            <conn:adminobject>
+                <conn:adminobject-interface>resource-connector-adminobject-adminobjectinterface</conn:adminobject-interface>
+                <conn:adminobject-class>resource-connector-adminobject-adminobjectclass</conn:adminobject-class>
+                <conn:adminobject-instance>
+                    <conn:message-destination-name>resource-connector-adminobject-instance-messagedestinationname</conn:message-destination-name>
+                    <conn:config-property-setting name="resource-connector-adminobject-instance-name">resource-connector-adminobject-instance-value</conn:config-property-setting>
+                </conn:adminobject-instance>
+            </conn:adminobject>
+            <dep:gbean name="resource-connector-gbean-name" class="resource-connector-gbean-class"/>
+        </conn:connector>
+    </client:resource>
+    <dep:gbean name="service-gbean-name" class="service-gbean-class"/>
+</client:application-client>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/connector/geronimo-ra-expected-11.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/connector/geronimo-ra-expected-11.xml?rev=652419&r1=652418&r2=652419&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/connector/geronimo-ra-expected-11.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/connector/geronimo-ra-expected-11.xml Wed Apr 30 19:09:32 2008
@@ -18,87 +18,87 @@
            
 <!-- @version $Rev$ $Date$ -->
            
-<ns2:connector xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" xmlns:ns3="http://geronimo.apache.org/xml/ns/naming-1.2">
-    <environment>
-        <moduleId>
-            <groupId>org.apache.geronimo.testsuite</groupId>
-            <artifactId>agent-ear</artifactId>
-            <version>2.2-SNAPSHOT</version>
-            <type>ear</type>
-        </moduleId>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.geronimo.testsuite</groupId>
-                <artifactId>agent-ds</artifactId>
-                <version>2.2-SNAPSHOT</version>
-                <type>car</type>
-            </dependency>
-        </dependencies>
-    </environment>
-    <ns2:resourceadapter>
-        <ns2:resourceadapter-instance>
-            <ns2:resourceadapter-name>resourceadapter-name</ns2:resourceadapter-name>
-            <ns2:config-property-setting name="resourceadapter-instance-name">resourceadapter-instance-value</ns2:config-property-setting>
-            <ns3:workmanager>
-                <ns3:pattern>
-                    <ns3:groupId>connector-resourceadapter-workmanager-pattern-groupid</ns3:groupId>
-                    <ns3:artifactId>connector-resourceadapter-workmanager-pattern-artifactid</ns3:artifactId>
-                    <ns3:version>connector-resourceadapter-workmanager-pattern-version</ns3:version>
-                    <ns3:module>connector-resourceadapter-workmanager-pattern-module</ns3:module>
-                    <ns3:name>connector-resourceadapter-workmanager-pattern-name</ns3:name>
-                </ns3:pattern>
-                <ns3:gbean-link>connector-resourceadapter-workmanager-gbeanlink</ns3:gbean-link>
-            </ns3:workmanager>
-        </ns2:resourceadapter-instance>
-        <ns2:outbound-resourceadapter>
-            <ns2:connection-definition>
-                <ns2:connectionfactory-interface>resourceadapter-outbound-connectiondefinition-interface</ns2:connectionfactory-interface>
-                <ns2:connectiondefinition-instance>
-                    <ns2:name>resourceadapter-outbound-connectiondefinition-instance-name</ns2:name>
-                    <ns2:implemented-interface>resourceadapter-outbound-connectiondefinition-instance-implementedinterface</ns2:implemented-interface>
-                    <ns2:config-property-setting name="resourceadapter-outbound-connectiondefinition-instance-name">resourceadapter-outbound-connectiondefinition-instance-value</ns2:config-property-setting>
-                    <ns2:connectionmanager>
-                        <ns2:container-managed-security/>
-                        <ns2:no-transaction/>
-                        <ns2:local-transaction/>
-                        <ns2:xa-transaction>
-                            <ns2:transaction-caching/>
-                            <ns2:thread-caching/>
-                        </ns2:xa-transaction>
-                        <ns2:transaction-log/>
-                        <ns2:no-pool/>
-                        <ns2:single-pool>
-                            <ns2:max-size>0</ns2:max-size>
-                            <ns2:min-size>0</ns2:min-size>
-                            <ns2:blocking-timeout-milliseconds>0</ns2:blocking-timeout-milliseconds>
-                            <ns2:idle-timeout-minutes>0</ns2:idle-timeout-minutes>
-                            <ns2:match-one/>
-                            <ns2:match-all/>
-                            <ns2:select-one-assume-match/>
-                        </ns2:single-pool>
-                        <ns2:partitioned-pool>
-                            <ns2:max-size>0</ns2:max-size>
-                            <ns2:min-size>0</ns2:min-size>
-                            <ns2:blocking-timeout-milliseconds>0</ns2:blocking-timeout-milliseconds>
-                            <ns2:idle-timeout-minutes>0</ns2:idle-timeout-minutes>
-                            <ns2:match-one/>
-                            <ns2:match-all/>
-                            <ns2:select-one-assume-match/>
-                            <ns2:partition-by-subject/>
-                            <ns2:partition-by-connectionrequestinfo/>
-                        </ns2:partitioned-pool>
-                    </ns2:connectionmanager>
-                </ns2:connectiondefinition-instance>
-            </ns2:connection-definition>
-        </ns2:outbound-resourceadapter>
-    </ns2:resourceadapter>
-    <ns2:adminobject>
-        <ns2:adminobject-interface>adminobject-adminobjectinterface</ns2:adminobject-interface>
-        <ns2:adminobject-class>adminobject-adminobjectclass</ns2:adminobject-class>
-        <ns2:adminobject-instance>
-            <ns2:message-destination-name>adminobject-instance-messagedestinationname</ns2:message-destination-name>
-            <ns2:config-property-setting name="adminobject-instance-name">adminobject-instance-value</ns2:config-property-setting>
-        </ns2:adminobject-instance>
-    </ns2:adminobject>
-    <gbean name="gbean-name" class="gbean-class"/>
-</ns2:connector>
+<conn:connector xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:conn="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" xmlns:name="http://geronimo.apache.org/xml/ns/naming-1.2">
+    <dep:environment>
+        <dep:moduleId>
+            <dep:groupId>org.apache.geronimo.testsuite</dep:groupId>
+            <dep:artifactId>agent-ear</dep:artifactId>
+            <dep:version>2.2-SNAPSHOT</dep:version>
+            <dep:type>ear</dep:type>
+        </dep:moduleId>
+        <dep:dependencies>
+            <dep:dependency>
+                <dep:groupId>org.apache.geronimo.testsuite</dep:groupId>
+                <dep:artifactId>agent-ds</dep:artifactId>
+                <dep:version>2.2-SNAPSHOT</dep:version>
+                <dep:type>car</dep:type>
+            </dep:dependency>
+        </dep:dependencies>
+    </dep:environment>
+    <conn:resourceadapter>
+        <conn:resourceadapter-instance>
+            <conn:resourceadapter-name>resourceadapter-name</conn:resourceadapter-name>
+            <conn:config-property-setting name="resourceadapter-instance-name">resourceadapter-instance-value</conn:config-property-setting>
+            <name:workmanager>
+                <name:pattern>
+                    <name:groupId>connector-resourceadapter-workmanager-pattern-groupid</name:groupId>
+                    <name:artifactId>connector-resourceadapter-workmanager-pattern-artifactid</name:artifactId>
+                    <name:version>connector-resourceadapter-workmanager-pattern-version</name:version>
+                    <name:module>connector-resourceadapter-workmanager-pattern-module</name:module>
+                    <name:name>connector-resourceadapter-workmanager-pattern-name</name:name>
+                </name:pattern>
+                <name:gbean-link>connector-resourceadapter-workmanager-gbeanlink</name:gbean-link>
+            </name:workmanager>
+        </conn:resourceadapter-instance>
+        <conn:outbound-resourceadapter>
+            <conn:connection-definition>
+                <conn:connectionfactory-interface>resourceadapter-outbound-connectiondefinition-interface</conn:connectionfactory-interface>
+                <conn:connectiondefinition-instance>
+                    <conn:name>resourceadapter-outbound-connectiondefinition-instance-name</conn:name>
+                    <conn:implemented-interface>resourceadapter-outbound-connectiondefinition-instance-implementedinterface</conn:implemented-interface>
+                    <conn:config-property-setting name="resourceadapter-outbound-connectiondefinition-instance-name">resourceadapter-outbound-connectiondefinition-instance-value</conn:config-property-setting>
+                    <conn:connectionmanager>
+                        <conn:container-managed-security/>
+                        <conn:no-transaction/>
+                        <conn:local-transaction/>
+                        <conn:xa-transaction>
+                            <conn:transaction-caching/>
+                            <conn:thread-caching/>
+                        </conn:xa-transaction>
+                        <conn:transaction-log/>
+                        <conn:no-pool/>
+                        <conn:single-pool>
+                            <conn:max-size>0</conn:max-size>
+                            <conn:min-size>0</conn:min-size>
+                            <conn:blocking-timeout-milliseconds>0</conn:blocking-timeout-milliseconds>
+                            <conn:idle-timeout-minutes>0</conn:idle-timeout-minutes>
+                            <conn:match-one/>
+                            <conn:match-all/>
+                            <conn:select-one-assume-match/>
+                        </conn:single-pool>
+                        <conn:partitioned-pool>
+                            <conn:max-size>0</conn:max-size>
+                            <conn:min-size>0</conn:min-size>
+                            <conn:blocking-timeout-milliseconds>0</conn:blocking-timeout-milliseconds>
+                            <conn:idle-timeout-minutes>0</conn:idle-timeout-minutes>
+                            <conn:match-one/>
+                            <conn:match-all/>
+                            <conn:select-one-assume-match/>
+                            <conn:partition-by-subject/>
+                            <conn:partition-by-connectionrequestinfo/>
+                        </conn:partitioned-pool>
+                    </conn:connectionmanager>
+                </conn:connectiondefinition-instance>
+            </conn:connection-definition>
+        </conn:outbound-resourceadapter>
+    </conn:resourceadapter>
+    <conn:adminobject>
+        <conn:adminobject-interface>adminobject-adminobjectinterface</conn:adminobject-interface>
+        <conn:adminobject-class>adminobject-adminobjectclass</conn:adminobject-class>
+        <conn:adminobject-instance>
+            <conn:message-destination-name>adminobject-instance-messagedestinationname</conn:message-destination-name>
+            <conn:config-property-setting name="adminobject-instance-name">adminobject-instance-value</conn:config-property-setting>
+        </conn:adminobject-instance>
+    </conn:adminobject>
+    <dep:gbean name="gbean-name" class="gbean-class"/>
+</conn:connector>



Mime
View raw message