You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/02/03 08:26:56 UTC
svn commit: r905918 [1/4] - in /geronimo/server/trunk: ./
framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/
framework/configs/geronimo-gbean-deployer/src/main/history/
framework/configs/gshell-geronimo/src/main/history/ framework/co...
Author: xuhaihong
Date: Wed Feb 3 07:26:50 2010
New Revision: 905918
URL: http://svn.apache.org/viewvc?rev=905918&view=rev
Log:
GERONIMO-5057 Use those xmlbeans generated by JAVA EE 6 schema files
Added:
geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/resources/j2ee_1_3dtd/application-client-6.xml (with props)
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/geronimo-ra.xml (with props)
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/ra.xml (with props)
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/j2ee_1_3dtd/ra-16.xml (with props)
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/application-6.xml (with props)
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_2dtd/web-1-30.xml (with props)
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-1-30.xml (with props)
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/j2ee_1_3dtd/web-30.xml (with props)
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/javaee_6schema/
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/javaee_6schema/web-1-30.xml (with props)
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/javaee_6schema/web-2-30.xml (with props)
geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/test/resources/webservices-javaee6.xml (with props)
Modified:
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/NoSuchConfigException.java
geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/MockResourceSource.java
geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NewServerInstance.java
geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/Context.java
geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/credentialstore/RunAsLoginModule.java
geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java
geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2ServiceRefBuilder.java
geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml
geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java
geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/SchemaConversionTest.java
geronimo/server/trunk/plugins/clustering/plugin-farm-member/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/src/main/java/org/apache/geronimo/concurrent/builder/ResourceRefBuilder.java
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapterDConfigRoot.java
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/jsr88/Connector15DCBRoot.java
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/SchemaConversionTest.java
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/AnnotationHelperTest.java
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/script/test-setup.xml
geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java
geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFServiceRefBuilder.java
geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/client/CXFServiceReference.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApp.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApplicationClient.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedEjbJar.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedWebApp.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelper.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationHelper.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ENCHelper.java
geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LifecycleMethodBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/SwitchingServiceRefBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/annotation/AnnotationHelperTest.java
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverter.java
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web/deployment/WebAppDConfigRoot.java
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/security/SpecSecurityBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/SchemaConversionTest.java
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/security/SecurityConfigTest.java
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web25/deployment/security/SpecSecurityParsingTest.java
geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml
geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/AdvancedWARWebServiceFinder.java
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/EndpointInfoBuilder.java
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceRefBuilder.java
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/SimpleWARWebServiceFinder.java
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/HandlerChainsUtils.java
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/AnnotationHandlerChainBuilder.java
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/main/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerChainBuilder.java
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/src/test/java/org/apache/geronimo/jaxws/handler/GeronimoHandlerResolverTest.java
geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/main/java/org/apache/geronimo/jetty8/deployment/JettyModuleBuilder.java
geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/test/java/org/apache/geronimo/jetty8/deployment/PlanParsingTest.java
geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/test/java/org/apache/geronimo/jetty8/deployment/StartupOrderComparatorTest.java
geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/mconsole-itest-simple/src/test/java/org/apache/geronimo/monitoring/console/GeneralSTest.java
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/PopUpGraphServlet.java
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/data/View.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbDeploymentBuilder.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/XmlUtil.java
geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceContextRefBuilder.java
geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitBuilder.java
geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/src/main/java/org/apache/geronimo/persistence/builder/PersistenceUnitRefBuilder.java
geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/configData/JndiRefsConfigData.java
geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/configData/MessageDestinationConfigData.java
geronimo/server/trunk/plugins/plancreator/plancreator-portlets/src/main/java/org/apache/geronimo/console/configcreator/configData/SecurityConfigData.java
geronimo/server/trunk/plugins/pom.xml
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java
geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-wadi/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java
geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/src/test/java/org/apache/geronimo/webservices/builder/ParsingTest.java
geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml Wed Feb 3 07:26:50 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
<module-id>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
@@ -78,6 +78,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-javaee_6</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
<artifactId>geronimo-schema-jee_5</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml Wed Feb 3 07:26:50 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
<module-id>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
@@ -48,6 +48,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-javaee_6</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
<artifactId>geronimo-schema-jee_5</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml Wed Feb 3 07:26:50 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
<module-id>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>gshell-geronimo</artifactId>
@@ -118,6 +118,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-javaee_6</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
<artifactId>geronimo-schema-jee_5</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml Wed Feb 3 07:26:50 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
<module-id>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>jsr88-cli</artifactId>
@@ -98,6 +98,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-javaee_6</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
<artifactId>geronimo-schema-jee_5</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml Wed Feb 3 07:26:50 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
<module-id>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>karaf-framework</artifactId>
@@ -273,6 +273,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-javaee_6</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
<artifactId>geronimo-schema-jee_5</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml Wed Feb 3 07:26:50 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
<module-id>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>shutdown</artifactId>
@@ -98,6 +98,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-javaee_6</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
<artifactId>geronimo-schema-jee_5</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/NoSuchConfigException.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/NoSuchConfigException.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/NoSuchConfigException.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/NoSuchConfigException.java Wed Feb 3 07:26:50 2010
@@ -21,7 +21,7 @@
/**
* Exception indicating the requestion Configuration could not be located.
- *
+ *
* @version $Rev$ $Date$
*/
public class NoSuchConfigException extends Exception {
@@ -45,4 +45,9 @@
public String toString() {
return super.toString() + " (configId: " + configId + ")";
}
+
+ @Override
+ public String getMessage() {
+ return super.getMessage() + " (configId: " + configId + ")";
+ }
}
Modified: geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/MockResourceSource.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/MockResourceSource.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/MockResourceSource.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-naming/src/test/java/org/apache/geronimo/gjndi/MockResourceSource.java Wed Feb 3 07:26:50 2010
@@ -25,7 +25,7 @@
import org.apache.geronimo.gbean.annotation.GBean;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
@GBean
public class MockResourceSource implements ResourceSource {
Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NewServerInstance.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NewServerInstance.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NewServerInstance.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/NewServerInstance.java Wed Feb 3 07:26:50 2010
@@ -21,7 +21,7 @@
package org.apache.geronimo.system.plugin;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public interface NewServerInstance {
void newServerInstance(String serverName) throws Exception;
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/Context.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/Context.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/Context.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/Context.java Wed Feb 3 07:26:50 2010
@@ -27,7 +27,7 @@
import javax.security.auth.Subject;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class Context {
private final SubjectId id;
Modified: geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/credentialstore/RunAsLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/credentialstore/RunAsLoginModule.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/credentialstore/RunAsLoginModule.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-security/src/main/java/org/apache/geronimo/security/credentialstore/RunAsLoginModule.java Wed Feb 3 07:26:50 2010
@@ -43,7 +43,7 @@
* Simple login module that may help create subjects for run-as roles. List the desired class as the principalClass and the
* desired allowed names for principals as allowedNames in a comma-separated list.
*
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class RunAsLoginModule implements LoginModule {
Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml Wed Feb 3 07:26:50 2010
@@ -36,6 +36,11 @@
<!-- required for base xbean definitions -->
<dependency>
<groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-javaee_6</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
<artifactId>geronimo-schema-jee_5</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java Wed Feb 3 07:26:50 2010
@@ -42,11 +42,11 @@
import org.apache.geronimo.naming.deployment.ServiceRefBuilder;
import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefDocument;
import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefType;
-import org.apache.geronimo.xbeans.javaee.ParamValueType;
-import org.apache.geronimo.xbeans.javaee.PortComponentRefType;
-import org.apache.geronimo.xbeans.javaee.ServiceRefHandlerType;
-import org.apache.geronimo.xbeans.javaee.ServiceRefType;
-import org.apache.geronimo.xbeans.javaee.XsdQNameType;
+import org.apache.geronimo.xbeans.javaee6.ParamValueType;
+import org.apache.geronimo.xbeans.javaee6.PortComponentRefType;
+import org.apache.geronimo.xbeans.javaee6.ServiceRefHandlerType;
+import org.apache.geronimo.xbeans.javaee6.ServiceRefType;
+import org.apache.geronimo.xbeans.javaee6.XsdQNameType;
import org.apache.xmlbeans.QNameSet;
import org.apache.xmlbeans.XmlObject;
import org.osgi.framework.Bundle;
@@ -167,7 +167,7 @@
List handlerInfos = new ArrayList();
for (int i = 0; i < handlers.length; i++) {
ServiceRefHandlerType handler = handlers[i];
- org.apache.geronimo.xbeans.javaee.String[] portNameArray = handler.getPortNameArray();
+ org.apache.geronimo.xbeans.javaee6.String[] portNameArray = handler.getPortNameArray();
List portNames = new ArrayList();
for (int j = 0; j < portNameArray.length; j++) {
portNames.add(portNameArray[j].getStringValue().trim());
Modified: geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml Wed Feb 3 07:26:50 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
<module-id>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>axis2</artifactId>
@@ -113,6 +113,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-javaee_6</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
<artifactId>geronimo-schema-jee_5</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java Wed Feb 3 07:26:50 2010
@@ -42,11 +42,11 @@
import org.apache.geronimo.jaxws.builder.wsdl.WsdlGenerator;
import org.apache.geronimo.jaxws.builder.wsdl.WsdlGeneratorOptions;
import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.xbeans.javaee.PortComponentType;
-import org.apache.geronimo.xbeans.javaee.ServiceImplBeanType;
-import org.apache.geronimo.xbeans.javaee.WebserviceDescriptionType;
-import org.apache.geronimo.xbeans.javaee.WebservicesDocument;
-import org.apache.geronimo.xbeans.javaee.WebservicesType;
+import org.apache.geronimo.xbeans.javaee6.PortComponentType;
+import org.apache.geronimo.xbeans.javaee6.ServiceImplBeanType;
+import org.apache.geronimo.xbeans.javaee6.WebserviceDescriptionType;
+import org.apache.geronimo.xbeans.javaee6.WebservicesDocument;
+import org.apache.geronimo.xbeans.javaee6.WebservicesType;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlObject;
import org.slf4j.Logger;
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2ServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2ServiceRefBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2ServiceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2ServiceRefBuilder.java Wed Feb 3 07:26:50 2010
@@ -41,8 +41,8 @@
import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.naming.deployment.ServiceRefBuilder;
import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefType;
-import org.apache.geronimo.xbeans.javaee.PortComponentRefType;
-import org.apache.geronimo.xbeans.javaee.ServiceRefType;
+import org.apache.geronimo.xbeans.javaee6.PortComponentRefType;
+import org.apache.geronimo.xbeans.javaee6.ServiceRefType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml Wed Feb 3 07:26:50 2010
@@ -61,6 +61,11 @@
<dependency>
<groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-javaee_6</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
<artifactId>geronimo-schema-jee_5</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/client/Axis2ServiceReference.java Wed Feb 3 07:26:50 2010
@@ -57,11 +57,11 @@
Map<Object, EndpointInfo> seiInfoMap) {
super(handlerChainsXML, seiInfoMap, name, serviceQName, wsdlURI, referenceClassName, serviceClassName);
}
-
+
@Override
public Object getContent() throws NamingException {
DescriptionBuilderComposite composite = null;
-
+
URL catalogURL = getCatalog();
if (catalogURL != null) {
composite = new DescriptionBuilderComposite();
@@ -69,7 +69,7 @@
catalogManager.setCatalogFiles(catalogURL.toString());
composite.setCatalogManager(catalogManager);
}
-
+
ServiceDelegate.setServiceMetadata(composite);
try {
return super.getContent();
@@ -87,7 +87,7 @@
}
return types;
}
-
+
protected HandlerResolver getHandlerResolver(Class serviceClass) {
JAXWSAnnotationProcessor annotationProcessor =
new JAXWSAnnotationProcessor(new JNDIResolver(), new WebServiceContextImpl());
@@ -95,9 +95,9 @@
new GeronimoHandlerResolver(classLoader, serviceClass, getHandlerChains(), annotationProcessor);
return handlerResolver;
}
-
+
protected PortMethodInterceptor getPortMethodInterceptor() {
return new Axis2PortMethodInterceptor(this.seiInfoMap);
}
-
+
}
Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Wed Feb 3 07:26:50 2010
@@ -89,9 +89,9 @@
import org.apache.geronimo.xbeans.geronimo.client.GerApplicationClientType;
import org.apache.geronimo.xbeans.geronimo.client.GerResourceType;
import org.apache.geronimo.xbeans.geronimo.security.GerSubjectInfoType;
-import org.apache.geronimo.xbeans.javaee.ApplicationClientDocument;
-import org.apache.geronimo.xbeans.javaee.ApplicationClientType;
-import org.apache.geronimo.xbeans.javaee.FullyQualifiedClassType;
+import org.apache.geronimo.xbeans.javaee6.ApplicationClientDocument;
+import org.apache.geronimo.xbeans.javaee6.ApplicationClientType;
+import org.apache.geronimo.xbeans.javaee6.FullyQualifiedClassType;
import org.apache.xbean.finder.ClassFinder;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
@@ -477,17 +477,19 @@
}
static ApplicationClientDocument convertToApplicationClientSchema(XmlObject xmlObject) throws XmlException {
- if (ApplicationClientDocument.type.equals(xmlObject.schemaType())) {
- XmlBeansUtil.validateDD(xmlObject);
- return (ApplicationClientDocument) xmlObject;
- }
XmlCursor cursor = xmlObject.newCursor();
XmlCursor moveable = xmlObject.newCursor();
- String schemaLocationURL = "http://java.sun.com/xml/ns/javaee/application-client_5.xsd";
- String version = "5";
+ String schemaLocationURL = "http://java.sun.com/xml/ns/javaee/application-client_6.xsd";
+ String version = "6";
try {
cursor.toStartDoc();
cursor.toFirstChild();
+ if ("http://java.sun.com/xml/ns/javaee".equals(cursor.getName().getNamespaceURI())) {
+ SchemaConversionUtils.convertSchemaVersion(cursor, SchemaConversionUtils.JAVAEE_NAMESPACE, schemaLocationURL, version);
+ XmlObject result = xmlObject.changeType(ApplicationClientDocument.type);
+ XmlBeansUtil.validateDD(result);
+ return (ApplicationClientDocument) result;
+ }
if ("http://java.sun.com/xml/ns/j2ee".equals(cursor.getName().getNamespaceURI())) {
SchemaConversionUtils.convertSchemaVersion(cursor, SchemaConversionUtils.JAVAEE_NAMESPACE, schemaLocationURL, version);
XmlObject result = xmlObject.changeType(ApplicationClientDocument.type);
@@ -501,18 +503,17 @@
cursor.toChild(SchemaConversionUtils.JAVAEE_NAMESPACE, "application-client");
cursor.toFirstChild();
SchemaConversionUtils.convertToDescriptionGroup(SchemaConversionUtils.JAVAEE_NAMESPACE, cursor, moveable);
+ XmlObject result = xmlObject.changeType(ApplicationClientDocument.type);
+ if (result != null) {
+ XmlBeansUtil.validateDD(result);
+ return (ApplicationClientDocument) result;
+ }
+ XmlBeansUtil.validateDD(xmlObject);
+ return (ApplicationClientDocument) xmlObject;
} finally {
cursor.dispose();
moveable.dispose();
}
- XmlObject result = xmlObject.changeType(ApplicationClientDocument.type);
- if (result != null) {
- XmlBeansUtil.validateDD(result);
- return (ApplicationClientDocument) result;
- }
- XmlBeansUtil.validateDD(xmlObject);
- return (ApplicationClientDocument) xmlObject;
-
}
public void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repositories) throws DeploymentException {
Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/SchemaConversionTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/SchemaConversionTest.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/SchemaConversionTest.java (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/SchemaConversionTest.java Wed Feb 3 07:26:50 2010
@@ -35,9 +35,9 @@
public class SchemaConversionTest extends XmlBeansTestSupport {
private ClassLoader classLoader = this.getClass().getClassLoader();
- public void testApplicationClient13ToApplicationClient5Transform() throws Exception {
+ public void testApplicationClient13ToApplicationClient6Transform() throws Exception {
URL srcXml = classLoader.getResource("j2ee_1_3dtd/application-client-13.xml");
- URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/application-client-5.xml");
+ URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/application-client-6.xml");
XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
XmlBeansUtil.validateDD(expected);
@@ -48,8 +48,8 @@
//make sure trying to convert twice has no bad effects
XmlCursor cursor2 = xmlObject.newCursor();
try {
- String schemaLocationURL = "http://java.sun.com/xml/ns/javaee/application_5.xsd";
- String version = "5";
+ String schemaLocationURL = "http://java.sun.com/xml/ns/javaee/application_6.xsd";
+ String version = "6";
assertFalse(SchemaConversionUtils.convertToSchema(cursor2, SchemaConversionUtils.JAVAEE_NAMESPACE, schemaLocationURL, version));
} finally {
cursor2.dispose();
@@ -62,9 +62,9 @@
assertTrue("Differences after reconverting to application client schema: " + problems, ok3);
}
- public void testApplicationClient14ToApplicationClient5Transform() throws Exception {
+ public void testApplicationClient14ToApplicationClient6Transform() throws Exception {
URL srcXml = classLoader.getResource("j2ee_1_3dtd/application-client-14.xml");
- URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/application-client-5.xml");
+ URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/application-client-6.xml");
XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
XmlBeansUtil.validateDD(expected);
@@ -75,8 +75,35 @@
//make sure trying to convert twice has no bad effects
XmlCursor cursor2 = xmlObject.newCursor();
try {
- String schemaLocationURL = "http://java.sun.com/xml/ns/javaee/application_5.xsd";
- String version = "5";
+ String schemaLocationURL = "http://java.sun.com/xml/ns/javaee/application_6.xsd";
+ String version = "6";
+ assertFalse(SchemaConversionUtils.convertToSchema(cursor2, SchemaConversionUtils.JAVAEE_NAMESPACE, schemaLocationURL, version));
+ } finally {
+ cursor2.dispose();
+ }
+ boolean ok2 = compareXmlObjects(xmlObject, expected, problems);
+ assertTrue("Differences after reconverting to schema: " + problems, ok2);
+ //do the whole transform twice...
+ xmlObject = AppClientModuleBuilder.convertToApplicationClientSchema(xmlObject);
+ boolean ok3 = compareXmlObjects(xmlObject, expected, problems);
+ assertTrue("Differences after reconverting to application client schema: " + problems, ok3);
+ }
+
+ public void testApplicationClient15ToApplicationClient6Transform() throws Exception {
+ URL srcXml = classLoader.getResource("j2ee_1_3dtd/application-client-5.xml");
+ URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/application-client-6.xml");
+ XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
+ XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
+ XmlBeansUtil.validateDD(expected);
+ xmlObject = AppClientModuleBuilder.convertToApplicationClientSchema(xmlObject);
+ List problems = new ArrayList();
+ boolean ok = compareXmlObjects(xmlObject, expected, problems);
+ assertTrue("Differences: " + problems, ok);
+ //make sure trying to convert twice has no bad effects
+ XmlCursor cursor2 = xmlObject.newCursor();
+ try {
+ String schemaLocationURL = "http://java.sun.com/xml/ns/javaee/application_6.xsd";
+ String version = "6";
assertFalse(SchemaConversionUtils.convertToSchema(cursor2, SchemaConversionUtils.JAVAEE_NAMESPACE, schemaLocationURL, version));
} finally {
cursor2.dispose();
Added: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/resources/j2ee_1_3dtd/application-client-6.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/resources/j2ee_1_3dtd/application-client-6.xml?rev=905918&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/resources/j2ee_1_3dtd/application-client-6.xml (added)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/resources/j2ee_1_3dtd/application-client-6.xml Wed Feb 3 07:26:50 2010
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+
+<application-client xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_6.xsd" version="6" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee">
+ <description>it's like this, see?</description>
+ <display-name>display me!</display-name>
+ <resource-ref>
+ <res-ref-name>jdbc/DefaultDatasource</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ <res-sharing-scope>Shareable</res-sharing-scope>
+ </resource-ref>
+ <resource-ref>
+ <res-ref-name>jms/JMSConnectionFactory</res-ref-name>
+ <res-type>javax.jms.ConnectionFactory</res-type>
+ <res-auth>Container</res-auth>
+ <res-sharing-scope>Shareable</res-sharing-scope>
+ </resource-ref>
+ <resource-env-ref>
+ <resource-env-ref-name>jms/Queue</resource-env-ref-name>
+ <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+ </resource-env-ref>
+</application-client>
Propchange: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/resources/j2ee_1_3dtd/application-client-6.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/resources/j2ee_1_3dtd/application-client-6.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/resources/j2ee_1_3dtd/application-client-6.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/server/trunk/plugins/clustering/plugin-farm-member/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm-member/src/main/history/dependencies.xml?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm-member/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm-member/src/main/history/dependencies.xml Wed Feb 3 07:26:50 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
<module-id>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>plugin-farm-member</artifactId>
@@ -38,6 +38,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-javaee_6</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
<artifactId>geronimo-schema-jee_5</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/src/main/java/org/apache/geronimo/concurrent/builder/ResourceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/src/main/java/org/apache/geronimo/concurrent/builder/ResourceRefBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/src/main/java/org/apache/geronimo/concurrent/builder/ResourceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/src/main/java/org/apache/geronimo/concurrent/builder/ResourceRefBuilder.java Wed Feb 3 07:26:50 2010
@@ -53,12 +53,12 @@
import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
import org.apache.geronimo.xbeans.geronimo.naming.GerResourceEnvRefDocument;
import org.apache.geronimo.xbeans.geronimo.naming.GerResourceEnvRefType;
-import org.apache.geronimo.xbeans.javaee.DescriptionType;
-import org.apache.geronimo.xbeans.javaee.FullyQualifiedClassType;
-import org.apache.geronimo.xbeans.javaee.InjectionTargetType;
-import org.apache.geronimo.xbeans.javaee.JndiNameType;
-import org.apache.geronimo.xbeans.javaee.ResourceEnvRefType;
-import org.apache.geronimo.xbeans.javaee.XsdStringType;
+import org.apache.geronimo.xbeans.javaee6.DescriptionType;
+import org.apache.geronimo.xbeans.javaee6.FullyQualifiedClassType;
+import org.apache.geronimo.xbeans.javaee6.InjectionTargetType;
+import org.apache.geronimo.xbeans.javaee6.JndiNameType;
+import org.apache.geronimo.xbeans.javaee6.ResourceEnvRefType;
+import org.apache.geronimo.xbeans.javaee6.XsdStringType;
import org.apache.xmlbeans.QNameSet;
import org.apache.xmlbeans.XmlObject;
import org.osgi.framework.Bundle;
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java Wed Feb 3 07:26:50 2010
@@ -50,15 +50,15 @@
import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
import org.apache.geronimo.xbeans.geronimo.naming.GerResourceEnvRefDocument;
import org.apache.geronimo.xbeans.geronimo.naming.GerResourceEnvRefType;
-import org.apache.geronimo.xbeans.javaee.DescriptionType;
-import org.apache.geronimo.xbeans.javaee.FullyQualifiedClassType;
-import org.apache.geronimo.xbeans.javaee.InjectionTargetType;
-import org.apache.geronimo.xbeans.javaee.JndiNameType;
-import org.apache.geronimo.xbeans.javaee.MessageDestinationRefType;
-import org.apache.geronimo.xbeans.javaee.MessageDestinationType;
-import org.apache.geronimo.xbeans.javaee.MessageDestinationTypeType;
-import org.apache.geronimo.xbeans.javaee.ResourceEnvRefType;
-import org.apache.geronimo.xbeans.javaee.XsdStringType;
+import org.apache.geronimo.xbeans.javaee6.DescriptionType;
+import org.apache.geronimo.xbeans.javaee6.FullyQualifiedClassType;
+import org.apache.geronimo.xbeans.javaee6.InjectionTargetType;
+import org.apache.geronimo.xbeans.javaee6.JndiNameType;
+import org.apache.geronimo.xbeans.javaee6.MessageDestinationRefType;
+import org.apache.geronimo.xbeans.javaee6.MessageDestinationType;
+import org.apache.geronimo.xbeans.javaee6.MessageDestinationTypeType;
+import org.apache.geronimo.xbeans.javaee6.ResourceEnvRefType;
+import org.apache.geronimo.xbeans.javaee6.XsdStringType;
import org.apache.xmlbeans.QNameSet;
import org.apache.xmlbeans.XmlObject;
import org.osgi.framework.Bundle;
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Wed Feb 3 07:26:50 2010
@@ -109,16 +109,15 @@
import org.apache.geronimo.xbeans.connector.GerResourceadapterInstanceType;
import org.apache.geronimo.xbeans.connector.GerResourceadapterType;
import org.apache.geronimo.xbeans.connector.GerSinglepoolType;
-import org.apache.geronimo.xbeans.j2ee.ActivationspecType;
-import org.apache.geronimo.xbeans.j2ee.AdminobjectType;
-import org.apache.geronimo.xbeans.j2ee.ConfigPropertyType;
-import org.apache.geronimo.xbeans.j2ee.ConnectionDefinitionType;
-import org.apache.geronimo.xbeans.j2ee.ConnectorDocument;
-import org.apache.geronimo.xbeans.j2ee.ConnectorType;
-import org.apache.geronimo.xbeans.j2ee.MessagelistenerType;
-import org.apache.geronimo.xbeans.j2ee.ResourceadapterType;
+import org.apache.geronimo.xbeans.javaee6.ActivationspecType;
+import org.apache.geronimo.xbeans.javaee6.AdminobjectType;
+import org.apache.geronimo.xbeans.javaee6.ConfigPropertyType;
+import org.apache.geronimo.xbeans.javaee6.ConnectionDefinitionType;
+import org.apache.geronimo.xbeans.javaee6.ConnectorDocument;
+import org.apache.geronimo.xbeans.javaee6.ConnectorType;
+import org.apache.geronimo.xbeans.javaee6.MessagelistenerType;
+import org.apache.geronimo.xbeans.javaee6.ResourceadapterType;
import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlDocumentProperties;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
import org.osgi.framework.Bundle;
@@ -131,7 +130,7 @@
public class ConnectorModuleBuilder implements ModuleBuilder, ActivationSpecInfoLocator, GBeanLifecycle {
private static final Logger log = LoggerFactory.getLogger(ConnectorModuleBuilder.class);
- private static final QName RESOURCE_ADAPTER_VERSION = new QName(SchemaConversionUtils.J2EE_NAMESPACE, "resourceadapter-version");
+ private static final QName RESOURCE_ADAPTER_VERSION = new QName(SchemaConversionUtils.JAVAEE_NAMESPACE, "resourceadapter-version");
private static QName CONNECTOR_QNAME = GerConnectorDocument.type.getDocumentElementName();
static final String GERCONNECTOR_NAMESPACE = CONNECTOR_QNAME.getNamespaceURI();
private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String, String>();
@@ -208,7 +207,7 @@
public Module createModule(Bundle bundle, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
return null;
}
-
+
public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
return createModule(plan, moduleFile, "rar", null, null, null, naming, idBuilder);
}
@@ -323,52 +322,57 @@
return (ConnectorDocument) xmlObject;
}
XmlCursor cursor = xmlObject.newCursor();
- XmlDocumentProperties xmlDocumentProperties = cursor.documentProperties();
- String publicId = xmlDocumentProperties.getDoctypePublicId();
+ cursor.toStartDoc();
+ cursor.toFirstChild();
try {
- if ("-//Sun Microsystems, Inc.//DTD Connector 1.0//EN".equals(publicId)) {
+ String schemaLocationURL = "http://java.sun.com/xml/ns/javaee/connector_1_6.xsd";
+ String version = "1.6";
+ if ("http://java.sun.com/xml/ns/j2ee".equals(cursor.getName().getNamespaceURI())) {
+ SchemaConversionUtils.convertSchemaVersion(cursor, SchemaConversionUtils.JAVAEE_NAMESPACE, schemaLocationURL, version);
+ XmlObject result = xmlObject.changeType(ConnectorDocument.type);
+ XmlBeansUtil.validateDD(result);
+ return (ConnectorDocument) result;
+ } else if ("-//Sun Microsystems, Inc.//DTD Connector 1.0//EN".equals(cursor.documentProperties().getDoctypePublicId())) {
XmlCursor moveable = xmlObject.newCursor();
try {
- String schemaLocationURL = "http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd";
- String version = "1.5";
- SchemaConversionUtils.convertToSchema(cursor, SchemaConversionUtils.J2EE_NAMESPACE, schemaLocationURL, version);
+ SchemaConversionUtils.convertToSchema(cursor, SchemaConversionUtils.JAVAEE_NAMESPACE, schemaLocationURL, version);
cursor.toStartDoc();
- cursor.toChild(SchemaConversionUtils.J2EE_NAMESPACE, "connector");
+ cursor.toChild(SchemaConversionUtils.JAVAEE_NAMESPACE, "connector");
cursor.toFirstChild();
- SchemaConversionUtils.convertToDescriptionGroup(SchemaConversionUtils.J2EE_NAMESPACE, cursor, moveable);
- cursor.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "spec-version");
+ SchemaConversionUtils.convertToDescriptionGroup(SchemaConversionUtils.JAVAEE_NAMESPACE, cursor, moveable);
+ cursor.toNextSibling(SchemaConversionUtils.JAVAEE_NAMESPACE, "spec-version");
cursor.removeXml();
- cursor.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "version");
+ cursor.toNextSibling(SchemaConversionUtils.JAVAEE_NAMESPACE, "version");
cursor.setName(RESOURCE_ADAPTER_VERSION);
- cursor.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "resourceadapter");
+ cursor.toNextSibling(SchemaConversionUtils.JAVAEE_NAMESPACE, "resourceadapter");
moveable.toCursor(cursor);
cursor.toFirstChild();
- cursor.beginElement("outbound-resourceadapter", SchemaConversionUtils.J2EE_NAMESPACE);
- cursor.beginElement("connection-definition", SchemaConversionUtils.J2EE_NAMESPACE);
- moveable.toChild(SchemaConversionUtils.J2EE_NAMESPACE, "managedconnectionfactory-class");
+ cursor.beginElement("outbound-resourceadapter", SchemaConversionUtils.JAVAEE_NAMESPACE);
+ cursor.beginElement("connection-definition", SchemaConversionUtils.JAVAEE_NAMESPACE);
+ moveable.toChild(SchemaConversionUtils.JAVAEE_NAMESPACE, "managedconnectionfactory-class");
moveable.push();
//from moveable to cursor
moveable.moveXml(cursor);
- while (moveable.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "config-property")) {
+ while (moveable.toNextSibling(SchemaConversionUtils.JAVAEE_NAMESPACE, "config-property")) {
moveable.moveXml(cursor);
}
moveable.pop();
- moveable.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "connectionfactory-interface");
+ moveable.toNextSibling(SchemaConversionUtils.JAVAEE_NAMESPACE, "connectionfactory-interface");
moveable.moveXml(cursor);
- moveable.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "connectionfactory-impl-class");
+ moveable.toNextSibling(SchemaConversionUtils.JAVAEE_NAMESPACE, "connectionfactory-impl-class");
moveable.moveXml(cursor);
- moveable.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "connection-interface");
+ moveable.toNextSibling(SchemaConversionUtils.JAVAEE_NAMESPACE, "connection-interface");
moveable.moveXml(cursor);
- moveable.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "connection-impl-class");
+ moveable.toNextSibling(SchemaConversionUtils.JAVAEE_NAMESPACE, "connection-impl-class");
moveable.moveXml(cursor);
//get out of connection-definition element
cursor.toNextToken();
- moveable.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "transaction-support");
+ moveable.toNextSibling(SchemaConversionUtils.JAVAEE_NAMESPACE, "transaction-support");
moveable.moveXml(cursor);
- while (moveable.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "authentication-mechanism")) {
+ while (moveable.toNextSibling(SchemaConversionUtils.JAVAEE_NAMESPACE, "authentication-mechanism")) {
moveable.moveXml(cursor);
}
- moveable.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "reauthentication-support");
+ moveable.toNextSibling(SchemaConversionUtils.JAVAEE_NAMESPACE, "reauthentication-support");
moveable.moveXml(cursor);
} finally {
moveable.dispose();
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java Wed Feb 3 07:26:50 2010
@@ -60,14 +60,14 @@
import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefDocument;
import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefType;
-import org.apache.geronimo.xbeans.javaee.DescriptionType;
-import org.apache.geronimo.xbeans.javaee.FullyQualifiedClassType;
-import org.apache.geronimo.xbeans.javaee.InjectionTargetType;
-import org.apache.geronimo.xbeans.javaee.JndiNameType;
-import org.apache.geronimo.xbeans.javaee.ResAuthType;
-import org.apache.geronimo.xbeans.javaee.ResSharingScopeType;
-import org.apache.geronimo.xbeans.javaee.ResourceRefType;
-import org.apache.geronimo.xbeans.javaee.XsdStringType;
+import org.apache.geronimo.xbeans.javaee6.DescriptionType;
+import org.apache.geronimo.xbeans.javaee6.FullyQualifiedClassType;
+import org.apache.geronimo.xbeans.javaee6.InjectionTargetType;
+import org.apache.geronimo.xbeans.javaee6.JndiNameType;
+import org.apache.geronimo.xbeans.javaee6.ResAuthType;
+import org.apache.geronimo.xbeans.javaee6.ResSharingScopeType;
+import org.apache.geronimo.xbeans.javaee6.ResourceRefType;
+import org.apache.geronimo.xbeans.javaee6.XsdStringType;
import org.apache.geronimo.deployment.service.EnvironmentBuilder;
import org.apache.xmlbeans.QNameSet;
import org.apache.xmlbeans.XmlObject;
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapterDConfigRoot.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapterDConfigRoot.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapterDConfigRoot.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapterDConfigRoot.java Wed Feb 3 07:26:50 2010
@@ -41,7 +41,7 @@
* */
public class ResourceAdapterDConfigRoot extends DConfigBeanRootSupport {
static final SchemaTypeLoader SCHEMA_TYPE_LOADER = XmlBeans.typeLoaderUnion(new SchemaTypeLoader[] {
- XmlBeans.typeLoaderForClassLoader(org.apache.geronimo.xbeans.j2ee.String.class.getClassLoader()),
+ XmlBeans.typeLoaderForClassLoader(org.apache.geronimo.xbeans.javaee6.String.class.getClassLoader()),
XmlBeans.typeLoaderForClassLoader(GerConnectorDocument.class.getClassLoader())
});
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/jsr88/Connector15DCBRoot.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/jsr88/Connector15DCBRoot.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/jsr88/Connector15DCBRoot.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/jsr88/Connector15DCBRoot.java Wed Feb 3 07:26:50 2010
@@ -52,7 +52,7 @@
// This may be overcomplicated -- if we don't refer to J2EE types in our schemas
// then we should only need to use the GerConnectorDocument loader
static final SchemaTypeLoader SCHEMA_TYPE_LOADER = XmlBeans.typeLoaderUnion(new SchemaTypeLoader[] {
- XmlBeans.typeLoaderForClassLoader(org.apache.geronimo.xbeans.j2ee.String.class.getClassLoader()),
+ XmlBeans.typeLoaderForClassLoader(org.apache.geronimo.xbeans.javaee6.String.class.getClassLoader()),
XmlBeans.typeLoaderForClassLoader(GerConnectorDocument.class.getClassLoader())
});
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Wed Feb 3 07:26:50 2010
@@ -116,7 +116,6 @@
private AbstractName serverName;
private static final AbstractNameQuery transactionManagerName = new AbstractNameQuery(null, Collections.singletonMap("name", "TransactionManager"));
-
public void testBuildEar() throws Exception {
JarFile rarFile = null;
try {
@@ -309,6 +308,31 @@
}
}
+ //1.6 tests
+ public void testBuildUnpackedModule16() throws Exception {
+ InstallAction action = new InstallAction() {
+ private File rarFile = new File(BASEDIR, "target/test-rar-16");
+
+ public File getRARFile() {
+ return rarFile;
+ }
+
+ };
+ executeTestBuildModule(action, true);
+ }
+
+
+ public void testBuildPackedModule16() throws Exception {
+ InstallAction action = new InstallAction() {
+ private File rarFile = new File(BASEDIR, "target/test-rar-16.rar");
+
+ public File getRARFile() {
+ return rarFile;
+ }
+
+ };
+ executeTestBuildModule(action, true);
+ }
private void executeTestBuildModule(InstallAction action, boolean is15) throws Exception {
String resourceAdapterName = "testRA";
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java Wed Feb 3 07:26:50 2010
@@ -25,7 +25,7 @@
import org.apache.geronimo.testsupport.TestSupport;
import org.apache.geronimo.xbeans.connector.GerConnectorDocument;
import org.apache.geronimo.xbeans.connector.GerConnectorType;
-import org.apache.geronimo.xbeans.j2ee.ConnectorDocument;
+import org.apache.geronimo.xbeans.javaee6.ConnectorDocument;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
@@ -44,8 +44,8 @@
assertEquals(1, connectorDocument.getConnector().getResourceadapterArray().length);
}
- public void testLoadJ2eeDeploymentDescriptor() throws Exception {
- URL srcXml = classLoader.getResource("connector_1_5/ra.xml");
+ public void testLoadJavaEEDeploymentDescriptor() throws Exception {
+ URL srcXml = classLoader.getResource("connector_1_6/ra.xml");
XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
ConnectorDocument connectorDocument = (ConnectorDocument) plan.changeType(ConnectorDocument.type);
assertNotNull(connectorDocument.getConnector().getResourceadapter());
@@ -53,7 +53,7 @@
}
public void testLoadGeronimoDeploymentDescriptor15() throws Exception {
- URL srcXml = classLoader.getResource("connector_1_5/geronimo-ra.xml");
+ URL srcXml = classLoader.getResource("connector_1_6/geronimo-ra.xml");
XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
GerConnectorDocument connectorDocument = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
GerConnectorType connector = (GerConnectorType) SchemaConversionUtils.fixGeronimoSchema(connectorDocument, CONNECTOR_QNAME, GerConnectorType.type);
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/SchemaConversionTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/SchemaConversionTest.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/SchemaConversionTest.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/SchemaConversionTest.java Wed Feb 3 07:26:50 2010
@@ -20,13 +20,12 @@
import java.util.ArrayList;
import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.geronimo.schema.SchemaConversionUtils;
import org.apache.geronimo.testsupport.XmlBeansTestSupport;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlObject;
+import org.junit.Test;
/**
* ejb 1.1 dtd appears to be a subset of ejb 2.0 dtd so the same xsl should
@@ -37,9 +36,9 @@
public class SchemaConversionTest extends XmlBeansTestSupport {
private ClassLoader classLoader = this.getClass().getClassLoader();
- public void testConnector10ToConnector15Transform() throws Exception {
+ public void testConnector10ToConnector16Transform() throws Exception {
URL srcXml = classLoader.getResource("j2ee_1_3dtd/ra-10.xml");
- URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/ra-15.xml");
+ URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/ra-16.xml");
XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
XmlBeansUtil.validateDD(expected);
@@ -50,9 +49,9 @@
//make sure trying to convert twice has no bad effects
XmlCursor cursor2 = xmlObject.newCursor();
try {
- String schemaLocationURL = "http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd";
- String version = "1.4";
- assertFalse(SchemaConversionUtils.convertToSchema(cursor2, SchemaConversionUtils.J2EE_NAMESPACE, schemaLocationURL, version));
+ String schemaLocationURL = "http://java.sun.com/xml/ns/javaee/connector_1_6.xsd";
+ String version = "1.6";
+ assertFalse(SchemaConversionUtils.convertToSchema(cursor2, SchemaConversionUtils.JAVAEE_NAMESPACE, schemaLocationURL, version));
} finally {
cursor2.dispose();
}
@@ -64,4 +63,31 @@
assertTrue("Differences after reconverting to application schema: " + problems, ok3);
}
+ @Test
+ public void testConnector15ToConnector16Transform() throws Exception {
+ URL srcXml = classLoader.getResource("j2ee_1_3dtd/ra-15xml");
+ URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/ra-16.xml");
+ XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
+ XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
+ XmlBeansUtil.validateDD(expected);
+ xmlObject = ConnectorModuleBuilder.convertToConnectorSchema(xmlObject);
+ List problems = new ArrayList();
+ boolean ok = compareXmlObjects(xmlObject, expected, problems);
+ assertTrue("Differences: " + problems, ok);
+ //make sure trying to convert twice has no bad effects
+ XmlCursor cursor2 = xmlObject.newCursor();
+ try {
+ String schemaLocationURL = "http://java.sun.com/xml/ns/javaee/connector_1_6.xsd";
+ String version = "1.6";
+ assertFalse(SchemaConversionUtils.convertToSchema(cursor2, SchemaConversionUtils.JAVAEE_NAMESPACE, schemaLocationURL, version));
+ } finally {
+ cursor2.dispose();
+ }
+ boolean ok2 = compareXmlObjects(xmlObject, expected, problems);
+ assertTrue("Differences after reconverting to schema: " + problems, ok2);
+ //do the whole transform twice...
+ xmlObject = ConnectorModuleBuilder.convertToConnectorSchema(xmlObject);
+ boolean ok3 = compareXmlObjects(xmlObject, expected, problems);
+ assertTrue("Differences after reconverting to application schema: " + problems, ok3);
+ }
}
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/AnnotationHelperTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/AnnotationHelperTest.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/AnnotationHelperTest.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/AnnotationHelperTest.java Wed Feb 3 07:26:50 2010
@@ -30,8 +30,8 @@
import org.apache.geronimo.connector.deployment.ResourceRefBuilder;
import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedWebApp;
import org.apache.geronimo.testsupport.XmlBeansTestSupport;
-import org.apache.geronimo.xbeans.javaee.WebAppDocument;
-import org.apache.geronimo.xbeans.javaee.WebAppType;
+import org.apache.geronimo.xbeans.javaee6.WebAppDocument;
+import org.apache.geronimo.xbeans.javaee6.WebAppType;
import org.apache.xmlbeans.XmlObject;
import org.apache.xbean.finder.ClassFinder;
import org.apache.xmlbeans.XmlOptions;