June 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3761 - in branches/jbossws-2.0/jbossws-core: src/test/java/org/jboss/test/ws/jaxrpc/serviceref and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-29 07:51:49 -0400 (Fri, 29 Jun 2007) New Revision: 3761 Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ExampleHandler.java Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml Log: Reproduce JBCTS-624 locally. It's commented out. Added FIXME Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml 2007-06-29 08:18:16 UTC (rev 3760) +++ branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml 2007-06-29 11:51:49 UTC (rev 3761) @@ -2679,6 +2679,7 @@ <include name="org/jboss/test/ws/jaxrpc/serviceref/ServletClient.class"/> <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxrpc/serviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/serviceref/ExampleHandler.class"/> </classes> <webinf dir="${tests.output.dir}/resources/jaxrpc/serviceref/META-INF"> <include name="jaxrpc-mapping.xml"/> Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ExampleHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ExampleHandler.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ExampleHandler.java 2007-06-29 11:51:49 UTC (rev 3761) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxrpc.serviceref; + +import javax.xml.rpc.handler.GenericHandler; +import javax.xml.namespace.QName; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jun 29, 2007 + */ +public class ExampleHandler extends GenericHandler { + + public QName[] getHeaders() + { + return new QName[] { new QName("http://extra-header.org", "extra-header")}; + } +} Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ExampleHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java 2007-06-29 08:18:16 UTC (rev 3760) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefServletTestCase.java 2007-06-29 11:51:49 UTC (rev 3761) @@ -76,6 +76,12 @@ public void testServletClient() throws Exception { + + System.out.println("FIXME [JBCTS-624]: R2753 cannot parse web.xml for jsp vehicle"); + // In order to reproduce this error, you'll need to u9ncomment that handler associated through + // the service-ref element in web.xml. It's actually the namespace declaration in that header block + // which causes jboss-web to choke + URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); String retStr = br.readLine(); Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml 2007-06-29 08:18:16 UTC (rev 3760) +++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/serviceref/servlet-client/WEB-INF/web.xml 2007-06-29 11:51:49 UTC (rev 3761) @@ -21,6 +21,12 @@ <port-component-ref> <service-endpoint-interface>org.jboss.test.ws.jaxrpc.serviceref.TestEndpoint</service-endpoint-interface> </port-component-ref> + <handler> + <handler-name>Handler</handler-name> + <handler-class>org.jboss.test.ws.jaxrpc.serviceref.ExampleHandler</handler-class> +  + </handler> </service-ref> <service-ref>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r3760 - in branches/jbossws-2.0: build and 16 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-29 04:18:16 -0400 (Fri, 29 Jun 2007) New Revision: 3760 Added: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/BasicJAXBHandler.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextCache.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBHandler.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java Removed: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/BindingCustomization.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/BasicJAXBHandler.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextCache.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBHandler.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBBindingCustomization.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCustomisation.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java Modified: branches/jbossws-2.0/build/ant.properties.example branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java branches/jbossws-2.0/jbossws-2.0.iws branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SerializationContextJAXWS.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java Log: Rollback invalid change due to numerous compile issues svn merge -r3758:3755 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0 Modified: branches/jbossws-2.0/build/ant.properties.example =================================================================== --- branches/jbossws-2.0/build/ant.properties.example 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/build/ant.properties.example 2007-06-29 08:18:16 UTC (rev 3760) @@ -5,7 +5,7 @@ # Optional JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 -#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA +#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA #jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 # The JBoss server under test. This can be [jboss50|jboss42|jboss40] @@ -37,7 +37,7 @@ hudson.jboss50.rev=HEAD hudson.jboss42.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_2 -hudson.jboss42.build=jboss-4.2.1.GA +hudson.jboss42.build=jboss-4.2.0.GA hudson.jboss42.rev=HEAD hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_0 Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml =================================================================== --- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-29 08:18:16 UTC (rev 3760) @@ -125,7 +125,8 @@ <bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/> <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer"> <property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property> - <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> + <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> + <property name="jaxbHandler">org.jboss.wsf.spi.binding.jaxb.JAXBContextCache</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-29 08:18:16 UTC (rev 3760) @@ -125,7 +125,8 @@ <bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/> <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer"> <property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property> - <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> + <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> + <property name="jaxbHandler">org.jboss.wsf.spi.binding.jaxb.JAXBContextCache</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-29 08:18:16 UTC (rev 3760) @@ -129,7 +129,8 @@ <bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/> <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer"> <property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property> - <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> + <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> + <property name="jaxbHandler">org.jboss.wsf.spi.binding.jaxb.JAXBContextCache</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-29 08:18:16 UTC (rev 3760) @@ -52,7 +52,7 @@ 2) WebServiceDeployerJSE < WarDeployer 3) WebServiceMainDeployer - Each WebServiceDeployer has a number of DeployerHooks registered with it + Each WebServiceDeployer has a number of DeployerHooks registerd with it - WebServiceDeployerEJB - WSDeployerHook_JAXRPC_EJB21 @@ -140,7 +140,8 @@ <bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/> <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer"> <property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property> - <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> + <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> + <property name="jaxbHandler">org.jboss.wsf.spi.binding.jaxb.JAXBContextCache</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> Deleted: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/BindingCustomization.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/BindingCustomization.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/BindingCustomization.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -1,39 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.spi.binding; - -import java.util.HashMap; - -/** - * Allows introduction of arbitrary binding customization properties.<p> - * This may be different between stacks and addresses meta data binding - * (i.e JSR-181 to UnifiedMetaData) as well as JAVA to XML binding operations. - * <p> - * Supported properties need to be documented in subclasses. - * - * - * @author Heiko.Braun(a)jboss.com - * Created: Jun 28, 2007 - */ -public abstract class BindingCustomization extends HashMap { - -} Copied: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb (from rev 3755, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb) Deleted: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/BasicJAXBHandler.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/BasicJAXBHandler.java 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/BasicJAXBHandler.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -1,42 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.spi.binding.jaxb; - -// $Id: $ - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; - -/** - * A basic JAXBHandler. - * - * @author Thomas.Diesler(a)jboss.com - * @since 26-Jun-2007 - */ -public class BasicJAXBHandler implements JAXBHandler -{ - public JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException - { - JAXBContext ctx = JAXBContext.newInstance(javaTypes); - return ctx; - } -} Copied: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/BasicJAXBHandler.java (from rev 3755, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/BasicJAXBHandler.java) =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/BasicJAXBHandler.java (rev 0) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/BasicJAXBHandler.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.binding.jaxb; + +// $Id: $ + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; + +/** + * A basic JAXBHandler. + * + * @author Thomas.Diesler(a)jboss.com + * @since 26-Jun-2007 + */ +public class BasicJAXBHandler implements JAXBHandler +{ + public JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException + { + JAXBContext ctx = JAXBContext.newInstance(javaTypes); + return ctx; + } +} Deleted: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextCache.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextCache.java 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextCache.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -1,81 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.spi.binding.jaxb; - -// $Id: $ - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; - -import org.jboss.wsf.spi.utils.HashCodeUtil; - -/** - * Cache JAXBContext's. - * - * @author Heiko.Braun(a)jboss.com - * @author Thomas.Diesler(a)jboss.com - * @since 26-Jun-2007 - */ -public class JAXBContextCache implements JAXBHandler -{ - private Map<Integer, JAXBContext> cache = new ConcurrentHashMap<Integer, JAXBContext>(); - - private JAXBContext get(Integer id) - { - return cache.get(id); - } - - private void add(Integer id, JAXBContext context) - { - cache.put(id, context); - } - - /** - * Retrieve a cached JAXBContext instance. - * If no instance is cached a new one will be created and registered. - */ - public JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException - { - Integer id = buildId(javaTypes); - JAXBContext ctx = get(id); - if (null == ctx) - { - ctx = JAXBContext.newInstance(javaTypes); - add(id, ctx); - } - - return ctx; - } - - private Integer buildId(Class[] classes) - { - int sum = HashCodeUtil.SEED; - for (Class cls : classes) - { - sum = HashCodeUtil.hash(sum, cls.getName()); - } - return new Integer(sum); - } -} Copied: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextCache.java (from rev 3755, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextCache.java) =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextCache.java (rev 0) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBContextCache.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.binding.jaxb; + +// $Id: $ + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; + +import org.jboss.wsf.spi.utils.HashCodeUtil; + +/** + * Cache JAXBContext's. + * + * @author Heiko.Braun(a)jboss.com + * @author Thomas.Diesler(a)jboss.com + * @since 26-Jun-2007 + */ +public class JAXBContextCache implements JAXBHandler +{ + private Map<Integer, JAXBContext> cache = new ConcurrentHashMap<Integer, JAXBContext>(); + + private JAXBContext get(Integer id) + { + return cache.get(id); + } + + private void add(Integer id, JAXBContext context) + { + cache.put(id, context); + } + + /** + * Retrieve a cached JAXBContext instance. + * If no instance is cached a new one will be created and registered. + */ + public JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException + { + Integer id = buildId(javaTypes); + JAXBContext ctx = get(id); + if (null == ctx) + { + ctx = JAXBContext.newInstance(javaTypes); + add(id, ctx); + } + + return ctx; + } + + private Integer buildId(Class[] classes) + { + int sum = HashCodeUtil.SEED; + for (Class cls : classes) + { + sum = HashCodeUtil.hash(sum, cls.getName()); + } + return new Integer(sum); + } +} Deleted: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBHandler.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBHandler.java 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBHandler.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.spi.binding.jaxb; - -// $Id: $ - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; - -/** - * A factory for JAXBContext - * - * @author Thomas.Diesler(a)jboss.org - * @since 26-Jun-2007 - */ -public interface JAXBHandler -{ - /** Get a JAXBContext instance. - */ - JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException; -} Copied: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBHandler.java (from rev 3755, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBHandler.java) =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBHandler.java (rev 0) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/JAXBHandler.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.binding.jaxb; + +// $Id: $ + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; + +/** + * A factory for JAXBContext + * + * @author Thomas.Diesler(a)jboss.org + * @since 26-Jun-2007 + */ +public interface JAXBHandler +{ + /** Get a JAXBContext instance. + */ + JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException; +} Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -21,14 +21,17 @@ */ package org.jboss.wsf.spi.deployment; -import org.jboss.wsf.spi.binding.BindingCustomization; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import javax.management.ObjectName; + +import org.jboss.wsf.spi.binding.jaxb.JAXBHandler; import org.jboss.wsf.spi.invocation.InvocationHandler; import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.management.EndpointMetrics; -import javax.management.ObjectName; -import java.util.*; - /** * A general JAXWS endpoint. * @@ -46,10 +49,10 @@ private RequestHandler requestHandler; private InvocationHandler invocationHandler; private LifecycleHandler lifecycleHandler; + private JAXBHandler jaxbHandler; private Map<Class, Object> attachments = new HashMap<Class, Object>(); private Map<String, Object> properties = new HashMap<String, Object>(); private EndpointMetrics metrics; - private List<BindingCustomization> bindingCustomizsations = new ArrayList<BindingCustomization>(); public BasicEndpoint() { @@ -78,15 +81,15 @@ this.targetBean = targetBean; } - public Class getTargetBeanClass() + public Class getTargetBeanClass() { if (targetBean == null) throw new IllegalStateException("Target bean not set"); - + ClassLoader classLoader = service.getDeployment().getClassLoader(); if (classLoader == null) throw new IllegalStateException("Deployment classloader not set"); - + Class beanClass; try { @@ -98,7 +101,7 @@ } return beanClass; } - + public ObjectName getName() { return name; @@ -175,33 +178,15 @@ this.invocationHandler = handler; } - public List<BindingCustomization> getBindingCustomizations() + public JAXBHandler getJAXBHandler() { - return Collections.unmodifiableList(bindingCustomizsations); + return jaxbHandler; } - /* Get a concrete binding customization */ - public BindingCustomization getBindingCustomization(BindingCustomization customization) + public void setJAXBHandler(JAXBHandler jaxbHandler) { - BindingCustomization match = null; - - Iterator<BindingCustomization> it = bindingCustomizsations.iterator(); - while(it.hasNext()) - { - BindingCustomization bc = it.next(); - if(bc.getClass().equals(customization.getClass())) - { - match = bc; - } - } - - return match; - } - - public void addBindingCustomization(BindingCustomization customization) - { assertEndpointSetterAccess(); - bindingCustomizsations.add(customization); + this.jaxbHandler = jaxbHandler; } public <T> T addAttachment(Class<T> key, Object value) @@ -218,7 +203,7 @@ { return (T)attachments.get(key); } - + public Set<String> getProperties() { return properties.keySet(); @@ -249,9 +234,9 @@ assertEndpointSetterAccess(); metrics.setEndpoint(this); this.metrics = metrics; - + } - + private void assertEndpointSetterAccess() { if (state == EndpointState.STARTED) Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -23,15 +23,15 @@ // $Id$ -import org.jboss.wsf.spi.binding.BindingCustomization; +import java.util.Set; + +import javax.management.ObjectName; + +import org.jboss.wsf.spi.binding.jaxb.JAXBHandler; import org.jboss.wsf.spi.invocation.InvocationHandler; import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.management.EndpointMetrics; -import javax.management.ObjectName; -import java.util.List; -import java.util.Set; - /** * A general JAXWS endpoint. * @@ -107,16 +107,13 @@ /** Set the endpoint bean invoker */ void setInvocationHandler(InvocationHandler invoker); - - /** Get all binding customizations for this endpoint */ - List<BindingCustomization> getBindingCustomizations(); - - /* Get a concrete binding customization */ - BindingCustomization getBindingCustomization(BindingCustomization bindingCustomization); - - /** Add a binding customization to this endpoint*/ - void addBindingCustomization (BindingCustomization bindingCustomization); - + + /** Get the JAXBHandler for this endpoint */ + JAXBHandler getJAXBHandler(); + + /** Set the JAXBHandler for this endpoint */ + void setJAXBHandler(JAXBHandler handler); + /** Get the endpoint metrics for this endpoint */ EndpointMetrics getEndpointMetrics(); Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -23,14 +23,15 @@ //$Id$ +import java.util.Map; + +import org.jboss.wsf.spi.binding.jaxb.JAXBHandler; import org.jboss.wsf.spi.invocation.InvocationHandler; import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; -import java.util.Map; - /** * A deployer that assigns the handlers to the Endpoint * @@ -41,6 +42,7 @@ { private String requestHandler; private String lifecycleHandler; + private String jaxbHandler; private Map<String,String> invocationHandler; public void setLifecycleHandler(String handler) @@ -58,6 +60,11 @@ this.invocationHandler = handlers; } + public void setJaxbHandler(String jaxbHandler) + { + this.jaxbHandler = jaxbHandler; + } + @Override public void create(Deployment dep) { @@ -66,6 +73,7 @@ ep.setRequestHandler(getRequestHandler(dep)); ep.setLifecycleHandler(getLifecycleHandler(dep)); ep.setInvocationHandler(getInvocationHandler(ep)); + ep.setJAXBHandler(getJAXBHandler(dep)); } } @@ -95,6 +103,19 @@ } } + private JAXBHandler getJAXBHandler(Deployment dep) + { + try + { + Class<?> handlerClass = dep.getClassLoader().loadClass(jaxbHandler); + return (JAXBHandler)handlerClass.newInstance(); + } + catch (Exception e) + { + throw new IllegalStateException("Cannot load jaxb handler: " + jaxbHandler); + } + } + private InvocationHandler getInvocationHandler(Endpoint ep) { Deployment dep = ep.getService().getDeployment(); Copied: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java (from rev 3755, branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java) =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java (rev 0) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -0,0 +1,146 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.utils; + +import java.lang.reflect.Array; + +/** + * Collected methods which allow easy implementation of <code>hashCode</code>. + * + * Example use case: + * <pre> + * public int hashCode(){ + * int result = HashCodeUtil.SEED; + * //collect the contributions of various fields + * result = HashCodeUtil.hash(result, fPrimitive); + * result = HashCodeUtil.hash(result, fObject); + * result = HashCodeUtil.hash(result, fArray); + * return result; + * } + * </pre> + */ +public final class HashCodeUtil +{ + + /** + * An initial value for a <code>hashCode</code>, to which is added contributions + * from fields. Using a non-zero value decreases collisons of <code>hashCode</code> + * values. + */ + public static final int SEED = 23; + + /** + * booleans. + */ + public static int hash(int aSeed, boolean aBoolean) + { + return firstTerm(aSeed) + (aBoolean ? 1 : 0); + } + + /** + * chars. + */ + public static int hash(int aSeed, char aChar) + { + return firstTerm(aSeed) + (int)aChar; + } + + /** + * ints. + */ + public static int hash(int aSeed, int aInt) + { + /* + * Implementation Note + * Note that byte and short are handled by this method, through + * implicit conversion. + */ + return firstTerm(aSeed) + aInt; + } + + /** + * longs. + */ + public static int hash(int aSeed, long aLong) + { + return firstTerm(aSeed) + (int)(aLong ^ (aLong >>> 32)); + } + + /** + * floats. + */ + public static int hash(int aSeed, float aFloat) + { + return hash(aSeed, Float.floatToIntBits(aFloat)); + } + + /** + * doubles. + */ + public static int hash(int aSeed, double aDouble) + { + return hash(aSeed, Double.doubleToLongBits(aDouble)); + } + + /** + * <code>aObject</code> is a possibly-null object field, and possibly an array. + * + * If <code>aObject</code> is an array, then each element may be a primitive + * or a possibly-null object. + */ + public static int hash(int aSeed, Object aObject) + { + int result = aSeed; + if (aObject == null) + { + result = hash(result, 0); + } + else if (!isArray(aObject)) + { + result = hash(result, aObject.hashCode()); + } + else + { + int length = Array.getLength(aObject); + for (int idx = 0; idx < length; ++idx) + { + Object item = Array.get(aObject, idx); + //recursive call! + result = hash(result, item); + } + } + return result; + } + + /// PRIVATE /// + private static final int fODD_PRIME_NUMBER = 37; + + private static int firstTerm(int aSeed) + { + return fODD_PRIME_NUMBER * aSeed; + } + + private static boolean isArray(Object aObject) + { + return aObject.getClass().isArray(); + } +} Modified: branches/jbossws-2.0/jbossws-2.0.iws =================================================================== --- branches/jbossws-2.0/jbossws-2.0.iws 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/jbossws-2.0.iws 2007-06-29 08:18:16 UTC (rev 3760) @@ -162,7 +162,7 @@ </provider> </entry> </file> - <file leaf-file-name="CustomizableJAXBContextFactory.java" pinned="false" current="false" current-in-tab="false"> + <file leaf-file-name="CustomizableJAXBContextFactory.java" pinned="false" current="true" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java"> <provider selected="true" editor-type-id="text-editor"> <state line="46" column="43" selection-start="1842" selection-end="1872" vertical-scroll-proportion="0.45023698"> @@ -171,17 +171,6 @@ </provider> </entry> </file> - <file leaf-file-name="BasicEndpoint.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="202" column="35" selection-start="5267" selection-end="5267" vertical-scroll-proportion="4.312796"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -1042,6 +1031,15 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="50" column="36" selection-start="1972" selection-end="1972" vertical-scroll-proportion="0.6350711"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java"> <provider selected="true" editor-type-id="text-editor"> <state line="40" column="17" selection-start="1544" selection-end="1544" vertical-scroll-proportion="-0.3127962"> @@ -1074,15 +1072,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="202" column="35" selection-start="5267" selection-end="5267" vertical-scroll-proportion="4.312796"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> </component> </project> Modified: branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -42,7 +42,6 @@ import javax.xml.ws.WebServiceException; import org.w3c.dom.Element; -import org.jboss.ws.core.jaxws.JAXBContextFactory; /** @@ -67,12 +66,12 @@ @XmlRootElement(name="EndpointReference",namespace=W3CEndpointReference.NS) @XmlType(name="EndpointReferenceType",namespace=W3CEndpointReference.NS) public final class W3CEndpointReference extends EndpointReference { - + private final static JAXBContext w3cjc = getW3CJaxbContext(); protected W3CEndpointReference() { } - + /** * construct an EPR from infoset representation * @@ -80,10 +79,10 @@ * instance consistent with the W3C WS-Addressing Core * recommendation. * - * @throws WebServiceException + * @throws WebServiceException * If the source does NOT contain a valid W3C WS-Addressing * EndpointReference. - * @throws NullPointerException + * @throws NullPointerException * If the <code>null</code> <code>source</code> value is given */ public W3CEndpointReference(Source source) { @@ -98,7 +97,7 @@ throw new WebServiceException("Source did not contain W3CEndpointReference", e); } } - + /** * {@inheritDoc} */ @@ -111,11 +110,15 @@ throw new WebServiceException("Error marshalling W3CEndpointReference. ", e); } } - + private static JAXBContext getW3CJaxbContext() { - return JAXBContextFactory.newInstance().createContext(new Class[] { W3CEndpointReference.class}); + try { + return JAXBContext.newInstance(W3CEndpointReference.class); + } catch (JAXBException e) { + throw new WebServiceException("Error creating JAXBContext for W3CEndpointReference. ", e); + } } - + // private but necessary properties for databinding @XmlElement(name="Address",namespace=NS) private Address address; @@ -127,8 +130,8 @@ Map<QName,String> attributes; @XmlAnyElement List<Element> elements; - - + + private static class Address { protected Address() {} @XmlValue @@ -136,8 +139,8 @@ @XmlAnyAttribute Map<QName,String> attributes; } - - + + private static class Elements { protected Elements() {} @XmlAnyElement @@ -145,6 +148,6 @@ @XmlAnyAttribute Map<QName,String> attributes; } - + protected static final String NS = "http://www.w3.org/2005/08/addressing"; } Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -53,7 +53,7 @@ import org.jboss.ws.core.jaxrpc.binding.QNameSerializerFactory; import org.jboss.ws.core.jaxrpc.binding.SimpleDeserializerFactory; import org.jboss.ws.core.jaxrpc.binding.SimpleSerializerFactory; -import org.jboss.ws.core.utils.HashCodeUtil; +import org.jboss.wsf.spi.utils.HashCodeUtil; import org.jboss.wsf.spi.utils.JavaUtils; /** Deleted: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -1,90 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jaxws; - -import org.jboss.ws.WSException; -import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.wsf.spi.binding.BindingCustomization; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import java.util.Iterator; - -/** - * The default factory checks if a {@link JAXBBindingCustomization} exists - * and uses it to customize the JAXBContext that will be created. - * - * @see org.jboss.wsf.spi.deployment.Endpoint - * @see org.jboss.wsf.spi.binding.BindingCustomization - * @see JAXBBindingCustomization - * - * @see JAXBContext#newInstance(Class...) - * @see JAXBContext#newInstance(String, ClassLoader, java.util.Map<java.lang.String,?>) - * - * @author Heiko.Braun(a)jboss.com - * Created: Jun 26, 2007 - */ -public class CustomizableJAXBContextFactory extends JAXBContextFactory -{ - public JAXBContext createContext(Class[] clazzes) throws WSException - { - try - { - BindingCustomization customization = getCustomization(); - if(null == customization) - return JAXBContext.newInstance(clazzes); - else - return JAXBContext.newInstance(clazzes, customization); - } - catch (JAXBException e) { - throw new WSException("Failed to create JAXBContext", e); - } - } - - public JAXBContext createContext(Class clazz) throws WSException - { - return createContext(new Class[] {clazz}); - } - - private BindingCustomization getCustomization() - { - BindingCustomization customization = null; - - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - if(msgContext!=null) // may not be available anytime - { - Iterator<BindingCustomization> it = msgContext.getEndpointMetaData().getBindingCustomizations().iterator(); - while(it.hasNext()) - { - BindingCustomization current = it.next(); - if(current instanceof JAXBBindingCustomization) - { - customization = current; - break; - } - } - } - - return customization; - } -} Deleted: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBBindingCustomization.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBBindingCustomization.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBBindingCustomization.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -1,47 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jaxws; - -import org.jboss.wsf.spi.binding.BindingCustomization; -import com.sun.xml.bind.api.JAXBRIContext; - -/** - * Supported JAXB 2.1 customizations. - * - * @see org.jboss.wsf.spi.deployment.Endpoint - * - * @author Heiko.Braun(a)jboss.com - * Created: Jun 28, 2007 - */ -public class JAXBBindingCustomization extends BindingCustomization { - - // Use an alternative RuntimeAnnotationReader implementation - public final static String ANNOTATION_READER = JAXBRIContext.ANNOTATION_READER; - - // Reassign the default namespace URI to something else at the runtime - public final static String DEFAULT_NAMESPACE_REMAP = JAXBRIContext.DEFAULT_NAMESPACE_REMAP; - - // Enable the c14n marshalling support in the JAXBContext. - public final static String CANONICALIZATION_SUPPORT = JAXBRIContext.CANONICALIZATION_SUPPORT; - - -} Deleted: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -1,89 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jaxws; - -// $Id$ - -import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.core.utils.HashCodeUtil; -import org.jboss.ws.metadata.umdm.EndpointMetaData; - -import javax.xml.bind.JAXBContext; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * Cache JAXBContext's. - * - * @author Heiko.Braun(a)jboss.org - * @since 26.01.2007 - */ -public class JAXBContextCache -{ - private Map<Integer, JAXBContext> cache = new ConcurrentHashMap<Integer, JAXBContext>(); - - public JAXBContext get(Class[] clazzes) - { - Integer id = buildId(clazzes); - return get(id); - } - - public void add(Class[] clazzes, JAXBContext context) - { - Integer id = buildId(clazzes); - add(id, context); - } - - private JAXBContext get(Integer id) - { - return cache.get(id); - } - - private void add(Integer id, JAXBContext context) - { - cache.put(id, context); - } - - private static Integer buildId(Class[] classes) - { - int sum = HashCodeUtil.SEED; - for (Class cls : classes) - { - sum = HashCodeUtil.hash(sum, cls.getName()); - } - return sum; - } - - /** - * Access the JAXBContext cache through the message context. - * The actual instance is assiciated with the EndpointMetaData. - * @return JAXBContextCache - */ - public static JAXBContextCache getContextCache() - { - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - EndpointMetaData epMetaData = msgContext.getEndpointMetaData(); - return epMetaData.getJaxbCache(); - } -} - Deleted: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCustomisation.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCustomisation.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCustomisation.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -1,31 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jaxws; - -import java.util.HashMap; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jun 27, 2007 - */ -public class JAXBContextCustomisation extends HashMap { -} Deleted: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -1,56 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.jaxws; - -import org.jboss.ws.WSException; -import org.jboss.wsf.spi.utils.ServiceLoader; - -import javax.xml.bind.JAXBContext; - -/** - * Creates JAXBContext's.<p> - * - * @author Heiko.Braun(a)jboss.com - * Created: Jun 26, 2007 - */ -public abstract class JAXBContextFactory { - - public final static String DEFAULT_JAXB_CONTEXT_FACTORY = "org.jboss.ws.core.jaxws.CustomizableJAXBContextFactory"; - - public abstract JAXBContext createContext(Class[] clazzes) throws WSException; - - public abstract JAXBContext createContext(Class clazz) throws WSException; - - /** - * Retrieve JAXBContextFactory instance through the {@link ServiceLoader}. - * Defaults to {@link CustomizableJAXBContextFactory} - * @return JAXBContextFactory - */ - public static JAXBContextFactory newInstance() - { - return (JAXBContextFactory)ServiceLoader.loadService( - JAXBContextFactory.class.getName(), - DEFAULT_JAXB_CONTEXT_FACTORY - ); - } -} - \ No newline at end of file Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -23,20 +23,22 @@ // $Id$ -import org.jboss.ws.extensions.xop.jaxws.AttachmentUnmarshallerImpl; -import org.jboss.ws.core.binding.BindingException; -import org.jboss.ws.core.binding.TypeMappingImpl; -import org.jboss.ws.core.binding.ComplexTypeDeserializer; -import org.jboss.ws.core.binding.SerializationContext; -import org.jboss.logging.Logger; - import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; +import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; import javax.xml.namespace.QName; import javax.xml.transform.Source; import javax.xml.ws.WebServiceException; +import org.jboss.logging.Logger; +import org.jboss.ws.core.binding.BindingException; +import org.jboss.ws.core.binding.ComplexTypeDeserializer; +import org.jboss.ws.core.binding.SerializationContext; +import org.jboss.ws.core.binding.TypeMappingImpl; +import org.jboss.ws.extensions.xop.jaxws.AttachmentUnmarshallerImpl; +import org.jboss.wsf.spi.binding.jaxb.JAXBHandler; + /** * A Deserializer that can handle complex types by delegating to JAXB. * @@ -64,11 +66,11 @@ TypeMappingImpl typeMapping = serContext.getTypeMapping(); Class javaType = typeMapping.getJavaType(xmlType); - JAXBContext jaxbContext = getJAXBContext(javaTypes); - + JAXBContext jaxbContext = ((SerializationContextJAXWS)serContext).getJAXBContext(javaTypes); + Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); unmarshaller.setAttachmentUnmarshaller( new AttachmentUnmarshallerImpl()); - + JAXBElement jbe = unmarshaller.unmarshal(xmlFragment, javaType); value = jbe.getValue(); @@ -82,22 +84,6 @@ } - /** - * Retrieve JAXBContext from cache or create new one and cache it. - * @param types - * @return JAXBContext - */ - private JAXBContext getJAXBContext(Class[] types){ - JAXBContextCache cache = JAXBContextCache.getContextCache(); - JAXBContext context = cache.get(types); - if(null==context) - { - context = JAXBContextFactory.newInstance().createContext(types); - cache.add(types, context); - } - return context; - } - // 4.21 Conformance (Marshalling failure): If an error occurs when using the supplied JAXBContext to marshall // a request or unmarshall a response, an implementation MUST throw a WebServiceException whose // cause is set to the original JAXBException. Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -23,14 +23,6 @@ // $Id$ -import org.jboss.logging.Logger; -import org.jboss.ws.extensions.xop.jaxws.AttachmentMarshallerImpl; -import org.jboss.ws.core.binding.BindingException; -import org.jboss.ws.core.binding.ComplexTypeSerializer; -import org.jboss.ws.core.binding.SerializationContext; -import org.jboss.ws.core.binding.BufferedStreamResult; -import org.w3c.dom.NamedNodeMap; - import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; import javax.xml.bind.Marshaller; @@ -39,6 +31,15 @@ import javax.xml.transform.Result; import javax.xml.ws.WebServiceException; +import org.jboss.logging.Logger; +import org.jboss.ws.core.binding.BindingException; +import org.jboss.ws.core.binding.BufferedStreamResult; +import org.jboss.ws.core.binding.ComplexTypeSerializer; +import org.jboss.ws.core.binding.SerializationContext; +import org.jboss.ws.extensions.xop.jaxws.AttachmentMarshallerImpl; +import org.jboss.wsf.spi.binding.jaxb.JAXBHandler; +import org.w3c.dom.NamedNodeMap; + /** * A Serializer that can handle complex types by delegating to JAXB. * @@ -66,9 +67,10 @@ // This should be more efficient and accurate than searching the type mapping Class expectedType = serContext.getJavaType(); Class actualType = value.getClass(); - Class[] types = shouldFilter(actualType) ? new Class[]{expectedType} : new Class[]{expectedType, actualType}; - JAXBContext jaxbContext = getJAXBContext(types); + Class[] javaTypes = shouldFilter(actualType) ? new Class[]{expectedType} : new Class[]{expectedType, actualType}; + JAXBContext jaxbContext = ((SerializationContextJAXWS)serContext).getJAXBContext(javaTypes); + Marshaller marshaller = jaxbContext.createMarshaller(); marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true); @@ -89,22 +91,6 @@ return result; } - /** - * Retrieve JAXBContext from cache or create new one and cache it. - * @param types - * @return JAXBContext - */ - private JAXBContext getJAXBContext(Class[] types){ - JAXBContextCache cache = JAXBContextCache.getContextCache(); - JAXBContext context = cache.get(types); - if(null==context) - { - context = JAXBContextFactory.newInstance().createContext(types); - cache.add(types, context); - } - return context; - } - // Remove this when we add a XMLGregorianCalendar Serializer private boolean shouldFilter(Class<?> actualType) { Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SerializationContextJAXWS.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SerializationContextJAXWS.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SerializationContextJAXWS.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -39,5 +39,16 @@ */ public class SerializationContextJAXWS extends SerializationContext { - public static final String JAXB_CONTEXT_TYPES = "org.jboss.ws.jaxb.context.types"; + public static final String JAXB_CONTEXT_TYPES = "org.jboss.ws.jaxb.context.types"; + + /** + * Access the JAXBContext through the message context. + * The actual instance is assiciated with the EndpointMetaData. + */ + public static JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException + { + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + EndpointMetaData epMetaData = msgContext.getEndpointMetaData(); + return epMetaData.getJAXBContext(javaTypes); + } } Deleted: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -1,146 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.ws.core.utils; - -import java.lang.reflect.Array; - -/** - * Collected methods which allow easy implementation of <code>hashCode</code>. - * - * Example use case: - * <pre> - * public int hashCode(){ - * int result = HashCodeUtil.SEED; - * //collect the contributions of various fields - * result = HashCodeUtil.hash(result, fPrimitive); - * result = HashCodeUtil.hash(result, fObject); - * result = HashCodeUtil.hash(result, fArray); - * return result; - * } - * </pre> - */ -public final class HashCodeUtil -{ - - /** - * An initial value for a <code>hashCode</code>, to which is added contributions - * from fields. Using a non-zero value decreases collisons of <code>hashCode</code> - * values. - */ - public static final int SEED = 23; - - /** - * booleans. - */ - public static int hash(int aSeed, boolean aBoolean) - { - return org.jboss.ws.core.utils.HashCodeUtil.firstTerm(aSeed) + (aBoolean ? 1 : 0); - } - - /** - * chars. - */ - public static int hash(int aSeed, char aChar) - { - return org.jboss.ws.core.utils.HashCodeUtil.firstTerm(aSeed) + (int)aChar; - } - - /** - * ints. - */ - public static int hash(int aSeed, int aInt) - { - /* - * Implementation Note - * Note that byte and short are handled by this method, through - * implicit conversion. - */ - return org.jboss.ws.core.utils.HashCodeUtil.firstTerm(aSeed) + aInt; - } - - /** - * longs. - */ - public static int hash(int aSeed, long aLong) - { - return org.jboss.ws.core.utils.HashCodeUtil.firstTerm(aSeed) + (int)(aLong ^ (aLong >>> 32)); - } - - /** - * floats. - */ - public static int hash(int aSeed, float aFloat) - { - return org.jboss.ws.core.utils.HashCodeUtil.hash(aSeed, Float.floatToIntBits(aFloat)); - } - - /** - * doubles. - */ - public static int hash(int aSeed, double aDouble) - { - return org.jboss.ws.core.utils.HashCodeUtil.hash(aSeed, Double.doubleToLongBits(aDouble)); - } - - /** - * <code>aObject</code> is a possibly-null object field, and possibly an array. - * - * If <code>aObject</code> is an array, then each element may be a primitive - * or a possibly-null object. - */ - public static int hash(int aSeed, Object aObject) - { - int result = aSeed; - if (aObject == null) - { - result = org.jboss.ws.core.utils.HashCodeUtil.hash(result, 0); - } - else if (!org.jboss.ws.core.utils.HashCodeUtil.isArray(aObject)) - { - result = org.jboss.ws.core.utils.HashCodeUtil.hash(result, aObject.hashCode()); - } - else - { - int length = Array.getLength(aObject); - for (int idx = 0; idx < length; ++idx) - { - Object item = Array.get(aObject, idx); - //recursive call! - result = org.jboss.ws.core.utils.HashCodeUtil.hash(result, item); - } - } - return result; - } - - /// PRIVATE /// - private static final int fODD_PRIME_NUMBER = 37; - - private static int firstTerm(int aSeed) - { - return org.jboss.ws.core.utils.HashCodeUtil.fODD_PRIME_NUMBER * aSeed; - } - - private static boolean isArray(Object aObject) - { - return aObject.getClass().isArray(); - } -} Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -25,7 +25,6 @@ import javax.xml.namespace.QName; import org.jboss.ws.WSException; -import org.jboss.ws.core.jaxws.JAXBContextFactory; import org.jboss.ws.metadata.umdm.Accessor; import org.jboss.ws.metadata.umdm.AccessorFactory; import org.jboss.ws.metadata.umdm.AccessorFactoryCreator; @@ -61,8 +60,18 @@ } private AccessorFactory create(final Class clazz) - { - final JAXBRIContext ctx = (JAXBRIContext) JAXBContextFactory.newInstance().createContext(clazz); + { + final JAXBRIContext ctx; + try + { + ctx = (JAXBRIContext)JAXBRIContext.newInstance(new Class[] { clazz }); + } + catch (JAXBException e) + { + WSException ex = new WSException(e.getMessage()); + ex.setStackTrace(e.getStackTrace()); + throw ex; + } return new AccessorFactory() { Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -23,11 +23,15 @@ // $Id$ +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.namespace.QName; + import org.jboss.ws.metadata.config.ConfigurationProvider; +import org.jboss.wsf.spi.binding.jaxb.JAXBContextCache; +import org.jboss.wsf.spi.binding.jaxb.JAXBHandler; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; -import javax.xml.namespace.QName; - /** * Client side endpoint meta data. * @@ -36,6 +40,7 @@ */ public class ClientEndpointMetaData extends EndpointMetaData { + private JAXBHandler jaxbHandler = new JAXBContextCache(); public ClientEndpointMetaData(ServiceMetaData service, QName qname, QName portTypeName, Type type) { @@ -48,6 +53,12 @@ configFile = ConfigurationProvider.DEFAULT_JAXWS_CLIENT_CONFIG_FILE; } + @Override + public JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException + { + return jaxbHandler.getJAXBContext(javaTypes); + } + public String toString() { StringBuilder buffer = new StringBuilder("\nClientEndpointMetaData:"); Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -23,6 +23,25 @@ // $Id$ +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Observable; +import java.util.Properties; +import java.util.Set; + +import javax.jws.soap.SOAPBinding.ParameterStyle; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.namespace.QName; +import javax.xml.rpc.ParameterMode; +import javax.xml.ws.Service.Mode; + import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; @@ -33,27 +52,21 @@ import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory; import org.jboss.ws.core.jaxrpc.binding.SOAPArrayDeserializerFactory; import org.jboss.ws.core.jaxrpc.binding.SOAPArraySerializerFactory; -import org.jboss.ws.core.jaxws.JAXBContextCache; -import org.jboss.ws.core.jaxws.JAXBContextFactory; import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; import org.jboss.ws.core.jaxws.JAXBSerializerFactory; import org.jboss.ws.core.jaxws.client.DispatchBinding; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.ws.metadata.config.*; +import org.jboss.ws.metadata.config.CommonConfig; +import org.jboss.ws.metadata.config.Configurable; +import org.jboss.ws.metadata.config.ConfigurationProvider; +import org.jboss.ws.metadata.config.EndpointFeature; +import org.jboss.ws.metadata.config.JBossWSConfigFactory; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; import org.jboss.wsf.spi.utils.JavaUtils; -import org.jboss.wsf.spi.binding.BindingCustomization; -import javax.jws.soap.SOAPBinding.ParameterStyle; -import javax.xml.namespace.QName; -import javax.xml.rpc.ParameterMode; -import javax.xml.ws.Service.Mode; -import java.lang.reflect.Method; -import java.util.*; - /** * A Service component describes a set of endpoints. * @@ -131,10 +144,6 @@ private List<UnifiedPortComponentRefMetaData> serviceRefContrib = new ArrayList<UnifiedPortComponentRefMetaData>(); - private JAXBContextCache jaxbCache = new JAXBContextCache(); - - private List<BindingCustomization> bindingCustomization = new ArrayList<BindingCustomization>(); - public EndpointMetaData(ServiceMetaData service, QName portName, QName portTypeName, Type type) { this.serviceMetaData = service; @@ -315,9 +324,7 @@ return type; } - public List<BindingCustomization> getBindingCustomizations() { - return bindingCustomization; - } + public abstract JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException; public String getAuthMethod() { @@ -639,11 +646,6 @@ configObservable.addObserver(observer); } - public JAXBContextCache getJaxbCache() - { - return jaxbCache; - } - public String getConfigFile() { return this.configFile; Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -23,16 +23,17 @@ // $Id$ +import javax.management.ObjectName; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.namespace.QName; + import org.jboss.logging.Logger; import org.jboss.ws.metadata.config.ConfigurationProvider; +import org.jboss.wsf.spi.binding.jaxb.JAXBHandler; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; -import org.jboss.wsf.spi.binding.BindingCustomization; -import javax.management.ObjectName; -import javax.xml.namespace.QName; -import java.util.List; - /** * Client side endpoint meta data. * @@ -43,14 +44,14 @@ public class ServerEndpointMetaData extends EndpointMetaData { protected static final Logger log = Logger.getLogger(ServerEndpointMetaData.class); - + public static final String SEPID_DOMAIN = "jboss.ws"; public static final String SEPID_PROPERTY_CONTEXT = "context"; public static final String SEPID_PROPERTY_ENDPOINT = "endpoint"; - + // The associated SPI endpoint private Endpoint endpoint; - + // The REQUIRED link name private String linkName; // Legacy JSR-109 port component name @@ -186,14 +187,11 @@ { this.secureWSDLAccess = secureWSDLAccess; } - - /** - * Will be set through a deployment aspect - * @return List<BindingCustomization> of available customizations - */ - public List<BindingCustomization> getBindingCustomizations() + + @Override + public JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException { - return endpoint.getBindingCustomizations(); + return endpoint.getJAXBHandler().getJAXBContext(javaTypes); } public String toString() Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -23,11 +23,14 @@ // $Id$ +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.namespace.QName; + import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; +import org.jboss.wsf.spi.binding.jaxb.BasicJAXBHandler; -import javax.xml.namespace.QName; - /** * Tools Endpoint Metadata * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana @@ -41,4 +44,10 @@ { super(service, portName, portTypeName, Type.JAXRPC); } + + @Override + public JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException + { + return new BasicJAXBHandler().getJAXBContext(javaTypes); + } } \ No newline at end of file Deleted: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -1,96 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.binding; - -import junit.framework.TestCase; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.BasicEndpoint; -import org.jboss.ws.core.jaxws.JAXBBindingCustomization; - -import static org.jboss.wsf.spi.deployment.Endpoint.EndpointState; -import org.jboss.wsf.spi.binding.BindingCustomization; - -import java.util.List; -import java.util.Iterator; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jun 28, 2007 - */ -public class BindingCustomizationTestCase extends TestCase { - - public void testCustomizationWriteAccess() throws Exception - { - Endpoint endpoint = new BasicEndpoint(); - JAXBBindingCustomization jaxbCustomization = new JAXBBindingCustomization(); - jaxbCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.bindingCustomization"); - endpoint.addBindingCustomization(jaxbCustomization); - - // a started endpoint should deny customizations - try - { - endpoint.setState(EndpointState.STARTED); - endpoint.addBindingCustomization(jaxbCustomization); - - fail("It should not be possible to change bindinig customizations on a started endpoint"); - } - catch (Exception e) - { - // all fine, this should happen - } - } - - public void testCustomizationReadAccess() throws Exception - { - Endpoint endpoint = new BasicEndpoint(); - JAXBBindingCustomization jaxbCustomization = new JAXBBindingCustomization(); - jaxbCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.bindingCustomization"); - endpoint.addBindingCustomization(jaxbCustomization); - endpoint.setState(EndpointState.STARTED); - - // read a single customization - List<BindingCustomization> customizations = endpoint.getBindingCustomizations(); - - BindingCustomization knownCustomization = null; - Iterator<BindingCustomization> it = customizations.iterator(); - while(it.hasNext()) - { - knownCustomization = it.next(); - break; - } - - assertNotNull(knownCustomization); - - // however the iteratoion should be unmodifiable - try - { - customizations.add( new JAXBBindingCustomization() ); - fail("Started Endpoints should only axpose read acccess to their binding customizations"); - } - catch (Exception e) - { - // all fine, we'd expect this - } - - - } -} Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java 2007-06-28 20:22:16 UTC (rev 3759) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java 2007-06-29 08:18:16 UTC (rev 3760) @@ -39,7 +39,6 @@ import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; -import org.jboss.ws.core.jaxws.JAXBContextFactory; /** * Arrays with JSR181 endpoints @@ -74,8 +73,8 @@ public void testNullArray() throws Exception { Integer[] intArr = null; - - JAXBContext jbc = JAXBContextFactory.newInstance().createContext(Integer[].class); + + JAXBContext jbc = JAXBContext.newInstance(Integer[].class); Marshaller m = jbc.createMarshaller(); m.setProperty(Marshaller.JAXB_FRAGMENT, true); StringWriter strw = new StringWriter(); @@ -84,7 +83,7 @@ String xmlFragment = strw.toString(); // <myarr xsi:nil="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/> // System.out.println(xmlFragment); - + Unmarshaller um = jbc.createUnmarshaller(); Source source = new StreamSource(new ByteArrayInputStream(xmlFragment.getBytes())); JAXBElement jbel = um.unmarshal(source, Integer[].class); @@ -94,8 +93,8 @@ public void testEmptyArray() throws Exception { Integer[] intArr = new Integer[0]; - - JAXBContext jbc = JAXBContextFactory.newInstance().createContext(Integer[].class); + + JAXBContext jbc = JAXBContext.newInstance(Integer[].class); Marshaller m = jbc.createMarshaller(); m.setProperty(Marshaller.JAXB_FRAGMENT, true); StringWriter strw = new StringWriter(); @@ -104,7 +103,7 @@ String xmlFragment = strw.toString(); // <myarr/> // System.out.println(xmlFragment); - + Unmarshaller um = jbc.createUnmarshaller(); Source source = new StreamSource(new ByteArrayInputStream(xmlFragment.getBytes())); JAXBElement jbel = um.unmarshal(source, Integer[].class); @@ -114,8 +113,8 @@ public void testSingleValueArray() throws Exception { Integer[] intArr = new Integer[] { new Integer(1) }; - - JAXBContext jbc = JAXBContextFactory.newInstance().createContext(Integer[].class); + + JAXBContext jbc = JAXBContext.newInstance(Integer[].class); Marshaller m = jbc.createMarshaller(); m.setProperty(Marshaller.JAXB_FRAGMENT, true); StringWriter strw = new StringWriter(); @@ -124,7 +123,7 @@ String xmlFragment = strw.toString(); // <myarr><item>1</item></myarr> // System.out.println(xmlFragment); - + Unmarshaller um = jbc.createUnmarshaller(); Source source = new StreamSource(new ByteArrayInputStream(xmlFragment.getBytes())); JAXBElement jbel = um.unmarshal(source, Integer[].class); @@ -134,8 +133,8 @@ public void testMultipleValueArray() throws Exception { Integer[] intArr = new Integer[] { new Integer(1), new Integer(2), new Integer(3) }; - - JAXBContext jbc = JAXBContextFactory.newInstance().createContext(Integer[].class); + + JAXBContext jbc = JAXBContext.newInstance(Integer[].class); Marshaller m = jbc.createMarshaller(); m.setProperty(Marshaller.JAXB_FRAGMENT, true); StringWriter strw = new StringWriter(); @@ -144,13 +143,13 @@ String xmlFragment = strw.toString(); // <myarr><item>1</item><item>2</item><item>3</item></myarr> // System.out.println(xmlFragment); - + Unmarshaller um = jbc.createUnmarshaller(); Source source = new StreamSource(new ByteArrayInputStream(xmlFragment.getBytes())); JAXBElement jbel = um.unmarshal(source, Integer[].class); assertEquals(intArr, jbel.getValue()); } - + public void testEchoNullArray() throws Exception { Integer[] outArr = endpoint.intArr("null", null);

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r3759 - in projects/wiki: skins and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-28 16:22:16 -0400 (Thu, 28 Jun 2007) New Revision: 3759 Modified: projects/wiki/includes/CategoryPage.php projects/wiki/skins/Devmo.php projects/wiki/skins/devmo/css/base.css projects/wiki/skins/devmo/css/wiki.css Log: fixed size layout Modified: projects/wiki/includes/CategoryPage.php =================================================================== --- projects/wiki/includes/CategoryPage.php 2007-06-28 18:43:40 UTC (rev 3758) +++ projects/wiki/includes/CategoryPage.php 2007-06-28 20:22:16 UTC (rev 3759) @@ -222,7 +222,7 @@ } function getCategoryTop() { - $r = "<br style=\"clear:both;\"/>\n"; + $r = "<br/>\n"; if( $this->until != '' ) { $r .= $this->pagingLinks( $this->title, $this->nextPage, $this->until, $this->limit ); } elseif( $this->nextPage != '' || $this->from != '' ) { Modified: projects/wiki/skins/Devmo.php =================================================================== --- projects/wiki/skins/Devmo.php 2007-06-28 18:43:40 UTC (rev 3758) +++ projects/wiki/skins/Devmo.php 2007-06-28 20:22:16 UTC (rev 3759) @@ -234,28 +234,29 @@ <?php } ?> </div> - </div> - </div> - - <div id="content"> - <div class="article"> - <a name="top" id="contentTop"></a> - <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?> + + + +<div id="content"> + <div class="article"> + <a name="top" id="contentTop"></a> + <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?> <h1 class="firstHeading"><?php $this->text('title') ?></h1> - <h3 id="siteSub"><?php $this->msg('tagline') ?></h3> - <div id="contentSub"><?php $this->html('subtitle') ?></div> - <?php if($this->data['undelete']) { ?><div id="contentSub"><?php $this->html('undelete') ?></div><?php } ?> - <?php if($this->data['newtalk'] ) { ?><div class="usermessage"><?php $this->html('newtalk') ?></div><?php } ?> + <h3 id="siteSub"><?php $this->msg('tagline') ?></h3> + <div id="contentSub"><?php $this->html('subtitle') ?></div> + <?php if($this->data['undelete']) { ?><div id="contentSub"><?php $this->html('undelete') ?></div><?php } ?> + <?php if($this->data['newtalk'] ) { ?><div class="usermessage"><?php $this->html('newtalk') ?></div><?php } ?> - <?php $this->html('bodytext') ?> - <?php if($this->data['catlinks']) { ?><div id="catlinks"><?php $this->html('catlinks') ?></div><?php } ?> + <?php $this->html('bodytext') ?> + <?php if($this->data['catlinks']) { ?><div id="catlinks"><?php $this->html('catlinks') ?></div><?php } ?> - </div> - </div>  + </div> +</div>  - +</div>  + <div id="footer"> <ul> <?php if($this->data['lastmod' ]) { ?><li id="f-lastmod"><?php $this->html('lastmod') ?></li><?php } ?> @@ -268,8 +269,8 @@ <?php if($this->data['about' ]) { ?><li id="f-about"><?php $this->html('about') ?></li><?php } ?> <?php if($this->data['tagline']) { ?><li id="f-tagline"><?php echo $this->data['tagline'] ?></li><?php } ?> </ul> - </div> - </div>  + </div> + </div>  <?php $this->html('reporttime') ?> Modified: projects/wiki/skins/devmo/css/base.css =================================================================== --- projects/wiki/skins/devmo/css/base.css 2007-06-28 18:43:40 UTC (rev 3758) +++ projects/wiki/skins/devmo/css/base.css 2007-06-28 20:22:16 UTC (rev 3759) @@ -17,7 +17,7 @@ background-color:#fff; background-image:url("images/bkgheader_left.gif"); background-repeat:repeat-x; - font-size: 0.9em; + font-size: 0.9em; color: #333; } @@ -28,14 +28,15 @@ } #container { - width: 100%; - margin: 0px auto; + margin: 0px auto; + width: 969px; + text-align: left; } #page { padding: 2.15em 0 0 0; } #content { - margin: 0 230px 0 0; + margin: 0 230px 0 0; background: url(images/page-background.gif) repeat-x top left; } @@ -135,13 +136,13 @@ } /* Footer ****************************************************** */ -#footer { - clear: both; +#footer { + float:left; background: url(images/page-background.gif) repeat-x top left; margin: 10px 230px 0 auto; - width: auto; + width: 739px; text-align: center; - font-size: 0.8em; + font-size: 0.8em; } #footer ul { margin: 0; @@ -169,12 +170,13 @@ #primarynav { clear:right; float:right; - margin-top:14px; + margin-top:14px; + font-size: 0.9em; } #primarynav ul { margin: 0px; - padding:0px; + padding:0px; } #primarynav ul li { @@ -191,8 +193,7 @@ #primarynav ul a { display: inline; float: left; - text-decoration: none; - font-size:12px; + text-decoration: none; font-weight:bold; color: white; padding: 5px 20px 3px 20px; @@ -210,8 +211,7 @@ background-position: top left; } -#primarynav #current { - font-size: 12px; +#primarynav #current { font-weight: bold; } @@ -330,9 +330,7 @@ /* 6) Ssdebar ******************************************************************* */ #sidebar { - position: absolute; - top: 143px; - right: 30px; + float:right; background: #fff; width: 210px; line-height: 120%; Modified: projects/wiki/skins/devmo/css/wiki.css =================================================================== --- projects/wiki/skins/devmo/css/wiki.css 2007-06-28 18:43:40 UTC (rev 3758) +++ projects/wiki/skins/devmo/css/wiki.css 2007-06-28 20:22:16 UTC (rev 3759) @@ -7,7 +7,6 @@ } #since { - clear:both; margin-bottom: 8px; float:right; padding: 5px 5px 5px 5px; @@ -15,6 +14,7 @@ border:1px solid #333; color:white; font-weight:BOLD; + position:relative; } /* Special Slidebar Stuff */ @@ -499,7 +499,7 @@ } div.note { - clear:both; + border: solid goldenrod 2px; padding: 0px 10px 0px 10px; margin: 10px 0px 10px 0px; @@ -684,7 +684,6 @@ font-size: 1.4em; } .topicpage-table { - clear: both; width: 100%; margin: -30px 0 0 0; }

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3758 - branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-28 14:43:40 -0400 (Thu, 28 Jun 2007) New Revision: 3758 Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java Log: Fix test case Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java 2007-06-28 18:10:57 UTC (rev 3757) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java 2007-06-28 18:43:40 UTC (rev 3758) @@ -53,7 +53,7 @@ fail("It should not be possible to change bindinig customizations on a started endpoint"); } - catch (IllegalAccessError e) + catch (Exception e) { // all fine, this should happen }

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3757 - branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-28 14:10:57 -0400 (Thu, 28 Jun 2007) New Revision: 3757 Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java Log: Fix HashCodeUtil import Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java 2007-06-28 15:06:17 UTC (rev 3756) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/binding/TypeMappingImpl.java 2007-06-28 18:10:57 UTC (rev 3757) @@ -53,7 +53,7 @@ import org.jboss.ws.core.jaxrpc.binding.QNameSerializerFactory; import org.jboss.ws.core.jaxrpc.binding.SimpleDeserializerFactory; import org.jboss.ws.core.jaxrpc.binding.SimpleSerializerFactory; -import org.jboss.wsf.spi.utils.HashCodeUtil; +import org.jboss.ws.core.utils.HashCodeUtil; import org.jboss.wsf.spi.utils.JavaUtils; /**

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3756 - in branches/jbossws-2.0: build and 14 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-28 11:06:17 -0400 (Thu, 28 Jun 2007) New Revision: 3756 Added: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/BindingCustomization.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBBindingCustomization.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCustomisation.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java Removed: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/jaxb/ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java Modified: branches/jbossws-2.0/build/ant.properties.example branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java branches/jbossws-2.0/jbossws-2.0.iws branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SerializationContextJAXWS.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java Log: Introduce BindingCustomization API (See http://www.jboss.org/index.html?module=bb&op=viewtopic&t=111114) Modified: branches/jbossws-2.0/build/ant.properties.example =================================================================== --- branches/jbossws-2.0/build/ant.properties.example 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/build/ant.properties.example 2007-06-28 15:06:17 UTC (rev 3756) @@ -5,7 +5,7 @@ # Optional JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 -#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA +#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA #jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 # The JBoss server under test. This can be [jboss50|jboss42|jboss40] @@ -37,7 +37,7 @@ hudson.jboss50.rev=HEAD hudson.jboss42.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_2 -hudson.jboss42.build=jboss-4.2.0.GA +hudson.jboss42.build=jboss-4.2.1.GA hudson.jboss42.rev=HEAD hudson.jboss40.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_0 Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml =================================================================== --- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml 2007-06-28 15:06:17 UTC (rev 3756) @@ -125,8 +125,7 @@ <bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/> <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer"> <property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property> - <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> - <property name="jaxbHandler">org.jboss.wsf.spi.binding.jaxb.JAXBContextCache</property> + <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-28 15:06:17 UTC (rev 3756) @@ -125,8 +125,7 @@ <bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/> <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer"> <property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property> - <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> - <property name="jaxbHandler">org.jboss.wsf.spi.binding.jaxb.JAXBContextCache</property> + <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-28 15:06:17 UTC (rev 3756) @@ -129,8 +129,7 @@ <bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/> <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer"> <property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property> - <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> - <property name="jaxbHandler">org.jboss.wsf.spi.binding.jaxb.JAXBContextCache</property> + <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-28 15:06:17 UTC (rev 3756) @@ -52,7 +52,7 @@ 2) WebServiceDeployerJSE < WarDeployer 3) WebServiceMainDeployer - Each WebServiceDeployer has a number of DeployerHooks registerd with it + Each WebServiceDeployer has a number of DeployerHooks registered with it - WebServiceDeployerEJB - WSDeployerHook_JAXRPC_EJB21 @@ -140,8 +140,7 @@ <bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/> <bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer"> <property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property> - <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> - <property name="jaxbHandler">org.jboss.wsf.spi.binding.jaxb.JAXBContextCache</property> + <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> <property name="invocationHandler"> <map keyClass="java.lang.String" valueClass="java.lang.String"> <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.stack.jbws.ServiceLifecycleInvocationHandler</value></entry> Added: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/BindingCustomization.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/BindingCustomization.java (rev 0) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/BindingCustomization.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.binding; + +import java.util.HashMap; + +/** + * Allows introduction of arbitrary binding customization properties.<p> + * This may be different between stacks and addresses meta data binding + * (i.e JSR-181 to UnifiedMetaData) as well as JAVA to XML binding operations. + * <p> + * Supported properties need to be documented in subclasses. + * + * + * @author Heiko.Braun(a)jboss.com + * Created: Jun 28, 2007 + */ +public abstract class BindingCustomization extends HashMap { + +} Property changes on: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/binding/BindingCustomization.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -21,17 +21,14 @@ */ package org.jboss.wsf.spi.deployment; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import javax.management.ObjectName; - -import org.jboss.wsf.spi.binding.jaxb.JAXBHandler; +import org.jboss.wsf.spi.binding.BindingCustomization; import org.jboss.wsf.spi.invocation.InvocationHandler; import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.management.EndpointMetrics; +import javax.management.ObjectName; +import java.util.*; + /** * A general JAXWS endpoint. * @@ -49,10 +46,10 @@ private RequestHandler requestHandler; private InvocationHandler invocationHandler; private LifecycleHandler lifecycleHandler; - private JAXBHandler jaxbHandler; private Map<Class, Object> attachments = new HashMap<Class, Object>(); private Map<String, Object> properties = new HashMap<String, Object>(); private EndpointMetrics metrics; + private List<BindingCustomization> bindingCustomizsations = new ArrayList<BindingCustomization>(); public BasicEndpoint() { @@ -81,15 +78,15 @@ this.targetBean = targetBean; } - public Class getTargetBeanClass() + public Class getTargetBeanClass() { if (targetBean == null) throw new IllegalStateException("Target bean not set"); - + ClassLoader classLoader = service.getDeployment().getClassLoader(); if (classLoader == null) throw new IllegalStateException("Deployment classloader not set"); - + Class beanClass; try { @@ -101,7 +98,7 @@ } return beanClass; } - + public ObjectName getName() { return name; @@ -178,15 +175,33 @@ this.invocationHandler = handler; } - public JAXBHandler getJAXBHandler() + public List<BindingCustomization> getBindingCustomizations() { - return jaxbHandler; + return Collections.unmodifiableList(bindingCustomizsations); } - public void setJAXBHandler(JAXBHandler jaxbHandler) + /* Get a concrete binding customization */ + public BindingCustomization getBindingCustomization(BindingCustomization customization) { + BindingCustomization match = null; + + Iterator<BindingCustomization> it = bindingCustomizsations.iterator(); + while(it.hasNext()) + { + BindingCustomization bc = it.next(); + if(bc.getClass().equals(customization.getClass())) + { + match = bc; + } + } + + return match; + } + + public void addBindingCustomization(BindingCustomization customization) + { assertEndpointSetterAccess(); - this.jaxbHandler = jaxbHandler; + bindingCustomizsations.add(customization); } public <T> T addAttachment(Class<T> key, Object value) @@ -203,7 +218,7 @@ { return (T)attachments.get(key); } - + public Set<String> getProperties() { return properties.keySet(); @@ -234,9 +249,9 @@ assertEndpointSetterAccess(); metrics.setEndpoint(this); this.metrics = metrics; - + } - + private void assertEndpointSetterAccess() { if (state == EndpointState.STARTED) Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -23,15 +23,15 @@ // $Id$ -import java.util.Set; - -import javax.management.ObjectName; - -import org.jboss.wsf.spi.binding.jaxb.JAXBHandler; +import org.jboss.wsf.spi.binding.BindingCustomization; import org.jboss.wsf.spi.invocation.InvocationHandler; import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.management.EndpointMetrics; +import javax.management.ObjectName; +import java.util.List; +import java.util.Set; + /** * A general JAXWS endpoint. * @@ -107,13 +107,16 @@ /** Set the endpoint bean invoker */ void setInvocationHandler(InvocationHandler invoker); - - /** Get the JAXBHandler for this endpoint */ - JAXBHandler getJAXBHandler(); - - /** Set the JAXBHandler for this endpoint */ - void setJAXBHandler(JAXBHandler handler); - + + /** Get all binding customizations for this endpoint */ + List<BindingCustomization> getBindingCustomizations(); + + /* Get a concrete binding customization */ + BindingCustomization getBindingCustomization(BindingCustomization bindingCustomization); + + /** Add a binding customization to this endpoint*/ + void addBindingCustomization (BindingCustomization bindingCustomization); + /** Get the endpoint metrics for this endpoint */ EndpointMetrics getEndpointMetrics(); Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -23,15 +23,14 @@ //$Id$ -import java.util.Map; - -import org.jboss.wsf.spi.binding.jaxb.JAXBHandler; import org.jboss.wsf.spi.invocation.InvocationHandler; import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; +import java.util.Map; + /** * A deployer that assigns the handlers to the Endpoint * @@ -42,7 +41,6 @@ { private String requestHandler; private String lifecycleHandler; - private String jaxbHandler; private Map<String,String> invocationHandler; public void setLifecycleHandler(String handler) @@ -60,11 +58,6 @@ this.invocationHandler = handlers; } - public void setJaxbHandler(String jaxbHandler) - { - this.jaxbHandler = jaxbHandler; - } - @Override public void create(Deployment dep) { @@ -73,7 +66,6 @@ ep.setRequestHandler(getRequestHandler(dep)); ep.setLifecycleHandler(getLifecycleHandler(dep)); ep.setInvocationHandler(getInvocationHandler(ep)); - ep.setJAXBHandler(getJAXBHandler(dep)); } } @@ -103,19 +95,6 @@ } } - private JAXBHandler getJAXBHandler(Deployment dep) - { - try - { - Class<?> handlerClass = dep.getClassLoader().loadClass(jaxbHandler); - return (JAXBHandler)handlerClass.newInstance(); - } - catch (Exception e) - { - throw new IllegalStateException("Cannot load jaxb handler: " + jaxbHandler); - } - } - private InvocationHandler getInvocationHandler(Endpoint ep) { Deployment dep = ep.getService().getDeployment(); Deleted: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/utils/HashCodeUtil.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -1,146 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.spi.utils; - -import java.lang.reflect.Array; - -/** - * Collected methods which allow easy implementation of <code>hashCode</code>. - * - * Example use case: - * <pre> - * public int hashCode(){ - * int result = HashCodeUtil.SEED; - * //collect the contributions of various fields - * result = HashCodeUtil.hash(result, fPrimitive); - * result = HashCodeUtil.hash(result, fObject); - * result = HashCodeUtil.hash(result, fArray); - * return result; - * } - * </pre> - */ -public final class HashCodeUtil -{ - - /** - * An initial value for a <code>hashCode</code>, to which is added contributions - * from fields. Using a non-zero value decreases collisons of <code>hashCode</code> - * values. - */ - public static final int SEED = 23; - - /** - * booleans. - */ - public static int hash(int aSeed, boolean aBoolean) - { - return firstTerm(aSeed) + (aBoolean ? 1 : 0); - } - - /** - * chars. - */ - public static int hash(int aSeed, char aChar) - { - return firstTerm(aSeed) + (int)aChar; - } - - /** - * ints. - */ - public static int hash(int aSeed, int aInt) - { - /* - * Implementation Note - * Note that byte and short are handled by this method, through - * implicit conversion. - */ - return firstTerm(aSeed) + aInt; - } - - /** - * longs. - */ - public static int hash(int aSeed, long aLong) - { - return firstTerm(aSeed) + (int)(aLong ^ (aLong >>> 32)); - } - - /** - * floats. - */ - public static int hash(int aSeed, float aFloat) - { - return hash(aSeed, Float.floatToIntBits(aFloat)); - } - - /** - * doubles. - */ - public static int hash(int aSeed, double aDouble) - { - return hash(aSeed, Double.doubleToLongBits(aDouble)); - } - - /** - * <code>aObject</code> is a possibly-null object field, and possibly an array. - * - * If <code>aObject</code> is an array, then each element may be a primitive - * or a possibly-null object. - */ - public static int hash(int aSeed, Object aObject) - { - int result = aSeed; - if (aObject == null) - { - result = hash(result, 0); - } - else if (!isArray(aObject)) - { - result = hash(result, aObject.hashCode()); - } - else - { - int length = Array.getLength(aObject); - for (int idx = 0; idx < length; ++idx) - { - Object item = Array.get(aObject, idx); - //recursive call! - result = hash(result, item); - } - } - return result; - } - - /// PRIVATE /// - private static final int fODD_PRIME_NUMBER = 37; - - private static int firstTerm(int aSeed) - { - return fODD_PRIME_NUMBER * aSeed; - } - - private static boolean isArray(Object aObject) - { - return aObject.getClass().isArray(); - } -} Modified: branches/jbossws-2.0/jbossws-2.0.iws =================================================================== --- branches/jbossws-2.0/jbossws-2.0.iws 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/jbossws-2.0.iws 2007-06-28 15:06:17 UTC (rev 3756) @@ -162,7 +162,7 @@ </provider> </entry> </file> - <file leaf-file-name="CustomizableJAXBContextFactory.java" pinned="false" current="true" current-in-tab="true"> + <file leaf-file-name="CustomizableJAXBContextFactory.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java"> <provider selected="true" editor-type-id="text-editor"> <state line="46" column="43" selection-start="1842" selection-end="1872" vertical-scroll-proportion="0.45023698"> @@ -171,6 +171,17 @@ </provider> </entry> </file> + <file leaf-file-name="BasicEndpoint.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="202" column="35" selection-start="5267" selection-end="5267" vertical-scroll-proportion="4.312796"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -1031,15 +1042,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="50" column="36" selection-start="1972" selection-end="1972" vertical-scroll-proportion="0.6350711"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java"> <provider selected="true" editor-type-id="text-editor"> <state line="40" column="17" selection-start="1544" selection-end="1544" vertical-scroll-proportion="-0.3127962"> @@ -1072,6 +1074,15 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="202" column="35" selection-start="5267" selection-end="5267" vertical-scroll-proportion="4.312796"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> </component> </project> Modified: branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/ws/wsaddressing/W3CEndpointReference.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -42,6 +42,7 @@ import javax.xml.ws.WebServiceException; import org.w3c.dom.Element; +import org.jboss.ws.core.jaxws.JAXBContextFactory; /** @@ -66,12 +67,12 @@ @XmlRootElement(name="EndpointReference",namespace=W3CEndpointReference.NS) @XmlType(name="EndpointReferenceType",namespace=W3CEndpointReference.NS) public final class W3CEndpointReference extends EndpointReference { - + private final static JAXBContext w3cjc = getW3CJaxbContext(); protected W3CEndpointReference() { } - + /** * construct an EPR from infoset representation * @@ -79,10 +80,10 @@ * instance consistent with the W3C WS-Addressing Core * recommendation. * - * @throws WebServiceException + * @throws WebServiceException * If the source does NOT contain a valid W3C WS-Addressing * EndpointReference. - * @throws NullPointerException + * @throws NullPointerException * If the <code>null</code> <code>source</code> value is given */ public W3CEndpointReference(Source source) { @@ -97,7 +98,7 @@ throw new WebServiceException("Source did not contain W3CEndpointReference", e); } } - + /** * {@inheritDoc} */ @@ -110,15 +111,11 @@ throw new WebServiceException("Error marshalling W3CEndpointReference. ", e); } } - + private static JAXBContext getW3CJaxbContext() { - try { - return JAXBContext.newInstance(W3CEndpointReference.class); - } catch (JAXBException e) { - throw new WebServiceException("Error creating JAXBContext for W3CEndpointReference. ", e); - } + return JAXBContextFactory.newInstance().createContext(new Class[] { W3CEndpointReference.class}); } - + // private but necessary properties for databinding @XmlElement(name="Address",namespace=NS) private Address address; @@ -130,8 +127,8 @@ Map<QName,String> attributes; @XmlAnyElement List<Element> elements; - - + + private static class Address { protected Address() {} @XmlValue @@ -139,8 +136,8 @@ @XmlAnyAttribute Map<QName,String> attributes; } - - + + private static class Elements { protected Elements() {} @XmlAnyElement @@ -148,6 +145,6 @@ @XmlAnyAttribute Map<QName,String> attributes; } - + protected static final String NS = "http://www.w3.org/2005/08/addressing"; } Added: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -0,0 +1,90 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core.jaxws; + +import org.jboss.ws.WSException; +import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.wsf.spi.binding.BindingCustomization; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import java.util.Iterator; + +/** + * The default factory checks if a {@link JAXBBindingCustomization} exists + * and uses it to customize the JAXBContext that will be created. + * + * @see org.jboss.wsf.spi.deployment.Endpoint + * @see org.jboss.wsf.spi.binding.BindingCustomization + * @see JAXBBindingCustomization + * + * @see JAXBContext#newInstance(Class...) + * @see JAXBContext#newInstance(String, ClassLoader, java.util.Map<java.lang.String,?>) + * + * @author Heiko.Braun(a)jboss.com + * Created: Jun 26, 2007 + */ +public class CustomizableJAXBContextFactory extends JAXBContextFactory +{ + public JAXBContext createContext(Class[] clazzes) throws WSException + { + try + { + BindingCustomization customization = getCustomization(); + if(null == customization) + return JAXBContext.newInstance(clazzes); + else + return JAXBContext.newInstance(clazzes, customization); + } + catch (JAXBException e) { + throw new WSException("Failed to create JAXBContext", e); + } + } + + public JAXBContext createContext(Class clazz) throws WSException + { + return createContext(new Class[] {clazz}); + } + + private BindingCustomization getCustomization() + { + BindingCustomization customization = null; + + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + if(msgContext!=null) // may not be available anytime + { + Iterator<BindingCustomization> it = msgContext.getEndpointMetaData().getBindingCustomizations().iterator(); + while(it.hasNext()) + { + BindingCustomization current = it.next(); + if(current instanceof JAXBBindingCustomization) + { + customization = current; + break; + } + } + } + + return customization; + } +} Property changes on: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBBindingCustomization.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBBindingCustomization.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBBindingCustomization.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core.jaxws; + +import org.jboss.wsf.spi.binding.BindingCustomization; +import com.sun.xml.bind.api.JAXBRIContext; + +/** + * Supported JAXB 2.1 customizations. + * + * @see org.jboss.wsf.spi.deployment.Endpoint + * + * @author Heiko.Braun(a)jboss.com + * Created: Jun 28, 2007 + */ +public class JAXBBindingCustomization extends BindingCustomization { + + // Use an alternative RuntimeAnnotationReader implementation + public final static String ANNOTATION_READER = JAXBRIContext.ANNOTATION_READER; + + // Reassign the default namespace URI to something else at the runtime + public final static String DEFAULT_NAMESPACE_REMAP = JAXBRIContext.DEFAULT_NAMESPACE_REMAP; + + // Enable the c14n marshalling support in the JAXBContext. + public final static String CANONICALIZATION_SUPPORT = JAXBRIContext.CANONICALIZATION_SUPPORT; + + +} Property changes on: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBBindingCustomization.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -0,0 +1,89 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core.jaxws; + +// $Id$ + +import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.ws.core.utils.HashCodeUtil; +import org.jboss.ws.metadata.umdm.EndpointMetaData; + +import javax.xml.bind.JAXBContext; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * Cache JAXBContext's. + * + * @author Heiko.Braun(a)jboss.org + * @since 26.01.2007 + */ +public class JAXBContextCache +{ + private Map<Integer, JAXBContext> cache = new ConcurrentHashMap<Integer, JAXBContext>(); + + public JAXBContext get(Class[] clazzes) + { + Integer id = buildId(clazzes); + return get(id); + } + + public void add(Class[] clazzes, JAXBContext context) + { + Integer id = buildId(clazzes); + add(id, context); + } + + private JAXBContext get(Integer id) + { + return cache.get(id); + } + + private void add(Integer id, JAXBContext context) + { + cache.put(id, context); + } + + private static Integer buildId(Class[] classes) + { + int sum = HashCodeUtil.SEED; + for (Class cls : classes) + { + sum = HashCodeUtil.hash(sum, cls.getName()); + } + return sum; + } + + /** + * Access the JAXBContext cache through the message context. + * The actual instance is assiciated with the EndpointMetaData. + * @return JAXBContextCache + */ + public static JAXBContextCache getContextCache() + { + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + EndpointMetaData epMetaData = msgContext.getEndpointMetaData(); + return epMetaData.getJaxbCache(); + } +} + Property changes on: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCustomisation.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCustomisation.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCustomisation.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -0,0 +1,31 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core.jaxws; + +import java.util.HashMap; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jun 27, 2007 + */ +public class JAXBContextCustomisation extends HashMap { +} Property changes on: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCustomisation.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -0,0 +1,56 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core.jaxws; + +import org.jboss.ws.WSException; +import org.jboss.wsf.spi.utils.ServiceLoader; + +import javax.xml.bind.JAXBContext; + +/** + * Creates JAXBContext's.<p> + * + * @author Heiko.Braun(a)jboss.com + * Created: Jun 26, 2007 + */ +public abstract class JAXBContextFactory { + + public final static String DEFAULT_JAXB_CONTEXT_FACTORY = "org.jboss.ws.core.jaxws.CustomizableJAXBContextFactory"; + + public abstract JAXBContext createContext(Class[] clazzes) throws WSException; + + public abstract JAXBContext createContext(Class clazz) throws WSException; + + /** + * Retrieve JAXBContextFactory instance through the {@link ServiceLoader}. + * Defaults to {@link CustomizableJAXBContextFactory} + * @return JAXBContextFactory + */ + public static JAXBContextFactory newInstance() + { + return (JAXBContextFactory)ServiceLoader.loadService( + JAXBContextFactory.class.getName(), + DEFAULT_JAXB_CONTEXT_FACTORY + ); + } +} + \ No newline at end of file Property changes on: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -23,22 +23,20 @@ // $Id$ +import org.jboss.ws.extensions.xop.jaxws.AttachmentUnmarshallerImpl; +import org.jboss.ws.core.binding.BindingException; +import org.jboss.ws.core.binding.TypeMappingImpl; +import org.jboss.ws.core.binding.ComplexTypeDeserializer; +import org.jboss.ws.core.binding.SerializationContext; +import org.jboss.logging.Logger; + import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; import javax.xml.namespace.QName; import javax.xml.transform.Source; import javax.xml.ws.WebServiceException; -import org.jboss.logging.Logger; -import org.jboss.ws.core.binding.BindingException; -import org.jboss.ws.core.binding.ComplexTypeDeserializer; -import org.jboss.ws.core.binding.SerializationContext; -import org.jboss.ws.core.binding.TypeMappingImpl; -import org.jboss.ws.extensions.xop.jaxws.AttachmentUnmarshallerImpl; -import org.jboss.wsf.spi.binding.jaxb.JAXBHandler; - /** * A Deserializer that can handle complex types by delegating to JAXB. * @@ -66,11 +64,11 @@ TypeMappingImpl typeMapping = serContext.getTypeMapping(); Class javaType = typeMapping.getJavaType(xmlType); - JAXBContext jaxbContext = ((SerializationContextJAXWS)serContext).getJAXBContext(javaTypes); - + JAXBContext jaxbContext = getJAXBContext(javaTypes); + Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); unmarshaller.setAttachmentUnmarshaller( new AttachmentUnmarshallerImpl()); - + JAXBElement jbe = unmarshaller.unmarshal(xmlFragment, javaType); value = jbe.getValue(); @@ -84,6 +82,22 @@ } + /** + * Retrieve JAXBContext from cache or create new one and cache it. + * @param types + * @return JAXBContext + */ + private JAXBContext getJAXBContext(Class[] types){ + JAXBContextCache cache = JAXBContextCache.getContextCache(); + JAXBContext context = cache.get(types); + if(null==context) + { + context = JAXBContextFactory.newInstance().createContext(types); + cache.add(types, context); + } + return context; + } + // 4.21 Conformance (Marshalling failure): If an error occurs when using the supplied JAXBContext to marshall // a request or unmarshall a response, an implementation MUST throw a WebServiceException whose // cause is set to the original JAXBException. Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -23,6 +23,14 @@ // $Id$ +import org.jboss.logging.Logger; +import org.jboss.ws.extensions.xop.jaxws.AttachmentMarshallerImpl; +import org.jboss.ws.core.binding.BindingException; +import org.jboss.ws.core.binding.ComplexTypeSerializer; +import org.jboss.ws.core.binding.SerializationContext; +import org.jboss.ws.core.binding.BufferedStreamResult; +import org.w3c.dom.NamedNodeMap; + import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; import javax.xml.bind.Marshaller; @@ -31,15 +39,6 @@ import javax.xml.transform.Result; import javax.xml.ws.WebServiceException; -import org.jboss.logging.Logger; -import org.jboss.ws.core.binding.BindingException; -import org.jboss.ws.core.binding.BufferedStreamResult; -import org.jboss.ws.core.binding.ComplexTypeSerializer; -import org.jboss.ws.core.binding.SerializationContext; -import org.jboss.ws.extensions.xop.jaxws.AttachmentMarshallerImpl; -import org.jboss.wsf.spi.binding.jaxb.JAXBHandler; -import org.w3c.dom.NamedNodeMap; - /** * A Serializer that can handle complex types by delegating to JAXB. * @@ -67,10 +66,9 @@ // This should be more efficient and accurate than searching the type mapping Class expectedType = serContext.getJavaType(); Class actualType = value.getClass(); + Class[] types = shouldFilter(actualType) ? new Class[]{expectedType} : new Class[]{expectedType, actualType}; + JAXBContext jaxbContext = getJAXBContext(types); - Class[] javaTypes = shouldFilter(actualType) ? new Class[]{expectedType} : new Class[]{expectedType, actualType}; - JAXBContext jaxbContext = ((SerializationContextJAXWS)serContext).getJAXBContext(javaTypes); - Marshaller marshaller = jaxbContext.createMarshaller(); marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true); @@ -91,6 +89,22 @@ return result; } + /** + * Retrieve JAXBContext from cache or create new one and cache it. + * @param types + * @return JAXBContext + */ + private JAXBContext getJAXBContext(Class[] types){ + JAXBContextCache cache = JAXBContextCache.getContextCache(); + JAXBContext context = cache.get(types); + if(null==context) + { + context = JAXBContextFactory.newInstance().createContext(types); + cache.add(types, context); + } + return context; + } + // Remove this when we add a XMLGregorianCalendar Serializer private boolean shouldFilter(Class<?> actualType) { Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SerializationContextJAXWS.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SerializationContextJAXWS.java 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SerializationContextJAXWS.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -39,16 +39,5 @@ */ public class SerializationContextJAXWS extends SerializationContext { - public static final String JAXB_CONTEXT_TYPES = "org.jboss.ws.jaxb.context.types"; - - /** - * Access the JAXBContext through the message context. - * The actual instance is assiciated with the EndpointMetaData. - */ - public static JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException - { - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - EndpointMetaData epMetaData = msgContext.getEndpointMetaData(); - return epMetaData.getJAXBContext(javaTypes); - } + public static final String JAXB_CONTEXT_TYPES = "org.jboss.ws.jaxb.context.types"; } Added: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -0,0 +1,146 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core.utils; + +import java.lang.reflect.Array; + +/** + * Collected methods which allow easy implementation of <code>hashCode</code>. + * + * Example use case: + * <pre> + * public int hashCode(){ + * int result = HashCodeUtil.SEED; + * //collect the contributions of various fields + * result = HashCodeUtil.hash(result, fPrimitive); + * result = HashCodeUtil.hash(result, fObject); + * result = HashCodeUtil.hash(result, fArray); + * return result; + * } + * </pre> + */ +public final class HashCodeUtil +{ + + /** + * An initial value for a <code>hashCode</code>, to which is added contributions + * from fields. Using a non-zero value decreases collisons of <code>hashCode</code> + * values. + */ + public static final int SEED = 23; + + /** + * booleans. + */ + public static int hash(int aSeed, boolean aBoolean) + { + return org.jboss.ws.core.utils.HashCodeUtil.firstTerm(aSeed) + (aBoolean ? 1 : 0); + } + + /** + * chars. + */ + public static int hash(int aSeed, char aChar) + { + return org.jboss.ws.core.utils.HashCodeUtil.firstTerm(aSeed) + (int)aChar; + } + + /** + * ints. + */ + public static int hash(int aSeed, int aInt) + { + /* + * Implementation Note + * Note that byte and short are handled by this method, through + * implicit conversion. + */ + return org.jboss.ws.core.utils.HashCodeUtil.firstTerm(aSeed) + aInt; + } + + /** + * longs. + */ + public static int hash(int aSeed, long aLong) + { + return org.jboss.ws.core.utils.HashCodeUtil.firstTerm(aSeed) + (int)(aLong ^ (aLong >>> 32)); + } + + /** + * floats. + */ + public static int hash(int aSeed, float aFloat) + { + return org.jboss.ws.core.utils.HashCodeUtil.hash(aSeed, Float.floatToIntBits(aFloat)); + } + + /** + * doubles. + */ + public static int hash(int aSeed, double aDouble) + { + return org.jboss.ws.core.utils.HashCodeUtil.hash(aSeed, Double.doubleToLongBits(aDouble)); + } + + /** + * <code>aObject</code> is a possibly-null object field, and possibly an array. + * + * If <code>aObject</code> is an array, then each element may be a primitive + * or a possibly-null object. + */ + public static int hash(int aSeed, Object aObject) + { + int result = aSeed; + if (aObject == null) + { + result = org.jboss.ws.core.utils.HashCodeUtil.hash(result, 0); + } + else if (!org.jboss.ws.core.utils.HashCodeUtil.isArray(aObject)) + { + result = org.jboss.ws.core.utils.HashCodeUtil.hash(result, aObject.hashCode()); + } + else + { + int length = Array.getLength(aObject); + for (int idx = 0; idx < length; ++idx) + { + Object item = Array.get(aObject, idx); + //recursive call! + result = org.jboss.ws.core.utils.HashCodeUtil.hash(result, item); + } + } + return result; + } + + /// PRIVATE /// + private static final int fODD_PRIME_NUMBER = 37; + + private static int firstTerm(int aSeed) + { + return org.jboss.ws.core.utils.HashCodeUtil.fODD_PRIME_NUMBER * aSeed; + } + + private static boolean isArray(Object aObject) + { + return aObject.getClass().isArray(); + } +} Property changes on: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/HashCodeUtil.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -25,6 +25,7 @@ import javax.xml.namespace.QName; import org.jboss.ws.WSException; +import org.jboss.ws.core.jaxws.JAXBContextFactory; import org.jboss.ws.metadata.umdm.Accessor; import org.jboss.ws.metadata.umdm.AccessorFactory; import org.jboss.ws.metadata.umdm.AccessorFactoryCreator; @@ -60,18 +61,8 @@ } private AccessorFactory create(final Class clazz) - { - final JAXBRIContext ctx; - try - { - ctx = (JAXBRIContext)JAXBRIContext.newInstance(new Class[] { clazz }); - } - catch (JAXBException e) - { - WSException ex = new WSException(e.getMessage()); - ex.setStackTrace(e.getStackTrace()); - throw ex; - } + { + final JAXBRIContext ctx = (JAXBRIContext) JAXBContextFactory.newInstance().createContext(clazz); return new AccessorFactory() { Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -23,15 +23,11 @@ // $Id$ -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.namespace.QName; - import org.jboss.ws.metadata.config.ConfigurationProvider; -import org.jboss.wsf.spi.binding.jaxb.JAXBContextCache; -import org.jboss.wsf.spi.binding.jaxb.JAXBHandler; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import javax.xml.namespace.QName; + /** * Client side endpoint meta data. * @@ -40,7 +36,6 @@ */ public class ClientEndpointMetaData extends EndpointMetaData { - private JAXBHandler jaxbHandler = new JAXBContextCache(); public ClientEndpointMetaData(ServiceMetaData service, QName qname, QName portTypeName, Type type) { @@ -53,12 +48,6 @@ configFile = ConfigurationProvider.DEFAULT_JAXWS_CLIENT_CONFIG_FILE; } - @Override - public JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException - { - return jaxbHandler.getJAXBContext(javaTypes); - } - public String toString() { StringBuilder buffer = new StringBuilder("\nClientEndpointMetaData:"); Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -23,25 +23,6 @@ // $Id$ -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Observable; -import java.util.Properties; -import java.util.Set; - -import javax.jws.soap.SOAPBinding.ParameterStyle; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.namespace.QName; -import javax.xml.rpc.ParameterMode; -import javax.xml.ws.Service.Mode; - import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; @@ -52,21 +33,27 @@ import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory; import org.jboss.ws.core.jaxrpc.binding.SOAPArrayDeserializerFactory; import org.jboss.ws.core.jaxrpc.binding.SOAPArraySerializerFactory; +import org.jboss.ws.core.jaxws.JAXBContextCache; +import org.jboss.ws.core.jaxws.JAXBContextFactory; import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; import org.jboss.ws.core.jaxws.JAXBSerializerFactory; import org.jboss.ws.core.jaxws.client.DispatchBinding; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.ws.metadata.config.CommonConfig; -import org.jboss.ws.metadata.config.Configurable; -import org.jboss.ws.metadata.config.ConfigurationProvider; -import org.jboss.ws.metadata.config.EndpointFeature; -import org.jboss.ws.metadata.config.JBossWSConfigFactory; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.ws.metadata.config.*; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; import org.jboss.wsf.spi.utils.JavaUtils; +import org.jboss.wsf.spi.binding.BindingCustomization; +import javax.jws.soap.SOAPBinding.ParameterStyle; +import javax.xml.namespace.QName; +import javax.xml.rpc.ParameterMode; +import javax.xml.ws.Service.Mode; +import java.lang.reflect.Method; +import java.util.*; + /** * A Service component describes a set of endpoints. * @@ -144,6 +131,10 @@ private List<UnifiedPortComponentRefMetaData> serviceRefContrib = new ArrayList<UnifiedPortComponentRefMetaData>(); + private JAXBContextCache jaxbCache = new JAXBContextCache(); + + private List<BindingCustomization> bindingCustomization = new ArrayList<BindingCustomization>(); + public EndpointMetaData(ServiceMetaData service, QName portName, QName portTypeName, Type type) { this.serviceMetaData = service; @@ -324,7 +315,9 @@ return type; } - public abstract JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException; + public List<BindingCustomization> getBindingCustomizations() { + return bindingCustomization; + } public String getAuthMethod() { @@ -646,6 +639,11 @@ configObservable.addObserver(observer); } + public JAXBContextCache getJaxbCache() + { + return jaxbCache; + } + public String getConfigFile() { return this.configFile; Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -23,17 +23,16 @@ // $Id$ -import javax.management.ObjectName; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.namespace.QName; - import org.jboss.logging.Logger; import org.jboss.ws.metadata.config.ConfigurationProvider; -import org.jboss.wsf.spi.binding.jaxb.JAXBHandler; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.binding.BindingCustomization; +import javax.management.ObjectName; +import javax.xml.namespace.QName; +import java.util.List; + /** * Client side endpoint meta data. * @@ -44,14 +43,14 @@ public class ServerEndpointMetaData extends EndpointMetaData { protected static final Logger log = Logger.getLogger(ServerEndpointMetaData.class); - + public static final String SEPID_DOMAIN = "jboss.ws"; public static final String SEPID_PROPERTY_CONTEXT = "context"; public static final String SEPID_PROPERTY_ENDPOINT = "endpoint"; - + // The associated SPI endpoint private Endpoint endpoint; - + // The REQUIRED link name private String linkName; // Legacy JSR-109 port component name @@ -187,11 +186,14 @@ { this.secureWSDLAccess = secureWSDLAccess; } - - @Override - public JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException + + /** + * Will be set through a deployment aspect + * @return List<BindingCustomization> of available customizations + */ + public List<BindingCustomization> getBindingCustomizations() { - return endpoint.getJAXBHandler().getJAXBContext(javaTypes); + return endpoint.getBindingCustomizations(); } public String toString() Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -23,14 +23,11 @@ // $Id$ -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.namespace.QName; - import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.wsf.spi.binding.jaxb.BasicJAXBHandler; +import javax.xml.namespace.QName; + /** * Tools Endpoint Metadata * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana @@ -44,10 +41,4 @@ { super(service, portName, portTypeName, Type.JAXRPC); } - - @Override - public JAXBContext getJAXBContext(Class[] javaTypes) throws JAXBException - { - return new BasicJAXBHandler().getJAXBContext(javaTypes); - } } \ No newline at end of file Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java (rev 0) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -0,0 +1,96 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.binding; + +import junit.framework.TestCase; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.BasicEndpoint; +import org.jboss.ws.core.jaxws.JAXBBindingCustomization; + +import static org.jboss.wsf.spi.deployment.Endpoint.EndpointState; +import org.jboss.wsf.spi.binding.BindingCustomization; + +import java.util.List; +import java.util.Iterator; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jun 28, 2007 + */ +public class BindingCustomizationTestCase extends TestCase { + + public void testCustomizationWriteAccess() throws Exception + { + Endpoint endpoint = new BasicEndpoint(); + JAXBBindingCustomization jaxbCustomization = new JAXBBindingCustomization(); + jaxbCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.bindingCustomization"); + endpoint.addBindingCustomization(jaxbCustomization); + + // a started endpoint should deny customizations + try + { + endpoint.setState(EndpointState.STARTED); + endpoint.addBindingCustomization(jaxbCustomization); + + fail("It should not be possible to change bindinig customizations on a started endpoint"); + } + catch (IllegalAccessError e) + { + // all fine, this should happen + } + } + + public void testCustomizationReadAccess() throws Exception + { + Endpoint endpoint = new BasicEndpoint(); + JAXBBindingCustomization jaxbCustomization = new JAXBBindingCustomization(); + jaxbCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.bindingCustomization"); + endpoint.addBindingCustomization(jaxbCustomization); + endpoint.setState(EndpointState.STARTED); + + // read a single customization + List<BindingCustomization> customizations = endpoint.getBindingCustomizations(); + + BindingCustomization knownCustomization = null; + Iterator<BindingCustomization> it = customizations.iterator(); + while(it.hasNext()) + { + knownCustomization = it.next(); + break; + } + + assertNotNull(knownCustomization); + + // however the iteratoion should be unmodifiable + try + { + customizations.add( new JAXBBindingCustomization() ); + fail("Started Endpoints should only axpose read acccess to their binding customizations"); + } + catch (Exception e) + { + // all fine, we'd expect this + } + + + } +} Property changes on: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java 2007-06-28 15:02:00 UTC (rev 3755) +++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java 2007-06-28 15:06:17 UTC (rev 3756) @@ -39,6 +39,7 @@ import org.jboss.wsf.spi.test.JBossWSTest; import org.jboss.wsf.spi.test.JBossWSTestSetup; +import org.jboss.ws.core.jaxws.JAXBContextFactory; /** * Arrays with JSR181 endpoints @@ -73,8 +74,8 @@ public void testNullArray() throws Exception { Integer[] intArr = null; - - JAXBContext jbc = JAXBContext.newInstance(Integer[].class); + + JAXBContext jbc = JAXBContextFactory.newInstance().createContext(Integer[].class); Marshaller m = jbc.createMarshaller(); m.setProperty(Marshaller.JAXB_FRAGMENT, true); StringWriter strw = new StringWriter(); @@ -83,7 +84,7 @@ String xmlFragment = strw.toString(); // <myarr xsi:nil="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/> // System.out.println(xmlFragment); - + Unmarshaller um = jbc.createUnmarshaller(); Source source = new StreamSource(new ByteArrayInputStream(xmlFragment.getBytes())); JAXBElement jbel = um.unmarshal(source, Integer[].class); @@ -93,8 +94,8 @@ public void testEmptyArray() throws Exception { Integer[] intArr = new Integer[0]; - - JAXBContext jbc = JAXBContext.newInstance(Integer[].class); + + JAXBContext jbc = JAXBContextFactory.newInstance().createContext(Integer[].class); Marshaller m = jbc.createMarshaller(); m.setProperty(Marshaller.JAXB_FRAGMENT, true); StringWriter strw = new StringWriter(); @@ -103,7 +104,7 @@ String xmlFragment = strw.toString(); // <myarr/> // System.out.println(xmlFragment); - + Unmarshaller um = jbc.createUnmarshaller(); Source source = new StreamSource(new ByteArrayInputStream(xmlFragment.getBytes())); JAXBElement jbel = um.unmarshal(source, Integer[].class); @@ -113,8 +114,8 @@ public void testSingleValueArray() throws Exception { Integer[] intArr = new Integer[] { new Integer(1) }; - - JAXBContext jbc = JAXBContext.newInstance(Integer[].class); + + JAXBContext jbc = JAXBContextFactory.newInstance().createContext(Integer[].class); Marshaller m = jbc.createMarshaller(); m.setProperty(Marshaller.JAXB_FRAGMENT, true); StringWriter strw = new StringWriter(); @@ -123,7 +124,7 @@ String xmlFragment = strw.toString(); // <myarr><item>1</item></myarr> // System.out.println(xmlFragment); - + Unmarshaller um = jbc.createUnmarshaller(); Source source = new StreamSource(new ByteArrayInputStream(xmlFragment.getBytes())); JAXBElement jbel = um.unmarshal(source, Integer[].class); @@ -133,8 +134,8 @@ public void testMultipleValueArray() throws Exception { Integer[] intArr = new Integer[] { new Integer(1), new Integer(2), new Integer(3) }; - - JAXBContext jbc = JAXBContext.newInstance(Integer[].class); + + JAXBContext jbc = JAXBContextFactory.newInstance().createContext(Integer[].class); Marshaller m = jbc.createMarshaller(); m.setProperty(Marshaller.JAXB_FRAGMENT, true); StringWriter strw = new StringWriter(); @@ -143,13 +144,13 @@ String xmlFragment = strw.toString(); // <myarr><item>1</item><item>2</item><item>3</item></myarr> // System.out.println(xmlFragment); - + Unmarshaller um = jbc.createUnmarshaller(); Source source = new StreamSource(new ByteArrayInputStream(xmlFragment.getBytes())); JAXBElement jbel = um.unmarshal(source, Integer[].class); assertEquals(intArr, jbel.getValue()); } - + public void testEchoNullArray() throws Exception { Integer[] outArr = endpoint.intArr("null", null);

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3755 - branches/jbossws-2.0.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-28 11:02:00 -0400 (Thu, 28 Jun 2007) New Revision: 3755 Added: branches/jbossws-2.0/jbossws-2.0.ipr branches/jbossws-2.0/jbossws-2.0.iws Log: Intellij project files Added: branches/jbossws-2.0/jbossws-2.0.ipr =================================================================== --- branches/jbossws-2.0/jbossws-2.0.ipr (rev 0) +++ branches/jbossws-2.0/jbossws-2.0.ipr 2007-06-28 15:02:00 UTC (rev 3755) @@ -0,0 +1,202 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4" relativePaths="false"> + <component name="AntConfiguration"> + <defaultAnt bundledAnt="true" /> + </component> + <component name="CodeStyleSettingsManager"> + <option name="PER_PROJECT_SETTINGS" /> + <option name="USE_PER_PROJECT_SETTINGS" value="false" /> + </component> + <component name="CompilerConfiguration"> + <option name="DEFAULT_COMPILER" value="Javac" /> + <option name="CLEAR_OUTPUT_DIRECTORY" value="false" /> + <option name="DEPLOY_AFTER_MAKE" value="0" /> + <resourceExtensions> + <entry name=".+\.(properties|xml|html|dtd|tld)" /> + <entry name=".+\.(gif|png|jpeg|jpg)" /> + </resourceExtensions> + <wildcardResourcePatterns> + <entry name="?*.properties" /> + <entry name="?*.xml" /> + <entry name="?*.gif" /> + <entry name="?*.png" /> + <entry name="?*.jpeg" /> + <entry name="?*.jpg" /> + <entry name="?*.html" /> + <entry name="?*.dtd" /> + <entry name="?*.tld" /> + </wildcardResourcePatterns> + </component> + <component name="DataSourceManagerImpl" /> + <component name="DependenciesAnalyzeManager"> + <option name="myForwardDirection" value="false" /> + </component> + <component name="DependencyValidationManager" /> + <component name="EntryPointsManager"> + <entry_points /> + </component> + <component name="ExportToHTMLSettings"> + <option name="PRINT_LINE_NUMBERS" value="false" /> + <option name="OPEN_IN_BROWSER" value="false" /> + <option name="OUTPUT_DIRECTORY" /> + </component> + <component name="GUI Designer component loader factory" /> + <component name="JavacSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="false" /> + <option name="DEPRECATION" value="true" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="JavadocGenerationManager"> + <option name="OUTPUT_DIRECTORY" /> + <option name="OPTION_SCOPE" value="protected" /> + <option name="OPTION_HIERARCHY" value="true" /> + <option name="OPTION_NAVIGATOR" value="true" /> + <option name="OPTION_INDEX" value="true" /> + <option name="OPTION_SEPARATE_INDEX" value="true" /> + <option name="OPTION_DOCUMENT_TAG_USE" value="false" /> + <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" /> + <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" /> + <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" /> + <option name="OPTION_DEPRECATED_LIST" value="true" /> + <option name="OTHER_OPTIONS" value="" /> + <option name="HEAP_SIZE" /> + <option name="OPEN_IN_BROWSER" value="true" /> + </component> + <component name="JikesSettings"> + <option name="JIKES_PATH" value="" /> + <option name="DEBUGGING_INFO" value="true" /> + <option name="DEPRECATION" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="false" /> + <option name="IS_EMACS_ERRORS_MODE" value="true" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + </component> + <component name="Palette2"> + <group name="Swing"> + <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false"> + <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false"> + <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" /> + </item> + <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false"> + <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" /> + <initial-values> + <property name="text" value="Button" /> + </initial-values> + </item> + <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="RadioButton" /> + </initial-values> + </item> + <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="CheckBox" /> + </initial-values> + </item> + <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="Label" /> + </initial-values> + </item> + <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false"> + <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false"> + <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> + <preferred-size width="200" height="200" /> + </default-constraints> + </item> + <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> + <preferred-size width="200" height="200" /> + </default-constraints> + </item> + <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> + </item> + </group> + </component> + <component name="ProjectModuleManager"> + <modules> + <module fileurl="file://$PROJECT_DIR$/build/build.iml" filepath="$PROJECT_DIR$/build/build.iml" /> + <module fileurl="file://$PROJECT_DIR$/integration/native/int-native.iml" filepath="$PROJECT_DIR$/integration/native/int-native.iml" /> + <module fileurl="file://$PROJECT_DIR$/jbossws-core/jbossws-core.iml" filepath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" /> + <module fileurl="file://$PROJECT_DIR$/integration/spi/spi.iml" filepath="$PROJECT_DIR$/integration/spi/spi.iml" /> + </modules> + </component> + <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" /> + <component name="RmicSettings"> + <option name="IS_EANABLED" value="false" /> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="false" /> + <option name="GENERATE_IIOP_STUBS" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + </component> + <component name="libraryTable" /> + <component name="uidesigner-configuration"> + <option name="INSTRUMENT_CLASSES" value="true" /> + <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" /> + </component> + <UsedPathMacros /> +</project> + Added: branches/jbossws-2.0/jbossws-2.0.iws =================================================================== --- branches/jbossws-2.0/jbossws-2.0.iws (rev 0) +++ branches/jbossws-2.0/jbossws-2.0.iws 2007-06-28 15:02:00 UTC (rev 3755) @@ -0,0 +1,1077 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4" relativePaths="false"> + <component name="AspectsView" /> + <component name="BookmarkManager" /> + <component name="ChangeBrowserSettings"> + <option name="MAIN_SPLITTER_PROPORTION" value="0.3" /> + <option name="MESSAGES_SPLITTER_PROPORTION" value="0.8" /> + <option name="USE_DATE_BEFORE_FILTER" value="false" /> + <option name="USE_DATE_AFTER_FILTER" value="false" /> + <option name="USE_CHANGE_BEFORE_FILTER" value="false" /> + <option name="USE_CHANGE_AFTER_FILTER" value="false" /> + <option name="DATE_BEFORE" value="" /> + <option name="DATE_AFTER" value="" /> + <option name="CHANGE_BEFORE" value="" /> + <option name="CHANGE_AFTER" value="" /> + <option name="USE_USER_FILTER" value="false" /> + <option name="USER" value="" /> + </component> + <component name="CheckinPanelState" /> + <component name="Commander"> + <leftPanel /> + <rightPanel /> + <splitter proportion="0.5" /> + </component> + <component name="CompilerWorkspaceConfiguration"> + <option name="COMPILE_IN_BACKGROUND" value="false" /> + <option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" /> + <option name="CLOSE_MESSAGE_VIEW_IF_SUCCESS" value="true" /> + <option name="COMPILE_DEPENDENT_FILES" value="false" /> + </component> + <component name="Cvs2Configuration"> + <option name="PRUNE_EMPTY_DIRECTORIES" value="true" /> + <option name="MERGING_MODE" value="0" /> + <option name="MERGE_WITH_BRANCH1_NAME" value="HEAD" /> + <option name="MERGE_WITH_BRANCH2_NAME" value="HEAD" /> + <option name="RESET_STICKY" value="false" /> + <option name="CREATE_NEW_DIRECTORIES" value="true" /> + <option name="DEFAULT_TEXT_FILE_SUBSTITUTION" value="kv" /> + <option name="PROCESS_UNKNOWN_FILES" value="false" /> + <option name="PROCESS_DELETED_FILES" value="false" /> + <option name="PROCESS_IGNORED_FILES" value="false" /> + <option name="RESERVED_EDIT" value="false" /> + <option name="CHECKOUT_DATE_OR_REVISION_SETTINGS"> + <value> + <option name="BRANCH" value="" /> + <option name="DATE" value="" /> + <option name="USE_BRANCH" value="false" /> + <option name="USE_DATE" value="false" /> + </value> + </option> + <option name="UPDATE_DATE_OR_REVISION_SETTINGS"> + <value> + <option name="BRANCH" value="" /> + <option name="DATE" value="" /> + <option name="USE_BRANCH" value="false" /> + <option name="USE_DATE" value="false" /> + </value> + </option> + <option name="SHOW_CHANGES_REVISION_SETTINGS"> + <value> + <option name="BRANCH" value="" /> + <option name="DATE" value="" /> + <option name="USE_BRANCH" value="false" /> + <option name="USE_DATE" value="false" /> + </value> + </option> + <option name="SHOW_OUTPUT" value="false" /> + <option name="ADD_WATCH_INDEX" value="0" /> + <option name="REMOVE_WATCH_INDEX" value="0" /> + <option name="UPDATE_KEYWORD_SUBSTITUTION" /> + <option name="MAKE_NEW_FILES_READONLY" value="false" /> + <option name="SHOW_CORRUPTED_PROJECT_FILES" value="0" /> + <option name="TAG_AFTER_PROJECT_COMMIT" value="false" /> + <option name="OVERRIDE_EXISTING_TAG_FOR_PROJECT" value="true" /> + <option name="TAG_AFTER_PROJECT_COMMIT_NAME" value="" /> + <option name="CLEAN_COPY" value="false" /> + </component> + <component name="DaemonCodeAnalyzer"> + <disable_hints /> + </component> + <component name="DebuggerManager"> + <breakpoint_any> + <breakpoint> + <option name="NOTIFY_CAUGHT" value="true" /> + <option name="NOTIFY_UNCAUGHT" value="true" /> + <option name="ENABLED" value="false" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> + <breakpoint> + <option name="NOTIFY_CAUGHT" value="true" /> + <option name="NOTIFY_UNCAUGHT" value="true" /> + <option name="ENABLED" value="false" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> + </breakpoint_any> + <breakpoint_rules /> + <ui_properties /> + </component> + <component name="ErrorTreeViewConfiguration"> + <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> + <option name="HIDE_WARNINGS" value="false" /> + </component> + <component name="FavoritesViewImpl"> + <favorites_list name="jbossws-2.0"> + <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> + <option name="IS_SHOW_MEMBERS" value="false" /> + <option name="IS_STRUCTURE_VIEW" value="false" /> + <option name="IS_SHOW_MODULES" value="true" /> + <option name="IS_FLATTEN_PACKAGES" value="false" /> + <option name="IS_ABBREVIATION_PACKAGE_NAMES" value="false" /> + <option name="IS_HIDE_EMPTY_MIDDLE_PACKAGES" value="false" /> + <option name="IS_SHOW_LIBRARY_CONTENTS" value="true" /> + </favorites_list> + <option name="myCurrentFavoritesList" value="jbossws-2.0" /> + </component> + <component name="FileEditorManager"> + <leaf> + <file leaf-file-name="EndpointMetaData.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="318" column="34" selection-start="9810" selection-end="9810" vertical-scroll-proportion="0.3570567"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ServerEndpointMetaData.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="191" column="49" selection-start="5351" selection-end="5351" vertical-scroll-proportion="0.44549763"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="JAXBContextFactory.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="47" column="47" selection-start="1814" selection-end="1825" vertical-scroll-proportion="0.5687204"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="CustomizableJAXBContextFactory.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="46" column="43" selection-start="1842" selection-end="1872" vertical-scroll-proportion="0.45023698"> + <folding /> + </state> + </provider> + </entry> + </file> + </leaf> + </component> + <component name="FindManager"> + <FindUsagesManager> + <setting name="OPEN_NEW_TAB" value="false" /> + </FindUsagesManager> + </component> + <component name="HierarchyBrowserManager"> + <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> + <option name="SORT_ALPHABETICALLY" value="false" /> + <option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" /> + </component> + <component name="InspectionManager"> + <option name="AUTOSCROLL_TO_SOURCE" value="false" /> + <option name="SPLITTER_PROPORTION" value="0.5" /> + <option name="GROUP_BY_SEVERITY" value="false" /> + <option name="ANALYZE_TEST_SOURCES" value="true" /> + <option name="SCOPE_TYPE" value="1" /> + <option name="CUSTOM_SCOPE_NAME" value="" /> + <profile name="Default" /> + </component> + <component name="J2EEProjectPane"> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.j2ee.module.view.nodes.J2EEProjectNodeDescriptor" /> + </PATH_ELEMENT> + </PATH> + <setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" /> + </component> + <component name="ModuleEditorState"> + <option name="LAST_EDITED_MODULE_NAME" value="jbossws-core" /> + <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" /> + </component> + <component name="NamedScopeManager" /> + <component name="PackagesPane"> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + </PATH> + </component> + <component name="PerforceChangeBrowserSettings"> + <option name="USE_CLIENT_FILTER" value="true" /> + <option name="CLIENT" value="" /> + </component> + <component name="PerforceDirect.Settings"> + <option name="useP4CONFIG" value="true" /> + <option name="port" value="<perforce_server>:1666" /> + <option name="client" value="" /> + <option name="user" value="" /> + <option name="passwd" value="" /> + <option name="showCmds" value="false" /> + <option name="useNativeApi" value="false" /> + <option name="pathToExec" value="p4" /> + <option name="useCustomPathToExec" value="false" /> + <option name="SYNC_FORCE" value="false" /> + <option name="SYNC_RUN_RESOLVE" value="true" /> + <option name="REVERT_UNCHANGED_FILES" value="true" /> + <option name="CHARSET" value="none" /> + <option name="SHOW_BRANCHES_HISTORY" value="true" /> + <option name="ENABLED" value="true" /> + <option name="USE_LOGIN" value="false" /> + <option name="LOGIN_SILENTLY" value="false" /> + <option name="INTEGRATE_BRANCH_NAME" /> + <option name="INTEGRATE_CHANGELIST_NUM" value="-1" /> + <option name="INTEGRATE_RUN_RESOLVE" value="true" /> + <option name="INTEGRATE_REVERT_UNCHANGED" value="true" /> + <option name="INTEGRATE_CHANGE_LIST_NUMBER" value="" /> + <option name="INTEGRATE_CHANGE_LIST" value="false" /> + <option name="INTEGRATE_REVERSE" value="false" /> + </component> + <component name="ProjectLevelVcsManager"> + <OptionsSetting value="true" id="Add" /> + <OptionsSetting value="true" id="Remove" /> + <OptionsSetting value="true" id="Checkin" /> + <OptionsSetting value="true" id="Checkout" /> + <OptionsSetting value="true" id="Update" /> + <OptionsSetting value="true" id="Status" /> + <OptionsSetting value="true" id="Edit" /> + <OptionsSetting value="true" id="Undo Check Out" /> + <OptionsSetting value="true" id="Compare with SourceSafe Version" /> + <OptionsSetting value="true" id="Get Latest Version" /> + <ConfirmationsSetting value="0" id="Add" /> + <ConfirmationsSetting value="0" id="Remove" /> + </component> + <component name="ProjectPane"> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src/main/resources/jbossws-core.jar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src/main/resources/jbossws-core.jar/META-INF" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src/main/resources/jbossws-core.jar/META-INF/services" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/jbossws-core/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native50.sar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native50.sar/META-INF" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native50.deployer" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native50.deployer/META-INF" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native42.sar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native42.sar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native40.sar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native40.sar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="build" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="jbossws-2.0.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="build" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/build" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + </component> + <component name="ProjectReloadState"> + <option name="STATE" value="0" /> + </component> + <component name="ProjectView"> + <navigator currentView="ProjectPane" splitterProportion="0.5"> + <flattenPackages /> + <showMembers /> + <showModules /> + <showLibraryContents /> + <hideEmptyPackages PackagesPane="false" /> + <abbreviatePackageNames /> + <showStructure PackagesPane="false" ProjectPane="false" /> + <autoscrollToSource /> + <autoscrollFromSource /> + <sortByType /> + </navigator> + </component> + <component name="PropertiesComponent"> + <property name="MemberChooser.copyJavadoc" value="false" /> + <property name="GoToClass.includeLibraries" value="false" /> + <property name="MemberChooser.showClasses" value="true" /> + <property name="MemberChooser.sorted" value="false" /> + <property name="GoToFile.includeJavaFiles" value="false" /> + <property name="GoToClass.toSaveIncludeLibraries" value="false" /> + </component> + <component name="ReadonlyStatusHandler"> + <option name="SHOW_DIALOG" value="true" /> + </component> + <component name="RecentsManager"> + <key name="CopyClassDialog.RECENTS_KEY"> + <recent name="org.jboss.ws.core.utils" /> + </key> + </component> + <component name="RestoreUpdateTree" /> + <component name="RunManager"> + <activeType name="Application" /> + <configuration selected="false" default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> + </configuration> + <configuration selected="false" default="true" type="JUnit" factoryName="JUnit"> + <module name="" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="PACKAGE_NAME" /> + <option name="MAIN_CLASS_NAME" /> + <option name="METHOD_NAME" /> + <option name="TEST_OBJECT" value="class" /> + <option name="VM_PARAMETERS" /> + <option name="PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ADDITIONAL_CLASS_PATH" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="wholeProject" /> + </option> + </configuration> + <configuration selected="false" default="true" type="Application" factoryName="Application"> + <option name="MAIN_CLASS_NAME" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <module name="" /> + </configuration> + <configuration selected="false" default="true" type="Applet" factoryName="Applet"> + <module name="" /> + <option name="MAIN_CLASS_NAME" /> + <option name="HTML_FILE_NAME" /> + <option name="HTML_USED" value="false" /> + <option name="WIDTH" value="400" /> + <option name="HEIGHT" value="300" /> + <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> + <option name="VM_PARAMETERS" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + </configuration> + </component> + <component name="SelectInManager" /> + <component name="StarteamConfiguration"> + <option name="SERVER" value="" /> + <option name="PORT" value="49201" /> + <option name="USER" value="" /> + <option name="PASSWORD" value="" /> + <option name="PROJECT" value="" /> + <option name="VIEW" value="" /> + <option name="ALTERNATIVE_WORKING_PATH" value="" /> + </component> + <component name="StructuralSearchPlugin" /> + <component name="StructureViewFactory"> + <option name="AUTOSCROLL_MODE" value="true" /> + <option name="AUTOSCROLL_FROM_SOURCE" value="false" /> + <option name="ACTIVE_ACTIONS" value="ALPHA_COMPARATOR" /> + </component> + <component name="SvnChangesBrowserSettings"> + <option name="USE_AUTHOR_FIELD" value="true" /> + <option name="AUTHOR" value="" /> + <option name="LOCATION" value="" /> + <option name="USE_PROJECT_SETTINGS" value="true" /> + <option name="USE_ALTERNATE_LOCATION" value="false" /> + </component> + <component name="SvnConfiguration"> + <option name="USER" value="" /> + <option name="PASSWORD" value="" /> + <option name="PROCESS_UNRESOLVED" value="false" /> + <configuration useDefault="false">/home/hbraun/.subversion</configuration> + <checkoutURL active="true">https://svn.jboss.org/repos/jbossws</checkoutURL> + </component> + <component name="TodoView" selected-index="0"> + <todo-panel id="selected-file"> + <are-packages-shown value="false" /> + <are-modules-shown value="false" /> + <flatten-packages value="false" /> + <is-autoscroll-to-source value="true" /> + </todo-panel> + <todo-panel id="all"> + <are-packages-shown value="true" /> + <are-modules-shown value="false" /> + <flatten-packages value="false" /> + <is-autoscroll-to-source value="true" /> + </todo-panel> + </component> + <component name="ToolWindowManager"> + <frame x="0" y="25" width="1690" height="1004" extended-state="6" /> + <editor active="true" /> + <layout> + <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.26164216" order="0" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.54846066" order="1" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.25" order="1" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3295325" order="8" /> + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" /> + <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> + <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> + <window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> + <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" /> + <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="4" /> + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> + <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" /> + <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="0" /> + <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" /> + <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="5" /> + </layout> + </component> + <component name="VCS.FileViewConfiguration"> + <option name="SELECTED_STATUSES" value="DEFAULT" /> + <option name="SELECTED_COLUMNS" value="DEFAULT" /> + <option name="SHOW_FILTERS" value="true" /> + <option name="CUSTOMIZE_VIEW" value="true" /> + <option name="SHOW_FILE_HISTORY_AS_TREE" value="true" /> + </component> + <component name="VcsManagerConfiguration"> + <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" /> + <option name="PUT_FOCUS_INTO_COMMENT" value="false" /> + <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> + <option name="LAST_COMMIT_MESSAGE" /> + <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" /> + <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" /> + <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> + <option name="OPTIMIZE_IMPORTS_BEFORE_FILE_COMMIT" value="false" /> + <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" /> + <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" /> + <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" /> + <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" /> + <option name="ERROR_OCCURED" value="false" /> + <option name="ACTIVE_VCS_NAME" /> + <option name="UPDATE_GROUP_BY_PACKAGES" value="false" /> + <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> + <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" /> + </component> + <component name="VssConfiguration"> + <option name="CLIENT_PATH" value="" /> + <option name="SRCSAFEINI_PATH" value="" /> + <option name="USER_NAME" value="" /> + <option name="PWD" value="" /> + <option name="VSS_IS_INITIALIZED" value="true" /> + <CheckoutOptions> + <option name="COMMENT" value="" /> + <option name="DO_NOT_GET_LATEST_VERSION" value="false" /> + <option name="REPLACE_WRITABLE" value="false" /> + <option name="RECURSIVE" value="false" /> + </CheckoutOptions> + <CheckinOptions> + <option name="COMMENT" value="" /> + <option name="KEEP_CHECKED_OUT" value="false" /> + <option name="RECURSIVE" value="false" /> + </CheckinOptions> + <AddOptions> + <option name="COMMENT" value="" /> + <option name="STORE_ONLY_LATEST_VERSION" value="false" /> + <option name="CHECK_OUT_IMMEDIATELY" value="false" /> + <option name="FILE_TYPE" value="0" /> + </AddOptions> + <UndocheckoutOptions> + <option name="MAKE_WRITABLE" value="false" /> + <option name="REPLACE_LOCAL_COPY" value="0" /> + <option name="RECURSIVE" value="false" /> + </UndocheckoutOptions> + <GetOptions> + <option name="REPLACE_WRITABLE" value="0" /> + <option name="MAKE_WRITABLE" value="false" /> + <option name="RECURSIVE" value="false" /> + </GetOptions> + </component> + <component name="antWorkspaceConfiguration"> + <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> + <option name="FILTER_TARGETS" value="false" /> + </component> + <component name="editorHistoryManager"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextCache.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="81" column="41" selection-start="2474" selection-end="2474" vertical-scroll-proportion="0.66824645"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="142" column="94" selection-start="6593" selection-end="6593" vertical-scroll-proportion="0.40050697"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="131" column="94" selection-start="6468" selection-end="6468" vertical-scroll-proportion="0.32446134"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="127" column="94" selection-start="6226" selection-end="6226" vertical-scroll-proportion="0.32446134"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native40.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="125" column="100" selection-start="6015" selection-end="6038" vertical-scroll-proportion="0.27376425"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeployer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="43" column="47" selection-start="1777" selection-end="1777" vertical-scroll-proportion="0.050697085"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/binding/BindingCustomization.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="36" column="30" selection-start="1479" selection-end="1479" vertical-scroll-proportion="0.40557668"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBBindingCustomization.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="47" column="0" selection-start="1147" selection-end="1862" vertical-scroll-proportion="0.68441063"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="21" column="45" selection-start="1051" selection-end="1051" vertical-scroll-proportion="0.024271844"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="318" column="34" selection-start="9810" selection-end="9810" vertical-scroll-proportion="0.3570567"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="50" column="36" selection-start="1972" selection-end="1972" vertical-scroll-proportion="0.6350711"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="40" column="17" selection-start="1544" selection-end="1544" vertical-scroll-proportion="-0.3127962"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="191" column="49" selection-start="5351" selection-end="5351" vertical-scroll-proportion="0.44549763"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="47" column="47" selection-start="1814" selection-end="1825" vertical-scroll-proportion="0.5687204"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="46" column="43" selection-start="1842" selection-end="1872" vertical-scroll-proportion="0.45023698"> + <folding /> + </state> + </provider> + </entry> + </component> +</project> +

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3754 - branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-28 07:16:18 -0400 (Thu, 28 Jun 2007) New Revision: 3754 Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java Log: assertEndpointSetterAccess Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java 2007-06-28 08:54:40 UTC (rev 3753) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java 2007-06-28 11:16:18 UTC (rev 3754) @@ -66,6 +66,7 @@ public void setService(Service service) { + assertEndpointSetterAccess(); this.service = service; } @@ -76,6 +77,7 @@ public void setTargetBeanName(String targetBean) { + assertEndpointSetterAccess(); this.targetBean = targetBean; } @@ -99,6 +101,7 @@ } return beanClass; } + public ObjectName getName() { return name; @@ -106,6 +109,7 @@ public void setName(ObjectName name) { + assertEndpointSetterAccess(); this.name = name; } @@ -116,6 +120,7 @@ public void setShortName(String shortName) { + assertEndpointSetterAccess(); this.shortName = shortName; } @@ -126,6 +131,7 @@ public void setURLPattern(String urlPattern) { + assertEndpointSetterAccess(); this.urlPattern = urlPattern; } @@ -146,6 +152,7 @@ public void setRequestHandler(RequestHandler handler) { + assertEndpointSetterAccess(); this.requestHandler = handler; } @@ -156,6 +163,7 @@ public void setLifecycleHandler(LifecycleHandler handler) { + assertEndpointSetterAccess(); this.lifecycleHandler = handler; } @@ -166,6 +174,7 @@ public void setInvocationHandler(InvocationHandler handler) { + assertEndpointSetterAccess(); this.invocationHandler = handler; } @@ -176,6 +185,7 @@ public void setJAXBHandler(JAXBHandler jaxbHandler) { + assertEndpointSetterAccess(); this.jaxbHandler = jaxbHandler; } @@ -221,8 +231,15 @@ public void setEndpointMetrics(EndpointMetrics metrics) { + assertEndpointSetterAccess(); metrics.setEndpoint(this); this.metrics = metrics; } + + private void assertEndpointSetterAccess() + { + if (state == EndpointState.STARTED) + throw new IllegalStateException("Cannot modify endpoint properties in state: " + state); + } }

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3753 - trunk/build.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-06-28 04:54:40 -0400 (Thu, 28 Jun 2007) New Revision: 3753 Modified: trunk/build/ant.properties.example Log: Target container becomes jboss-4.2.1.GA Modified: trunk/build/ant.properties.example =================================================================== --- trunk/build/ant.properties.example 2007-06-28 04:52:09 UTC (rev 3752) +++ trunk/build/ant.properties.example 2007-06-28 08:54:40 UTC (rev 3753) @@ -5,7 +5,7 @@ # Optional JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 -#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA +#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA #jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 # The JBoss server under test. This can be [jboss50|jboss42|jboss40]

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3752 - branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/rpc/handler.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-06-28 00:52:09 -0400 (Thu, 28 Jun 2007) New Revision: 3752 Modified: branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/rpc/handler/HandlerInfo.java Log: Prevent NPE with null handler confog Modified: branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/rpc/handler/HandlerInfo.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/rpc/handler/HandlerInfo.java 2007-06-27 21:18:36 UTC (rev 3751) +++ branches/jbossws-2.0/jbossws-core/src/main/java/javax/xml/rpc/handler/HandlerInfo.java 2007-06-28 04:52:09 UTC (rev 3752) @@ -59,8 +59,9 @@ public HandlerInfo(Class handlerClass, Map config, QName[] headers) { this.handlerClass = handlerClass; - this.configMap.putAll(config); this.headers = headers; + if (config != null) + this.configMap.putAll(config); } /** Gets the Handler class @@ -97,7 +98,8 @@ public void setHandlerConfig(Map config) { configMap.clear(); - configMap.putAll(config); + if (config != null) + configMap.putAll(config); } /** Gets the header blocks processed by this Handler.

16 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits June 2007