July 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3902 - in branches/tdiesler/trunk: integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42 and 10 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-16 18:20:11 -0400 (Mon, 16 Jul 2007) New Revision: 3902 Removed: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ClassLoaderInjectionDeploymentAspect.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeploymentAspect.java Modified: branches/tdiesler/trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java branches/tdiesler/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java branches/tdiesler/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java branches/tdiesler/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointContextListener.java branches/tdiesler/trunk/integration/native/src/main/resources/jbossws-native-config.xml branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployment.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeploymentAspect.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifierImpl.java branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java Log: partial Modified: branches/tdiesler/trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-16 22:20:11 UTC (rev 3902) @@ -48,7 +48,7 @@ </bean> <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21"> <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property> - <property name="phaseOneInterceptors"> + <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorEJB21</value> </list> @@ -64,18 +64,8 @@ </bean> <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3"> <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property> - <property name="phaseOneInterceptors"> - <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> - <value>jboss.ws:service=DeployerInterceptorEJB3</value> - </list> - </property> - </bean> - <bean name="WSMainDeployerHook" class="org.jboss.wsf.container.jboss42.MainDeployerHook"> - <property name="deploymentAspectManager"><inject bean="WSMainDeploymentAspectManager"/></property> <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> - <value>jboss.ws:service=DeployerInterceptorJSE</value> - <value>jboss.ws:service=DeployerInterceptorEJB21</value> <value>jboss.ws:service=DeployerInterceptorEJB3</value> </list> </property> @@ -90,18 +80,10 @@ <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.spi.deployment.BasicDeploymentAspectManager"> <property name="name">WSDeploymentAspectManagerEJB</property> </bean> - <bean name="WSMainDeploymentAspectManager" class="org.jboss.wsf.spi.deployment.BasicDeploymentAspectManager"> - <property name="name">WSMainDeploymentAspectManager</property> - </bean>  - <bean name="WSClassLoaderInjectionDeploymentAspect" class="org.jboss.wsf.container.jboss42.ClassLoaderInjectionDeploymentAspect"> - <property name="requires">AllowClassLoaderInjection</property> - <property name="provides">ContainerClassLoader</property> - </bean> - <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.spi.deployment.BackwardCompatibleContextRootDeploymentAspect"> <property name="requires">ContainerMetaData</property> <property name="provides">ContextRoot</property> @@ -133,7 +115,7 @@ </bean> <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeploymentAspect"> - <property name="requires">EndpointName,StackEndpointHandler,InitializedMetaDataModel</property> + <property name="requires">EndpointName,StackEndpointHandler</property> <property name="provides">RegisteredEndpoint</property> </bean> @@ -187,16 +169,22 @@ <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> <inject bean="WSModifyWebMetaDataDeploymentAspect"/> <inject bean="WSUnifiedDeploymentInfoDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> </set> </property> </bean> - <bean name="WSMainDeploymentAspectInstaller" class="org.jboss.wsf.spi.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSMainDeploymentAspectManager"/></property> + <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.spi.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSClassLoaderInjectionDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> <inject bean="WSEndpointLifecycleDeploymentAspect"/> Deleted: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ClassLoaderInjectionDeploymentAspect.java =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ClassLoaderInjectionDeploymentAspect.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ClassLoaderInjectionDeploymentAspect.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -1,57 +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.container.jboss42; - -//$Id: ClassLoaderInjectionDeployer.java 3147 2007-05-19 15:35:46Z thomas.diesler(a)jboss.com $ - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.metadata.WebMetaData; -import org.jboss.wsf.spi.deployment.DeploymentAspect; -import org.jboss.wsf.spi.deployment.Deployment; - -/** - * A deployer that injects the correct classloader into the UMDM - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class ClassLoaderInjectionDeploymentAspect extends DeploymentAspect -{ - @Override - public void create(Deployment dep) - { - DeploymentInfo unit = dep.getContext().getAttachment(DeploymentInfo.class); - if (unit == null) - throw new IllegalStateException("Cannot obtain deployement unit"); - - ClassLoader classLoader = unit.ucl; - - // Get the webapp context classloader and use it as the deploymet class loader - WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); - if (webMetaData != null) - { - classLoader = webMetaData.getContextLoader(); - } - - dep.setClassLoader(classLoader); - } -} \ No newline at end of file Modified: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -55,7 +55,8 @@ { Deployment dep = createDeployment(); dep.setRootFile(new URLLoaderAdapter(unit.localUrl)); - dep.setClassLoader(unit.annotationsCl); + dep.setInitialClassLoader(unit.annotationsCl); + dep.setRuntimeClassLoader(unit.ucl); dep.setType(getDeploymentType()); Service service = dep.getService(); Modified: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -61,7 +61,8 @@ { Deployment dep = createDeployment(); dep.setRootFile(new URLLoaderAdapter(unit.localUrl)); - dep.setClassLoader(unit.annotationsCl); + dep.setInitialClassLoader(unit.annotationsCl); + dep.setRuntimeClassLoader(null); dep.setType(getDeploymentType()); Service service = dep.getService(); @@ -91,7 +92,7 @@ try { - ClassLoader loader = dep.getClassLoader(); + ClassLoader loader = dep.getInitialClassLoader(); Class<?> epBean = loader.loadClass(servletClass.trim()); // If this is a servlet we defer the the bean creation Modified: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -56,7 +56,8 @@ { Deployment dep = createDeployment(); dep.setRootFile(new URLLoaderAdapter(unit.localUrl)); - dep.setClassLoader(unit.annotationsCl); + dep.setInitialClassLoader(unit.annotationsCl); + dep.setRuntimeClassLoader(unit.ucl); dep.setType(getDeploymentType()); Service service = dep.getService(); Modified: branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -60,7 +60,8 @@ { Deployment dep = createDeployment(); dep.setRootFile(new URLLoaderAdapter(unit.localUrl)); - dep.setClassLoader(unit.annotationsCl); + dep.setInitialClassLoader(unit.annotationsCl); + dep.setRuntimeClassLoader(null); dep.setType(getDeploymentType()); Service service = dep.getService(); Modified: branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-16 22:20:11 UTC (rev 3902) @@ -48,7 +48,7 @@ </bean> <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21"> <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property> - <property name="phaseOneInterceptors"> + <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorEJB21</value> </list> @@ -64,18 +64,8 @@ </bean> <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3"> <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property> - <property name="phaseOneInterceptors"> - <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> - <value>jboss.ws:service=DeployerInterceptorEJB3</value> - </list> - </property> - </bean> - <bean name="WSMainDeployerHook" class="org.jboss.wsf.container.jboss42.MainDeployerHook"> - <property name="deploymentAspectManager"><inject bean="WSMainDeploymentAspectManager"/></property> <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> - <value>jboss.ws:service=DeployerInterceptorJSE</value> - <value>jboss.ws:service=DeployerInterceptorEJB21</value> <value>jboss.ws:service=DeployerInterceptorEJB3</value> </list> </property> @@ -90,18 +80,10 @@ <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.spi.deployment.BasicDeploymentAspectManager"> <property name="name">WSDeploymentAspectManagerEJB</property> </bean> - <bean name="WSMainDeploymentAspectManager" class="org.jboss.wsf.spi.deployment.BasicDeploymentAspectManager"> - <property name="name">WSMainDeploymentAspectManager</property> - </bean>  - <bean name="WSClassLoaderInjectionDeploymentAspect" class="org.jboss.wsf.container.jboss42.ClassLoaderInjectionDeploymentAspect"> - <property name="requires">AllowClassLoaderInjection</property> - <property name="provides">ContainerClassLoader</property> - </bean> - <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.spi.deployment.BackwardCompatibleContextRootDeploymentAspect"> <property name="requires">ContainerMetaData</property> <property name="provides">ContextRoot</property> @@ -133,7 +115,7 @@ </bean> <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeploymentAspect"> - <property name="requires">EndpointName,StackEndpointHandler,InitializedMetaDataModel</property> + <property name="requires">EndpointName, StackEndpointHandler</property> <property name="provides">RegisteredEndpoint</property> </bean> @@ -186,16 +168,22 @@ <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> <inject bean="WSModifyWebMetaDataDeploymentAspect"/> <inject bean="WSUnifiedDeploymentInfoDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> </set> </property> </bean> - <bean name="WSMainDeploymentAspectInstaller" class="org.jboss.wsf.spi.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSMainDeploymentAspectManager"/></property> + <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.spi.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSClassLoaderInjectionDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> <inject bean="WSEndpointLifecycleDeploymentAspect"/> Deleted: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeploymentAspect.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeploymentAspect.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ClassLoaderInjectionDeploymentAspect.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -1,57 +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.container.jboss50; - -//$Id: ClassLoaderInjectionDeployer.java 3772 2007-07-01 19:29:13Z thomas.diesler(a)jboss.com $ - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.metadata.WebMetaData; -import org.jboss.wsf.spi.deployment.DeploymentAspect; -import org.jboss.wsf.spi.deployment.Deployment; - -/** - * A deployer that injects the correct classloader into the Deployment - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class ClassLoaderInjectionDeploymentAspect extends DeploymentAspect -{ - @Override - public void create(Deployment dep) - { - DeploymentUnit unit = dep.getContext().getAttachment(DeploymentUnit.class); - if (unit == null) - throw new IllegalStateException("Cannot obtain deployement unit"); - - ClassLoader classLoader = unit.getClassLoader(); - - // Get the webapp context classloader and use it as the deploymet class loader - WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); - if (webMetaData != null) - { - classLoader = webMetaData.getContextLoader(); - } - - dep.setClassLoader(classLoader); - } -} \ No newline at end of file Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -88,7 +88,7 @@ // Since we create temporary classes, we need to create a delegate loader // This prevents CCE problems where the parent loader is available at deploy time, // and a child loader is available at start time. - udi.classLoader = new URLClassLoader(new URL[] {}, unit.getClassLoader()); + udi.classLoader = new URLClassLoader(new URL[] {}, unit.getInitialClassLoader()); log.debug("UnifiedDeploymentInfo:\n" + udi); } Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -58,7 +58,7 @@ { Deployment dep = createDeployment(); dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); - dep.setClassLoader(unit.getClassLoader()); + dep.setInitialClassLoader(unit.getClassLoader()); dep.setType(getDeploymentType()); Service service = dep.getService(); Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -58,7 +58,7 @@ { Deployment dep = createDeployment(); dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); - dep.setClassLoader(unit.getClassLoader()); + dep.setInitialClassLoader(unit.getInitialClassLoader()); dep.setType(getDeploymentType()); Service service = dep.getService(); Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -58,7 +58,7 @@ { Deployment dep = createDeployment(); dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); - dep.setClassLoader(unit.getClassLoader()); + dep.setInitialClassLoader(unit.getInitialClassLoader()); dep.setType(getDeploymentType()); Service service = dep.getService(); @@ -70,7 +70,7 @@ // Copy the attachments dep.getContext().addAttachment(WebMetaData.class, webMetaData); - List<Servlet> servlets = getRelevantServlets(webMetaData, unit.getClassLoader()); + List<Servlet> servlets = getRelevantServlets(webMetaData, unit.getInitialClassLoader()); for (Servlet servlet : servlets) { String servletName = servlet.getName(); @@ -98,7 +98,7 @@ try { WebMetaData webMetaData = unit.getAttachment(WebMetaData.class); - List<Servlet> servlets = getRelevantServlets(webMetaData, unit.getClassLoader()); + List<Servlet> servlets = getRelevantServlets(webMetaData, unit.getInitialClassLoader()); isWebServiceDeployment = servlets.size() > 0; } catch (Exception ex) Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -83,7 +83,7 @@ } // Nothing to do if we have an <init-param> - if (!isAlreadyModified(servlet) && !isJavaxServlet(orgServletClass, dep.getClassLoader())) + if (!isAlreadyModified(servlet) && !isJavaxServlet(orgServletClass, dep.getInitialClassLoader())) { servlet.setServletClass(servletClass); NameValuePair initParam = new NameValuePair(Endpoint.SEPID_DOMAIN_ENDPOINT, orgServletClass); Modified: branches/tdiesler/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java =================================================================== --- branches/tdiesler/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -42,7 +42,7 @@ if (umd == null) throw new IllegalStateException("Cannot obtain unified meta data"); - umd.setClassLoader(dep.getClassLoader()); + umd.setClassLoader(dep.getRuntimeClassLoader()); umd.eagerInitialize(); } } \ No newline at end of file Modified: branches/tdiesler/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- branches/tdiesler/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -164,7 +164,7 @@ ServletInputStream in = req.getInputStream(); ServletOutputStream out = res.getOutputStream(); - ClassLoader classLoader = endpoint.getService().getDeployment().getClassLoader(); + ClassLoader classLoader = endpoint.getService().getDeployment().getInitialClassLoader(); if (classLoader == null) throw new IllegalStateException("Deployment has no classloader associated"); Modified: branches/tdiesler/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointContextListener.java =================================================================== --- branches/tdiesler/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointContextListener.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointContextListener.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -56,24 +56,25 @@ if (contextPath.equals("/" + propContext)) { Endpoint ep = epRegistry.getEndpoint(sepId); - Deployment dep = ep.getService().getDeployment(); - ClassLoader classLoader = dep.getClassLoader(); - // For JSE endpoints, this should be the tomcat classloader if (dep.getType() == DeploymentType.JAXRPC_JSE || dep.getType() == DeploymentType.JAXWS_JSE) - classLoader = Thread.currentThread().getContextClassLoader(); + { + // For JSE endpoints, this should be the tomcat classloader + ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); + dep.setRuntimeClassLoader(classLoader); - UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class); - if (umd.isEagerInitialized() == false) - { - umd.setClassLoader(classLoader); - umd.eagerInitialize(); + UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class); + if (umd.isEagerInitialized() == false) + { + umd.setClassLoader(classLoader); + umd.eagerInitialize(); + } + + // start the endpoint + if (ep.getState() == EndpointState.CREATED) + ep.getLifecycleHandler().start(ep); } - - // start the endpoint - if (ep.getState() == EndpointState.CREATED) - ep.getLifecycleHandler().start(ep); } } } @@ -90,10 +91,13 @@ if (contextPath.equals(propContext)) { Endpoint ep = epRegistry.getEndpoint(sepId); - - // stop the endpoint - if (ep.getState() == EndpointState.STARTED) - ep.getLifecycleHandler().stop(ep); + Deployment dep = ep.getService().getDeployment(); + + if (dep.getType() == DeploymentType.JAXRPC_JSE || dep.getType() == DeploymentType.JAXWS_JSE) + { + if (ep.getState() == EndpointState.STARTED) + ep.getLifecycleHandler().stop(ep); + } } } } Modified: branches/tdiesler/trunk/integration/native/src/main/resources/jbossws-native-config.xml =================================================================== --- branches/tdiesler/trunk/integration/native/src/main/resources/jbossws-native-config.xml 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/native/src/main/resources/jbossws-native-config.xml 2007-07-16 22:20:11 UTC (rev 3902) @@ -57,6 +57,11 @@ </property> </bean> + <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel</property> + <property name="provides">InitializedMetaDataModel</property> + </bean> + <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeploymentAspect"> <property name="requires">ContainerEndpointHandler</property> <property name="provides">StackEndpointHandler</property> @@ -106,6 +111,7 @@ <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSNativeContextPropertiesDeploymentAspect"/> + <inject bean="WSNativeEagerInitializeDeploymentAspect"/> <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> <inject bean="WSNativeEventingDeploymentAspect"/> <inject bean="WSNativePublishContractDeploymentAspect"/> Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployment.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployment.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicDeployment.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -47,7 +47,9 @@ // The state for this deployment private DeploymentState state; // The deployment class loader - private ClassLoader classLoader; + private ClassLoader initialLoader; + // The runtime class loader + private ClassLoader runtimeLoader; public BasicDeployment() { @@ -76,16 +78,26 @@ this.rootFile = rootFile; } - public void setClassLoader(ClassLoader classLoader) + public void setInitialClassLoader(ClassLoader classLoader) { - this.classLoader = classLoader; + this.initialLoader = classLoader; } - public ClassLoader getClassLoader() + public ClassLoader getInitialClassLoader() { - return classLoader; + return initialLoader; } + public void setRuntimeClassLoader(ClassLoader classLoader) + { + this.runtimeLoader = classLoader; + } + + public ClassLoader getRuntimeClassLoader() + { + return runtimeLoader; + } + public Service getService() { return service; Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -83,8 +83,11 @@ if (targetBean == null) throw new IllegalStateException("Target bean not set"); - ClassLoader classLoader = service.getDeployment().getClassLoader(); + ClassLoader classLoader = service.getDeployment().getRuntimeClassLoader(); if (classLoader == null) + classLoader = service.getDeployment().getInitialClassLoader(); + + if (classLoader == null) throw new IllegalStateException("Deployment classloader not set"); Class beanClass; Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -54,11 +54,17 @@ void setRootFile(UnifiedVirtualFile root); /** Get the class loader for this deployment */ - ClassLoader getClassLoader(); + ClassLoader getInitialClassLoader(); /** Set the class loader for this deployment */ - void setClassLoader(ClassLoader loader); + void setInitialClassLoader(ClassLoader loader); + /** Get the runtime class loader for this deployment */ + ClassLoader getRuntimeClassLoader(); + + /** Set the runtime class loader for this deployment */ + void setRuntimeClassLoader(ClassLoader loader); + /** Get the deployment context */ DeploymentContext getContext(); Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeploymentAspect.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeploymentAspect.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/EndpointHandlerDeploymentAspect.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -84,7 +84,7 @@ { try { - Class<?> handlerClass = dep.getClassLoader().loadClass(requestHandler); + Class<?> handlerClass = dep.getInitialClassLoader().loadClass(requestHandler); return (RequestHandler)handlerClass.newInstance(); } catch (Exception e) @@ -97,7 +97,7 @@ { try { - Class<?> handlerClass = dep.getClassLoader().loadClass(lifecycleHandler); + Class<?> handlerClass = dep.getInitialClassLoader().loadClass(lifecycleHandler); return (LifecycleHandler)handlerClass.newInstance(); } catch (Exception e) @@ -128,7 +128,7 @@ { try { - Class<?> handlerClass = dep.getClassLoader().loadClass(className); + Class<?> handlerClass = dep.getInitialClassLoader().loadClass(className); invocationHandler = (InvocationHandler)handlerClass.newInstance(); } catch (Exception e) Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifierImpl.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifierImpl.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifierImpl.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -87,7 +87,7 @@ Class orgServletClass = null; try { - ClassLoader loader = dep.getClassLoader(); + ClassLoader loader = dep.getInitialClassLoader(); orgServletClass = loader.loadClass(orgServletClassName); } catch (ClassNotFoundException ex) Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -98,7 +98,7 @@ Class orgServletClass = null; try { - ClassLoader loader = dep.getClassLoader(); + ClassLoader loader = dep.getInitialClassLoader(); orgServletClass = loader.loadClass(orgServletClassName); } catch (ClassNotFoundException ex) Modified: branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java =================================================================== --- branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -85,7 +85,7 @@ Class orgServletClass = null; try { - ClassLoader loader = dep.getClassLoader(); + ClassLoader loader = dep.getInitialClassLoader(); orgServletClass = loader.loadClass(orgServletClassName); } catch (ClassNotFoundException ex) Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -257,9 +257,9 @@ TypeMapping typeMapping = serContext.getTypeMapping(); OperationMetaData opMetaData = msgContext.getOperationMetaData(); - if (opMetaData != null && opMetaData.getFault(javaType) != null) + if (opMetaData != null && opMetaData.getFaultMetaData(javaType) != null) { - FaultMetaData faultMetaData = opMetaData.getFault(javaType); + FaultMetaData faultMetaData = opMetaData.getFaultMetaData(javaType); QName xmlName = faultMetaData.getXmlName(); QName xmlType = faultMetaData.getXmlType(); Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -259,9 +259,9 @@ OperationMetaData opMetaData = msgContext.getOperationMetaData(); Class<? extends Exception> exClass = ex.getClass(); - if (opMetaData != null && opMetaData.getFault(exClass) != null) + if (opMetaData != null && opMetaData.getFaultMetaData(exClass) != null) { - FaultMetaData faultMetaData = opMetaData.getFault(exClass); + FaultMetaData faultMetaData = opMetaData.getFaultMetaData(exClass); Object faultBean = faultMetaData.toFaultBean(ex); Detail detail = soapFault.addDetail(); Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-07-16 20:47:16 UTC (rev 3901) +++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-07-16 22:20:11 UTC (rev 3902) @@ -375,7 +375,7 @@ return faultMetaData; } - public FaultMetaData getFault(Class javaType) + public FaultMetaData getFaultMetaData(Class javaType) { FaultMetaData faultMetaData = null; for (FaultMetaData aux : faults)

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3901 - branches/tdiesler/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-16 16:47:16 -0400 (Mon, 16 Jul 2007) New Revision: 3901 Added: branches/tdiesler/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointContextListener.java Log: partial Added: branches/tdiesler/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointContextListener.java =================================================================== --- branches/tdiesler/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointContextListener.java (rev 0) +++ branches/tdiesler/trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointContextListener.java 2007-07-16 20:47:16 UTC (rev 3901) @@ -0,0 +1,100 @@ +/* + * 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.stack.jbws; + +// $Id: ServiceEndpointServlet.java 3395 2007-06-02 20:38:33Z thomas.diesler(a)jboss.com $ + +import javax.management.ObjectName; +import javax.servlet.ServletContext; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; + +import org.jboss.ws.metadata.umdm.UnifiedMetaData; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.deployment.Endpoint.EndpointState; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; + +/** + * A listener that initializes the UnifiedMetaDataModel + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class ServiceEndpointContextListener implements ServletContextListener +{ + public void contextInitialized(ServletContextEvent event) + { + EndpointRegistry epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + ServletContext ctx = event.getServletContext(); + String contextPath = ctx.getContextPath(); + + for (ObjectName sepId : epRegistry.getEndpoints()) + { + String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT); + if (contextPath.equals("/" + propContext)) + { + Endpoint ep = epRegistry.getEndpoint(sepId); + + Deployment dep = ep.getService().getDeployment(); + ClassLoader classLoader = dep.getClassLoader(); + + // For JSE endpoints, this should be the tomcat classloader + if (dep.getType() == DeploymentType.JAXRPC_JSE || dep.getType() == DeploymentType.JAXWS_JSE) + classLoader = Thread.currentThread().getContextClassLoader(); + + UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class); + if (umd.isEagerInitialized() == false) + { + umd.setClassLoader(classLoader); + umd.eagerInitialize(); + } + + // start the endpoint + if (ep.getState() == EndpointState.CREATED) + ep.getLifecycleHandler().start(ep); + } + } + } + + public void contextDestroyed(ServletContextEvent event) + { + EndpointRegistry epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + ServletContext ctx = event.getServletContext(); + String contextPath = ctx.getContextPath(); + + for (ObjectName sepId : epRegistry.getEndpoints()) + { + String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT); + if (contextPath.equals(propContext)) + { + Endpoint ep = epRegistry.getEndpoint(sepId); + + // stop the endpoint + if (ep.getState() == EndpointState.STARTED) + ep.getLifecycleHandler().stop(ep); + } + } + } +}

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3900 - in branches/tdiesler/trunk/integration: jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-16 16:45:09 -0400 (Mon, 16 Jul 2007) New Revision: 3900 Added: branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml Removed: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri50/ branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/ branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-sunri50.deployer/ branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/ Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml branches/tdiesler/trunk/integration/native/src/main/resources/jbossws-native-config.xml branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeploymentAspect.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeploymentAspect.java branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifierImpl.java branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml branches/tdiesler/trunk/integration/sunri/ant-import/macros-deploy-sunri.xml branches/tdiesler/trunk/integration/sunri/build.xml branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java branches/tdiesler/trunk/integration/xfire/ant-import/build-testsuite.xml branches/tdiesler/trunk/integration/xfire/ant-import/macros-deploy-xfire.xml Log: partial Modified: branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2007-07-16 20:42:35 UTC (rev 3899) +++ branches/tdiesler/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2007-07-16 20:45:09 UTC (rev 3900) @@ -24,12 +24,16 @@ //$Id: ModifyWebMetaDataDeployer.java 3150 2007-05-20 00:29:48Z thomas.diesler(a)jboss.com $ import java.util.Iterator; +import java.util.Map; +import org.jboss.metadata.Listener; import org.jboss.metadata.NameValuePair; import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.web.ParamValue; import org.jboss.metadata.web.Servlet; +import org.jboss.metadata.web.ParamValue.ParamType; +import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; -import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; /** @@ -43,11 +47,27 @@ @Override public void create(Deployment dep) { - String propKey = "SERVICE_ENDPOINT_SERVLET"; + String propKey = "ServletClass"; String servletClass = (String)dep.getContext().getProperty(propKey); if (servletClass == null) throw new IllegalStateException("Cannot obtain context property: " + propKey); + + modifyServletClass(dep, servletClass); + + propKey = "ServletContextListener"; + String listenerClass = (String)dep.getContext().getProperty(propKey); + if (listenerClass != null) + modifyListener(dep, listenerClass); + propKey = "ContextParameterMap"; + Map<String, String> contextParams = (Map<String, String>)dep.getContext().getProperty(propKey); + if (contextParams != null) + modifyContextParams(dep, contextParams); + } + + private void modifyServletClass(Deployment dep, String servletClass) + { + WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); if (webMetaData != null) { @@ -73,6 +93,33 @@ } } + private void modifyListener(Deployment dep, String listenerClass) + { + WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + if (webMetaData != null) + { + Listener listener = new Listener(); + listener.setListenerClass(listenerClass); + webMetaData.addListener(listener); + } + } + + private void modifyContextParams(Deployment dep, Map<String, String> contextParams) + { + WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + if (webMetaData != null) + { + for (Map.Entry<String, String> entry : contextParams.entrySet()) + { + ParamValue ctxParam = new ParamValue(); + ctxParam.setType(ParamType.CONTEXT_PARAM); + ctxParam.setName(entry.getKey()); + ctxParam.setValue(entry.getValue()); + webMetaData.addContextParam(ctxParam); + } + } + } + private boolean isJavaxServlet(String orgServletClass, ClassLoader loader) { boolean isServlet = false; Modified: branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-16 20:42:35 UTC (rev 3899) +++ branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-16 20:45:09 UTC (rev 3900) @@ -6,12 +6,11 @@ ********************************************************************************************************************* Web Service deployment - There are three deployers registered with the JBoss Main Deployer. + There are two deployers registered with the JBoss Main Deployer. The order of which is important 1) EJBDeployer < WebServiceDeployerEJB 2) WebServiceDeployerJSE < WarDeployer - 3) WebServiceMainDeployer Each WebServiceDeployer has a number of DeployerHooks registered with it @@ -23,9 +22,6 @@ - WSDeployerHook_JAXRPC_JSE - WSDeployerHook_JAXWS_JSE - - WebServiceMainDeployer - - WSMainDeployerHook - Conceptually, each of these hooks implements the following pattern: DeployerHook.deploy(unit) @@ -69,17 +65,6 @@ <depends>WebAppParsingDeployer</depends> </bean> -  - <bean name="WebServiceMainDeployer" class="org.jboss.wsf.container.jboss50.WebServiceMainDeployer"> - <property name="relOrderJSE"><inject bean="WebServiceDeployerJSE" property="relativeOrder"/></property> - <property name="relOrderEJB"><inject bean="WebServiceDeployerEJB" property="relativeOrder"/></property> - <depends>WarDeployer</depends> - <depends>WebServiceDeployerEJB</depends> - <depends>WebServiceDeployerJSE</depends> - </bean> -  @@ -139,20 +124,6 @@ </uninstall> <depends>WebServiceDeployerEJB</depends> </bean> - <bean name="WSMainDeployerHook" class="org.jboss.wsf.container.jboss50.MainDeployerHook"> - <property name="deploymentAspectManager"><inject bean="WSMainDeploymentAspectManager"/></property> - <install bean="WebServiceMainDeployer" method="addDeployerHook"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="WebServiceMainDeployer" method="removeDeployerHook"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>WebServiceMainDeployer</depends> - </bean>  - <bean name="WSNativeJSEDeploymentAspectInstaller" class="org.jboss.wsf.spi.deployment.DeploymentAspectInstaller"> + <bean name="WSNativeDeploymentAspectInstallerJSE" class="org.jboss.wsf.spi.deployment.DeploymentAspectInstaller"> <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSNativeContextPropertiesDeploymentAspect"/> + <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> + <inject bean="WSNativeEventingDeploymentAspect"/> + <inject bean="WSNativePublishContractDeploymentAspect"/> + <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> + <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> </set> </property> </bean> - <bean name="WSNativeMainDeploymentAspectInstaller" class="org.jboss.wsf.spi.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSMainDeploymentAspectManager"/></property> + <bean name="WSNativeDeploymentAspectInstallerEJB" class="org.jboss.wsf.spi.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSNativeContextPropertiesDeploymentAspect"/> - <inject bean="WSNativeEagerInitializeDeploymentAspect"/> <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> <inject bean="WSNativeEventingDeploymentAspect"/> <inject bean="WSNativePublishContractDeploymentAspect"/> @@ -114,4 +114,4 @@ </set> </property> </bean> - + \ No newline at end of file Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeploymentAspect.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeploymentAspect.java 2007-07-16 20:42:35 UTC (rev 3899) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeploymentAspect.java 2007-07-16 20:45:09 UTC (rev 3900) @@ -38,15 +38,19 @@ @Override public void create(Deployment dep) { - String contextRoot = getExplicitContextRoot(dep); + String contextRoot = dep.getService().getContextRoot(); if (contextRoot == null) - contextRoot = getImplicitContextRoot(dep); - - // Always prefix with '/' - if (contextRoot.startsWith("/") == false) - contextRoot = "/" + contextRoot; - - dep.getService().setContextRoot(contextRoot); + { + contextRoot = getExplicitContextRoot(dep); + if (contextRoot == null) + contextRoot = getImplicitContextRoot(dep); + + // Always prefix with '/' + if (contextRoot.startsWith("/") == false) + contextRoot = "/" + contextRoot; + + dep.getService().setContextRoot(contextRoot); + } } protected String getExplicitContextRoot(Deployment dep) Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeploymentAspect.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeploymentAspect.java 2007-07-16 20:42:35 UTC (rev 3899) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeploymentAspect.java 2007-07-16 20:45:09 UTC (rev 3900) @@ -42,15 +42,19 @@ { for (Endpoint ep : dep.getService().getEndpoints()) { - String urlPattern = getExplicitPattern(dep, ep); + String urlPattern = ep.getURLPattern(); if (urlPattern == null) - urlPattern = getImplicitPattern(dep, ep); - - // Always prefix with '/' - if (urlPattern.startsWith("/") == false) - urlPattern = "/" + urlPattern; + { + urlPattern = getExplicitPattern(dep, ep); + if (urlPattern == null) + urlPattern = getImplicitPattern(dep, ep); + + // Always prefix with '/' + if (urlPattern.startsWith("/") == false) + urlPattern = "/" + urlPattern; - ep.setURLPattern(urlPattern); + ep.setURLPattern(urlPattern); + } } } Modified: branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifierImpl.java =================================================================== --- branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifierImpl.java 2007-07-16 20:42:35 UTC (rev 3899) +++ branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifierImpl.java 2007-07-16 20:45:09 UTC (rev 3900) @@ -22,6 +22,7 @@ package org.jboss.wsf.spi.deployment; import java.util.Iterator; +import java.util.Map; import org.dom4j.Document; import org.dom4j.Element; @@ -40,14 +41,34 @@ public RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException { - String propKey = "SERVICE_ENDPOINT_SERVLET"; + RewriteResults results = new RewriteResults(); + Element root = webXml.getRootElement(); + + String propKey = "ServletClass"; String servletClass = (String)dep.getContext().getProperty(propKey); if (servletClass == null) throw new IllegalStateException("Cannot obtain context property: " + propKey); - RewriteResults results = new RewriteResults(); - - Element root = webXml.getRootElement(); + propKey = "ContextParameterMap"; + Map<String, String> contextParams = (Map<String, String>)dep.getContext().getProperty(propKey); + if (contextParams != null) + { + for (Map.Entry<String, String> entry : contextParams.entrySet()) + { + Element contextParam = root.addElement("context-param"); + contextParam.addElement("param-name").addText(entry.getKey()); + contextParam.addElement("param-value").addText(entry.getValue()); + } + } + + propKey = "ServletContextListener"; + String listenerClass = (String)dep.getContext().getProperty(propKey); + if (listenerClass != null) + { + Element listener = root.addElement("listener"); + listener.addElement("listener-class").setText(listenerClass); + } + for (Iterator it = root.elementIterator("servlet"); it.hasNext();) { Element servlet = (Element)it.next(); Modified: branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml 2007-07-16 20:42:35 UTC (rev 3899) +++ branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml 2007-07-16 20:45:09 UTC (rev 3900) @@ -18,6 +18,9 @@ <property name="tests.resources.dir" value="${tests.dir}/resources"/>  + <condition property="excludesfile" value="${int.sunri.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"> + <available file="${int.sunri.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> + </condition> <property name="excludesfile" value="${int.sunri.dir}/src/test/resources/test-excludes.txt"/>  Modified: branches/tdiesler/trunk/integration/sunri/ant-import/macros-deploy-sunri.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-07-16 20:42:35 UTC (rev 3899) +++ branches/tdiesler/trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-07-16 20:45:09 UTC (rev 3900) @@ -53,6 +53,11 @@ <fileset dir="@{jbosslibs}"> <include name="jbossws-jboss50.jar"/> </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxws-api.jar"/> + <include name="jsr181-api.jar"/> + <include name="saaj-api.jar"/> + </fileset> </copy>  @@ -64,7 +69,7 @@ </copy> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{stacklibs}/jbossws-sunri50-deployer.zip"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{jbosslibs}/jbossws-jboss50-deployer.zip"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{stacklibs}/jbossws-sunri50.sar"/> <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="@{stacklibs}/jbossws-context.war" overwrite="true"/> @@ -100,8 +105,12 @@  <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> <include name="jbossws-jboss50.jar"/> + <include name="jaxws-api.jar"/> + <include name="jsr181-api.jar"/> + <include name="saaj-api.jar"/> </fileset> </delete> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>  <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> Modified: branches/tdiesler/trunk/integration/sunri/build.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/build.xml 2007-07-16 20:42:35 UTC (rev 3899) +++ branches/tdiesler/trunk/integration/sunri/build.xml 2007-07-16 20:45:09 UTC (rev 3900) @@ -116,7 +116,6 @@ <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri.jar" manifest="${sunri.output.etc.dir}/default.mf"> <fileset dir="${sunri.output.classes.dir}"> <exclude name="org/jboss/wsf/stack/sunri/sunri/tools/**"/> - <include name="org/jboss/wsf/stack/sunri50/**"/> <include name="org/jboss/wsf/stack/sunri/injection/**"/> <include name="org/jboss/wsf/stack/sunri/client/**"/> <include name="org/jboss/wsf/stack/sunri/metadata/**"/> @@ -153,11 +152,22 @@ <target name="jars-jboss50" depends="jars-common" if="jboss50.home"> +  + <concat destfile="${sunri.output.lib.dir}/jbossws-sunri50/jbossws-beans.xml"> + <header trimleading="yes"> + <deployment xmlns="urn:jboss:bean-deployer:2.0"> + </header> + <fileset file="${sunri.resources.dir}/jbossws-sunri-config.xml"/> + <footer trimleading="yes"> + </deployment> + </footer> + </concat> +  <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri50.sar" manifest="${sunri.output.etc.dir}/default.mf"> -  <fileset dir="${spi.dir}/thirdparty"> @@ -179,23 +189,14 @@ <include name="stax-ex.jar"/> <include name="streambuffer.jar"/> </fileset> - <metainf dir="${sunri.resources.dir}/jbossws-sunri50.sar/META-INF"> + <fileset dir="${sunri.output.lib.dir}"> + <include name="jbossws-sunri.jar"/> + </fileset> + <metainf dir="${sunri.output.lib.dir}/jbossws-sunri50"> <include name="jbossws-beans.xml"/> </metainf> </jar> -  - <zip zipfile="${sunri.output.lib.dir}/jbossws-sunri50-deployer.zip"> - <fileset dir="${int.jboss50.dir}/output/lib"> - <include name="jbossws-jboss50.jar"/> - </fileset> - <fileset dir="${sunri.output.lib.dir}"> - <include name="jbossws-sunri.jar"/> - </fileset> - <fileset dir="${sunri.resources.dir}/jbossws-sunri50.deployer"> - <include name="META-INF/jbossws-deployer-beans.xml"/> - </fileset> - </zip> </target> <target name="jars-jboss42" depends="jars-common" if="jboss42.home"> Modified: branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java 2007-07-16 20:42:35 UTC (rev 3899) +++ branches/tdiesler/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java 2007-07-16 20:45:09 UTC (rev 3900) @@ -23,11 +23,14 @@ //$Id: SunJaxwsDeployer.java 3802 2007-07-05 16:44:32Z thomas.diesler(a)jboss.com $ +import java.util.HashMap; +import java.util.Map; + import javax.xml.ws.BindingType; import javax.xml.ws.soap.SOAPBinding; +import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; -import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.stack.sunri.metadata.sunjaxws.DDEndpoint; import org.jboss.wsf.stack.sunri.metadata.sunjaxws.DDEndpoints; @@ -43,29 +46,44 @@ @Override public void create(Deployment dep) { - DDEndpoints dd = new DDEndpoints(); - for (Endpoint ep : dep.getService().getEndpoints()) + + DDEndpoints dd = dep.getContext().getAttachment(DDEndpoints.class); + if (dd == null) { - String epName = ep.getShortName(); - String targetBean = ep.getTargetBeanName(); - String urlPattern = ep.getURLPattern(); + dd = new DDEndpoints(); + for (Endpoint ep : dep.getService().getEndpoints()) + { + String epName = ep.getShortName(); + String targetBean = ep.getTargetBeanName(); + String urlPattern = ep.getURLPattern(); - DDEndpoint ddep = new DDEndpoint(epName, targetBean, urlPattern); + DDEndpoint ddep = new DDEndpoint(epName, targetBean, urlPattern); + + Class beanClass = ep.getTargetBeanClass(); + BindingType anBindingType = (BindingType)beanClass.getAnnotation(BindingType.class); + if (anBindingType != null && anBindingType.value().length() > 0) + { + String binding = anBindingType.value(); + ddep.setBinding(binding); + if (binding.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING) || binding.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING)) + ddep.setEnableMTOM(true); + } + + log.info("Add " + ddep); + dd.addEndpoint(ddep); + } - Class beanClass = ep.getTargetBeanClass(); - BindingType anBindingType = (BindingType)beanClass.getAnnotation(BindingType.class); - if (anBindingType != null && anBindingType.value().length() > 0) + dep.getContext().addAttachment(DDEndpoints.class, dd); + + String propKey = "SERVICE_ENDPOINT_CONTEXT_PARAMS"; + Map<String, String> contextParams = (Map<String, String>)dep.getContext().getProperty(propKey); + if (contextParams == null) { - String binding = anBindingType.value(); - ddep.setBinding(binding); - if (binding.equals(SOAPBinding.SOAP11HTTP_MTOM_BINDING) || binding.equals(SOAPBinding.SOAP12HTTP_MTOM_BINDING)) - ddep.setEnableMTOM(true); + contextParams = new HashMap<String, String>(); + dep.getContext().setProperty(propKey, contextParams); } - - log.info("Add " + ddep); - dd.addEndpoint(ddep); + contextParams.put(WSServletContextListenerJBWS.PARAM_SUN_JAXWS_URL, dd.createFileURL().toExternalForm()); } - dep.getContext().addAttachment(DDEndpoints.class, dd); } @Override Added: branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml =================================================================== --- branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml (rev 0) +++ branches/tdiesler/trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml 2007-07-16 20:45:09 UTC (rev 3900) @@ -0,0 +1,107 @@ + +  + <bean name="WSServerConfig" class="org.jboss.wsf.spi.management.BasicServerConfig"> +  + <property name="webServiceHost">${jboss.bind.address}</property> + <property name="modifySOAPAddress">true</property> + +  + </bean> + +  + <bean name="WSEndpointRegistry" class="org.jboss.wsf.stack.sunri.ManagedEndpointRegistry"/> + +  + <bean name="WSServiceRefHandler" class="org.jboss.wsf.spi.deployment.serviceref.ServiceRefHandlerImpl"> + <property name="jaxrpcBinder"><inject bean="WSServiceRefBinderJAXRPC"/></property> + <property name="jaxwsBinder"><inject bean="WSServiceRefBinderJAXWS"/></property> + </bean> + +  + <bean name="ServiceRefHandler" class="org.jboss.wsf.spi.deployment.serviceref.ServiceRefHandlerImpl"> + <property name="jaxrpcBinder"><inject bean="WSServiceRefBinderJAXRPC"/></property> + <property name="jaxwsBinder"><inject bean="WSServiceRefBinderJAXWS"/></property> + </bean> + <bean name="WSServiceRefBinderJAXRPC" class="org.jboss.wsf.stack.sunri.client.DummyServiceRefBinderJAXRPC"/> + <bean name="WSServiceRefBinderJAXWS" class="org.jboss.wsf.stack.sunri.client.ServiceRefBinderJAXWS"/> + +  + <bean name="JDKLogRedirector" class="org.jboss.wsf.stack.sunri.log.JDKLogRedirector"> + <property name="namespaces"> + <list class="java.util.LinkedList" elementClass="java.lang.String"> + <value>javax.enterprise.resource.webservices.jaxws</value> + <value>com.sun</value> + </list> + </property> + <property name="levelMapping"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>INFO</key><value>info</value></entry> + <entry><key>SEVERE</key><value>error</value></entry> + <entry><key>WARNING</key><value>warn</value></entry> + <entry><key>FINE</key><value>debug</value></entry> + <entry><key>FINER</key><value>trace</value></entry> + <entry><key>FINEST</key><value>trace</value></entry> + </map> + </property> + <property name="defaultLevel">debug</property> + </bean> + +  + <bean name="WSMetroContextPropertiesDeploymentAspect" class="org.jboss.wsf.spi.deployment.ContextPropertiesDeploymentAspect"> + <property name="provides">ContextProperties</property> + <property name="contextProperties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>SERVICE_ENDPOINT_LISTENER</key><value>org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS</value></entry> + <entry><key>SERVICE_ENDPOINT_SERVLET</key><value>org.jboss.wsf.spi.invocation.EndpointServlet</value></entry> + </map> + </property> + </bean> + + <bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeploymentAspect"> + <property name="requires">ContainerEndpointHandler</property> + <property name="provides">StackEndpointHandler</property> + <property name="requestHandler">org.jboss.wsf.stack.sunri.RequestHandlerImpl</property> + <property name="lifecycleHandler">org.jboss.wsf.stack.sunri.LifecycleHandlerImpl</property> + </bean> + + <bean name="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.sunri.SunJaxwsDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">StackGeneratedDescriptor</property> + </bean> + +  + <bean name="WSMetroDeploymentAspectInstallerJSE" class="org.jboss.wsf.spi.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSMetroContextPropertiesDeploymentAspect"/> + <inject bean="WSMetroDescriptorDeploymentAspect"/> + </set> + </property> + </bean> + <bean name="WSMetroMainDeploymentAspectInstaller" class="org.jboss.wsf.spi.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSMainDeploymentAspectManager"/></property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSMetroDescriptorDeploymentAspect"/> + <inject bean="WSMetroEndpointHandlerDeploymentAspect"/> + </set> + </property> + </bean> + Modified: branches/tdiesler/trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- branches/tdiesler/trunk/integration/xfire/ant-import/build-testsuite.xml 2007-07-16 20:42:35 UTC (rev 3899) +++ branches/tdiesler/trunk/integration/xfire/ant-import/build-testsuite.xml 2007-07-16 20:45:09 UTC (rev 3900) @@ -18,6 +18,9 @@ <property name="tests.resources.dir" value="${tests.dir}/resources"/>  + <condition property="excludesfile" value="${int.xfire.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"> + <available file="${int.xfire.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> + </condition> <property name="excludesfile" value="${int.xfire.dir}/src/test/resources/test-excludes.txt"/>  Modified: branches/tdiesler/trunk/integration/xfire/ant-import/macros-deploy-xfire.xml =================================================================== --- branches/tdiesler/trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-07-16 20:42:35 UTC (rev 3899) +++ branches/tdiesler/trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-07-16 20:45:09 UTC (rev 3900) @@ -50,7 +50,7 @@ </fileset> </copy> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{stacklibs}/jbossws-xfire50-deployer.zip"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{jbosslibs}/jbossws-jboss50-deployer.zip"/> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src="@{stacklibs}/jbossws-xfire50.sar"/> <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="@{stacklibs}/jbossws-context.war" overwrite="true"/>

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3899 - branches/tdiesler.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-16 16:42:35 -0400 (Mon, 16 Jul 2007) New Revision: 3899 Added: branches/tdiesler/trunk/ Log: recreate userbranch Copied: branches/tdiesler/trunk (from rev 3898, trunk)

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3898 - branches/tdiesler.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-16 16:42:09 -0400 (Mon, 16 Jul 2007) New Revision: 3898 Removed: branches/tdiesler/trunk/ Log: recreate userbranch

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3897 - in trunk: jbossws-core/ant-import-tests and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-16 11:31:39 -0400 (Mon, 16 Jul 2007) New Revision: 3897 Modified: trunk/build/ant-import/build-testsuite.xml trunk/jbossws-core/ant-import-tests/build-testsuite.xml Log: Use server dependencies for test run Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-07-16 14:43:28 UTC (rev 3896) +++ trunk/build/ant-import/build-testsuite.xml 2007-07-16 15:31:39 UTC (rev 3897) @@ -121,7 +121,7 @@ There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir. The 'ws.stack.classpath' contains jars that come with a specific stack distribution. - The 'tests.extra.classpath' contains stack specific jars that are needed for + The 'tests.extra.classpath' contains stack specific jars that are needed for ... --> <path id="tests.client.classpath"> <path refid="ws.stack.classpath"/> Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-07-16 14:43:28 UTC (rev 3896) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-07-16 15:31:39 UTC (rev 3897) @@ -36,14 +36,13 @@ </path> <path id="tests.extra.classpath"> - <pathelement location="${core.dir}/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${core.dir}/thirdparty/ejb3.deployer/jboss-ejb3.jar"/> - <pathelement location="${core.dir}/thirdparty/policy.jar"/> - <pathelement location="${core.dir}/thirdparty/qdox.jar"/> - <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/> - <pathelement location="${core.dir}/thirdparty/xmlunit.jar"/> - <pathelement location="${core.dir}/thirdparty/wstx.jar"/> - </path> + <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> + <pathelement location="${jboss.client}/policy.jar"/> + <pathelement location="${jboss.client}/wsdl4j.jar"/> + <pathelement location="${jboss.client}/wstx.jar"/> + <pathelement location="${core.dir}/thirdparty/qdox.jar"/> + <pathelement location="${core.dir}/thirdparty/xmlunit.jar"/> + </path>  <path id="jbpm.bpel.classpath">

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3896 - trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-16 10:43:28 -0400 (Mon, 16 Jul 2007) New Revision: 3896 Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java Log: Use dynamic server host assignment in benchmark/jaxrpc tests Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase.java 2007-07-16 14:43:28 UTC (rev 3896) @@ -28,6 +28,7 @@ import javax.naming.InitialContext; import javax.xml.rpc.Service; +import javax.xml.rpc.Stub; /** * Test Benchmark EJB Service @@ -37,52 +38,54 @@ */ public class BenchmarkDocEJBTestCase extends JBossWSTest { - private static BenchmarkService endpoint; + private static BenchmarkService endpoint; - public static Test suite() - { - return new JBossWSTestSetup(BenchmarkDocEJBTestCase.class, "jaxrpc-benchmark-doclit.jar, jaxrpc-benchmark-doclit-client.jar"); - } + public static Test suite() + { + return new JBossWSTestSetup(BenchmarkDocEJBTestCase.class, "jaxrpc-benchmark-doclit.jar, jaxrpc-benchmark-doclit-client.jar"); + } - protected void setUp() throws Exception - { - super.setUp(); + protected void setUp() throws Exception + { + super.setUp(); - if (endpoint == null) - { - InitialContext iniCtx = getInitialContext("benchmark-client"); - Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkEJB"); - endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); - } + if (endpoint == null) + { + InitialContext iniCtx = getInitialContext("benchmark-client"); + Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkEJB"); + endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); + ((Stub)endpoint)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-benchmark-doc-ejb"); + } - } - public void testEchoSimpleType() throws Exception - { - SimpleUserType userType = new SimpleUserType(1, 1.0f, "test"); - SimpleUserType retObj = endpoint.echoSimpleType(userType); - assertEquals(userType.getS()+userType.getF()+userType.getI(), retObj.getS()+retObj.getF()+retObj.getI()); - } + } - public void testEchoArrayOfSimpleUserType() throws Exception - { - SimpleUserType[] array = new SimpleUserType[1]; - array[0] = new SimpleUserType(1, 1.0f, "test"); - SimpleUserType[] retObj = endpoint.echoArrayOfSimpleUserType(array); - assertEquals(array[0].getS()+array[0].getF()+array[0].getI(), retObj[0].getS()+retObj[0].getF()+retObj[0].getI()); - } + public void testEchoSimpleType() throws Exception + { + SimpleUserType userType = new SimpleUserType(1, 1.0f, "test"); + SimpleUserType retObj = endpoint.echoSimpleType(userType); + assertEquals(userType.getS()+userType.getF()+userType.getI(), retObj.getS()+retObj.getF()+retObj.getI()); + } - public void testEchoSynthetic() throws Exception - { - Synthetic synthetic = new Synthetic("test", new SimpleUserType(1, 1.0f, "test"), "test".getBytes()); - Synthetic retObj = endpoint.echoSynthetic(synthetic); - assertEquals(synthetic.getS()+synthetic.getSut().getS()+synthetic.getSut().getF()+synthetic.getSut().getI(), retObj.getS()+retObj.getSut().getS()+retObj.getSut().getF()+retObj.getSut().getI()); - } + public void testEchoArrayOfSimpleUserType() throws Exception + { + SimpleUserType[] array = new SimpleUserType[1]; + array[0] = new SimpleUserType(1, 1.0f, "test"); + SimpleUserType[] retObj = endpoint.echoArrayOfSimpleUserType(array); + assertEquals(array[0].getS()+array[0].getF()+array[0].getI(), retObj[0].getS()+retObj[0].getF()+retObj[0].getI()); + } - public void testGetOrder() throws Exception - { - Order order = endpoint.getOrder(50,1); - assertEquals(50,order.getLineItems().length); - } + public void testEchoSynthetic() throws Exception + { + Synthetic synthetic = new Synthetic("test", new SimpleUserType(1, 1.0f, "test"), "test".getBytes()); + Synthetic retObj = endpoint.echoSynthetic(synthetic); + assertEquals(synthetic.getS()+synthetic.getSut().getS()+synthetic.getSut().getF()+synthetic.getSut().getI(), retObj.getS()+retObj.getSut().getS()+retObj.getSut().getF()+retObj.getSut().getI()); + } + + public void testGetOrder() throws Exception + { + Order order = endpoint.getOrder(50,1); + assertEquals(50,order.getLineItems().length); + } } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase.java 2007-07-16 14:43:28 UTC (rev 3896) @@ -30,6 +30,7 @@ import javax.naming.NamingException; import javax.xml.rpc.Service; import javax.xml.rpc.ServiceException; +import javax.xml.rpc.Stub; /** * Test Benchmark EJB Service @@ -57,7 +58,8 @@ InitialContext iniCtx = getInitialContext("benchmark-client"); Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkJSE"); endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); - //((Stub)endpoint)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://"+getServerHost()+":8080/jaxrpc-benchmark-doc/jse"); + + ((Stub)endpoint)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-benchmark-doc/jse"); } } catch (NamingException e) @@ -66,7 +68,7 @@ } catch (ServiceException e) { - e.printStackTrace(); + e.printStackTrace(); } } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcEJBTestCase.java 2007-07-16 14:43:28 UTC (rev 3896) @@ -28,6 +28,7 @@ import javax.naming.InitialContext; import javax.xml.rpc.Service; +import javax.xml.rpc.Stub; /** * Test Benchmark EJB Service @@ -37,50 +38,52 @@ */ public class BenchmarkRpcEJBTestCase extends JBossWSTest { - private static BenchmarkService endpoint; + private static BenchmarkService endpoint; - public static Test suite() - { - return new JBossWSTestSetup(BenchmarkRpcEJBTestCase.class, "jaxrpc-benchmark-rpclit.jar, jaxrpc-benchmark-rpclit-client.jar"); - } + public static Test suite() + { + return new JBossWSTestSetup(BenchmarkRpcEJBTestCase.class, "jaxrpc-benchmark-rpclit.jar, jaxrpc-benchmark-rpclit-client.jar"); + } - protected void setUp() throws Exception - { - super.setUp(); + protected void setUp() throws Exception + { + super.setUp(); - if (endpoint == null) - { - InitialContext iniCtx = getInitialContext("benchmark-client"); - Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkEJB"); - endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); - } - } + if (endpoint == null) + { + InitialContext iniCtx = getInitialContext("benchmark-client"); + Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkEJB"); + endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); - public void testEchoSimpleType() throws Exception - { - SimpleUserType userType = new SimpleUserType(1, 1.0f, "test"); - SimpleUserType retObj = endpoint.echoSimpleType(userType); - assertEquals(userType.getS()+userType.getF()+userType.getI(), retObj.getS()+retObj.getF()+retObj.getI()); - } + ((Stub)endpoint)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-benchmark-rpc-ejb"); + } + } - public void testEchoArrayOfSimpleUserType() throws Exception - { - SimpleUserType[] array = new SimpleUserType[1]; - array[0] = new SimpleUserType(1, 1.0f, "test"); - SimpleUserType[] retObj = endpoint.echoArrayOfSimpleUserType(array); - assertEquals(array[0].getS()+array[0].getF()+array[0].getI(), retObj[0].getS()+retObj[0].getF()+retObj[0].getI()); - } + public void testEchoSimpleType() throws Exception + { + SimpleUserType userType = new SimpleUserType(1, 1.0f, "test"); + SimpleUserType retObj = endpoint.echoSimpleType(userType); + assertEquals(userType.getS()+userType.getF()+userType.getI(), retObj.getS()+retObj.getF()+retObj.getI()); + } - public void testEchoSynthetic() throws Exception - { - Synthetic synthetic = new Synthetic("test", new SimpleUserType(1, 1.0f, "test"), "test".getBytes()); - Synthetic retObj = endpoint.echoSynthetic(synthetic); - assertEquals(synthetic.getS()+synthetic.getSut().getS()+synthetic.getSut().getF()+synthetic.getSut().getI(), retObj.getS()+retObj.getSut().getS()+retObj.getSut().getF()+retObj.getSut().getI()); - } + public void testEchoArrayOfSimpleUserType() throws Exception + { + SimpleUserType[] array = new SimpleUserType[1]; + array[0] = new SimpleUserType(1, 1.0f, "test"); + SimpleUserType[] retObj = endpoint.echoArrayOfSimpleUserType(array); + assertEquals(array[0].getS()+array[0].getF()+array[0].getI(), retObj[0].getS()+retObj[0].getF()+retObj[0].getI()); + } - public void testGetOrder() throws Exception - { - Order order = endpoint.getOrder(50,1); - assertEquals(50,order.getLineItems().length); - } + public void testEchoSynthetic() throws Exception + { + Synthetic synthetic = new Synthetic("test", new SimpleUserType(1, 1.0f, "test"), "test".getBytes()); + Synthetic retObj = endpoint.echoSynthetic(synthetic); + assertEquals(synthetic.getS()+synthetic.getSut().getS()+synthetic.getSut().getF()+synthetic.getSut().getI(), retObj.getS()+retObj.getSut().getS()+retObj.getSut().getF()+retObj.getSut().getI()); + } + + public void testGetOrder() throws Exception + { + Order order = endpoint.getOrder(50,1); + assertEquals(50,order.getLineItems().length); + } } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java 2007-07-16 13:27:36 UTC (rev 3895) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/benchmark/jaxrpc/BenchmarkRpcJSETestCase.java 2007-07-16 14:43:28 UTC (rev 3896) @@ -28,6 +28,7 @@ import javax.naming.InitialContext; import javax.xml.rpc.Service; +import javax.xml.rpc.Stub; /** * Test Benchmark EJB Service @@ -37,50 +38,52 @@ */ public class BenchmarkRpcJSETestCase extends JBossWSTest { - private static BenchmarkService endpoint; + private static BenchmarkService endpoint; - public static Test suite() - { - return new JBossWSTestSetup(BenchmarkRpcJSETestCase.class, "jaxrpc-benchmark-rpclit.war, jaxrpc-benchmark-rpclit-client.jar"); - } + public static Test suite() + { + return new JBossWSTestSetup(BenchmarkRpcJSETestCase.class, "jaxrpc-benchmark-rpclit.war, jaxrpc-benchmark-rpclit-client.jar"); + } - protected void setUp() throws Exception - { - super.setUp(); + protected void setUp() throws Exception + { + super.setUp(); - if (endpoint == null) - { - InitialContext iniCtx = getInitialContext("benchmark-client"); - Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkJSE"); - endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); - } - } + if (endpoint == null) + { + InitialContext iniCtx = getInitialContext("benchmark-client"); + Service service = (Service)iniCtx.lookup("java:comp/env/service/BenchmarkJSE"); + endpoint = (BenchmarkService)service.getPort(BenchmarkService.class); - public void testEchoSimpleType() throws Exception - { - SimpleUserType userType = new SimpleUserType(1, 1.0f, "test"); - SimpleUserType retObj = endpoint.echoSimpleType(userType); - assertEquals(userType.getS()+userType.getF()+userType.getI(), retObj.getS()+retObj.getF()+retObj.getI()); - } + ((Stub)endpoint)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-benchmark-rpc"); + } + } - public void testEchoArrayOfSimpleUserType() throws Exception - { - SimpleUserType[] array = new SimpleUserType[1]; - array[0] = new SimpleUserType(1, 1.0f, "test"); - SimpleUserType[] retObj = endpoint.echoArrayOfSimpleUserType(array); - assertEquals(array[0].getS()+array[0].getF()+array[0].getI(), retObj[0].getS()+retObj[0].getF()+retObj[0].getI()); - } + public void testEchoSimpleType() throws Exception + { + SimpleUserType userType = new SimpleUserType(1, 1.0f, "test"); + SimpleUserType retObj = endpoint.echoSimpleType(userType); + assertEquals(userType.getS()+userType.getF()+userType.getI(), retObj.getS()+retObj.getF()+retObj.getI()); + } - public void testEchoSynthetic() throws Exception - { - Synthetic synthetic = new Synthetic("test", new SimpleUserType(1, 1.0f, "test"), "test".getBytes()); - Synthetic retObj = endpoint.echoSynthetic(synthetic); - assertEquals(synthetic.getS()+synthetic.getSut().getS()+synthetic.getSut().getF()+synthetic.getSut().getI(), retObj.getS()+retObj.getSut().getS()+retObj.getSut().getF()+retObj.getSut().getI()); - } + public void testEchoArrayOfSimpleUserType() throws Exception + { + SimpleUserType[] array = new SimpleUserType[1]; + array[0] = new SimpleUserType(1, 1.0f, "test"); + SimpleUserType[] retObj = endpoint.echoArrayOfSimpleUserType(array); + assertEquals(array[0].getS()+array[0].getF()+array[0].getI(), retObj[0].getS()+retObj[0].getF()+retObj[0].getI()); + } - public void testGetOrder() throws Exception - { - Order order = endpoint.getOrder(50,1); - assertEquals(50,order.getLineItems().length); - } + public void testEchoSynthetic() throws Exception + { + Synthetic synthetic = new Synthetic("test", new SimpleUserType(1, 1.0f, "test"), "test".getBytes()); + Synthetic retObj = endpoint.echoSynthetic(synthetic); + assertEquals(synthetic.getS()+synthetic.getSut().getS()+synthetic.getSut().getF()+synthetic.getSut().getI(), retObj.getS()+retObj.getSut().getS()+retObj.getSut().getF()+retObj.getSut().getI()); + } + + public void testGetOrder() throws Exception + { + Order order = endpoint.getOrder(50,1); + assertEquals(50,order.getLineItems().length); + } }

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3895 - in branches/hbraun/trunk: jbossws-core/src/test/java/org/jboss/test/ws/jaxws and 9 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-16 09:27:36 -0400 (Mon, 16 Jul 2007) New Revision: 3895 Added: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/ branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/ branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/application-client.xml branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/ branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/ branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/application-client.xml branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml Removed: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/ branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/ Modified: branches/hbraun/trunk/jbossws-core/ant-import-tests/build-samples-jaxws.xml branches/hbraun/trunk/testsuite/ant-import/build-jars-jaxws.xml Log: Move prop. websevriceref tests back to jbossws-core module Modified: branches/hbraun/trunk/jbossws-core/ant-import-tests/build-samples-jaxws.xml =================================================================== --- branches/hbraun/trunk/jbossws-core/ant-import-tests/build-samples-jaxws.xml 2007-07-16 13:21:14 UTC (rev 3894) +++ branches/hbraun/trunk/jbossws-core/ant-import-tests/build-samples-jaxws.xml 2007-07-16 13:27:36 UTC (rev 3895) @@ -105,8 +105,45 @@ <include name="wsdl/**"/> </webinf> </war> - -  + +  + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.class"/> + </fileset> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.SecureEndpointClient"/> + </manifest> + </jar> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-override-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override"> + <include name="jbossws-client-config.xml"/> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="wsdl/**"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo"/> + </manifest> + </jar> + +  </target> Added: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java (rev 0) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java 2007-07-16 13:27:36 UTC (rev 3895) @@ -0,0 +1,35 @@ + +package org.jboss.test.ws.jaxws.webserviceref; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebService(name = "SecureEndpoint", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-samples-webserviceref-secure/Secu...") +@SOAPBinding(style = Style.RPC) +public interface SecureEndpoint { + + + /** + * + * @param arg0 + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/wsref", partName = "return") + public String echo( + @WebParam(name = "arg0", partName = "arg0") + String arg0); + +} Property changes on: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java (rev 0) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java 2007-07-16 13:27:36 UTC (rev 3895) @@ -0,0 +1,83 @@ +/* + * 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.webserviceref; + +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceRef; + +import org.jboss.logging.Logger; +import org.jboss.test.ws.jaxws.webserviceref.SecureEndpointService; + +public class SecureEndpointClient +{ + // Provide logging + private static Logger log = Logger.getLogger(SecureEndpointClient.class); + + @WebServiceRef(name = "SecureService1") + static SecureEndpointService secureService1; + + @WebServiceRef(name = "SecureService2") + static Service secureService2; + + @WebServiceRef(name = "SecurePort1") + static SecureEndpoint securePort1; + + static String retStr; + + public static void main(String[] args) + { + String reqMsg = args[0]; + log.info("echo: " + reqMsg); + + String username = null; + if (args.length > 1) + username = args[1]; + + String password = null; + if (args.length > 2) + password = args[2]; + + SecureEndpoint port = secureService1.getSecureEndpointPort(); + String retMsg = invokeEndpoint(port, reqMsg, username, password); + + port = secureService2.getPort(SecureEndpoint.class); + retMsg += "|" + invokeEndpoint(port, reqMsg, username, password); + + port = securePort1; + retMsg += "|" + invokeEndpoint(port, reqMsg, username, password); + + retStr = retMsg; + } + + private static String invokeEndpoint(SecureEndpoint port, String inStr, String username, String password) + { + if (username != null && password != null) + { + BindingProvider bindingProvider = (BindingProvider)port; + bindingProvider.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, username); + bindingProvider.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, password); + } + + return port.echo(inStr); + } +} Property changes on: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java (rev 0) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java 2007-07-16 13:27:36 UTC (rev 3895) @@ -0,0 +1,53 @@ +/* + * 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.webserviceref; + +import javax.annotation.security.RolesAllowed; +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + +import org.jboss.annotation.security.SecurityDomain; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.annotation.WebContext; + +@WebService(name = "SecureEndpoint", serviceName = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/wsref") +@Stateless(name = "SecureEndpoint") +@SOAPBinding(style = Style.RPC) + +@WebContext(contextRoot="/jaxws-samples-webserviceref-secure", urlPattern="/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false) +@SecurityDomain("JBossWS") +@RolesAllowed("friend") +public class SecureEndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(SecureEndpointImpl.class); + + @WebMethod + public String echo(String input) + { + log.info(input); + return input; + } +} Property changes on: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java (rev 0) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java 2007-07-16 13:27:36 UTC (rev 3895) @@ -0,0 +1,55 @@ + +package org.jboss.test.ws.jaxws.webserviceref; + +import java.net.MalformedURLException; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebServiceClient(name = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-samples-webserviceref-secure/Secu...") +public class SecureEndpointService + extends Service +{ + + private final static URL WSDL_LOCATION; + private final static QName SECUREENDPOINTSERVICE = new QName("http://org.jboss.ws/wsref", "SecureEndpointService"); + private final static QName SECUREENDPOINTPORT = new QName("http://org.jboss.ws/wsref", "SecureEndpointPort"); + + static { + URL url = null; + try { + url = new URL("http://localhost.localdomain:8080/jaxws-samples-webserviceref-secure/Secu..."); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + WSDL_LOCATION = url; + } + + public SecureEndpointService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public SecureEndpointService() { + super(WSDL_LOCATION, SECUREENDPOINTSERVICE); + } + + /** + * + * @return + * returns SecureEndpoint + */ + @WebEndpoint(name = "SecureEndpointPort") + public SecureEndpoint getSecureEndpointPort() { + return (SecureEndpoint)super.getPort(SECUREENDPOINTPORT, SecureEndpoint.class); + } + +} Property changes on: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java (rev 0) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java 2007-07-16 13:27:36 UTC (rev 3895) @@ -0,0 +1,100 @@ +/* + * 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.webserviceref; + +import junit.framework.Test; + +import org.jboss.ejb3.client.ClientLauncher; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + +/** + * Test @WebServiceRef overrides in jboss-client.xml + * + * @author Thomas.Diesler(a)jboss.com + * @since 18-Jan-2007 + */ +public class ServiceRefOverridesTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webserviceref"; + + public static Test suite() + { + return new JBossWSTestSetup(ServiceRefOverridesTestCase.class, "jaxws-samples-webserviceref.war, jaxws-samples-webserviceref-override-client.jar"); + } + + protected void setUp() throws Exception + { + super.setUp(); + + if (TestEndpointClientTwo.iniCtx == null) + TestEndpointClientTwo.iniCtx = getInitialContext(); + } + + public void testService1() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName(), resStr); + } + + public void testService2() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName(), resStr); + } + + public void testService3() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName() + getName(), resStr); + } + + public void testService4() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName() + getName(), resStr); + } + + public void testPort1() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName(), resStr); + } + + public void testPort2() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName() + getName(), resStr); + } + + public void testPort3() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName() + getName(), resStr); + } + + private String invokeTest(String reqStr) throws Throwable + { + new ClientLauncher().launch(TestEndpointClientTwo.class.getName(), "jbossws-client", new String[] { reqStr }); + return TestEndpointClientTwo.testResult.get(reqStr); + } +} Property changes on: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java (rev 0) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2007-07-16 13:27:36 UTC (rev 3895) @@ -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.test.ws.jaxws.webserviceref; + +import java.net.URL; +import java.io.InputStream; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.ejb3.client.ClientLauncher; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + +/** + * Test the JAXWS annotation: javax.xml.ws.WebServiceRef + * + * @author Thomas.Diesler(a)jboss.com + * @since 23-Oct-2005 + */ +public class StubPropertyTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webserviceref-secure"; + + public static Test suite() + { + return new JBossWSTestSetup(StubPropertyTestCase.class, "jaxws-samples-webserviceref-secure.jar, jaxws-samples-webserviceref-secure-client.jar"); + } + + public void testWSDLAccess() throws Exception + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + InputStream inputStream = wsdlURL.openStream(); + assertNotNull(inputStream); + inputStream.close(); + } + + public void testDynamicProxy() throws Exception + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName qname = new QName("http://org.jboss.ws/wsref", "SecureEndpointService"); + Service service = Service.create(wsdlURL, qname); + SecureEndpoint port = (SecureEndpoint)service.getPort(SecureEndpoint.class); + + BindingProvider bindingProvider = (BindingProvider)port; + bindingProvider.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit"); + bindingProvider.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "thefrog"); + + String helloWorld = "Hello World"; + Object retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void testUnconfiguredStub() throws Throwable + { + String reqMsg = "Hello World"; + new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" }); + assertEquals("Hello World|Hello World|Hello World", SecureEndpointClient.retStr); + } + + public void testConfiguredStub() throws Throwable + { + String reqMsg = "Hello World"; + new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg }); + assertEquals("Hello World|Hello World|Hello World", SecureEndpointClient.retStr); + } +} Property changes on: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java (rev 0) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java 2007-07-16 13:27:36 UTC (rev 3895) @@ -0,0 +1,53 @@ +/* + * 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.webserviceref; + +import javax.jws.WebService; +import javax.jws.WebMethod; +import javax.jws.WebResult; +import javax.jws.WebParam; +import javax.jws.soap.SOAPBinding; + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-samples-webserviceref?wsdl") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface TestEndpoint { + + + /** + * + * @param arg0 + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/wsref", partName = "return") + public String echo( + @WebParam(name = "arg0", partName = "arg0") + String arg0); + +} Property changes on: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java (rev 0) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java 2007-07-16 13:27:36 UTC (rev 3895) @@ -0,0 +1,127 @@ +/* + * 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.webserviceref; + +import org.jboss.logging.Logger; + +import javax.naming.InitialContext; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.WebServiceRef; +import javax.xml.ws.WebServiceRefs; +import java.util.ArrayList; + +@WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") + +// Test multiple on type +@WebServiceRefs( { + @WebServiceRef(name = "service2", value = TestEndpointService.class), + @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class) }) +public class TestEndpointClientOne +{ + // Provide logging + private static Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class); + + // Test on field with name + @WebServiceRef(name = "TestEndpointService3") + static TestEndpointService service3; + + // Test on field without name + @WebServiceRef + static TestEndpointService service4; + + // Test on method with name + @WebServiceRef(name = "TestEndpointService5") + static void setService5(TestEndpointService service) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service5 = service; + } + private static TestEndpointService service5; + + // Test on method without name + @WebServiceRef + static void setService6(TestEndpointService service) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service6 = service; + } + private static TestEndpointService service6; + + // Test on field with name and value + @WebServiceRef(name = "Port2", value = TestEndpointService.class) + static TestEndpoint port2; + + // Test on field with value + @WebServiceRef(value = TestEndpointService.class) + static TestEndpoint port3; + + // Test on field + @WebServiceRef + static TestEndpoint port4; + + // Test on field with name + @WebServiceRef (name = "Port5") + static TestEndpoint port5; + + static InitialContext iniCtx; + static String retStr; + + public static void main(String[] args) + { + String inStr = args[0]; + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.log.info("echo: " + inStr); + + ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>(); + try + { + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/service1")).getTestEndpointPort()); + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service3.getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/TestEndpointService3")).getTestEndpointPort()); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service4.getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/service4")).getTestEndpointPort()); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service5.getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort()); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service6.getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/service6")).getTestEndpointPort()); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/port1")); + ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port2); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/Port2")); + ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port3); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/port3")); + ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port4); + ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port5); + } + catch (Exception ex) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.log.error("Cannot add port", ex); + throw new WebServiceException(ex); + } + + for (TestEndpoint port : ports) + { + String outStr = port.echo(inStr); + if (inStr.equals(outStr) == false) + throw new WebServiceException("Invalid echo return: " + inStr); + } + + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.retStr = inStr; + } +} Property changes on: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java (rev 0) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java 2007-07-16 13:27:36 UTC (rev 3895) @@ -0,0 +1,206 @@ +/* + * 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.webserviceref; + +import org.jboss.logging.Logger; +import org.jboss.test.ws.jaxws.webserviceref.TestEndpoint; +import org.jboss.test.ws.jaxws.webserviceref.TestEndpointService; + +import javax.naming.InitialContext; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceRef; +import javax.xml.ws.WebServiceRefs; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; + +@WebServiceRef(name = "Service1") +// Test multiple on type +@WebServiceRefs( { @WebServiceRef(name = "Service2"), @WebServiceRef(name = "Port1", type = TestEndpoint.class) }) +public class TestEndpointClientTwo +{ + // provide logging + private static final Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.class); + + // Test on field + @WebServiceRef(name = "Service3") + static Service service3; + + // Test on field + @WebServiceRef(name = "Service4") + static TestEndpointService service4; + + // Test on field + @WebServiceRef(name = "Port2") + static TestEndpoint port2; + + // Test on field + @WebServiceRef(name = "Port3") + static TestEndpoint port3; + + static InitialContext iniCtx; + static Map<String, String> testResult = new HashMap<String, String>(); + + public static void main(String[] args) throws Exception + { + String testName = args[0]; + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo client = new org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo(); + Method method = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.class.getMethod(testName, new Class[] { String.class }); + try + { + String retStr = (String)method.invoke(client, testName); + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, retStr); + } + catch (InvocationTargetException ex) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.log.error("Invocation error", ex); + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, ex.getTargetException().toString()); + } + catch (Exception ex) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.log.error("Error", ex); + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, ex.toString()); + } + } + + /** + * Customize service-class-name, service-qname + */ + public String testService1(String reqStr) throws Exception + { + TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service1"); + TestEndpoint port = service.getTestEndpointPort(); + return port.echo(reqStr); + } + + /** + * Customize config-name, config-file + */ + public String testService2(String reqStr) throws Exception + { + Service service = (Service)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service2"); + + TestEndpoint port = service.getPort(TestEndpoint.class); + //verifyConfig((ConfigProvider)port); + + return port.echo(reqStr); + } + + /** + * Customize service-class-name, service-qname + */ + public String testService3(String reqStr) throws Exception + { + TestEndpoint port = ((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.service3).getTestEndpointPort(); + String resStr1 = port.echo(reqStr); + + TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service3"); + port = service.getTestEndpointPort(); + + String resStr2 = port.echo(reqStr); + + return resStr1 + resStr2; + } + + /** + * Customize config-name, config-file + */ + public String testService4(String reqStr) throws Exception + { + TestEndpoint port = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.service4.getTestEndpointPort(); + String resStr1 = port.echo(reqStr); + //verifyConfig((ConfigProvider)port); + + TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service4"); + port = service.getTestEndpointPort(); + //verifyConfig((ConfigProvider)port); + + String resStr2 = port.echo(reqStr); + + return resStr1 + resStr2; + } + + /** + * Customize port-info: port-qname, config-name, config-file + */ + public String testPort1(String reqStr) throws Exception + { + TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port1"); + //verifyConfig((ConfigProvider)port); + + return port.echo(reqStr); + } + + /** + * Customize port-info: service-endpoint-interface, config-name, config-file + */ + public String testPort2(String reqStr) throws Exception + { + //verifyConfig((ConfigProvider)port2); + String resStr1 = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port2.echo(reqStr); + + TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port2"); + //verifyConfig((ConfigProvider)port); + + String resStr2 = port.echo(reqStr); + + return resStr1 + resStr2; + } + + /** + * Customize port-info: service-endpoint-interface, port-qname, stub-property + */ + public String testPort3(String reqStr) throws Exception + { + String resStr1 = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port3.echo(reqStr); + + BindingProvider bp = (BindingProvider)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port3; + verifyProperties(bp.getRequestContext()); + + TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port3"); + String resStr2 = port.echo(reqStr); + + return resStr1 + resStr2; + } + + private void verifyProperties(Map<String, Object> ctx) + { + String username = (String)ctx.get(BindingProvider.USERNAME_PROPERTY); + if ("kermit".equals(username) == false) + throw new RuntimeException("Invalid username: " + username); + + String password = (String)ctx.get(BindingProvider.PASSWORD_PROPERTY); + if ("thefrog".equals(password) == false) + throw new RuntimeException("Invalid password: " + password); + } + + /*private void verifyConfig(ConfigProvider cp) + { + if ("Custom Client".equals(cp.getConfigName()) == false) + throw new RuntimeException("Invalid config name: " + cp.getConfigName()); + + if ("META-INF/jbossws-client-config.xml".equals(cp.getConfigFile()) == false) + throw new RuntimeException("Invalid config file: " + cp.getConfigFile()); + } */ +} Property changes on: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java (rev 0) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java 2007-07-16 13:27:36 UTC (rev 3895) @@ -0,0 +1,43 @@ +/* + * 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.webserviceref; + +import org.jboss.logging.Logger; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class TestEndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointImpl.class); + + @WebMethod + public String echo(String input) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointImpl.log.info(input); + return input; + } +} Property changes on: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java (rev 0) +++ branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java 2007-07-16 13:27:36 UTC (rev 3895) @@ -0,0 +1,75 @@ +/* + * 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.webserviceref; + + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import java.net.MalformedURLException; +import java.net.URL; + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "file://bogus-location/jaxws-samples-webserviceref?wsdl") +public class TestEndpointService + extends Service +{ + + private final static URL WSDL_LOCATION; + private final static QName TESTENDPOINTSERVICE = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + private final static QName TESTENDPOINTPORT = new QName("http://org.jboss.ws/wsref", "TestEndpointPort"); + + static { + URL url = null; + try { + url = new URL("file://bogus-location/jaxws-samples-webserviceref?wsdl"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + WSDL_LOCATION = url; + } + + public TestEndpointService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public TestEndpointService() { + super(org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.WSDL_LOCATION, org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.TESTENDPOINTSERVICE); + } + + /** + * + * @return + * returns TestEndpoint + */ + @WebEndpoint(name = "TestEndpointPort") + public org.jboss.test.ws.jaxws.webserviceref.TestEndpoint getTestEndpointPort() { + return (TestEndpoint)super.getPort(org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.TESTENDPOINTPORT, TestEndpoint.class); + } + +} Property changes on: branches/hbraun/trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/application-client.xml =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/application-client.xml (rev 0) +++ branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/application-client.xml 2007-07-16 13:27:36 UTC (rev 3895) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<application-client version="5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd"> + + <display-name>TestEndpointService</display-name> + +</application-client> Property changes on: branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/application-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml (rev 0) +++ branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml 2007-07-16 13:27:36 UTC (rev 3895) @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> + +  + <service-ref> + <service-ref-name>Service1</service-ref-name> + <service-impl-class>org.jboss.test.ws.jaxws.webserviceref.TestEndpointService</service-impl-class> + <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + +  + <service-ref> + <service-ref-name>Service2</service-ref-name> + <config-name>Custom Client</config-name> + <config-file>META-INF/jbossws-client-config.xml</config-file> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + +  + <service-ref> + <service-ref-name>Service3</service-ref-name> + <service-impl-class>org.jboss.test.ws.jaxws.webserviceref.TestEndpointService</service-impl-class> + <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + +  + <service-ref> + <service-ref-name>Service4</service-ref-name> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.TestEndpoint</service-endpoint-interface> + <config-name>Custom Client</config-name> + <config-file>META-INF/jbossws-client-config.xml</config-file> + </port-component-ref> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + +  + <service-ref> + <service-ref-name>Port1</service-ref-name> + <port-component-ref> + <port-qname>{http://org.jboss.ws/wsref}TestEndpointPort</port-qname> + <config-name>Custom Client</config-name> + <config-file>META-INF/jbossws-client-config.xml</config-file> + </port-component-ref> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + +  + <service-ref> + <service-ref-name>Port2</service-ref-name> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.TestEndpoint</service-endpoint-interface> + <config-name>Custom Client</config-name> + <config-file>META-INF/jbossws-client-config.xml</config-file> + </port-component-ref> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + +  + <service-ref> + <service-ref-name>Port3</service-ref-name> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.TestEndpoint</service-endpoint-interface> + <port-qname>{http://org.jboss.ws/wsref}TestEndpointPort</port-qname> + <stub-property> + <prop-name>javax.xml.ws.security.auth.username</prop-name> + <prop-value>kermit</prop-value> + </stub-property> + <stub-property> + <prop-name>javax.xml.ws.security.auth.password</prop-name> + <prop-value>thefrog</prop-value> + </stub-property> + </port-component-ref> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + +</jboss-client> \ No newline at end of file Property changes on: branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml (rev 0) +++ branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml 2007-07-16 13:27:36 UTC (rev 3895) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" + xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> + + <client-config> + <config-name>Custom Client</config-name> + </client-config> + +</jaxrpc-config> \ No newline at end of file Property changes on: branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl (rev 0) +++ branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl 2007-07-16 13:27:36 UTC (rev 3895) @@ -0,0 +1,39 @@ + +<definitions name='TestEndpointService' targetNamespace='http://org.jboss.ws/wsref' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/wsref' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + + <message name='TestEndpoint_echo'> + <part name='arg0' type='xsd:string'/> + </message> + <message name='TestEndpoint_echoResponse'> + <part name='return' type='xsd:string'/> + </message> + + <portType name='TestEndpoint'> + <operation name='echo' parameterOrder='arg0'> + <input message='tns:TestEndpoint_echo'/> + <output message='tns:TestEndpoint_echoResponse'/> + </operation> + </portType> + + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> + </output> + </operation> + </binding> + + <service name='TestEndpointService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-webserviceref'/> + </port> + </service> + +</definitions> Property changes on: branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/application-client.xml =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/application-client.xml (rev 0) +++ branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/application-client.xml 2007-07-16 13:27:36 UTC (rev 3895) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<application-client version="5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd"> + + <display-name>SecureEndpointService</display-name> + +</application-client> Property changes on: branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/application-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml =================================================================== --- branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml (rev 0) +++ branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml 2007-07-16 13:27:36 UTC (rev 3895) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> + + <service-ref> + <service-ref-name>SecureService1</service-ref-name> + <service-impl-class>org.jboss.test.ws.jaxws.webserviceref.SecureEndpointService</service-impl-class> + <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface> + <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname> + <stub-property> + <prop-name>javax.xml.ws.security.auth.username</prop-name> + <prop-value>kermit</prop-value> + </stub-property> + <stub-property> + <prop-name>javax.xml.ws.security.auth.password</prop-name> + <prop-value>thefrog</prop-value> + </stub-property> + </port-component-ref> + <wsdl-override>http://@jboss.bind.address@:8080/jaxws-samples-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override> + </service-ref> + + <service-ref> + <service-ref-name>SecureService2</service-ref-name> + <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname> + <port-component-ref> + <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname> + <stub-property> + <prop-name>javax.xml.ws.security.auth.username</prop-name> + <prop-value>kermit</prop-value> + </stub-property> + <stub-property> + <prop-name>javax.xml.ws.security.auth.password</prop-name> + <prop-value>thefrog</prop-value> + </stub-property> + </port-component-ref> + <wsdl-override>http://@jboss.bind.address@:8080/jaxws-samples-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override> + </service-ref> + + <service-ref> + <service-ref-name>SecurePort1</service-ref-name> + <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface> + <stub-property> + <prop-name>javax.xml.ws.security.auth.username</prop-name> + <prop-value>kermit</prop-value> + </stub-property> + <stub-property> + <prop-name>javax.xml.ws.security.auth.password</prop-name> + <prop-value>thefrog</prop-value> + </stub-property> + </port-component-ref> + <wsdl-override>http://@jboss.bind.address@:8080/jaxws-samples-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override> + </service-ref> + +</jboss-client> \ No newline at end of file Property changes on: branches/hbraun/trunk/jbossws-core/src/test/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/hbraun/trunk/testsuite/ant-import/build-jars-jaxws.xml =================================================================== --- branches/hbraun/trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-07-16 13:21:14 UTC (rev 3894) +++ branches/hbraun/trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-07-16 13:27:36 UTC (rev 3895) @@ -413,43 +413,6 @@ </classes> </war> -  - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.class"/> - </fileset> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.SecureEndpointClient"/> - </manifest> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-override-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override"> - <include name="jbossws-client-config.xml"/> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="wsdl/**"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo"/> - </manifest> - </jar> -  </target>

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3894 - in branches/hbraun/trunk: testsuite/ant-import and 9 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-16 09:21:14 -0400 (Mon, 16 Jul 2007) New Revision: 3894 Added: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/ branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/ branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/application-client.xml branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/wsdl/ branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-secure/ branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-secure/application-client.xml branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml Removed: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpoint.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointClient.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointImpl.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointService.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServiceRefOverridesTestCase.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/serviceref/CommonServiceRefBinder.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/serviceref/ServiceRefHandlerImpl.java branches/hbraun/trunk/testsuite/ant-import/build-jars-jaxws.xml branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.java branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java branches/hbraun/trunk/testsuite/src/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml Log: Separate native webserviceref tests from common ones Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/serviceref/CommonServiceRefBinder.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/serviceref/CommonServiceRefBinder.java 2007-07-16 13:05:08 UTC (rev 3893) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/serviceref/CommonServiceRefBinder.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -67,24 +67,25 @@ { WebServiceRef wsref = null; - if(null == anElement) - throw new IllegalArgumentException("There needs to be an annotated target type available"); - if(null == loader) throw new IllegalArgumentException("There needs to be a classloader available"); // Build the list of @WebServiceRef relevant annotations List<WebServiceRef> wsrefList = new ArrayList<WebServiceRef>(); - for (Annotation an : anElement.getAnnotations()) + + if(anElement!=null) { - if (an instanceof WebServiceRef) - wsrefList.add((WebServiceRef)an); + for (Annotation an : anElement.getAnnotations()) + { + if (an instanceof WebServiceRef) + wsrefList.add((WebServiceRef)an); - if (an instanceof WebServiceRefs) - { - WebServiceRefs wsrefs = (WebServiceRefs)an; - for (WebServiceRef aux : wsrefs.value()) - wsrefList.add(aux); + if (an instanceof WebServiceRefs) + { + WebServiceRefs wsrefs = (WebServiceRefs)an; + for (WebServiceRef aux : wsrefs.value()) + wsrefList.add(aux); + } } } Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/serviceref/ServiceRefHandlerImpl.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/serviceref/ServiceRefHandlerImpl.java 2007-07-16 13:05:08 UTC (rev 3893) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/serviceref/ServiceRefHandlerImpl.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -121,7 +121,7 @@ { if (getServiceRefType(serviceRef, loader) == Type.JAXRPC) { - jaxrpcBinder.setupServiceRef(encCtx, encName, null, serviceRef); + jaxrpcBinder.setupServiceRef(encCtx, encName, null, serviceRef, loader); } else { Modified: branches/hbraun/trunk/testsuite/ant-import/build-jars-jaxws.xml =================================================================== --- branches/hbraun/trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-07-16 13:05:08 UTC (rev 3893) +++ branches/hbraun/trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-07-16 13:21:14 UTC (rev 3894) @@ -353,6 +353,7 @@ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.class"/> </classes> </war> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.class"/> @@ -368,6 +369,7 @@ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/> </manifest> </jar> + <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -384,6 +386,7 @@ <include name="jboss-web.xml"/> </webinf> </war> + <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-ejb3-client.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.class"/> @@ -398,54 +401,55 @@ <include name="wsdl/**"/> </metainf> </jar> + + +  + <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws/**"/> + <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws-handlers-server.xml"/> + <exclude name="org/jboss/test/ws/jaxws/samples/xop/doclit/*TestCase.class"/> + </classes> + </war> + +  <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.class"/> </fileset> </jar> <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure-client.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointClient.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-secure"> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointClient"/> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.SecureEndpointClient"/> </manifest> </jar> <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-override-client.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-override"> + <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override"> <include name="jbossws-client-config.xml"/> <include name="application-client.xml"/> <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> <include name="wsdl/**"/> - </metainf> + </metainf> <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientTwo"/> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo"/> </manifest> </jar> - -  - <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws/**"/> - <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws-handlers-server.xml"/> - <exclude name="org/jboss/test/ws/jaxws/samples/xop/doclit/*TestCase.class"/> - </classes> - </war> - +  </target> Deleted: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpoint.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpoint.java 2007-07-16 13:05:08 UTC (rev 3893) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpoint.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -1,35 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.webserviceref; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; - - -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.0-b26-ea3 - * Generated source version: 2.0 - * - */ -@WebService(name = "SecureEndpoint", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-samples-webserviceref-secure/Secu...") -@SOAPBinding(style = Style.RPC) -public interface SecureEndpoint { - - - /** - * - * @param arg0 - * @return - * returns java.lang.String - */ - @WebMethod - @WebResult(targetNamespace = "http://org.jboss.ws/wsref", partName = "return") - public String echo( - @WebParam(name = "arg0", partName = "arg0") - String arg0); - -} Deleted: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointClient.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointClient.java 2007-07-16 13:05:08 UTC (rev 3893) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointClient.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -1,82 +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.samples.webserviceref; - -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.WebServiceRef; - -import org.jboss.logging.Logger; - -public class SecureEndpointClient -{ - // Provide logging - private static Logger log = Logger.getLogger(SecureEndpointClient.class); - - @WebServiceRef(name = "SecureService1") - static SecureEndpointService secureService1; - - @WebServiceRef(name = "SecureService2") - static Service secureService2; - - @WebServiceRef(name = "SecurePort1") - static SecureEndpoint securePort1; - - static String retStr; - - public static void main(String[] args) - { - String reqMsg = args[0]; - log.info("echo: " + reqMsg); - - String username = null; - if (args.length > 1) - username = args[1]; - - String password = null; - if (args.length > 2) - password = args[2]; - - SecureEndpoint port = secureService1.getSecureEndpointPort(); - String retMsg = invokeEndpoint(port, reqMsg, username, password); - - port = secureService2.getPort(SecureEndpoint.class); - retMsg += "|" + invokeEndpoint(port, reqMsg, username, password); - - port = securePort1; - retMsg += "|" + invokeEndpoint(port, reqMsg, username, password); - - retStr = retMsg; - } - - private static String invokeEndpoint(SecureEndpoint port, String inStr, String username, String password) - { - if (username != null && password != null) - { - BindingProvider bindingProvider = (BindingProvider)port; - bindingProvider.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, username); - bindingProvider.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, password); - } - - return port.echo(inStr); - } -} Deleted: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointImpl.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointImpl.java 2007-07-16 13:05:08 UTC (rev 3893) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointImpl.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -1,53 +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.samples.webserviceref; - -import javax.annotation.security.RolesAllowed; -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.jws.soap.SOAPBinding.Style; - -import org.jboss.annotation.security.SecurityDomain; -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.annotation.WebContext; - -@WebService(name = "SecureEndpoint", serviceName = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/wsref") -@Stateless(name = "SecureEndpoint") -@SOAPBinding(style = Style.RPC) - -@WebContext(contextRoot="/jaxws-samples-webserviceref-secure", urlPattern="/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false) -@SecurityDomain("JBossWS") -@RolesAllowed("friend") -public class SecureEndpointImpl -{ - // Provide logging - private static Logger log = Logger.getLogger(SecureEndpointImpl.class); - - @WebMethod - public String echo(String input) - { - log.info(input); - return input; - } -} Deleted: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointService.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointService.java 2007-07-16 13:05:08 UTC (rev 3893) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointService.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -1,55 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.webserviceref; - -import java.net.MalformedURLException; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.xml.ws.WebEndpoint; -import javax.xml.ws.WebServiceClient; - -/** - * This class was generated by the JAXWS SI. - * JAX-WS RI 2.0-b26-ea3 - * Generated source version: 2.0 - * - */ -@WebServiceClient(name = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-samples-webserviceref-secure/Secu...") -public class SecureEndpointService - extends Service -{ - - private final static URL WSDL_LOCATION; - private final static QName SECUREENDPOINTSERVICE = new QName("http://org.jboss.ws/wsref", "SecureEndpointService"); - private final static QName SECUREENDPOINTPORT = new QName("http://org.jboss.ws/wsref", "SecureEndpointPort"); - - static { - URL url = null; - try { - url = new URL("http://localhost.localdomain:8080/jaxws-samples-webserviceref-secure/Secu..."); - } catch (MalformedURLException e) { - e.printStackTrace(); - } - WSDL_LOCATION = url; - } - - public SecureEndpointService(URL wsdlLocation, QName serviceName) { - super(wsdlLocation, serviceName); - } - - public SecureEndpointService() { - super(WSDL_LOCATION, SECUREENDPOINTSERVICE); - } - - /** - * - * @return - * returns SecureEndpoint - */ - @WebEndpoint(name = "SecureEndpointPort") - public SecureEndpoint getSecureEndpointPort() { - return (SecureEndpoint)super.getPort(SECUREENDPOINTPORT, SecureEndpoint.class); - } - -} Deleted: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServiceRefOverridesTestCase.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServiceRefOverridesTestCase.java 2007-07-16 13:05:08 UTC (rev 3893) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServiceRefOverridesTestCase.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -1,100 +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.samples.webserviceref; - -import junit.framework.Test; - -import org.jboss.ejb3.client.ClientLauncher; -import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.test.JBossWSTestSetup; - -/** - * Test @WebServiceRef overrides in jboss-client.xml - * - * @author Thomas.Diesler(a)jboss.com - * @since 18-Jan-2007 - */ -public class ServiceRefOverridesTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webserviceref"; - - public static Test suite() - { - return new JBossWSTestSetup(ServiceRefOverridesTestCase.class, "jaxws-samples-webserviceref.war, jaxws-samples-webserviceref-override-client.jar"); - } - - protected void setUp() throws Exception - { - super.setUp(); - - if (TestEndpointClientTwo.iniCtx == null) - TestEndpointClientTwo.iniCtx = getInitialContext(); - } - - public void testService1() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName(), resStr); - } - - public void testService2() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName(), resStr); - } - - public void testService3() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName() + getName(), resStr); - } - - public void testService4() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName() + getName(), resStr); - } - - public void testPort1() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName(), resStr); - } - - public void testPort2() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName() + getName(), resStr); - } - - public void testPort3() throws Throwable - { - String resStr = invokeTest(getName()); - assertEquals(getName() + getName(), resStr); - } - - private String invokeTest(String reqStr) throws Throwable - { - new ClientLauncher().launch(TestEndpointClientTwo.class.getName(), "jbossws-client", new String[] { reqStr }); - return TestEndpointClientTwo.testResult.get(reqStr); - } -} Deleted: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java 2007-07-16 13:05:08 UTC (rev 3893) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/StubPropertyTestCase.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -1,92 +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.samples.webserviceref; - -import java.net.MalformedURLException; -import java.net.URL; -import java.io.InputStream; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.ejb3.client.ClientLauncher; -import org.jboss.wsf.spi.test.JBossWSTest; -import org.jboss.wsf.spi.test.JBossWSTestSetup; - -/** - * Test the JAXWS annotation: javax.xml.ws.WebServiceRef - * - * @author Thomas.Diesler(a)jboss.com - * @since 23-Oct-2005 - */ -public class StubPropertyTestCase extends JBossWSTest -{ - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webserviceref-secure"; - - public static Test suite() - { - System.out.println("FIXME: Verif if stub properties may used across stacks, otherwise this test needs to be moved"); - - return new JBossWSTestSetup(StubPropertyTestCase.class, "jaxws-samples-webserviceref-secure.jar, jaxws-samples-webserviceref-secure-client.jar"); - } - - public void testWSDLAccess() throws Exception - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - InputStream inputStream = wsdlURL.openStream(); - assertNotNull(inputStream); - inputStream.close(); - } - - public void testDynamicProxy() throws Exception - { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - QName qname = new QName("http://org.jboss.ws/wsref", "SecureEndpointService"); - Service service = Service.create(wsdlURL, qname); - SecureEndpoint port = (SecureEndpoint)service.getPort(SecureEndpoint.class); - - BindingProvider bindingProvider = (BindingProvider)port; - bindingProvider.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit"); - bindingProvider.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "thefrog"); - - String helloWorld = "Hello World"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void testUnconfiguredStub() throws Throwable - { - String reqMsg = "Hello World"; - new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" }); - assertEquals("Hello World|Hello World|Hello World", SecureEndpointClient.retStr); - } - - public void testConfiguredStub() throws Throwable - { - String reqMsg = "Hello World"; - new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg }); - assertEquals("Hello World|Hello World|Hello World", SecureEndpointClient.retStr); - } -} Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.java 2007-07-16 13:05:08 UTC (rev 3893) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -29,6 +29,8 @@ import javax.xml.ws.WebServiceRefs; import org.jboss.logging.Logger; +import org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService; +import org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint; // Test on type with wsdlLocation @WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.java 2007-07-16 13:05:08 UTC (rev 3893) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -33,6 +33,8 @@ import javax.xml.ws.WebServiceRefs; import org.jboss.logging.Logger; +import org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint; +import org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService; //import org.jboss.ws.core.ConfigProvider; //Test on type Modified: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2007-07-16 13:05:08 UTC (rev 3893) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -24,7 +24,6 @@ import java.net.URL; import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; import junit.framework.Test; @@ -55,7 +54,7 @@ TestEndpointService service = new TestEndpointService(wsdlURL, serviceQName); TestEndpoint port = service.getTestEndpointPort(); - + String helloWorld = "Hello World!"; Object retObj = port.echo(helloWorld); assertEquals(helloWorld, retObj); Added: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java (rev 0) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -0,0 +1,35 @@ + +package org.jboss.test.ws.jaxws.webserviceref; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebService(name = "SecureEndpoint", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-samples-webserviceref-secure/Secu...") +@SOAPBinding(style = Style.RPC) +public interface SecureEndpoint { + + + /** + * + * @param arg0 + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/wsref", partName = "return") + public String echo( + @WebParam(name = "arg0", partName = "arg0") + String arg0); + +} Property changes on: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java (rev 0) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -0,0 +1,83 @@ +/* + * 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.webserviceref; + +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceRef; + +import org.jboss.logging.Logger; +import org.jboss.test.ws.jaxws.webserviceref.SecureEndpointService; + +public class SecureEndpointClient +{ + // Provide logging + private static Logger log = Logger.getLogger(SecureEndpointClient.class); + + @WebServiceRef(name = "SecureService1") + static SecureEndpointService secureService1; + + @WebServiceRef(name = "SecureService2") + static Service secureService2; + + @WebServiceRef(name = "SecurePort1") + static SecureEndpoint securePort1; + + static String retStr; + + public static void main(String[] args) + { + String reqMsg = args[0]; + log.info("echo: " + reqMsg); + + String username = null; + if (args.length > 1) + username = args[1]; + + String password = null; + if (args.length > 2) + password = args[2]; + + SecureEndpoint port = secureService1.getSecureEndpointPort(); + String retMsg = invokeEndpoint(port, reqMsg, username, password); + + port = secureService2.getPort(SecureEndpoint.class); + retMsg += "|" + invokeEndpoint(port, reqMsg, username, password); + + port = securePort1; + retMsg += "|" + invokeEndpoint(port, reqMsg, username, password); + + retStr = retMsg; + } + + private static String invokeEndpoint(SecureEndpoint port, String inStr, String username, String password) + { + if (username != null && password != null) + { + BindingProvider bindingProvider = (BindingProvider)port; + bindingProvider.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, username); + bindingProvider.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, password); + } + + return port.echo(inStr); + } +} Property changes on: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointClient.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java (rev 0) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -0,0 +1,53 @@ +/* + * 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.webserviceref; + +import javax.annotation.security.RolesAllowed; +import javax.ejb.Stateless; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + +import org.jboss.annotation.security.SecurityDomain; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.annotation.WebContext; + +@WebService(name = "SecureEndpoint", serviceName = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/wsref") +@Stateless(name = "SecureEndpoint") +@SOAPBinding(style = Style.RPC) + +@WebContext(contextRoot="/jaxws-samples-webserviceref-secure", urlPattern="/*", authMethod = "BASIC", transportGuarantee = "NONE", secureWSDLAccess = false) +@SecurityDomain("JBossWS") +@RolesAllowed("friend") +public class SecureEndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(SecureEndpointImpl.class); + + @WebMethod + public String echo(String input) + { + log.info(input); + return input; + } +} Property changes on: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java (rev 0) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -0,0 +1,55 @@ + +package org.jboss.test.ws.jaxws.webserviceref; + +import java.net.MalformedURLException; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebServiceClient(name = "SecureEndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-samples-webserviceref-secure/Secu...") +public class SecureEndpointService + extends Service +{ + + private final static URL WSDL_LOCATION; + private final static QName SECUREENDPOINTSERVICE = new QName("http://org.jboss.ws/wsref", "SecureEndpointService"); + private final static QName SECUREENDPOINTPORT = new QName("http://org.jboss.ws/wsref", "SecureEndpointPort"); + + static { + URL url = null; + try { + url = new URL("http://localhost.localdomain:8080/jaxws-samples-webserviceref-secure/Secu..."); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + WSDL_LOCATION = url; + } + + public SecureEndpointService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public SecureEndpointService() { + super(WSDL_LOCATION, SECUREENDPOINTSERVICE); + } + + /** + * + * @return + * returns SecureEndpoint + */ + @WebEndpoint(name = "SecureEndpointPort") + public SecureEndpoint getSecureEndpointPort() { + return (SecureEndpoint)super.getPort(SECUREENDPOINTPORT, SecureEndpoint.class); + } + +} Property changes on: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java (rev 0) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -0,0 +1,100 @@ +/* + * 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.webserviceref; + +import junit.framework.Test; + +import org.jboss.ejb3.client.ClientLauncher; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + +/** + * Test @WebServiceRef overrides in jboss-client.xml + * + * @author Thomas.Diesler(a)jboss.com + * @since 18-Jan-2007 + */ +public class ServiceRefOverridesTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webserviceref"; + + public static Test suite() + { + return new JBossWSTestSetup(ServiceRefOverridesTestCase.class, "jaxws-samples-webserviceref.war, jaxws-samples-webserviceref-override-client.jar"); + } + + protected void setUp() throws Exception + { + super.setUp(); + + if (TestEndpointClientTwo.iniCtx == null) + TestEndpointClientTwo.iniCtx = getInitialContext(); + } + + public void testService1() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName(), resStr); + } + + public void testService2() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName(), resStr); + } + + public void testService3() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName() + getName(), resStr); + } + + public void testService4() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName() + getName(), resStr); + } + + public void testPort1() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName(), resStr); + } + + public void testPort2() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName() + getName(), resStr); + } + + public void testPort3() throws Throwable + { + String resStr = invokeTest(getName()); + assertEquals(getName() + getName(), resStr); + } + + private String invokeTest(String reqStr) throws Throwable + { + new ClientLauncher().launch(TestEndpointClientTwo.class.getName(), "jbossws-client", new String[] { reqStr }); + return TestEndpointClientTwo.testResult.get(reqStr); + } +} Property changes on: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java (rev 0) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -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.test.ws.jaxws.webserviceref; + +import java.net.URL; +import java.io.InputStream; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.ejb3.client.ClientLauncher; +import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.spi.test.JBossWSTestSetup; + +/** + * Test the JAXWS annotation: javax.xml.ws.WebServiceRef + * + * @author Thomas.Diesler(a)jboss.com + * @since 23-Oct-2005 + */ +public class StubPropertyTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webserviceref-secure"; + + public static Test suite() + { + return new JBossWSTestSetup(StubPropertyTestCase.class, "jaxws-samples-webserviceref-secure.jar, jaxws-samples-webserviceref-secure-client.jar"); + } + + public void testWSDLAccess() throws Exception + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + InputStream inputStream = wsdlURL.openStream(); + assertNotNull(inputStream); + inputStream.close(); + } + + public void testDynamicProxy() throws Exception + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + QName qname = new QName("http://org.jboss.ws/wsref", "SecureEndpointService"); + Service service = Service.create(wsdlURL, qname); + SecureEndpoint port = (SecureEndpoint)service.getPort(SecureEndpoint.class); + + BindingProvider bindingProvider = (BindingProvider)port; + bindingProvider.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit"); + bindingProvider.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "thefrog"); + + String helloWorld = "Hello World"; + Object retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void testUnconfiguredStub() throws Throwable + { + String reqMsg = "Hello World"; + new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg, "kermit", "thefrog" }); + assertEquals("Hello World|Hello World|Hello World", SecureEndpointClient.retStr); + } + + public void testConfiguredStub() throws Throwable + { + String reqMsg = "Hello World"; + new ClientLauncher().launch(SecureEndpointClient.class.getName(), "jbossws-client", new String[] { reqMsg }); + assertEquals("Hello World|Hello World|Hello World", SecureEndpointClient.retStr); + } +} Property changes on: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/StubPropertyTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java (rev 0) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -0,0 +1,53 @@ +/* + * 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.webserviceref; + +import javax.jws.WebService; +import javax.jws.WebMethod; +import javax.jws.WebResult; +import javax.jws.WebParam; +import javax.jws.soap.SOAPBinding; + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "http://localhost.localdomain:8080/jaxws-samples-webserviceref?wsdl") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface TestEndpoint { + + + /** + * + * @param arg0 + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/wsref", partName = "return") + public String echo( + @WebParam(name = "arg0", partName = "arg0") + String arg0); + +} Property changes on: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java (rev 0) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -0,0 +1,127 @@ +/* + * 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.webserviceref; + +import org.jboss.logging.Logger; + +import javax.naming.InitialContext; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.WebServiceRef; +import javax.xml.ws.WebServiceRefs; +import java.util.ArrayList; + +@WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") + +// Test multiple on type +@WebServiceRefs( { + @WebServiceRef(name = "service2", value = TestEndpointService.class), + @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class) }) +public class TestEndpointClientOne +{ + // Provide logging + private static Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class); + + // Test on field with name + @WebServiceRef(name = "TestEndpointService3") + static TestEndpointService service3; + + // Test on field without name + @WebServiceRef + static TestEndpointService service4; + + // Test on method with name + @WebServiceRef(name = "TestEndpointService5") + static void setService5(TestEndpointService service) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service5 = service; + } + private static TestEndpointService service5; + + // Test on method without name + @WebServiceRef + static void setService6(TestEndpointService service) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service6 = service; + } + private static TestEndpointService service6; + + // Test on field with name and value + @WebServiceRef(name = "Port2", value = TestEndpointService.class) + static TestEndpoint port2; + + // Test on field with value + @WebServiceRef(value = TestEndpointService.class) + static TestEndpoint port3; + + // Test on field + @WebServiceRef + static TestEndpoint port4; + + // Test on field with name + @WebServiceRef (name = "Port5") + static TestEndpoint port5; + + static InitialContext iniCtx; + static String retStr; + + public static void main(String[] args) + { + String inStr = args[0]; + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.log.info("echo: " + inStr); + + ArrayList<TestEndpoint> ports = new ArrayList<TestEndpoint>(); + try + { + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/service1")).getTestEndpointPort()); + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/service2")).getTestEndpointPort()); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service3.getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/TestEndpointService3")).getTestEndpointPort()); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service4.getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/service4")).getTestEndpointPort()); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service5.getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort()); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.service6.getPort(TestEndpoint.class)); + ports.add(((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/service6")).getTestEndpointPort()); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/port1")); + ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port2); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/Port2")); + ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port3); + ports.add((TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.iniCtx.lookup("java:comp/env/" + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.class.getName() + "/port3")); + ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port4); + ports.add(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.port5); + } + catch (Exception ex) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.log.error("Cannot add port", ex); + throw new WebServiceException(ex); + } + + for (TestEndpoint port : ports) + { + String outStr = port.echo(inStr); + if (inStr.equals(outStr) == false) + throw new WebServiceException("Invalid echo return: " + inStr); + } + + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientOne.retStr = inStr; + } +} Property changes on: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientOne.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java (rev 0) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -0,0 +1,206 @@ +/* + * 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.webserviceref; + +import org.jboss.logging.Logger; +import org.jboss.test.ws.jaxws.webserviceref.TestEndpoint; +import org.jboss.test.ws.jaxws.webserviceref.TestEndpointService; + +import javax.naming.InitialContext; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceRef; +import javax.xml.ws.WebServiceRefs; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; + +@WebServiceRef(name = "Service1") +// Test multiple on type +@WebServiceRefs( { @WebServiceRef(name = "Service2"), @WebServiceRef(name = "Port1", type = TestEndpoint.class) }) +public class TestEndpointClientTwo +{ + // provide logging + private static final Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.class); + + // Test on field + @WebServiceRef(name = "Service3") + static Service service3; + + // Test on field + @WebServiceRef(name = "Service4") + static TestEndpointService service4; + + // Test on field + @WebServiceRef(name = "Port2") + static TestEndpoint port2; + + // Test on field + @WebServiceRef(name = "Port3") + static TestEndpoint port3; + + static InitialContext iniCtx; + static Map<String, String> testResult = new HashMap<String, String>(); + + public static void main(String[] args) throws Exception + { + String testName = args[0]; + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo client = new org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo(); + Method method = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.class.getMethod(testName, new Class[] { String.class }); + try + { + String retStr = (String)method.invoke(client, testName); + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, retStr); + } + catch (InvocationTargetException ex) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.log.error("Invocation error", ex); + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, ex.getTargetException().toString()); + } + catch (Exception ex) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.log.error("Error", ex); + org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.testResult.put(testName, ex.toString()); + } + } + + /** + * Customize service-class-name, service-qname + */ + public String testService1(String reqStr) throws Exception + { + TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service1"); + TestEndpoint port = service.getTestEndpointPort(); + return port.echo(reqStr); + } + + /** + * Customize config-name, config-file + */ + public String testService2(String reqStr) throws Exception + { + Service service = (Service)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service2"); + + TestEndpoint port = service.getPort(TestEndpoint.class); + //verifyConfig((ConfigProvider)port); + + return port.echo(reqStr); + } + + /** + * Customize service-class-name, service-qname + */ + public String testService3(String reqStr) throws Exception + { + TestEndpoint port = ((TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.service3).getTestEndpointPort(); + String resStr1 = port.echo(reqStr); + + TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service3"); + port = service.getTestEndpointPort(); + + String resStr2 = port.echo(reqStr); + + return resStr1 + resStr2; + } + + /** + * Customize config-name, config-file + */ + public String testService4(String reqStr) throws Exception + { + TestEndpoint port = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.service4.getTestEndpointPort(); + String resStr1 = port.echo(reqStr); + //verifyConfig((ConfigProvider)port); + + TestEndpointService service = (TestEndpointService)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Service4"); + port = service.getTestEndpointPort(); + //verifyConfig((ConfigProvider)port); + + String resStr2 = port.echo(reqStr); + + return resStr1 + resStr2; + } + + /** + * Customize port-info: port-qname, config-name, config-file + */ + public String testPort1(String reqStr) throws Exception + { + TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port1"); + //verifyConfig((ConfigProvider)port); + + return port.echo(reqStr); + } + + /** + * Customize port-info: service-endpoint-interface, config-name, config-file + */ + public String testPort2(String reqStr) throws Exception + { + //verifyConfig((ConfigProvider)port2); + String resStr1 = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port2.echo(reqStr); + + TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port2"); + //verifyConfig((ConfigProvider)port); + + String resStr2 = port.echo(reqStr); + + return resStr1 + resStr2; + } + + /** + * Customize port-info: service-endpoint-interface, port-qname, stub-property + */ + public String testPort3(String reqStr) throws Exception + { + String resStr1 = org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port3.echo(reqStr); + + BindingProvider bp = (BindingProvider)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.port3; + verifyProperties(bp.getRequestContext()); + + TestEndpoint port = (TestEndpoint)org.jboss.test.ws.jaxws.webserviceref.TestEndpointClientTwo.iniCtx.lookup("java:comp/env/Port3"); + String resStr2 = port.echo(reqStr); + + return resStr1 + resStr2; + } + + private void verifyProperties(Map<String, Object> ctx) + { + String username = (String)ctx.get(BindingProvider.USERNAME_PROPERTY); + if ("kermit".equals(username) == false) + throw new RuntimeException("Invalid username: " + username); + + String password = (String)ctx.get(BindingProvider.PASSWORD_PROPERTY); + if ("thefrog".equals(password) == false) + throw new RuntimeException("Invalid password: " + password); + } + + /*private void verifyConfig(ConfigProvider cp) + { + if ("Custom Client".equals(cp.getConfigName()) == false) + throw new RuntimeException("Invalid config name: " + cp.getConfigName()); + + if ("META-INF/jbossws-client-config.xml".equals(cp.getConfigFile()) == false) + throw new RuntimeException("Invalid config file: " + cp.getConfigFile()); + } */ +} Property changes on: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointClientTwo.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java (rev 0) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -0,0 +1,43 @@ +/* + * 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.webserviceref; + +import org.jboss.logging.Logger; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "TestEndpoint", serviceName = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class TestEndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(org.jboss.test.ws.jaxws.webserviceref.TestEndpointImpl.class); + + @WebMethod + public String echo(String input) + { + org.jboss.test.ws.jaxws.webserviceref.TestEndpointImpl.log.info(input); + return input; + } +} Property changes on: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java =================================================================== --- branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java (rev 0) +++ branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java 2007-07-16 13:21:14 UTC (rev 3894) @@ -0,0 +1,75 @@ +/* + * 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.webserviceref; + + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import java.net.MalformedURLException; +import java.net.URL; + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0-b26-ea3 + * Generated source version: 2.0 + * + */ +@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "file://bogus-location/jaxws-samples-webserviceref?wsdl") +public class TestEndpointService + extends Service +{ + + private final static URL WSDL_LOCATION; + private final static QName TESTENDPOINTSERVICE = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + private final static QName TESTENDPOINTPORT = new QName("http://org.jboss.ws/wsref", "TestEndpointPort"); + + static { + URL url = null; + try { + url = new URL("file://bogus-location/jaxws-samples-webserviceref?wsdl"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + WSDL_LOCATION = url; + } + + public TestEndpointService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public TestEndpointService() { + super(org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.WSDL_LOCATION, org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.TESTENDPOINTSERVICE); + } + + /** + * + * @return + * returns TestEndpoint + */ + @WebEndpoint(name = "TestEndpointPort") + public org.jboss.test.ws.jaxws.webserviceref.TestEndpoint getTestEndpointPort() { + return (TestEndpoint)super.getPort(org.jboss.test.ws.jaxws.webserviceref.TestEndpointService.TESTENDPOINTPORT, TestEndpoint.class); + } + +} Property changes on: branches/hbraun/trunk/testsuite/src/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/hbraun/trunk/testsuite/src/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml =================================================================== --- branches/hbraun/trunk/testsuite/src/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml 2007-07-16 13:05:08 UTC (rev 3893) +++ branches/hbraun/trunk/testsuite/src/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml 2007-07-16 13:21:14 UTC (rev 3894) @@ -7,10 +7,10 @@ <service-ref> <service-ref-name>SecureService1</service-ref-name> - <service-impl-class>org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointService</service-impl-class> + <service-impl-class>org.jboss.test.ws.jaxws.webserviceref.SecureEndpointService</service-impl-class> <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpoint</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface> <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname> <stub-property> <prop-name>javax.xml.ws.security.auth.username</prop-name> @@ -45,7 +45,7 @@ <service-ref-name>SecurePort1</service-ref-name> <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname> <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpoint</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface> <stub-property> <prop-name>javax.xml.ws.security.auth.username</prop-name> <prop-value>kermit</prop-value> Added: branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/application-client.xml =================================================================== --- branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/application-client.xml (rev 0) +++ branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/application-client.xml 2007-07-16 13:21:14 UTC (rev 3894) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<application-client version="5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd"> + + <display-name>TestEndpointService</display-name> + +</application-client> Property changes on: branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/application-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml =================================================================== --- branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml (rev 0) +++ branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml 2007-07-16 13:21:14 UTC (rev 3894) @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> + +  + <service-ref> + <service-ref-name>Service1</service-ref-name> + <service-impl-class>org.jboss.test.ws.jaxws.webserviceref.TestEndpointService</service-impl-class> + <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + +  + <service-ref> + <service-ref-name>Service2</service-ref-name> + <config-name>Custom Client</config-name> + <config-file>META-INF/jbossws-client-config.xml</config-file> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + +  + <service-ref> + <service-ref-name>Service3</service-ref-name> + <service-impl-class>org.jboss.test.ws.jaxws.webserviceref.TestEndpointService</service-impl-class> + <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + +  + <service-ref> + <service-ref-name>Service4</service-ref-name> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.TestEndpoint</service-endpoint-interface> + <config-name>Custom Client</config-name> + <config-file>META-INF/jbossws-client-config.xml</config-file> + </port-component-ref> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + +  + <service-ref> + <service-ref-name>Port1</service-ref-name> + <port-component-ref> + <port-qname>{http://org.jboss.ws/wsref}TestEndpointPort</port-qname> + <config-name>Custom Client</config-name> + <config-file>META-INF/jbossws-client-config.xml</config-file> + </port-component-ref> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + +  + <service-ref> + <service-ref-name>Port2</service-ref-name> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.TestEndpoint</service-endpoint-interface> + <config-name>Custom Client</config-name> + <config-file>META-INF/jbossws-client-config.xml</config-file> + </port-component-ref> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + +  + <service-ref> + <service-ref-name>Port3</service-ref-name> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.TestEndpoint</service-endpoint-interface> + <port-qname>{http://org.jboss.ws/wsref}TestEndpointPort</port-qname> + <stub-property> + <prop-name>javax.xml.ws.security.auth.username</prop-name> + <prop-value>kermit</prop-value> + </stub-property> + <stub-property> + <prop-name>javax.xml.ws.security.auth.password</prop-name> + <prop-value>thefrog</prop-value> + </stub-property> + </port-component-ref> + <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + +</jboss-client> \ No newline at end of file Property changes on: branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml =================================================================== --- branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml (rev 0) +++ branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml 2007-07-16 13:21:14 UTC (rev 3894) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" + xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> + + <client-config> + <config-name>Custom Client</config-name> + </client-config> + +</jaxrpc-config> \ No newline at end of file Property changes on: branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/jbossws-client-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl =================================================================== --- branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl (rev 0) +++ branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl 2007-07-16 13:21:14 UTC (rev 3894) @@ -0,0 +1,39 @@ + +<definitions name='TestEndpointService' targetNamespace='http://org.jboss.ws/wsref' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/wsref' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + + <message name='TestEndpoint_echo'> + <part name='arg0' type='xsd:string'/> + </message> + <message name='TestEndpoint_echoResponse'> + <part name='return' type='xsd:string'/> + </message> + + <portType name='TestEndpoint'> + <operation name='echo' parameterOrder='arg0'> + <input message='tns:TestEndpoint_echo'/> + <output message='tns:TestEndpoint_echoResponse'/> + </operation> + </portType> + + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.ws/wsref' use='literal'/> + </output> + </operation> + </binding> + + <service name='TestEndpointService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-webserviceref'/> + </port> + </service> + +</definitions> Property changes on: branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-override/wsdl/TestEndpoint.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-secure/application-client.xml =================================================================== --- branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-secure/application-client.xml (rev 0) +++ branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-secure/application-client.xml 2007-07-16 13:21:14 UTC (rev 3894) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<application-client version="5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd"> + + <display-name>SecureEndpointService</display-name> + +</application-client> Property changes on: branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-secure/application-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml =================================================================== --- branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml (rev 0) +++ branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml 2007-07-16 13:21:14 UTC (rev 3894) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> + + <service-ref> + <service-ref-name>SecureService1</service-ref-name> + <service-impl-class>org.jboss.test.ws.jaxws.webserviceref.SecureEndpointService</service-impl-class> + <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface> + <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname> + <stub-property> + <prop-name>javax.xml.ws.security.auth.username</prop-name> + <prop-value>kermit</prop-value> + </stub-property> + <stub-property> + <prop-name>javax.xml.ws.security.auth.password</prop-name> + <prop-value>thefrog</prop-value> + </stub-property> + </port-component-ref> + <wsdl-override>http://@jboss.bind.address@:8080/jaxws-samples-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override> + </service-ref> + + <service-ref> + <service-ref-name>SecureService2</service-ref-name> + <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname> + <port-component-ref> + <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname> + <stub-property> + <prop-name>javax.xml.ws.security.auth.username</prop-name> + <prop-value>kermit</prop-value> + </stub-property> + <stub-property> + <prop-name>javax.xml.ws.security.auth.password</prop-name> + <prop-value>thefrog</prop-value> + </stub-property> + </port-component-ref> + <wsdl-override>http://@jboss.bind.address@:8080/jaxws-samples-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override> + </service-ref> + + <service-ref> + <service-ref-name>SecurePort1</service-ref-name> + <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface> + <stub-property> + <prop-name>javax.xml.ws.security.auth.username</prop-name> + <prop-value>kermit</prop-value> + </stub-property> + <stub-property> + <prop-name>javax.xml.ws.security.auth.password</prop-name> + <prop-value>thefrog</prop-value> + </stub-property> + </port-component-ref> + <wsdl-override>http://@jboss.bind.address@:8080/jaxws-samples-webserviceref-secure/SecureEndpointImpl?wsdl</wsdl-override> + </service-ref> + +</jboss-client> \ No newline at end of file Property changes on: branches/hbraun/trunk/testsuite/src/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r3893 - trunk/integration/native/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-16 09:05:08 -0400 (Mon, 16 Jul 2007) New Revision: 3893 Modified: trunk/integration/native/ant-import/build-testsuite.xml Log: Fix as42/40 exclude lists Modified: trunk/integration/native/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/native/ant-import/build-testsuite.xml 2007-07-16 12:38:31 UTC (rev 3892) +++ trunk/integration/native/ant-import/build-testsuite.xml 2007-07-16 13:05:08 UTC (rev 3893) @@ -18,8 +18,8 @@ <property name="tests.resources.dir" value="${tests.dir}/resources"/>  - <condition property="excludesfile" value="${int.native.dir}/src/test/resources/test-excludes-jboss40.txt"> - <equals arg1="${jbossws.integration.target}" arg2="jboss40"/> + <condition property="excludesfile" value="${int.native.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"> + <available file="${int.native.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> </condition> <property name="excludesfile" value="${int.native.dir}/src/test/resources/test-excludes.txt"/>

17 years, 5 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 July 2007