geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r652419 [2/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
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-expected-11.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-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/openejb/openejb-jar-expected-11.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/openejb/openejb-jar-expected-11.xml Wed Apr 30 19:09:32 2008
@@ -18,222 +18,222 @@
 
 <!-- @version $Rev$ $Date$ -->
            
-<ns3:openejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns4="http://openejb.apache.org/xml/ns/pkgen-2.1" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:ns6="http://geronimo.apache.org/xml/ns/security-2.0">
-    <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:cmp-connection-factory>
-        <ns2:pattern>
-            <ns2:groupId>resourcelocator-pattern-groupid</ns2:groupId>
-            <ns2:artifactId>resourcelocator-pattern-artifactid</ns2:artifactId>
-            <ns2:version>resourcelocator-pattern-version</ns2:version>
-            <ns2:module>resourcelocator-pattern-module</ns2:module>
-            <ns2:name>resourcelocator-pattern-name</ns2:name>
-        </ns2:pattern>
-        <ns2:resource-link>resourcelocator-resourcelink</ns2:resource-link>
-        <ns2:url>resourcelocator-url</ns2:url>
-    </ns2:cmp-connection-factory>
-    <ns3:ejb-ql-compiler-factory>ejbqlcompilerfactory</ns3:ejb-ql-compiler-factory>
-    <ns3:db-syntax-factory>dbsyntaxfactory</ns3:db-syntax-factory>
-    <ns3:enforce-foreign-key-constraints/>
-    <ns3:enterprise-beans>
-        <ns3:message-driven id="messagedrivenbean-id">
-            <ns3:ejb-name>messagedrivenbean-ejbname</ns3:ejb-name>
-            <ns2:resource-adapter>
-                <ns2:pattern>
-                    <ns2:groupId>messagedrivenbean-resourcelocator-pattern-groupid</ns2:groupId>
-                    <ns2:artifactId>messagedrivenbean-resourcelocator-pattern-artifactid</ns2:artifactId>
-                    <ns2:version>messagedrivenbean-resourcelocator-pattern-version</ns2:version>
-                    <ns2:module>messagedrivenbean-resourcelocator-pattern-module</ns2:module>
-                    <ns2:name>messagedrivenbean-resourcelocator-pattern-name</ns2:name>
-                </ns2:pattern>
-                <ns2:resource-link>messagedrivenbean-resourcelocator-resourcelink</ns2:resource-link>
-                <ns2:url>messagedrivenbean-resourcelocator-url</ns2:url>
-            </ns2:resource-adapter>
-            <ns3:activation-config>
-                <ns3:description>messagedrivenbean-activationconfig-description</ns3:description>
-                <ns3:activation-config-property>
-                    <ns3:activation-config-property-name>messagedrivenbean-activationconfigproperty-name</ns3:activation-config-property-name>
-                    <ns3:activation-config-property-value>messagedrivenbean-activationconfigproperty-value</ns3:activation-config-property-value>
-                </ns3:activation-config-property>
-            </ns3:activation-config>
-            <ns2:abstract-naming-entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns2:persistence-unit-refType">
-                <ns2:persistence-unit-ref-name>messagedrivenbean-persistenceunitref-unitrefname</ns2:persistence-unit-ref-name>
-                <ns2:persistence-unit-name>messagedrivenbean-persistenceunitref-unitname</ns2:persistence-unit-name>
-                <ns2:pattern>
-                    <ns2:groupId>messagedrivenbean-persistenceunitref-pattern-groupid</ns2:groupId>
-                    <ns2:artifactId>messagedrivenbean-persistenceunitref-pattern-artifactid</ns2:artifactId>
-                    <ns2:version>messagedrivenbean-persistenceunitref-pattern-version</ns2:version>
-                    <ns2:module>messagedrivenbean-persistenceunitref-pattern-module</ns2:module>
-                    <ns2:name>messagedrivenbean-persistenceunitref-pattern-name</ns2:name>
-                </ns2:pattern>
-            </ns2:abstract-naming-entry>
-            <ns2:ejb-ref>
-                <ns2:ref-name>messagedrivenbean-ejbref-refname</ns2:ref-name>
-                <ns2:pattern>
-                    <ns2:groupId>messagedrivenbean-ejbref-pattern-groupid</ns2:groupId>
-                    <ns2:artifactId>messagedrivenbean-ejbref-pattern-artifactid</ns2:artifactId>
-                    <ns2:version>messagedrivenbean-ejbref-pattern-version</ns2:version>
-                    <ns2:module>messagedrivenbean-ejbref-pattern-module</ns2:module>
-                    <ns2:name>messagedrivenbean-ejbref-pattern-name</ns2:name>
-                </ns2:pattern>
-                <ns2:ns-corbaloc>messagedrivenbean-ejbref-nscorbaloc</ns2:ns-corbaloc>
-                <ns2:name>messagedrivenbean-ejbref-name</ns2:name>
-                <ns2:css>
-                    <ns2:groupId>messagedrivenbean-ejbref-css-groupid</ns2:groupId>
-                    <ns2:artifactId>messagedrivenbean-ejbref-css-artifactid</ns2:artifactId>
-                    <ns2:version>messagedrivenbean-ejbref-css-version</ns2:version>
-                    <ns2:module>messagedrivenbean-ejbref-css-module</ns2:module>
-                    <ns2:name>messagedrivenbean-ejbref-css-name</ns2:name>
-                </ns2:css>
-                <ns2:css-link>messagedrivenbean-ejbref-csslink</ns2:css-link>
-                <ns2:ejb-link>messagedrivenbean-ejbref-ejblink</ns2:ejb-link>
-            </ns2:ejb-ref>
-            <ns2:ejb-local-ref>
-                <ns2:ref-name>messagedrivenbean-ejblocalref-refname</ns2:ref-name>
-                <ns2:pattern>
-                    <ns2:groupId>messagedrivenbean-ejblocalref-pattern-groupid</ns2:groupId>
-                    <ns2:artifactId>messagedrivenbean-ejblocalref-pattern-artifactid</ns2:artifactId>
-                    <ns2:version>messagedrivenbean-ejblocalref-pattern-version</ns2:version>
-                    <ns2:module>messagedrivenbean-ejblocalref-pattern-module</ns2:module>
-                    <ns2:name>messagedrivenbean-ejblocalref-pattern-name</ns2:name>
-                </ns2:pattern>
-                <ns2:ejb-link>messagedrivenbean-ejblocalref-ejblink</ns2:ejb-link>
-            </ns2:ejb-local-ref>
-            <ns2:service-ref>
-                <ns2:service-ref-name>messagedrivenbean-serviceref-refname</ns2:service-ref-name>
-                <ns2:service-completion>
-                    <ns2:service-name>messagedrivenbean-serviceref-servicecompletion-servicename</ns2:service-name>
-                    <ns2:port-completion>
-                        <ns2:port>
-                            <ns2:port-name>messagedrivenbean-serviceref-servicecompletion-portcompletion-port-portname</ns2:port-name>
-                            <ns2:protocol>messagedrivenbean-serviceref-servicecompletion-portcompletion-port-protocol</ns2:protocol>
-                            <ns2:host>messagedrivenbean-serviceref-servicecompletion-portcompletion-port-host</ns2:host>
-                            <ns2:port>0</ns2:port>
-                            <ns2:uri>messagedrivenbean-serviceref-servicecompletion-portcompletion-port-uri</ns2:uri>
-                            <ns2:credentials-name>messagedrivenbean-serviceref-servicecompletion-portcompletion-port-credentialsname</ns2:credentials-name>
-                        </ns2:port>
-                        <ns2:binding-name>messagedrivenbean-serviceref-servicecompletion-portcompletion-bindingname</ns2:binding-name>
-                    </ns2:port-completion>
-                </ns2:service-completion>
-                <ns2:port>
-                    <ns2:port-name>messagedrivenbean-serviceref-port-portname</ns2:port-name>
-                    <ns2:protocol>messagedrivenbean-serviceref-port-protocol</ns2:protocol>
-                    <ns2:host>messagedrivenbean-serviceref-port-host</ns2:host>
-                    <ns2:port>0</ns2:port>
-                    <ns2:uri>messagedrivenbean-serviceref-port-uri</ns2:uri>
-                    <ns2:credentials-name>messagedrivenbean-serviceref-port-credentialsname</ns2:credentials-name>
-                </ns2:port>
-            </ns2:service-ref>
-            <ns2:resource-ref>
-                <ns2:ref-name>messagedrivenbean-resourceref-refname</ns2:ref-name>
-                <ns2:pattern>
-                    <ns2:groupId>messagedrivenbean-resourceref-pattern-groupid</ns2:groupId>
-                    <ns2:artifactId>messagedrivenbean-resourceref-pattern-artifactid</ns2:artifactId>
-                    <ns2:version>messagedrivenbean-resourceref-pattern-version</ns2:version>
-                    <ns2:module>messagedrivenbean-resourcref-pattern-module</ns2:module>
-                    <ns2:name>messagedrivenbean-resourceref-pattern-name</ns2:name>
-                </ns2:pattern>
-                <ns2:resource-link>messagedrivenbean-resourceref-resourcelink</ns2:resource-link>
-                <ns2:url>messagedrivenbean-resourceref-url</ns2:url>
-            </ns2:resource-ref>
-            <ns2:resource-env-ref>
-                <ns2:ref-name>messagedrivenbean-resourceenvref-refname</ns2:ref-name>
-                <ns2:pattern>
-                    <ns2:groupId>messagedrivenbean-resourceenvref-pattern-groupid</ns2:groupId>
-                    <ns2:artifactId>messagedrivenbean-resourceenvref-pattern-artifactid</ns2:artifactId>
-                    <ns2:version>messagedrivenbean-resourceenvref-pattern-version</ns2:version>
-                    <ns2:module>messagedrivenbean-resourceenvref-pattern-module</ns2:module>
-                    <ns2:name>messagedrivenbean-resourceenvref-pattern-name</ns2:name>
-                </ns2:pattern>
-                <ns2:message-destination-link>messagedrivenbean-resourceenvref-messagedestinationlink</ns2:message-destination-link>
-                <ns2:admin-object-module>messagedrivenbean-resourceenvref-adminobjectmodule</ns2:admin-object-module>
-                <ns2:admin-object-link>messagedrivenbean-resourceenvref-adminobjectlink</ns2:admin-object-link>
-            </ns2:resource-env-ref>
-        </ns3:message-driven>
-    </ns3:enterprise-beans>
-    <ns3:relationships>
-        <ns3:ejb-relation>
-            <ns3:ejb-relation-name>ejbrelation-ejbrelationname</ns3:ejb-relation-name>
-            <ns3:many-to-many-table-name>ejbrelation-manytomanytablename</ns3:many-to-many-table-name>
-            <ns3:ejb-relationship-role>
-                <ns3:ejb-relationship-role-name>ejbrelation-role-name</ns3:ejb-relationship-role-name>
-                <ns3:relationship-role-source>
-                    <ns3:ejb-name>ejbrelation-role-ejbname</ns3:ejb-name>
-                </ns3:relationship-role-source>
-                <ns3:cmr-field>
-                    <ns3:cmr-field-name>ejbrelation-role-cmrfieldname</ns3:cmr-field-name>
-                </ns3:cmr-field>
-                <ns3:role-mapping>
-                    <ns3:cmr-field-mapping>
-                        <ns3:key-column>ejbrelation-role-mapping-keycolumn</ns3:key-column>
-                        <ns3:foreign-key-column>ejbrelation-role-mapping-foreignkeycolumn</ns3:foreign-key-column>
-                    </ns3:cmr-field-mapping>
-                </ns3:role-mapping>
-            </ns3:ejb-relationship-role>
-        </ns3:ejb-relation>
-    </ns3:relationships>
-    <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>
-    <ns6:security use-context-handler="true" doas-current-caller="true" default-role="security-role">
-        <ns6: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>
-        </ns6:credential-store-ref>
-        <ns6:default-subject>
-            <ns6:description>security-subjectinfo-description</ns6:description>
-            <ns6:realm>security-subjectinfo-realm</ns6:realm>
-            <ns6:id>security-subjectinfo-id</ns6:id>
-        </ns6:default-subject>
-        <ns6:role-mappings>
-            <ns6:role role-name="security-role">
-                <ns6:description>security-role-description</ns6:description>
-                <ns6:run-as-subject>
-                    <ns6:description>security-role-subjectinfo-description</ns6:description>
-                    <ns6:realm>security-role-subjectinfo-realm</ns6:realm>
-                    <ns6:id>security-role-subjectinfo-id</ns6:id>
-                </ns6:run-as-subject>
-                <ns6:realm-principal name="security-role-realmprincipal-name" class="security-role-realmprincipal-class">
-                    <ns6:description>security-role-realmprincipal-description</ns6:description>
-                </ns6:realm-principal>
-                <ns6:login-domain-principal domain-name="security-role-logindomainprincipal-domainname" name="security-role-logindomainprincipal-name" class="security-role-logindomainprincipal-class">
-                    <ns6:description>security-role-logindomainprincipal-description</ns6:description>
-                </ns6:login-domain-principal>
-                <ns6:principal name="security-role-principal-name" class="security-role-principal-class">
-                    <ns6:description>security-role-principal-description</ns6:description>
-                </ns6:principal>
-                <ns6:distinguished-name name="security-role-distinguishedname">
-                    <ns6:description>security-role-distinguished-name-description</ns6:description>
-                </ns6:distinguished-name>
-            </ns6:role>
-        </ns6:role-mappings>
-    </ns6:security>
-    <gbean name="gbean-name" class="gbean-class"/>
-</ns3:openejb-jar>
+<ejb:openejb-jar xmlns:ejb="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:name="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1" xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0">
+    <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>
+    <name:cmp-connection-factory>
+        <name:pattern>
+            <name:groupId>resourcelocator-pattern-groupid</name:groupId>
+            <name:artifactId>resourcelocator-pattern-artifactid</name:artifactId>
+            <name:version>resourcelocator-pattern-version</name:version>
+            <name:module>resourcelocator-pattern-module</name:module>
+            <name:name>resourcelocator-pattern-name</name:name>
+        </name:pattern>
+        <name:resource-link>resourcelocator-resourcelink</name:resource-link>
+        <name:url>resourcelocator-url</name:url>
+    </name:cmp-connection-factory>
+    <ejb:ejb-ql-compiler-factory>ejbqlcompilerfactory</ejb:ejb-ql-compiler-factory>
+    <ejb:db-syntax-factory>dbsyntaxfactory</ejb:db-syntax-factory>
+    <ejb:enforce-foreign-key-constraints/>
+    <ejb:enterprise-beans>
+        <ejb:message-driven id="messagedrivenbean-id">
+            <ejb:ejb-name>messagedrivenbean-ejbname</ejb:ejb-name>
+            <name:resource-adapter>
+                <name:pattern>
+                    <name:groupId>messagedrivenbean-resourcelocator-pattern-groupid</name:groupId>
+                    <name:artifactId>messagedrivenbean-resourcelocator-pattern-artifactid</name:artifactId>
+                    <name:version>messagedrivenbean-resourcelocator-pattern-version</name:version>
+                    <name:module>messagedrivenbean-resourcelocator-pattern-module</name:module>
+                    <name:name>messagedrivenbean-resourcelocator-pattern-name</name:name>
+                </name:pattern>
+                <name:resource-link>messagedrivenbean-resourcelocator-resourcelink</name:resource-link>
+                <name:url>messagedrivenbean-resourcelocator-url</name:url>
+            </name:resource-adapter>
+            <ejb:activation-config>
+                <ejb:description>messagedrivenbean-activationconfig-description</ejb:description>
+                <ejb:activation-config-property>
+                    <ejb:activation-config-property-name>messagedrivenbean-activationconfigproperty-name</ejb:activation-config-property-name>
+                    <ejb:activation-config-property-value>messagedrivenbean-activationconfigproperty-value</ejb:activation-config-property-value>
+                </ejb:activation-config-property>
+            </ejb:activation-config>
+            <name:abstract-naming-entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="name:persistence-unit-refType">
+                <name:persistence-unit-ref-name>messagedrivenbean-persistenceunitref-unitrefname</name:persistence-unit-ref-name>
+                <name:persistence-unit-name>messagedrivenbean-persistenceunitref-unitname</name:persistence-unit-name>
+                <name:pattern>
+                    <name:groupId>messagedrivenbean-persistenceunitref-pattern-groupid</name:groupId>
+                    <name:artifactId>messagedrivenbean-persistenceunitref-pattern-artifactid</name:artifactId>
+                    <name:version>messagedrivenbean-persistenceunitref-pattern-version</name:version>
+                    <name:module>messagedrivenbean-persistenceunitref-pattern-module</name:module>
+                    <name:name>messagedrivenbean-persistenceunitref-pattern-name</name:name>
+                </name:pattern>
+            </name:abstract-naming-entry>
+            <name:ejb-ref>
+                <name:ref-name>messagedrivenbean-ejbref-refname</name:ref-name>
+                <name:pattern>
+                    <name:groupId>messagedrivenbean-ejbref-pattern-groupid</name:groupId>
+                    <name:artifactId>messagedrivenbean-ejbref-pattern-artifactid</name:artifactId>
+                    <name:version>messagedrivenbean-ejbref-pattern-version</name:version>
+                    <name:module>messagedrivenbean-ejbref-pattern-module</name:module>
+                    <name:name>messagedrivenbean-ejbref-pattern-name</name:name>
+                </name:pattern>
+                <name:ns-corbaloc>messagedrivenbean-ejbref-nscorbaloc</name:ns-corbaloc>
+                <name:name>messagedrivenbean-ejbref-name</name:name>
+                <name:css>
+                    <name:groupId>messagedrivenbean-ejbref-css-groupid</name:groupId>
+                    <name:artifactId>messagedrivenbean-ejbref-css-artifactid</name:artifactId>
+                    <name:version>messagedrivenbean-ejbref-css-version</name:version>
+                    <name:module>messagedrivenbean-ejbref-css-module</name:module>
+                    <name:name>messagedrivenbean-ejbref-css-name</name:name>
+                </name:css>
+                <name:css-link>messagedrivenbean-ejbref-csslink</name:css-link>
+                <name:ejb-link>messagedrivenbean-ejbref-ejblink</name:ejb-link>
+            </name:ejb-ref>
+            <name:ejb-local-ref>
+                <name:ref-name>messagedrivenbean-ejblocalref-refname</name:ref-name>
+                <name:pattern>
+                    <name:groupId>messagedrivenbean-ejblocalref-pattern-groupid</name:groupId>
+                    <name:artifactId>messagedrivenbean-ejblocalref-pattern-artifactid</name:artifactId>
+                    <name:version>messagedrivenbean-ejblocalref-pattern-version</name:version>
+                    <name:module>messagedrivenbean-ejblocalref-pattern-module</name:module>
+                    <name:name>messagedrivenbean-ejblocalref-pattern-name</name:name>
+                </name:pattern>
+                <name:ejb-link>messagedrivenbean-ejblocalref-ejblink</name:ejb-link>
+            </name:ejb-local-ref>
+            <name:service-ref>
+                <name:service-ref-name>messagedrivenbean-serviceref-refname</name:service-ref-name>
+                <name:service-completion>
+                    <name:service-name>messagedrivenbean-serviceref-servicecompletion-servicename</name:service-name>
+                    <name:port-completion>
+                        <name:port>
+                            <name:port-name>messagedrivenbean-serviceref-servicecompletion-portcompletion-port-portname</name:port-name>
+                            <name:protocol>messagedrivenbean-serviceref-servicecompletion-portcompletion-port-protocol</name:protocol>
+                            <name:host>messagedrivenbean-serviceref-servicecompletion-portcompletion-port-host</name:host>
+                            <name:port>0</name:port>
+                            <name:uri>messagedrivenbean-serviceref-servicecompletion-portcompletion-port-uri</name:uri>
+                            <name:credentials-name>messagedrivenbean-serviceref-servicecompletion-portcompletion-port-credentialsname</name:credentials-name>
+                        </name:port>
+                        <name:binding-name>messagedrivenbean-serviceref-servicecompletion-portcompletion-bindingname</name:binding-name>
+                    </name:port-completion>
+                </name:service-completion>
+                <name:port>
+                    <name:port-name>messagedrivenbean-serviceref-port-portname</name:port-name>
+                    <name:protocol>messagedrivenbean-serviceref-port-protocol</name:protocol>
+                    <name:host>messagedrivenbean-serviceref-port-host</name:host>
+                    <name:port>0</name:port>
+                    <name:uri>messagedrivenbean-serviceref-port-uri</name:uri>
+                    <name:credentials-name>messagedrivenbean-serviceref-port-credentialsname</name:credentials-name>
+                </name:port>
+            </name:service-ref>
+            <name:resource-ref>
+                <name:ref-name>messagedrivenbean-resourceref-refname</name:ref-name>
+                <name:pattern>
+                    <name:groupId>messagedrivenbean-resourceref-pattern-groupid</name:groupId>
+                    <name:artifactId>messagedrivenbean-resourceref-pattern-artifactid</name:artifactId>
+                    <name:version>messagedrivenbean-resourceref-pattern-version</name:version>
+                    <name:module>messagedrivenbean-resourcref-pattern-module</name:module>
+                    <name:name>messagedrivenbean-resourceref-pattern-name</name:name>
+                </name:pattern>
+                <name:resource-link>messagedrivenbean-resourceref-resourcelink</name:resource-link>
+                <name:url>messagedrivenbean-resourceref-url</name:url>
+            </name:resource-ref>
+            <name:resource-env-ref>
+                <name:ref-name>messagedrivenbean-resourceenvref-refname</name:ref-name>
+                <name:pattern>
+                    <name:groupId>messagedrivenbean-resourceenvref-pattern-groupid</name:groupId>
+                    <name:artifactId>messagedrivenbean-resourceenvref-pattern-artifactid</name:artifactId>
+                    <name:version>messagedrivenbean-resourceenvref-pattern-version</name:version>
+                    <name:module>messagedrivenbean-resourceenvref-pattern-module</name:module>
+                    <name:name>messagedrivenbean-resourceenvref-pattern-name</name:name>
+                </name:pattern>
+                <name:message-destination-link>messagedrivenbean-resourceenvref-messagedestinationlink</name:message-destination-link>
+                <name:admin-object-module>messagedrivenbean-resourceenvref-adminobjectmodule</name:admin-object-module>
+                <name:admin-object-link>messagedrivenbean-resourceenvref-adminobjectlink</name:admin-object-link>
+            </name:resource-env-ref>
+        </ejb:message-driven>
+    </ejb:enterprise-beans>
+    <ejb:relationships>
+        <ejb:ejb-relation>
+            <ejb:ejb-relation-name>ejbrelation-ejbrelationname</ejb:ejb-relation-name>
+            <ejb:many-to-many-table-name>ejbrelation-manytomanytablename</ejb:many-to-many-table-name>
+            <ejb:ejb-relationship-role>
+                <ejb:ejb-relationship-role-name>ejbrelation-role-name</ejb:ejb-relationship-role-name>
+                <ejb:relationship-role-source>
+                    <ejb:ejb-name>ejbrelation-role-ejbname</ejb:ejb-name>
+                </ejb:relationship-role-source>
+                <ejb:cmr-field>
+                    <ejb:cmr-field-name>ejbrelation-role-cmrfieldname</ejb:cmr-field-name>
+                </ejb:cmr-field>
+                <ejb:role-mapping>
+                    <ejb:cmr-field-mapping>
+                        <ejb:key-column>ejbrelation-role-mapping-keycolumn</ejb:key-column>
+                        <ejb:foreign-key-column>ejbrelation-role-mapping-foreignkeycolumn</ejb:foreign-key-column>
+                    </ejb:cmr-field-mapping>
+                </ejb:role-mapping>
+            </ejb:ejb-relationship-role>
+        </ejb:ejb-relation>
+    </ejb:relationships>
+    <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:security 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>
+    </sec:security>
+    <dep:gbean name="gbean-name" class="gbean-class"/>
+</ejb:openejb-jar>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/web/geronimo-web-expected-11.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/web/geronimo-web-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/web/geronimo-web-expected-11.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/resources/web/geronimo-web-expected-11.xml Wed Apr 30 19:09:32 2008
@@ -18,191 +18,191 @@
            
 <!-- @version $Rev$ $Date$ -->
            
-<ns2:web-app xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:ns3="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns6="http://java.sun.com/xml/ns/persistence">
-    <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:context-root>contextroot</ns2:context-root>
-    <ns2:work-dir>workdir</ns2:work-dir>
-    <ns3:web-container>
-        <ns3:pattern>
-            <ns3:groupId>gbeanlocator-pattern-groupid</ns3:groupId>
-            <ns3:artifactId>gbeanlocator-pattern-artifactid</ns3:artifactId>
-            <ns3:version>gbeanlocator-pattern-version</ns3:version>
-            <ns3:module>gbeanlocator-pattern-module</ns3:module>
-            <ns3:name>gbeanlocator-pattern-name</ns3:name>
-        </ns3:pattern>
-        <ns3:gbean-link>gbeanlocator-gbeanlink</ns3:gbean-link>
-    </ns3:web-container>
-    <ns3:abstract-naming-entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="ns3:persistence-unit-refType">
-        <ns3:persistence-unit-ref-name>persistenceunitref-unitrefname</ns3:persistence-unit-ref-name>
-        <ns3:persistence-unit-name>persistenceunitref-unitname</ns3:persistence-unit-name>
-        <ns3:pattern>
-            <ns3:groupId>persistenceunitref-pattern-groupid</ns3:groupId>
-            <ns3:artifactId>persistenceunitref-pattern-artifactid</ns3:artifactId>
-            <ns3:version>persistenceunitref-pattern-version</ns3:version>
-            <ns3:module>persistenceunitref-pattern-module</ns3:module>
-            <ns3:name>persistenceunitref-pattern-name</ns3:name>
-        </ns3:pattern>
-    </ns3:abstract-naming-entry>
-    <ns3:ejb-ref>
-        <ns3:ref-name>ejbref-refname</ns3:ref-name>
-        <ns3:pattern>
-            <ns3:groupId>ejbref-pattern-groupid</ns3:groupId>
-            <ns3:artifactId>ejbref-pattern-artifactid</ns3:artifactId>
-            <ns3:version>ejbref-pattern-version</ns3:version>
-            <ns3:module>ejbref-pattern-module</ns3:module>
-            <ns3:name>ejbref-pattern-name</ns3:name>
-        </ns3:pattern>
-        <ns3:ns-corbaloc>ejbref-nscorbaloc</ns3:ns-corbaloc>
-        <ns3:name>ejbref-name</ns3:name>
-        <ns3:css>
-            <ns3:groupId>ejbref-css-groupid</ns3:groupId>
-            <ns3:artifactId>ejbref-css-artifactid</ns3:artifactId>
-            <ns3:version>ejbref-css-version</ns3:version>
-            <ns3:module>ejbref-css-module</ns3:module>
-            <ns3:name>ejbref-css-name</ns3:name>
-        </ns3:css>
-        <ns3:css-link>ejbref-csslink</ns3:css-link>
-        <ns3:ejb-link>ejbref-ejblink</ns3:ejb-link>
-    </ns3:ejb-ref>
-    <ns3:ejb-local-ref>
-        <ns3:ref-name>ejblocalref-refname</ns3:ref-name>
-        <ns3:pattern>
-            <ns3:groupId>ejblocalref-pattern-groupid</ns3:groupId>
-            <ns3:artifactId>ejblocalref-pattern-artifactid</ns3:artifactId>
-            <ns3:version>ejblocalref-pattern-version</ns3:version>
-            <ns3:module>ejblocalref-pattern-module</ns3:module>
-            <ns3:name>ejblocalref-pattern-name</ns3:name>
-        </ns3:pattern>
-        <ns3:ejb-link>ejblocalref-ejblink</ns3:ejb-link>
-    </ns3:ejb-local-ref>
-    <ns3:service-ref>
-        <ns3:service-ref-name>serviceref-refname</ns3:service-ref-name>
-        <ns3:service-completion>
-            <ns3:service-name>serviceref-servicecompletion-servicename</ns3:service-name>
-            <ns3:port-completion>
-                <ns3:port>
-                    <ns3:port-name>serviceref-servicecompletion-portcompletion-port-portname</ns3:port-name>
-                    <ns3:protocol>serviceref-servicecompletion-portcompletion-port-protocol</ns3:protocol>
-                    <ns3:host>serviceref-servicecompletion-portcompletion-port-host</ns3:host>
-                    <ns3:port>0</ns3:port>
-                    <ns3:uri>serviceref-servicecompletion-portcompletion-port-uri</ns3:uri>
-                    <ns3:credentials-name>serviceref-servicecompletion-portcompletion-port-credentialsname</ns3:credentials-name>
-                </ns3:port>
-                <ns3:binding-name>serviceref-servicecompletion-portcompletion-bindingname</ns3:binding-name>
-            </ns3:port-completion>
-        </ns3:service-completion>
-        <ns3:port>
-            <ns3:port-name>serviceref-port-portname</ns3:port-name>
-            <ns3:protocol>serviceref-port-protocol</ns3:protocol>
-            <ns3:host>serviceref-port-host</ns3:host>
-            <ns3:port>0</ns3:port>
-            <ns3:uri>serviceref-port-uri</ns3:uri>
-            <ns3:credentials-name>serviceref-port-credentialsname</ns3:credentials-name>
-        </ns3:port>
-    </ns3:service-ref>
-    <ns3:resource-ref>
-        <ns3:ref-name>resourceref-refname</ns3:ref-name>
-        <ns3:pattern>
-            <ns3:groupId>resourceref-pattern-groupid</ns3:groupId>
-            <ns3:artifactId>resourceref-pattern-artifactid</ns3:artifactId>
-            <ns3:version>resourceref-pattern-version</ns3:version>
-            <ns3:module>resourcref-pattern-module</ns3:module>
-            <ns3:name>resourceref-pattern-name</ns3:name>
-        </ns3:pattern>
-        <ns3:resource-link>resourceref-resourcelink</ns3:resource-link>
-        <ns3:url>resourceref-url</ns3:url>
-    </ns3:resource-ref>
-    <ns3:resource-env-ref>
-        <ns3:ref-name>resourceenvref-refname</ns3:ref-name>
-        <ns3:pattern>
-            <ns3:groupId>resourceenvref-pattern-groupid</ns3:groupId>
-            <ns3:artifactId>resourceenvref-pattern-artifactid</ns3:artifactId>
-            <ns3:version>resourceenvref-pattern-version</ns3:version>
-            <ns3:module>resourceenvref-pattern-module</ns3:module>
-            <ns3:name>resourceenvref-pattern-name</ns3:name>
-        </ns3:pattern>
-        <ns3:message-destination-link>resourceenvref-messagedestinationlink</ns3:message-destination-link>
-        <ns3:admin-object-module>resourceenvref-adminobjectmodule</ns3:admin-object-module>
-        <ns3:admin-object-link>resourceenvref-adminobjectlink</ns3:admin-object-link>
-    </ns3:resource-env-ref>
-    <ns3:message-destination>
-        <ns3:message-destination-name>messagedestination-name</ns3:message-destination-name>
-        <ns3:pattern>
-            <ns3:groupId>messagedestination-pattern-groupid</ns3:groupId>
-            <ns3:artifactId>messagedestination-pattern-artifactid</ns3:artifactId>
-            <ns3:version>messagedestination-pattern-version</ns3:version>
-            <ns3:module>messagedestination-pattern-module</ns3:module>
-            <ns3:name>messagedestination-pattern-name</ns3:name>
-        </ns3:pattern>
-        <ns3:admin-object-module>messagedestination-adminobjectmodule</ns3:admin-object-module>
-        <ns3:admin-object-link>messagedestination-adminobjectlink</ns3:admin-object-link>
-    </ns3:message-destination>
-    <ns2:security-realm-name>securityrealmname</ns2:security-realm-name>
-    <ns5:security use-context-handler="true" doas-current-caller="true" default-role="security-role">
-        <ns5: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>
-        </ns5:credential-store-ref>
-        <ns5:default-subject>
-            <ns5:description>security-subjectinfo-description</ns5:description>
-            <ns5:realm>security-subjectinfo-realm</ns5:realm>
-            <ns5:id>security-subjectinfo-id</ns5:id>
-        </ns5:default-subject>
-        <ns5:role-mappings>
-            <ns5:role role-name="security-role">
-                <ns5:description>security-role-description</ns5:description>
-                <ns5:run-as-subject>
-                    <ns5:description>security-role-subjectinfo-description</ns5:description>
-                    <ns5:realm>security-role-subjectinfo-realm</ns5:realm>
-                    <ns5:id>security-role-subjectinfo-id</ns5:id>
-                </ns5:run-as-subject>
-                <ns5:realm-principal name="security-role-realmprincipal-name" class="security-role-realmprincipal-class">
-                    <ns5:description>security-role-realmprincipal-description</ns5:description>
-                </ns5:realm-principal>
-                <ns5:login-domain-principal domain-name="security-role-logindomainprincipal-domainname" name="security-role-logindomainprincipal-name" class="security-role-logindomainprincipal-class">
-                    <ns5:description>security-role-logindomainprincipal-description</ns5:description>
-                </ns5:login-domain-principal>
-                <ns5:principal name="security-role-principal-name" class="security-role-principal-class">
-                    <ns5:description>security-role-principal-description</ns5:description>
-                </ns5:principal>
-                <ns5:distinguished-name name="security-role-distinguishedname">
-                    <ns5:description>security-role-distinguished-name-description</ns5:description>
-                </ns5:distinguished-name>
-            </ns5:role>
-        </ns5:role-mappings>
-    </ns5:security>
-    <ns6:persistence version="persistence-version">
-        <ns6:persistence-unit transaction-type="RESOURCE_LOCAL" name="persistence-name">
-            <ns6:description>persistence-description</ns6:description>
-            <ns6:provider>persistence-provider</ns6:provider>
-            <ns6:jta-data-source>persistence-jtadatasource</ns6:jta-data-source>
-            <ns6:non-jta-data-source>persistence-nonjtadatasource</ns6:non-jta-data-source>
-            <ns6:mapping-file>persistence-mappingfile</ns6:mapping-file>
-            <ns6:jar-file>persistence-jarfile</ns6:jar-file>
-            <ns6:class>persistence-clazz</ns6:class>
-            <ns6:exclude-unlisted-classes>true</ns6:exclude-unlisted-classes>
-            <ns6:properties>
-                <ns6:property value="persistence-property-value" name="persistence-property-name"/>
-            </ns6:properties>
-        </ns6:persistence-unit>
-    </ns6:persistence>
-</ns2:web-app>
+<web:web-app xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" xmlns:name="http://geronimo.apache.org/xml/ns/naming-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" xmlns:pers="http://java.sun.com/xml/ns/persistence">
+    <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>
+    <web:context-root>contextroot</web:context-root>
+    <web:work-dir>workdir</web:work-dir>
+    <name:web-container>
+        <name:pattern>
+            <name:groupId>gbeanlocator-pattern-groupid</name:groupId>
+            <name:artifactId>gbeanlocator-pattern-artifactid</name:artifactId>
+            <name:version>gbeanlocator-pattern-version</name:version>
+            <name:module>gbeanlocator-pattern-module</name:module>
+            <name:name>gbeanlocator-pattern-name</name:name>
+        </name:pattern>
+        <name:gbean-link>gbeanlocator-gbeanlink</name:gbean-link>
+    </name:web-container>
+    <name:abstract-naming-entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="name:persistence-unit-refType">
+        <name:persistence-unit-ref-name>persistenceunitref-unitrefname</name:persistence-unit-ref-name>
+        <name:persistence-unit-name>persistenceunitref-unitname</name:persistence-unit-name>
+        <name:pattern>
+            <name:groupId>persistenceunitref-pattern-groupid</name:groupId>
+            <name:artifactId>persistenceunitref-pattern-artifactid</name:artifactId>
+            <name:version>persistenceunitref-pattern-version</name:version>
+            <name:module>persistenceunitref-pattern-module</name:module>
+            <name:name>persistenceunitref-pattern-name</name:name>
+        </name:pattern>
+    </name:abstract-naming-entry>
+    <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:ejb-local-ref>
+        <name:ref-name>ejblocalref-refname</name:ref-name>
+        <name:pattern>
+            <name:groupId>ejblocalref-pattern-groupid</name:groupId>
+            <name:artifactId>ejblocalref-pattern-artifactid</name:artifactId>
+            <name:version>ejblocalref-pattern-version</name:version>
+            <name:module>ejblocalref-pattern-module</name:module>
+            <name:name>ejblocalref-pattern-name</name:name>
+        </name:pattern>
+        <name:ejb-link>ejblocalref-ejblink</name:ejb-link>
+    </name:ejb-local-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>
+    <web:security-realm-name>securityrealmname</web:security-realm-name>
+    <sec:security 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>
+    </sec:security>
+    <pers:persistence version="persistence-version">
+        <pers:persistence-unit transaction-type="RESOURCE_LOCAL" name="persistence-name">
+            <pers:description>persistence-description</pers:description>
+            <pers:provider>persistence-provider</pers:provider>
+            <pers:jta-data-source>persistence-jtadatasource</pers:jta-data-source>
+            <pers:non-jta-data-source>persistence-nonjtadatasource</pers:non-jta-data-source>
+            <pers:mapping-file>persistence-mappingfile</pers:mapping-file>
+            <pers:jar-file>persistence-jarfile</pers:jar-file>
+            <pers:class>persistence-clazz</pers:class>
+            <pers:exclude-unlisted-classes>true</pers:exclude-unlisted-classes>
+            <pers:properties>
+                <pers:property value="persistence-property-value" name="persistence-property-name"/>
+            </pers:properties>
+        </pers:persistence-unit>
+    </pers:persistence>
+</web:web-app>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/JAXBUtils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/JAXBUtils.java?rev=652419&r1=652418&r2=652419&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/JAXBUtils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/JAXBUtils.java Wed Apr 30 19:09:32 2008
@@ -70,6 +70,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 outBuffer = new ByteArrayOutputStream();
 			marshaller.marshal(jaxbElement, outBuffer);
 			ByteArrayInputStream inBuffer = new ByteArrayInputStream(outBuffer.toByteArray());

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespaceFilter.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespaceFilter.java?rev=652419&r1=652418&r2=652419&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespaceFilter.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespaceFilter.java Wed Apr 30 19:09:32 2008
@@ -31,6 +31,8 @@
  * v1.1) of Geronimo namespaces and replace them with the more current versions 
  * (e.g., v2.1)<p>
  * 
+ * If this class changes, then the test version in org.apache.geronimo.jee.common
+ * need to be updated to be kept in sync
  * 
  * @version $Rev$ $Date$
  */

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespacePrefixMapperImpl.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespacePrefixMapperImpl.java?rev=652419&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespacePrefixMapperImpl.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespacePrefixMapperImpl.java Wed Apr 30 19:09:32 2008
@@ -0,0 +1,62 @@
+/**
+ * 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.st.core.jaxb;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.sun.xml.bind.marshaller.NamespacePrefixMapper;
+import org.apache.geronimo.st.core.internal.Trace;
+
+/**
+ * <strong>NamespacePrefixMapperImpl</strong> is used to map XML namespaces 
+ * to a set of predetermined values.
+ * 
+ * If this class changes, then the test version in org.apache.geronimo.jee.common
+ * need to be updated to be kept in sync
+ * 
+ * @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) {
+        Trace.tracePoint("Entry", "NamespacePrefixMapper.getPreferredPrefix", namespaceUri, suggestion, requirePrefix);
+
+        if (prefixMap.containsKey(namespaceUri))
+            return prefixMap.get(namespaceUri);
+
+        Trace.tracePoint("Exit", "NamespacePrefixMapper.getPreferredPrefix", namespaceUri, suggestion, requirePrefix);
+        return suggestion;
+    }
+    
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespacePrefixMapperImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespacePrefixMapperImpl.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespacePrefixMapperImpl.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message