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 [2/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...
Added: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/geronimo-ra.xml?rev=905918&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/geronimo-ra.xml (added)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/geronimo-ra.xml Wed Feb 3 07:26:50 2010
@@ -0,0 +1,147 @@
+<?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.
+-->
+
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <moduleId>
+ <groupId>geronimo</groupId>
+ <artifactId>test-ear</artifactId>
+ <version>1.0</version>
+ <type>car</type>
+ </moduleId>
+ </environment>
+
+ <resourceadapter>
+ <resourceadapter-instance>
+ <resourceadapter-name>testRA</resourceadapter-name>
+ <config-property-setting name="RAStringProperty">NewStringValue</config-property-setting>
+ <workmanager>
+ <gbean-link>DefaultWorkManager</gbean-link>
+ </workmanager>
+ </resourceadapter-instance>
+ <outbound-resourceadapter>
+ <connection-definition>
+ <connectionfactory-interface>javax.resource.cci.ConnectionFactory</connectionfactory-interface>
+ <connectiondefinition-instance>
+ <name>FirstTestOutboundConnectionFactory</name>
+ <config-property-setting name="OutboundStringProperty1">newvalue1</config-property-setting>
+ <config-property-setting name="OutboundStringProperty3">newvalue2</config-property-setting>
+ <connectionmanager>
+ <container-managed-security/>
+ <xa-transaction>
+ <transaction-caching/>
+ </xa-transaction>
+ <partitioned-pool>
+ <max-size>10</max-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <match-one/>
+ <partition-by-subject/>
+ </partitioned-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
+ <connectiondefinition-instance>
+ <name>SecondTestOutboundConnectionFactory</name>
+ <config-property-setting name="OutboundStringProperty4">newvalue3</config-property-setting>
+ <config-property-setting name="OutboundStringProperty1">newvalue4</config-property-setting>
+ <connectionmanager>
+ <container-managed-security/>
+ <xa-transaction>
+ <transaction-caching/>
+ </xa-transaction>
+ <partitioned-pool>
+ <max-size>10</max-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <match-one/>
+ <partition-by-subject/>
+ </partitioned-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
+ </connection-definition>
+ <connection-definition>
+ <connectionfactory-interface>
+ org.apache.geronimo.connector.mock.ConnectionFactoryExtension</connectionfactory-interface>
+ <connectiondefinition-instance>
+ <name>ThirdTestOutboundConnectionFactory</name>
+ <config-property-setting name="OutboundStringProperty1">StringValue3</config-property-setting>
+ <connectionmanager>
+ <container-managed-security/>
+ <xa-transaction>
+ <transaction-caching/>
+ </xa-transaction>
+ <partitioned-pool>
+ <max-size>10</max-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <match-one/>
+ <partition-by-subject/>
+ </partitioned-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
+ </connection-definition>
+ </outbound-resourceadapter>
+ </resourceadapter>
+
+ <adminobject>
+ <adminobject-interface>org.apache.geronimo.connector.mock.MockAdminObject</adminobject-interface>
+ <adminobject-class>org.apache.geronimo.connector.mock.MockAdminObjectImpl</adminobject-class>
+ <adminobject-instance>
+ <message-destination-name>tweedledee</message-destination-name>
+ <config-property-setting name="Tweedle">Dee-value</config-property-setting>
+ </adminobject-instance>
+ <adminobject-instance>
+ <message-destination-name>tweedledum</message-destination-name>
+ <config-property-setting name="Tweedle">Dum-value</config-property-setting>
+ </adminobject-instance>
+ </adminobject>
+
+ <!--normally this is in the j2ee-server-plan.xml. It is included here so the gbeans can start in unit tests-->
+ <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.wrapper.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+ <reference name="TransactionManager">
+ <name>TransactionManager</name>
+ </reference>
+ </gbean>
+
+ <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
+ <attribute name="keepAliveTime">5000</attribute>
+ <attribute name="minPoolSize">100</attribute>
+ <attribute name="maxPoolSize">300</attribute>
+ <attribute name="poolName">DefaultThreadPool</attribute>
+ </gbean>
+
+ <gbean name="DefaultWorkManager" class="org.apache.geronimo.connector.wrapper.work.GeronimoWorkManagerGBean">
+ <reference name="SyncPool">
+ <name>DefaultThreadPool</name>
+ </reference>
+ <reference name="StartPool">
+ <name>DefaultThreadPool</name>
+ </reference>
+ <reference name="ScheduledPool">
+ <name>DefaultThreadPool</name>
+ </reference>
+ <reference name="WorkContextHandler">
+ </reference>
+ </gbean>
+
+ <gbean name="TransactionContextHandler" class="org.apache.geronimo.connector.wrapper.work.TransactionContextHandlerGBean">
+ <reference name="XAWork">
+ <name>TransactionManager</name>
+ </reference>
+ </gbean>
+
+ <gbean name="TransactionManager" class="org.apache.geronimo.transaction.wrapper.manager.GeronimoTransactionManagerGBean"/>
+</connector>
Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/geronimo-ra.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/geronimo-ra.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/geronimo-ra.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/ra.xml?rev=905918&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/ra.xml (added)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/ra.xml Wed Feb 3 07:26:50 2010
@@ -0,0 +1,113 @@
+<?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.
+-->
+
+<connector xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/connector_1_6.xsd"
+ version="1.6">
+
+ <description>test ra.xml for jca 1.6</description>
+ <display-name>test 1.5 adapter spec</display-name>
+
+ <vendor-name>apache-geronimo</vendor-name>
+ <eis-type>test</eis-type>
+ <resourceadapter-version>0.0</resourceadapter-version>
+ <resourceadapter>
+ <resourceadapter-class>org.apache.geronimo.connector.mock.MockResourceAdapter</resourceadapter-class>
+ <config-property>
+ <config-property-name>RAStringProperty</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>StringValue</config-property-value>
+ </config-property>
+ <outbound-resourceadapter>
+ <connection-definition>
+ <managedconnectionfactory-class>org.apache.geronimo.connector.mock.MockManagedConnectionFactory</managedconnectionfactory-class>
+ <config-property>
+ <config-property-name>OutboundStringProperty1</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>originalvalue1</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>OutboundStringProperty2</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>originalvalue2</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>OutboundStringProperty3</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <config-property-name>OutboundStringProperty4</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+
+ <connectionfactory-interface>javax.resource.cci.ConnectionFactory</connectionfactory-interface>
+ <connectionfactory-impl-class>org.apache.geronimo.connector.mock.MockConnectionFactory</connectionfactory-impl-class>
+ <connection-interface>javax.resource.cci.Connection</connection-interface>
+ <connection-impl-class>org.apache.geronimo.connector.mock.MockConnection</connection-impl-class>
+
+ </connection-definition>
+ <connection-definition>
+ <managedconnectionfactory-class>org.apache.geronimo.connector.mock.MockManagedConnectionFactory</managedconnectionfactory-class>
+ <config-property>
+ <config-property-name>OutboundStringProperty1</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <connectionfactory-interface>org.apache.geronimo.connector.mock.ConnectionFactoryExtension</connectionfactory-interface>
+ <connectionfactory-impl-class>org.apache.geronimo.connector.mock.MockConnectionFactory</connectionfactory-impl-class>
+ <connection-interface>javax.resource.cci.Connection</connection-interface>
+ <connection-impl-class>org.apache.geronimo.connector.mock.MockConnection</connection-impl-class>
+
+ </connection-definition>
+ <transaction-support>XATransaction</transaction-support>
+ <authentication-mechanism>
+ <description>description</description>
+ <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
+ <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
+ </authentication-mechanism>
+ <reauthentication-support>false</reauthentication-support>
+ </outbound-resourceadapter>
+ <inbound-resourceadapter>
+ <!--0 or one-->
+ <messageadapter>
+ <!--one or more-->
+ <messagelistener>
+ <messagelistener-type>javax.jms.MessageListener</messagelistener-type>
+ <activationspec>
+ <activationspec-class>org.apache.geronimo.connector.mock.MockActivationSpec</activationspec-class>
+ <required-config-property>
+ <config-property-name>RequiredProperty</config-property-name>
+ </required-config-property>
+ </activationspec>
+ </messagelistener>
+ </messageadapter>
+
+ </inbound-resourceadapter>
+ <adminobject>
+ <adminobject-interface>org.apache.geronimo.connector.mock.MockAdminObject</adminobject-interface>
+ <adminobject-class>org.apache.geronimo.connector.mock.MockAdminObjectImpl</adminobject-class>
+ <config-property>
+ <config-property-name>Tweedle</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>Tweedle-value</config-property-value>
+ </config-property>
+ </adminobject>
+ </resourceadapter>
+</connector>
Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/ra.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/ra.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_6/ra.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/j2ee_1_3dtd/ra-16.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/j2ee_1_3dtd/ra-16.xml?rev=905918&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/j2ee_1_3dtd/ra-16.xml (added)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/j2ee_1_3dtd/ra-16.xml Wed Feb 3 07:26:50 2010
@@ -0,0 +1,70 @@
+<?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.
+-->
+<connector xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/connector_1_6.xsd" version="1.6" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee">
+ <description>test ra.xml for jca 1.0</description>
+ <display-name>test 1.0 adapter spec</display-name>
+ <vendor-name>apache-geronimo</vendor-name>
+ <eis-type>test</eis-type>
+ <resourceadapter-version>0.0</resourceadapter-version>
+ <resourceadapter>
+ <outbound-resourceadapter>
+ <connection-definition>
+ <managedconnectionfactory-class>org.apache.geronimo.connector.mock.MockManagedConnectionFactory</managedconnectionfactory-class>
+ <config-property>
+ <config-property-name>OutboundStringProperty1</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>originalvalue1</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>OutboundStringProperty2</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>originalvalue2</config-property-value>
+ </config-property>
+ <config-property>
+ <config-property-name>OutboundStringProperty3</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <config-property>
+ <config-property-name>OutboundStringProperty4</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
+ <connectionfactory-interface>javax.resource.cci.ConnectionFactory</connectionfactory-interface>
+ <connectionfactory-impl-class>org.apache.geronimo.connector.mock.MockConnectionFactory</connectionfactory-impl-class>
+ <connection-interface>javax.resource.cci.Connection</connection-interface>
+ <connection-impl-class>org.apache.geronimo.connector.mock.MockConnection</connection-impl-class>
+ </connection-definition>
+ <transaction-support>XATransaction</transaction-support>
+ <authentication-mechanism>
+ <description>description</description>
+ <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
+ <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
+ </authentication-mechanism>
+ <authentication-mechanism>
+ <description>description</description>
+ <authentication-mechanism-type>Kerbv5</authentication-mechanism-type>
+ <credential-interface>javax.resource.spi.security.GenericCredential</credential-interface>
+ </authentication-mechanism>
+ <reauthentication-support>false</reauthentication-support>
+ </outbound-resourceadapter>
+ <security-permission>
+ <description>test security permission</description>
+ <security-permission-spec>org.apache.geronimo.TestSecurityPermission</security-permission-spec>
+ </security-permission>
+ </resourceadapter>
+</connector>
Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/j2ee_1_3dtd/ra-16.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/j2ee_1_3dtd/ra-16.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/j2ee_1_3dtd/ra-16.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/script/test-setup.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/script/test-setup.xml?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/script/test-setup.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/script/test-setup.xml Wed Feb 3 07:26:50 2010
@@ -28,6 +28,13 @@
</copy>
<jar destfile="${basedir}/target/test-rar-10.rar" basedir="${basedir}/target/test-rar-10"/>
+ <!-- Build test-rar-16 -->
+ <mkdir dir="${basedir}/target/test-rar-16/META-INF"/>
+ <copy todir="${basedir}/target/test-rar-16/META-INF">
+ <fileset dir="${basedir}/src/test/resources/connector_1_6"/>
+ </copy>
+ <jar destfile="${basedir}/target/test-rar-16.rar" basedir="${basedir}/target/test-rar-16"/>
+
<!-- Build test-rar-15 -->
<mkdir dir="${basedir}/target/test-rar-15/META-INF"/>
<copy todir="${basedir}/target/test-rar-15/META-INF">
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java Wed Feb 3 07:26:50 2010
@@ -38,7 +38,7 @@
import org.apache.geronimo.xbeans.geronimo.naming.GerEjbRefDocument;
import org.apache.geronimo.xbeans.geronimo.naming.GerEjbRefType;
import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
-import org.apache.geronimo.xbeans.javaee.EjbRefType;
+import org.apache.geronimo.xbeans.javaee6.EjbRefType;
import org.apache.geronimo.corba.proxy.CORBAProxyReference;
import org.apache.xmlbeans.QNameSet;
import org.apache.xmlbeans.XmlObject;
Modified: geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/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>cxf</artifactId>
@@ -58,6 +58,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/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFServiceRefBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFServiceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFServiceRefBuilder.java Wed Feb 3 07:26:50 2010
@@ -35,8 +35,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.osgi.framework.Bundle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFEndpoint.java Wed Feb 3 07:26:50 2010
@@ -61,19 +61,19 @@
protected JaxWsServiceFactoryBean serviceFactory;
protected PortInfo portInfo;
-
+
protected AnnotationProcessor annotationProcessor;
-
- private String address;
+
+ private String address;
public CXFEndpoint(Bus bus, Object implementor) {
this.bus = bus;
this.implementor = implementor;
- this.portInfo = (PortInfo) bus.getExtension(PortInfo.class);
-
+ this.portInfo = bus.getExtension(PortInfo.class);
+
this.bus.setExtension(this, CXFEndpoint.class);
}
-
+
protected URL getWsdlURL(URL configurationBaseUrl, String wsdlFile) {
URL wsdlURL = null;
if (wsdlFile != null && wsdlFile.trim().length() > 0) {
@@ -97,24 +97,24 @@
}
return wsdlURL;
}
-
+
protected Class getImplementorClass() {
return this.implementor.getClass();
}
-
+
protected org.apache.cxf.endpoint.Endpoint getEndpoint() {
- return ((ServerImpl) getServer()).getEndpoint();
+ return (getServer()).getEndpoint();
}
public boolean isSOAP11() {
return SOAPBinding.SOAP11HTTP_BINDING.equals(implInfo.getBindingType()) ||
SOAPBinding.SOAP11HTTP_MTOM_BINDING.equals(implInfo.getBindingType());
}
-
+
public boolean isHTTP() {
return HTTPBinding.HTTP_BINDING.equals(implInfo.getBindingType());
}
-
+
public ServerImpl getServer() {
return (ServerImpl) server;
}
@@ -149,24 +149,24 @@
doInit = false;
}
}
-
- protected void doPublish(String baseAddress) {
+
+ protected void doPublish(String baseAddress) {
// XXX: assume port 8080 by default since we don't know the actual port at startup
String address = (baseAddress == null) ? "http://localhost:8080" : baseAddress;
-
+
JaxWsServerFactoryBean svrFactory = new GeronimoJaxWsServerFactoryBean();
svrFactory.setBus(bus);
svrFactory.setAddress(address + this.portInfo.getLocation());
svrFactory.setServiceFactory(serviceFactory);
svrFactory.setStart(false);
svrFactory.setServiceBean(implementor);
-
+
if (HTTPBinding.HTTP_BINDING.equals(implInfo.getBindingType())) {
svrFactory.setTransportId("http://cxf.apache.org/bindings/xformat");
}
-
+
server = svrFactory.create();
-
+
init();
org.apache.cxf.endpoint.Endpoint endpoint = getEndpoint();
@@ -174,15 +174,15 @@
if (getBinding() instanceof SOAPBinding && this.portInfo.isMTOMEnabled() != null) {
((SOAPBinding)getBinding()).setMTOMEnabled(this.portInfo.isMTOMEnabled());
}
-
+
server.start();
}
- protected void init() {
+ protected void init() {
}
-
+
/*
- * Update service's address on the very first invocation. The address
+ * Update service's address on the very first invocation. The address
* assumed at start up might not be valid.
*/
synchronized void updateAddress(URI request) {
@@ -192,33 +192,33 @@
this.address = requestAddress;
}
}
-
+
/*
* Set appropriate handlers for the port/service/bindings.
*/
- protected void initHandlers() throws Exception {
- HandlerChainsType handlerChains =
- HandlerChainsUtils.getHandlerChains(this.portInfo.getHandlersAsXML());
+ protected void initHandlers() throws Exception {
+ HandlerChainsType handlerChains =
+ HandlerChainsUtils.getHandlerChains(this.portInfo.getHandlersAsXML());
GeronimoHandlerResolver handlerResolver =
- new GeronimoHandlerResolver(getImplementorClass().getClassLoader(),
+ new GeronimoHandlerResolver(getImplementorClass().getClassLoader(),
getImplementorClass(),
- handlerChains,
+ handlerChains,
null);
-
- PortInfoImpl portInfo = new PortInfoImpl(implInfo.getBindingType(),
+
+ PortInfoImpl portInfo = new PortInfoImpl(implInfo.getBindingType(),
serviceFactory.getEndpointName(),
service.getName());
-
+
List<Handler> chain = handlerResolver.getHandlerChain(portInfo);
getBinding().setHandlerChain(chain);
}
-
+
protected void injectResources(Object instance) throws AnnotationException {
this.annotationProcessor.processAnnotations(instance);
this.annotationProcessor.invokePostConstruct(instance);
}
-
+
protected void injectHandlers() {
List<Handler> handlers = getBinding().getHandlerChain();
try {
@@ -229,7 +229,7 @@
throw new WebServiceException("Handler annotation failed", e);
}
}
-
+
protected void destroyHandlers() {
if (this.annotationProcessor != null) {
// call handlers preDestroy
@@ -239,8 +239,8 @@
}
}
}
-
- public void stop() {
+
+ public void stop() {
// shutdown server
if (this.server != null) {
this.server.stop();
Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/client/CXFServiceReference.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/client/CXFServiceReference.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/client/CXFServiceReference.java (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/client/CXFServiceReference.java Wed Feb 3 07:26:50 2010
@@ -53,22 +53,22 @@
AbstractName name,
String handlerChainsXML,
Map<Object, EndpointInfo> seiInfoMap) {
- super(handlerChainsXML, seiInfoMap, name, serviceQName, wsdlURI, referenceClassName, serviceClassName);
+ super(handlerChainsXML, seiInfoMap, name, serviceQName, wsdlURI, referenceClassName, serviceClassName);
}
-
- @Override
+
+ @Override
public Object getContent() throws NamingException {
Bus bus = CXFWebServiceContainer.getDefaultBus();
-
+
URL catalogURL = getCatalog();
if (catalogURL != null) {
bus = BusFactory.newInstance().createBus();
CXFCatalogUtils.loadOASISCatalog(bus, catalogURL);
SAAJInterceptor.registerInterceptors(bus);
} else {
- SAAJInterceptor.registerInterceptors();
+ SAAJInterceptor.registerInterceptors();
}
-
+
BusFactory.setThreadDefaultBus(bus);
try {
return super.getContent();
@@ -76,7 +76,7 @@
BusFactory.setThreadDefaultBus(null);
}
}
-
+
protected HandlerChainsType getHandlerChains() {
HandlerChainsType types = null;
try {
@@ -94,9 +94,9 @@
new GeronimoHandlerResolver(classLoader, serviceClass, getHandlerChains(), annotationProcessor);
return handlerResolver;
}
-
+
protected PortMethodInterceptor getPortMethodInterceptor() {
return new CXFPortMethodInterceptor(this.seiInfoMap);
}
-
+
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Wed Feb 3 07:26:50 2010
@@ -95,9 +95,9 @@
import org.apache.geronimo.xbeans.geronimo.j2ee.GerApplicationType;
import org.apache.geronimo.xbeans.geronimo.j2ee.GerExtModuleType;
import org.apache.geronimo.xbeans.geronimo.j2ee.GerModuleType;
-import org.apache.geronimo.xbeans.javaee.ApplicationDocument;
-import org.apache.geronimo.xbeans.javaee.ApplicationType;
-import org.apache.geronimo.xbeans.javaee.ModuleType;
+import org.apache.geronimo.xbeans.javaee6.ApplicationDocument;
+import org.apache.geronimo.xbeans.javaee6.ApplicationType;
+import org.apache.geronimo.xbeans.javaee6.ModuleType;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
@@ -474,18 +474,15 @@
}
static ApplicationDocument convertToApplicationSchema(XmlObject xmlObject) throws XmlException {
- if (ApplicationDocument.type.equals(xmlObject.schemaType())) {
- XmlBeansUtil.validateDD(xmlObject);
- return (ApplicationDocument) xmlObject;
- }
XmlCursor cursor = xmlObject.newCursor();
XmlCursor moveable = xmlObject.newCursor();
- 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";
try {
cursor.toStartDoc();
cursor.toFirstChild();
- if ("http://java.sun.com/xml/ns/j2ee".equals(cursor.getName().getNamespaceURI())) {
+ String nameSpaceURI = cursor.getName().getNamespaceURI();
+ if ("http://java.sun.com/xml/ns/javaee".equals(nameSpaceURI) || "http://java.sun.com/xml/ns/j2ee".equals(nameSpaceURI)) {
SchemaConversionUtils.convertSchemaVersion(cursor, SchemaConversionUtils.JAVAEE_NAMESPACE, schemaLocationURL, version);
XmlObject result = xmlObject.changeType(ApplicationDocument.type);
XmlBeansUtil.validateDD(result);
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApp.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApp.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApp.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApp.java Wed Feb 3 07:26:50 2010
@@ -19,16 +19,16 @@
import java.util.List;
-import org.apache.geronimo.xbeans.javaee.EjbLocalRefType;
-import org.apache.geronimo.xbeans.javaee.EjbRefType;
-import org.apache.geronimo.xbeans.javaee.EnvEntryType;
-import org.apache.geronimo.xbeans.javaee.LifecycleCallbackType;
-import org.apache.geronimo.xbeans.javaee.MessageDestinationRefType;
-import org.apache.geronimo.xbeans.javaee.PersistenceContextRefType;
-import org.apache.geronimo.xbeans.javaee.PersistenceUnitRefType;
-import org.apache.geronimo.xbeans.javaee.ResourceEnvRefType;
-import org.apache.geronimo.xbeans.javaee.ResourceRefType;
-import org.apache.geronimo.xbeans.javaee.ServiceRefType;
+import org.apache.geronimo.xbeans.javaee6.EjbLocalRefType;
+import org.apache.geronimo.xbeans.javaee6.EjbRefType;
+import org.apache.geronimo.xbeans.javaee6.EnvEntryType;
+import org.apache.geronimo.xbeans.javaee6.LifecycleCallbackType;
+import org.apache.geronimo.xbeans.javaee6.MessageDestinationRefType;
+import org.apache.geronimo.xbeans.javaee6.PersistenceContextRefType;
+import org.apache.geronimo.xbeans.javaee6.PersistenceUnitRefType;
+import org.apache.geronimo.xbeans.javaee6.ResourceEnvRefType;
+import org.apache.geronimo.xbeans.javaee6.ResourceRefType;
+import org.apache.geronimo.xbeans.javaee6.ServiceRefType;
/**
* Many of the classes generated from the JEE schemas have methods with identical signatures (see
@@ -39,13 +39,13 @@
* <p><strong>Example(s):</strong>
* <pre>
* public interface ApplicationClientType extends org.apache.xmlbeans.XmlObject {
- * org.apache.geronimo.xbeans.javaee.EnvEntryType[] getEnvEntryArray();
- * org.apache.geronimo.xbeans.javaee.ResourceRefType[] getResourceRefArray();
+ * org.apache.geronimo.xbeans.javaee6.EnvEntryType[] getEnvEntryArray();
+ * org.apache.geronimo.xbeans.javaee6.ResourceRefType[] getResourceRefArray();
* }
* <p/>
* public interface WebAppType extends org.apache.xmlbeans.XmlObject {
- * org.apache.geronimo.xbeans.javaee.EnvEntryType[] getEnvEntryArray();
- * org.apache.geronimo.xbeans.javaee.ResourceRefType[] getResourceRefArray();
+ * org.apache.geronimo.xbeans.javaee6.EnvEntryType[] getEnvEntryArray();
+ * org.apache.geronimo.xbeans.javaee6.ResourceRefType[] getResourceRefArray();
* }
* </pre>
* <p/>
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApplicationClient.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApplicationClient.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApplicationClient.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApplicationClient.java Wed Feb 3 07:26:50 2010
@@ -22,17 +22,17 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.geronimo.xbeans.javaee.ApplicationClientType;
-import org.apache.geronimo.xbeans.javaee.EjbLocalRefType;
-import org.apache.geronimo.xbeans.javaee.EjbRefType;
-import org.apache.geronimo.xbeans.javaee.EnvEntryType;
-import org.apache.geronimo.xbeans.javaee.LifecycleCallbackType;
-import org.apache.geronimo.xbeans.javaee.MessageDestinationRefType;
-import org.apache.geronimo.xbeans.javaee.PersistenceContextRefType;
-import org.apache.geronimo.xbeans.javaee.PersistenceUnitRefType;
-import org.apache.geronimo.xbeans.javaee.ResourceEnvRefType;
-import org.apache.geronimo.xbeans.javaee.ResourceRefType;
-import org.apache.geronimo.xbeans.javaee.ServiceRefType;
+import org.apache.geronimo.xbeans.javaee6.ApplicationClientType;
+import org.apache.geronimo.xbeans.javaee6.EjbLocalRefType;
+import org.apache.geronimo.xbeans.javaee6.EjbRefType;
+import org.apache.geronimo.xbeans.javaee6.EnvEntryType;
+import org.apache.geronimo.xbeans.javaee6.LifecycleCallbackType;
+import org.apache.geronimo.xbeans.javaee6.MessageDestinationRefType;
+import org.apache.geronimo.xbeans.javaee6.PersistenceContextRefType;
+import org.apache.geronimo.xbeans.javaee6.PersistenceUnitRefType;
+import org.apache.geronimo.xbeans.javaee6.ResourceEnvRefType;
+import org.apache.geronimo.xbeans.javaee6.ResourceRefType;
+import org.apache.geronimo.xbeans.javaee6.ServiceRefType;
/**
* Wrapper class to encapsulate the ApplicationClientType class with an interface that the various
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedEjbJar.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedEjbJar.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedEjbJar.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedEjbJar.java Wed Feb 3 07:26:50 2010
@@ -21,20 +21,20 @@
import java.util.List;
import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.xbeans.javaee.EjbJarType;
-import org.apache.geronimo.xbeans.javaee.EjbLocalRefType;
-import org.apache.geronimo.xbeans.javaee.EjbRefType;
-import org.apache.geronimo.xbeans.javaee.EntityBeanType;
-import org.apache.geronimo.xbeans.javaee.EnvEntryType;
-import org.apache.geronimo.xbeans.javaee.LifecycleCallbackType;
-import org.apache.geronimo.xbeans.javaee.MessageDestinationRefType;
-import org.apache.geronimo.xbeans.javaee.MessageDrivenBeanType;
-import org.apache.geronimo.xbeans.javaee.PersistenceContextRefType;
-import org.apache.geronimo.xbeans.javaee.PersistenceUnitRefType;
-import org.apache.geronimo.xbeans.javaee.ResourceEnvRefType;
-import org.apache.geronimo.xbeans.javaee.ResourceRefType;
-import org.apache.geronimo.xbeans.javaee.ServiceRefType;
-import org.apache.geronimo.xbeans.javaee.SessionBeanType;
+import org.apache.geronimo.xbeans.javaee6.EjbJarType;
+import org.apache.geronimo.xbeans.javaee6.EjbLocalRefType;
+import org.apache.geronimo.xbeans.javaee6.EjbRefType;
+import org.apache.geronimo.xbeans.javaee6.EntityBeanType;
+import org.apache.geronimo.xbeans.javaee6.EnvEntryType;
+import org.apache.geronimo.xbeans.javaee6.LifecycleCallbackType;
+import org.apache.geronimo.xbeans.javaee6.MessageDestinationRefType;
+import org.apache.geronimo.xbeans.javaee6.MessageDrivenBeanType;
+import org.apache.geronimo.xbeans.javaee6.PersistenceContextRefType;
+import org.apache.geronimo.xbeans.javaee6.PersistenceUnitRefType;
+import org.apache.geronimo.xbeans.javaee6.ResourceEnvRefType;
+import org.apache.geronimo.xbeans.javaee6.ResourceRefType;
+import org.apache.geronimo.xbeans.javaee6.ServiceRefType;
+import org.apache.geronimo.xbeans.javaee6.SessionBeanType;
import org.apache.xmlbeans.XmlObject;
/**
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedWebApp.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedWebApp.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedWebApp.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedWebApp.java Wed Feb 3 07:26:50 2010
@@ -22,17 +22,17 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.geronimo.xbeans.javaee.EjbLocalRefType;
-import org.apache.geronimo.xbeans.javaee.EjbRefType;
-import org.apache.geronimo.xbeans.javaee.EnvEntryType;
-import org.apache.geronimo.xbeans.javaee.LifecycleCallbackType;
-import org.apache.geronimo.xbeans.javaee.MessageDestinationRefType;
-import org.apache.geronimo.xbeans.javaee.PersistenceContextRefType;
-import org.apache.geronimo.xbeans.javaee.PersistenceUnitRefType;
-import org.apache.geronimo.xbeans.javaee.ResourceEnvRefType;
-import org.apache.geronimo.xbeans.javaee.ResourceRefType;
-import org.apache.geronimo.xbeans.javaee.ServiceRefType;
-import org.apache.geronimo.xbeans.javaee.WebAppType;
+import org.apache.geronimo.xbeans.javaee6.EjbLocalRefType;
+import org.apache.geronimo.xbeans.javaee6.EjbRefType;
+import org.apache.geronimo.xbeans.javaee6.EnvEntryType;
+import org.apache.geronimo.xbeans.javaee6.LifecycleCallbackType;
+import org.apache.geronimo.xbeans.javaee6.MessageDestinationRefType;
+import org.apache.geronimo.xbeans.javaee6.PersistenceContextRefType;
+import org.apache.geronimo.xbeans.javaee6.PersistenceUnitRefType;
+import org.apache.geronimo.xbeans.javaee6.ResourceEnvRefType;
+import org.apache.geronimo.xbeans.javaee6.ResourceRefType;
+import org.apache.geronimo.xbeans.javaee6.ServiceRefType;
+import org.apache.geronimo.xbeans.javaee6.WebAppType;
/**
* Wrapper class to encapsulate the WebAppType class with an interface that the various
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelper.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelper.java Wed Feb 3 07:26:50 2010
@@ -25,9 +25,9 @@
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
-import org.apache.geronimo.xbeans.javaee.FullyQualifiedClassType;
-import org.apache.geronimo.xbeans.javaee.InjectionTargetType;
-import org.apache.geronimo.xbeans.javaee.JavaIdentifierType;
+import org.apache.geronimo.xbeans.javaee6.FullyQualifiedClassType;
+import org.apache.geronimo.xbeans.javaee6.InjectionTargetType;
+import org.apache.geronimo.xbeans.javaee6.JavaIdentifierType;
import org.apache.xmlbeans.XmlException;
/**
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/EJBAnnotationHelper.java Wed Feb 3 07:26:50 2010
@@ -32,15 +32,15 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.geronimo.xbeans.javaee.DescriptionType;
-import org.apache.geronimo.xbeans.javaee.EjbLinkType;
-import org.apache.geronimo.xbeans.javaee.EjbLocalRefType;
-import org.apache.geronimo.xbeans.javaee.EjbRefNameType;
-import org.apache.geronimo.xbeans.javaee.EjbRefType;
-import org.apache.geronimo.xbeans.javaee.InjectionTargetType;
-import org.apache.geronimo.xbeans.javaee.LocalType;
-import org.apache.geronimo.xbeans.javaee.RemoteType;
-import org.apache.geronimo.xbeans.javaee.XsdStringType;
+import org.apache.geronimo.xbeans.javaee6.DescriptionType;
+import org.apache.geronimo.xbeans.javaee6.EjbLinkType;
+import org.apache.geronimo.xbeans.javaee6.EjbLocalRefType;
+import org.apache.geronimo.xbeans.javaee6.EjbRefNameType;
+import org.apache.geronimo.xbeans.javaee6.EjbRefType;
+import org.apache.geronimo.xbeans.javaee6.InjectionTargetType;
+import org.apache.geronimo.xbeans.javaee6.LocalType;
+import org.apache.geronimo.xbeans.javaee6.RemoteType;
+import org.apache.geronimo.xbeans.javaee6.XsdStringType;
import org.apache.xbean.finder.ClassFinder;
/**
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/HandlerChainAnnotationHelper.java Wed Feb 3 07:26:50 2010
@@ -26,20 +26,21 @@
import javax.jws.HandlerChain;
import javax.xml.ws.WebServiceRef;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
-import org.apache.geronimo.xbeans.javaee.HandlerChainType;
import org.apache.geronimo.xbeans.javaee.HandlerChainsDocument;
-import org.apache.geronimo.xbeans.javaee.HandlerChainsType;
import org.apache.geronimo.xbeans.javaee.PortComponentHandlerType;
-import org.apache.geronimo.xbeans.javaee.ServiceRefHandlerChainType;
-import org.apache.geronimo.xbeans.javaee.ServiceRefHandlerChainsType;
-import org.apache.geronimo.xbeans.javaee.ServiceRefHandlerType;
-import org.apache.geronimo.xbeans.javaee.ServiceRefType;
+import org.apache.geronimo.xbeans.javaee6.DescriptionType;
+import org.apache.geronimo.xbeans.javaee6.HandlerChainType;
+import org.apache.geronimo.xbeans.javaee6.HandlerChainsType;
+import org.apache.geronimo.xbeans.javaee6.HandlerType;
+import org.apache.geronimo.xbeans.javaee6.ParamValueType;
+import org.apache.geronimo.xbeans.javaee6.ServiceRefType;
+import org.apache.geronimo.xbeans.javaee6.XsdQNameType;
import org.apache.xbean.finder.ClassFinder;
import org.apache.xmlbeans.XmlObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -279,11 +280,11 @@
// Bind the XML handler chain file to an XMLBeans document
XmlObject xml = XmlBeansUtil.parse(url, null);
HandlerChainsDocument hcd = (HandlerChainsDocument) XmlBeansUtil.typedCopy(xml, HandlerChainsDocument.type);
- HandlerChainsType handlerChains = hcd.getHandlerChains();
-
- ServiceRefHandlerChainsType serviceRefHandlerChains = serviceRef.addNewHandlerChains();
- for (HandlerChainType handlerChain : handlerChains.getHandlerChainArray()) {
- ServiceRefHandlerChainType serviceRefHandlerChain = serviceRefHandlerChains.addNewHandlerChain();
+ org.apache.geronimo.xbeans.javaee.HandlerChainsType handlerChains = hcd.getHandlerChains();
+
+ HandlerChainsType serviceRefHandlerChains = serviceRef.addNewHandlerChains();
+ for (org.apache.geronimo.xbeans.javaee.HandlerChainType handlerChain : handlerChains.getHandlerChainArray()) {
+ HandlerChainType serviceRefHandlerChain = serviceRefHandlerChains.addNewHandlerChain();
if (handlerChain.getPortNamePattern() != null) {
serviceRefHandlerChain.setPortNamePattern(handlerChain.getPortNamePattern());
}
@@ -293,21 +294,48 @@
if (handlerChain.getProtocolBindings() != null) {
serviceRefHandlerChain.setProtocolBindings(handlerChain.getProtocolBindings());
}
- for ( PortComponentHandlerType handler : handlerChain.getHandlerArray()) {
- ServiceRefHandlerType serviceRefHandler = serviceRefHandlerChain.addNewHandler();
- serviceRefHandler.setHandlerName(handler.getHandlerName());
- serviceRefHandler.setHandlerClass(handler.getHandlerClass());
- if (handler.getDescriptionArray().length>0) {
- serviceRefHandler.setDescriptionArray(handler.getDescriptionArray());
+ for (PortComponentHandlerType srcHandler : handlerChain.getHandlerArray()) {
+ HandlerType serviceRefHandler = serviceRefHandlerChain.addNewHandler();
+ serviceRefHandler.setId(srcHandler.getId());
+ //Copy HandlerName
+ org.apache.geronimo.xbeans.javaee.String srcHandlerName = srcHandler.getHandlerName();
+ org.apache.geronimo.xbeans.javaee6.String desHandlerName = serviceRefHandler.addNewHandlerName();
+ desHandlerName.setStringValue(srcHandlerName.getStringValue());
+ desHandlerName.setId(srcHandlerName.getId());
+ //Copy HandlerClass
+ org.apache.geronimo.xbeans.javaee.String srcHandlerClass = srcHandler.getHandlerClass();
+ org.apache.geronimo.xbeans.javaee6.String desHandlerClass = serviceRefHandler.addNewHandlerClass();
+ desHandlerClass.setId(srcHandlerClass.getId());
+ desHandlerClass.setStringValue(srcHandlerClass.getStringValue());
+ //Copy DescriptionArray
+ for (org.apache.geronimo.xbeans.javaee.DescriptionType srcDescription : srcHandler.getDescriptionArray()) {
+ DescriptionType desDescription = serviceRefHandler.addNewDescription();
+ desDescription.setStringValue(srcDescription.getStringValue());
+ desDescription.setId(srcDescription.getId());
}
- if (handler.getInitParamArray().length>0) {
- serviceRefHandler.setInitParamArray(handler.getInitParamArray());
+ //Copy InitParamArray
+ for (org.apache.geronimo.xbeans.javaee.ParamValueType srcParamValue : srcHandler.getInitParamArray()) {
+ ParamValueType desParamValue = serviceRefHandler.addNewInitParam();
+ srcParamValue.setId(desParamValue.getId());
+ desParamValue.addNewParamName().setStringValue(srcParamValue.getParamName().getStringValue());
+ desParamValue.addNewParamValue().setStringValue(srcParamValue.getParamValue().getStringValue());
+ for (org.apache.geronimo.xbeans.javaee.DescriptionType srcDescription : srcParamValue.getDescriptionArray()) {
+ DescriptionType desDescription = desParamValue.addNewDescription();
+ desDescription.setId(srcDescription.getId());
+ desDescription.setStringValue(srcDescription.getStringValue());
+ }
}
- if (handler.getSoapHeaderArray().length>0) {
- serviceRefHandler.setSoapHeaderArray(handler.getSoapHeaderArray());
+ //Copy SoapHeaderArray
+ for (org.apache.geronimo.xbeans.javaee.XsdQNameType srcSOAPHeader : srcHandler.getSoapHeaderArray()) {
+ XsdQNameType desSOAPHeader = serviceRefHandler.addNewSoapHeader();
+ desSOAPHeader.setId(srcSOAPHeader.getId());
+ desSOAPHeader.setQNameValue(srcSOAPHeader.getQNameValue());
}
- if (handler.getSoapRoleArray().length>0) {
- serviceRefHandler.setSoapRoleArray(handler.getSoapRoleArray());
+ //Copy SoapRoleArray
+ for (org.apache.geronimo.xbeans.javaee.String srcSOAPRole : srcHandler.getSoapRoleArray()) {
+ org.apache.geronimo.xbeans.javaee6.String desSOAPRole = serviceRefHandler.addNewSoapRole();
+ desSOAPRole.setId(srcSOAPRole.getId());
+ desSOAPRole.setStringValue(srcSOAPRole.getStringValue());
}
}
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceContextAnnotationHelper.java Wed Feb 3 07:26:50 2010
@@ -31,12 +31,12 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.xbeans.javaee.InjectionTargetType;
-import org.apache.geronimo.xbeans.javaee.JndiNameType;
-import org.apache.geronimo.xbeans.javaee.PersistenceContextRefType;
-import org.apache.geronimo.xbeans.javaee.PersistenceContextTypeType;
-import org.apache.geronimo.xbeans.javaee.PropertyType;
-import org.apache.geronimo.xbeans.javaee.XsdStringType;
+import org.apache.geronimo.xbeans.javaee6.InjectionTargetType;
+import org.apache.geronimo.xbeans.javaee6.JndiNameType;
+import org.apache.geronimo.xbeans.javaee6.PersistenceContextRefType;
+import org.apache.geronimo.xbeans.javaee6.PersistenceContextTypeType;
+import org.apache.geronimo.xbeans.javaee6.PropertyType;
+import org.apache.geronimo.xbeans.javaee6.XsdStringType;
import org.apache.xbean.finder.ClassFinder;
@@ -241,7 +241,7 @@
// persistence-unit-name
String unitNameAnnotation = annotation.unitName();
if (!unitNameAnnotation.equals("")) {
- org.apache.geronimo.xbeans.javaee.String persistenceUnitName = persistenceContextRef.addNewPersistenceUnitName();
+ org.apache.geronimo.xbeans.javaee6.String persistenceUnitName = persistenceContextRef.addNewPersistenceUnitName();
persistenceUnitName.setStringValue(unitNameAnnotation);
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/PersistenceUnitAnnotationHelper.java Wed Feb 3 07:26:50 2010
@@ -29,9 +29,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.xbeans.javaee.InjectionTargetType;
-import org.apache.geronimo.xbeans.javaee.JndiNameType;
-import org.apache.geronimo.xbeans.javaee.PersistenceUnitRefType;
+import org.apache.geronimo.xbeans.javaee6.InjectionTargetType;
+import org.apache.geronimo.xbeans.javaee6.JndiNameType;
+import org.apache.geronimo.xbeans.javaee6.PersistenceUnitRefType;
import org.apache.xbean.finder.ClassFinder;
@@ -237,7 +237,7 @@
// persistence-unit-name
String unitNameAnnotation = annotation.unitName();
if (!unitNameAnnotation.equals("")) {
- org.apache.geronimo.xbeans.javaee.String persistenceUnitName = persistenceUnitRef.addNewPersistenceUnitName();
+ org.apache.geronimo.xbeans.javaee6.String persistenceUnitName = persistenceUnitRef.addNewPersistenceUnitName();
persistenceUnitName.setStringValue(unitNameAnnotation);
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/SecurityAnnotationHelper.java Wed Feb 3 07:26:50 2010
@@ -26,13 +26,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.xbeans.javaee.RoleNameType;
-import org.apache.geronimo.xbeans.javaee.RunAsType;
-import org.apache.geronimo.xbeans.javaee.SecurityRoleType;
-import org.apache.geronimo.xbeans.javaee.ServletType;
-import org.apache.geronimo.xbeans.javaee.ServletNameType;
-import org.apache.geronimo.xbeans.javaee.FullyQualifiedClassType;
-import org.apache.geronimo.xbeans.javaee.WebAppType;
+import org.apache.geronimo.xbeans.javaee6.RoleNameType;
+import org.apache.geronimo.xbeans.javaee6.RunAsType;
+import org.apache.geronimo.xbeans.javaee6.SecurityRoleType;
+import org.apache.geronimo.xbeans.javaee6.ServletType;
+import org.apache.geronimo.xbeans.javaee6.ServletNameType;
+import org.apache.geronimo.xbeans.javaee6.FullyQualifiedClassType;
+import org.apache.geronimo.xbeans.javaee6.WebAppType;
import org.apache.xbean.finder.ClassFinder;
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationHelper.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/WebServiceRefAnnotationHelper.java Wed Feb 3 07:26:50 2010
@@ -31,11 +31,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.xbeans.javaee.FullyQualifiedClassType;
-import org.apache.geronimo.xbeans.javaee.JndiNameType;
-import org.apache.geronimo.xbeans.javaee.ServiceRefType;
-import org.apache.geronimo.xbeans.javaee.XsdAnyURIType;
-import org.apache.geronimo.xbeans.javaee.XsdStringType;
+import org.apache.geronimo.xbeans.javaee6.FullyQualifiedClassType;
+import org.apache.geronimo.xbeans.javaee6.JndiNameType;
+import org.apache.geronimo.xbeans.javaee6.ServiceRefType;
+import org.apache.geronimo.xbeans.javaee6.XsdAnyURIType;
+import org.apache.geronimo.xbeans.javaee6.XsdStringType;
import org.apache.xbean.finder.ClassFinder;
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/SchemaConversionTest.java Wed Feb 3 07:26:50 2010
@@ -36,9 +36,9 @@
private ClassLoader classLoader = this.getClass().getClassLoader();
- public void testApplication13ToApplication5Transform() throws Exception {
+ public void testApplication13ToApplication6Transform() throws Exception {
URL srcXml = classLoader.getResource("j2ee_1_3dtd/application-13.xml");
- URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/application-5.xml");
+ URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/application-6.xml");
XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
XmlBeansUtil.validateDD(expected);
@@ -49,8 +49,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();
@@ -63,9 +63,9 @@
assertTrue("Differences after reconverting to application schema: " + problems, ok3);
}
- public void testApplication14ToApplication5Transform() throws Exception {
+ public void testApplication14ToApplication6Transform() throws Exception {
URL srcXml = classLoader.getResource("j2ee_1_3dtd/application-14.xml");
- URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/application-5.xml");
+ URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/application-6.xml");
XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
XmlBeansUtil.validateDD(expected);
@@ -76,8 +76,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();
@@ -90,4 +90,30 @@
assertTrue("Differences after reconverting to application schema: " + problems, ok3);
}
+ public void testApplication5ToApplication6Transform() throws Exception {
+ URL srcXml = classLoader.getResource("j2ee_1_3dtd/application-5.xml");
+ URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/application-6.xml");
+ XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
+ XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
+ XmlBeansUtil.validateDD(expected);
+ xmlObject = EARConfigBuilder.convertToApplicationSchema(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();
+ }
+ boolean ok2 = compareXmlObjects(xmlObject, expected, problems);
+ assertTrue("Differences after reconverting to schema: " + problems, ok2);
+ //do the whole transform twice...
+ xmlObject = EARConfigBuilder.convertToApplicationSchema(xmlObject);
+ boolean ok3 = compareXmlObjects(xmlObject, expected, problems);
+ assertTrue("Differences after reconverting to application schema: " + problems, ok3);
+ }
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotationHelperTest.java Wed Feb 3 07:26:50 2010
@@ -39,8 +39,8 @@
import javax.xml.ws.WebServiceRefs;
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.xbean.finder.ClassFinder;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlOptions;
Added: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/application-6.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/application-6.xml?rev=905918&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/application-6.xml (added)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/application-6.xml Wed Feb 3 07:26:50 2010
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<application xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ version="6">
+ <description>description</description>
+ <display-name>display-name</display-name>
+ <icon>
+ <small-icon>url/to/small/icon</small-icon>
+ <large-icon>url/to/large/icon</large-icon>
+ </icon>
+ <module>
+ <connector>connector.rar</connector>
+ <alt-dd>geronimo-ra.xml</alt-dd>
+ </module>
+ <module>
+ <ejb>ejb-jar.jar</ejb>
+ </module>
+ <module>
+ <java>client.jar</java>
+ </module>
+ <module>
+ <web>
+ <web-uri>web.war</web-uri>
+ <context-root>web-context</context-root>
+ </web>
+ </module>
+ <security-role>
+ <description>description</description>
+ <role-name>myrole</role-name>
+ </security-role>
+</application>
Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/application-6.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/application-6.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/j2ee_1_3dtd/application-6.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml Wed Feb 3 07:26:50 2010
@@ -48,6 +48,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/j2ee/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java Wed Feb 3 07:26:50 2010
@@ -38,7 +38,7 @@
static final String GERONIMO_NAMING_NAMESPACE = "http://geronimo.apache.org/xml/ns/naming-1.2";
private static final String GERONIMO_SERVICE_NAMESPACE = "http://geronimo.apache.org/xml/ns/deployment-1.2";
- private static final String JPA_PERSISTENCE_NAMESPACE = "http://java.sun.com/xml/ns/persistence";
+ public static final String JPA_PERSISTENCE_NAMESPACE = "http://java.sun.com/xml/ns/persistence";
private static final Map<String, ElementConverter> GERONIMO_SCHEMA_CONVERSIONS = new HashMap<String, ElementConverter>();
@@ -90,7 +90,7 @@
public static boolean convertSingleElementToGeronimoSubSchemas(XmlCursor cursor, XmlCursor end) {
if (cursor.isStart()) {
String localName = cursor.getName().getLocalPart();
- ElementConverter converter = (ElementConverter) GERONIMO_SCHEMA_CONVERSIONS.get(localName);
+ ElementConverter converter = GERONIMO_SCHEMA_CONVERSIONS.get(localName);
if (converter != null) {
converter.convertElement(cursor, end);
return true;
@@ -240,6 +240,30 @@
return true;
}
+ public static boolean convertSchemaVersion(XmlCursor start, XmlCursor end, String namespace, String schemaLocationURL, String version) {
+ boolean isFirstStart = true;
+ end.toCursor(start);
+ end.toEndToken();
+ while (start.hasNextToken() && start.isLeftOf(end)) {
+ if (start.isStart()) {
+ if (isFirstStart) {
+ if (start.getAttributeText(new QName("xmlns")) != null) {
+ start.removeAttribute(new QName("xmlns"));
+ }
+ start.setAttributeText(new QName("version"), version);
+ start.setAttributeText(new QName("http://www.w3.org/2001/XMLSchema-instance", "schemaLocation", "xsi"), namespace + " " + schemaLocationURL);
+ isFirstStart = false;
+ }
+ //convert namespace of each starting element
+ start.setName(new QName(namespace, start.getName().getLocalPart()));
+ start.toNextToken();
+ } else {
+ start.toNextToken();
+ }
+ }
+ return true;
+ }
+
/**
* Reorders elements to match descriptionGroup
*
@@ -291,7 +315,7 @@
moveElements("description", namespace, moveable, cursor);
moveElements("validator-class", namespace, moveable, cursor);
moveElements("init-param", namespace, moveable, cursor);
-
+
do {
String name = cursor.getName().getLocalPart();
if ("init-param".equals(name)) {
@@ -300,7 +324,7 @@
convertToTldInitParam(namespace, cursor, moveable);
cursor.pop();
}
- } while (cursor.toPrevSibling());
+ } while (cursor.toPrevSibling());
}
public static void convertToTldVariable(String namespace, XmlCursor cursor, XmlCursor moveable) {
@@ -313,14 +337,14 @@
moveElements("scope", namespace, moveable, cursor);
}
- public static void convertToJNDIEnvironmentRefsGroup(String namespace, XmlCursor cursor, XmlCursor moveable) {
+ public static void convertToJNDIEnvironmentRefsGroup(String namespace, XmlCursor cursor, XmlCursor moveable) {
moveElements("env-entry", namespace, moveable, cursor);
moveElements("ejb-ref", namespace, moveable, cursor);
moveElements("ejb-local-ref", namespace, moveable, cursor);
moveElements("resource-ref", namespace, moveable, cursor);
moveElements("resource-env-ref", namespace, moveable, cursor);
moveElements("message-destination-ref", namespace, moveable, cursor);
-
+
do {
String name = cursor.getName().getLocalPart();
if ("env-entry".equals(name)) {
@@ -330,7 +354,7 @@
convertToEnvEntryGroup(namespace, cursor, moveable);
cursor.pop();
}
- } while (cursor.toPrevSibling());
+ } while (cursor.toPrevSibling());
}
public static void convertToEnvEntryGroup(String namespace, XmlCursor cursor, XmlCursor moveable) {
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java Wed Feb 3 07:26:50 2010
@@ -25,7 +25,7 @@
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlObject;
-import org.apache.geronimo.xbeans.javaee.EjbJarType;
+import org.apache.geronimo.xbeans.javaee6.EjbJarType;
import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.geronimo.testsupport.XmlBeansTestSupport;
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java Wed Feb 3 07:26:50 2010
@@ -48,8 +48,8 @@
import org.apache.geronimo.xbeans.geronimo.naming.GerAbstractNamingEntryDocument;
import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
import org.apache.geronimo.xbeans.geronimo.naming.GerAbstractNamingEntryType;
-import org.apache.geronimo.xbeans.javaee.InjectionTargetType;
-import org.apache.geronimo.xbeans.javaee.XsdStringType;
+import org.apache.geronimo.xbeans.javaee6.InjectionTargetType;
+import org.apache.geronimo.xbeans.javaee6.XsdStringType;
import org.apache.xmlbeans.QNameSet;
import org.apache.xmlbeans.SchemaType;
import org.apache.xmlbeans.XmlCursor;
@@ -254,7 +254,7 @@
return xmlObject;
}
- protected static String getStringValue(org.apache.geronimo.xbeans.javaee.String string) {
+ protected static String getStringValue(org.apache.geronimo.xbeans.javaee6.String string) {
if (string == null) {
return null;
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ENCHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ENCHelper.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ENCHelper.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/ENCHelper.java Wed Feb 3 07:26:50 2010
@@ -36,7 +36,7 @@
*/
public class ENCHelper {
static final SchemaTypeLoader SCHEMA_TYPE_LOADER = XmlBeans.typeLoaderUnion(new SchemaTypeLoader[]{
- XmlBeans.typeLoaderForClassLoader(org.apache.geronimo.xbeans.javaee.String.class.getClassLoader()),
+ XmlBeans.typeLoaderForClassLoader(org.apache.geronimo.xbeans.javaee6.String.class.getClassLoader()),
});
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java Wed Feb 3 07:26:50 2010
@@ -37,12 +37,12 @@
import org.apache.geronimo.naming.reference.KernelReference;
import org.apache.geronimo.xbeans.geronimo.naming.GerEnvEntryDocument;
import org.apache.geronimo.xbeans.geronimo.naming.GerEnvEntryType;
-import org.apache.geronimo.xbeans.javaee.DescriptionType;
-import org.apache.geronimo.xbeans.javaee.EnvEntryType;
-import org.apache.geronimo.xbeans.javaee.EnvEntryTypeValuesType;
-import org.apache.geronimo.xbeans.javaee.InjectionTargetType;
-import org.apache.geronimo.xbeans.javaee.JndiNameType;
-import org.apache.geronimo.xbeans.javaee.XsdStringType;
+import org.apache.geronimo.xbeans.javaee6.DescriptionType;
+import org.apache.geronimo.xbeans.javaee6.EnvEntryType;
+import org.apache.geronimo.xbeans.javaee6.EnvEntryTypeValuesType;
+import org.apache.geronimo.xbeans.javaee6.InjectionTargetType;
+import org.apache.geronimo.xbeans.javaee6.JndiNameType;
+import org.apache.geronimo.xbeans.javaee6.XsdStringType;
import org.apache.xmlbeans.QNameSet;
import org.apache.xmlbeans.XmlObject;
import org.slf4j.Logger;
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LifecycleMethodBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LifecycleMethodBuilder.java?rev=905918&r1=905917&r2=905918&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LifecycleMethodBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LifecycleMethodBuilder.java Wed Feb 3 07:26:50 2010
@@ -38,9 +38,9 @@
import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedApp;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
-import org.apache.geronimo.xbeans.javaee.FullyQualifiedClassType;
-import org.apache.geronimo.xbeans.javaee.JavaIdentifierType;
-import org.apache.geronimo.xbeans.javaee.LifecycleCallbackType;
+import org.apache.geronimo.xbeans.javaee6.FullyQualifiedClassType;
+import org.apache.geronimo.xbeans.javaee6.JavaIdentifierType;
+import org.apache.geronimo.xbeans.javaee6.LifecycleCallbackType;
import org.apache.xbean.finder.ClassFinder;
import org.apache.xmlbeans.QNameSet;
import org.apache.xmlbeans.XmlObject;