Author: heiko.braun(a)jboss.com Date: 2007-01-16 09:29:43 -0500 (Tue, 16 Jan 2007) New Revision: 1983 Added: trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/EndpointConfig.java trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/WebContext.java Removed: trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/PortComponent.java Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/EndpointEJB.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean01.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean02.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean01.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean02.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.java Log: Fix JBWS-1429 Added: trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/EndpointConfig.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/EndpointConfig.java 2007-01-16 13:11:09 UTC (rev 1982) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/EndpointConfig.java 2007-01-16 14:29:43 UTC (rev 1983) @@ -0,0 +1,34 @@ +package org.jboss.ws.annotation; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import java.lang.annotation.ElementType; + +/** + * @author Heiko.Braun(a)jboss.org + * @version $Id$ + * @since 16.01.2007 + */ +@Retention(value = RetentionPolicy.RUNTIME) +@Target(value = { ElementType.TYPE }) +public @interface EndpointConfig { + + /** + * The optional config-name element gives the client configuration name that must be present in + * the configuration given by element config-file. + * + * Server side default: Standard Endpoint + * Client side default: Standard Client + */ + String configName() default ""; + + /** + * The optional config-file element gives the to a URL or resource name for the configuration. + * + * Server side default: standard-jaxrpc-endpoint-config.xml, standard-jaxws-endpoint-config.xml + * Client side default: standard-jaxrpc-client-config.xml, standard-jaxws-client-config.xml + */ + String configFile() default ""; + +} Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/PortComponent.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/PortComponent.java 2007-01-16 13:11:09 UTC (rev 1982) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/PortComponent.java 2007-01-16 14:29:43 UTC (rev 1983) @@ -1,112 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.ws.annotation; - -// $Id$ - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Provides web context specific meta data to EJB based web service endpoints. - * - * @author thomas.diesler(a)jboss.org - * @since 26-Apr-2005 - */ -@Retention(value = RetentionPolicy.RUNTIME) -@Target(value = { ElementType.TYPE }) -public @interface PortComponent { - - /** - * The contextRoot element specifies the context root that the web service endpoint is deployed to. - * If it is not specified it will be derived from the deployment short name. - * - * Applies to server side port components only. - */ - String contextRoot() default ""; - - /** - * The virtual hosts that the web service endpoint is deployed to. - * - * Applies to server side port components only. - */ - String[] virtualHosts() default {}; - - /** - * Relative path that is appended to the contextRoot to form fully qualified - * endpoint address for the web service endpoint. - * - * Applies to server side port components only. - */ - String urlPattern() default ""; - - /** - * The authMethod is used to configure the authentication mechanism for the web service. - * As a prerequisite to gaining access to any web service which are protected by an authorization - * constraint, a user must have authenticated using the configured mechanism. - * - * Legal values for this element are "BASIC", or "CLIENT-CERT". - */ - String authMethod() default ""; - - /** - * The transportGuarantee specifies that the communication - * between client and server should be NONE, INTEGRAL, or - * CONFIDENTIAL. NONE means that the application does not require any - * transport guarantees. A value of INTEGRAL means that the application - * requires that the data sent between the client and server be sent in - * such a way that it can't be changed in transit. CONFIDENTIAL means - * that the application requires that the data be transmitted in a - * fashion that prevents other entities from observing the contents of - * the transmission. In most cases, the presence of the INTEGRAL or - * CONFIDENTIAL flag will indicate that the use of SSL is required. - */ - String transportGuarantee() default ""; - - /** - * A secure endpoint does not by default publish it's wsdl on an unsecure transport. - * You can override this behaviour by explicitly setting the secureWSDLAccess flag to false. - * - * Protect access to WSDL - * http://jira.jboss.org/jira/browse/JBWS-723 - */ - boolean secureWSDLAccess() default true; - - /** - * The optional config-name element gives the client configuration name that must be present in - * the configuration given by element config-file. - * - * Server side default: Standard Endpoint - * Client side default: Standard Client - */ - String configName() default ""; - - /** - * The optional config-file element gives the to a URL or resource name for the configuration. - * - * Server side default: standard-jaxrpc-endpoint-config.xml, standard-jaxws-endpoint-config.xml - * Client side default: standard-jaxrpc-client-config.xml, standard-jaxws-client-config.xml - */ - String configFile() default ""; -} Copied: trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/WebContext.java (from rev 1979, trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/PortComponent.java) =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/PortComponent.java 2007-01-16 11:33:23 UTC (rev 1979) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/WebContext.java 2007-01-16 14:29:43 UTC (rev 1983) @@ -0,0 +1,96 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.ws.annotation; + +// $Id$ + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Provides web context specific meta data to EJB based web service endpoints. + * + * @author thomas.diesler(a)jboss.org + * @since 26-Apr-2005 + */ +@Retention(value = RetentionPolicy.RUNTIME) +@Target(value = { ElementType.TYPE }) +public @interface WebContext { + + /** + * The contextRoot element specifies the context root that the web service endpoint is deployed to. + * If it is not specified it will be derived from the deployment short name. + * + * Applies to server side port components only. + */ + String contextRoot() default ""; + + /** + * The virtual hosts that the web service endpoint is deployed to. + * + * Applies to server side port components only. + */ + String[] virtualHosts() default {}; + + /** + * Relative path that is appended to the contextRoot to form fully qualified + * endpoint address for the web service endpoint. + * + * Applies to server side port components only. + */ + String urlPattern() default ""; + + /** + * The authMethod is used to configure the authentication mechanism for the web service. + * As a prerequisite to gaining access to any web service which are protected by an authorization + * constraint, a user must have authenticated using the configured mechanism. + * + * Legal values for this element are "BASIC", or "CLIENT-CERT". + */ + String authMethod() default ""; + + /** + * The transportGuarantee specifies that the communication + * between client and server should be NONE, INTEGRAL, or + * CONFIDENTIAL. NONE means that the application does not require any + * transport guarantees. A value of INTEGRAL means that the application + * requires that the data sent between the client and server be sent in + * such a way that it can't be changed in transit. CONFIDENTIAL means + * that the application requires that the data be transmitted in a + * fashion that prevents other entities from observing the contents of + * the transmission. In most cases, the presence of the INTEGRAL or + * CONFIDENTIAL flag will indicate that the use of SSL is required. + */ + String transportGuarantee() default ""; + + /** + * A secure endpoint does not by default publish it's wsdl on an unsecure transport. + * You can override this behaviour by explicitly setting the secureWSDLAccess flag to false. + * + * Protect access to WSDL + * http://jira.jboss.org/jira/browse/JBWS-723 + */ + boolean secureWSDLAccess() default true; + +} Property changes on: trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/WebContext.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-01-16 13:11:09 UTC (rev 1982) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-01-16 14:29:43 UTC (rev 1983) @@ -126,8 +126,11 @@ serviceMetaData.setWsdlLocation(wsdlURL); } + // process config + processEndpointConfig(udi, sepClass, linkName, sepMetaData); + // Set the endpoint address - processPortComponent(udi, sepClass, linkName, sepMetaData); + processWebContext(udi, sepClass, linkName, sepMetaData); // Init the endpoint address MetaDataBuilder.initEndpointAddress(udi, sepMetaData, linkName); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-01-16 13:11:09 UTC (rev 1982) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-01-16 14:29:43 UTC (rev 1983) @@ -23,15 +23,16 @@ // $Id$ -import javax.jws.WebService; -import javax.xml.ws.WebServiceProvider; - -import org.jboss.ws.annotation.PortComponent; +import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.ws.annotation.WebContext; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; +import javax.jws.WebService; +import javax.xml.ws.WebServiceProvider; + /** * Builds ServiceEndpointMetaData for a JAX-WS endpoint. * @@ -54,37 +55,46 @@ } } - protected void processPortComponent(UnifiedDeploymentInfo udi, Class<?> wsClass, String linkName, ServerEndpointMetaData sepMetaData) + protected void processEndpointConfig(UnifiedDeploymentInfo udi, Class<?> wsClass, String linkName, ServerEndpointMetaData sepMetaData) { - PortComponent anPortComponent = wsClass.getAnnotation(PortComponent.class); - if (anPortComponent == null) + EndpointConfig anEndpointConfig = wsClass.getAnnotation(EndpointConfig.class); + + if (anEndpointConfig== null) return; // setup config name - if (anPortComponent.configName().length() > 0) + if (anEndpointConfig.configName().length() > 0) { - String configName = anPortComponent.configName(); + String configName = anEndpointConfig.configName(); sepMetaData.setConfigName(configName); } // setup config file - if (anPortComponent.configFile().length() > 0) + if (anEndpointConfig.configFile().length() > 0) { - String configFile = anPortComponent.configFile(); + String configFile = anEndpointConfig.configFile(); sepMetaData.setConfigFile(configFile); } + } + protected void processWebContext(UnifiedDeploymentInfo udi, Class<?> wsClass, String linkName, ServerEndpointMetaData sepMetaData) + { + WebContext anWebContext = wsClass.getAnnotation(WebContext.class); + + if (anWebContext == null) + return; + boolean isJSEEndpoint = (udi.type == DeploymentType.JAXWS_JSE); // context-root - if (anPortComponent.contextRoot().length() > 0) + if (anWebContext.contextRoot().length() > 0) { if (isJSEEndpoint) - log.warn(&quot;(a)PortComponent.contextRoot is only valid on EJB endpoints"); + log.warn(&quot;(a)WebContext.contextRoot is only valid on EJB endpoints"); if (isJSEEndpoint == false) { - String contextRoot = anPortComponent.contextRoot(); + String contextRoot = anWebContext.contextRoot(); if (contextRoot.startsWith("/") == false) contextRoot = "/" + contextRoot; @@ -93,49 +103,49 @@ } // url-pattern - if (anPortComponent.urlPattern().length() > 0) + if (anWebContext.urlPattern().length() > 0) { if (isJSEEndpoint) - log.warn(&quot;(a)PortComponent.urlPattern is only valid on EJB endpoints"); + log.warn(&quot;(a)WebContext.urlPattern is only valid on EJB endpoints"); if (isJSEEndpoint == false) { - String urlPattern = anPortComponent.urlPattern(); + String urlPattern = anWebContext.urlPattern(); sepMetaData.setURLPattern(urlPattern); } } // auth-method - if (anPortComponent.authMethod().length() > 0) + if (anWebContext.authMethod().length() > 0) { if (isJSEEndpoint) - log.warn(&quot;(a)PortComponent.authMethod is only valid on EJB endpoints"); + log.warn(&quot;(a)WebContext.authMethod is only valid on EJB endpoints"); if (isJSEEndpoint == false) { - String authMethod = anPortComponent.authMethod(); + String authMethod = anWebContext.authMethod(); sepMetaData.setAuthMethod(authMethod); } } // transport-guarantee - if (anPortComponent.transportGuarantee().length() > 0) + if (anWebContext.transportGuarantee().length() > 0) { if (isJSEEndpoint) - log.warn(&quot;(a)PortComponent.transportGuarantee is only valid on EJB endpoints"); + log.warn(&quot;(a)WebContext.transportGuarantee is only valid on EJB endpoints"); if (isJSEEndpoint == false) { - String transportGuarantee = anPortComponent.transportGuarantee(); + String transportGuarantee = anWebContext.transportGuarantee(); sepMetaData.setTransportGuarantee(transportGuarantee); } } // secure wsdl access - sepMetaData.setSecureWSDLAccess(anPortComponent.secureWSDLAccess()); + sepMetaData.setSecureWSDLAccess(anWebContext.secureWSDLAccess()); // virtual hosts - String[] virtualHosts = anPortComponent.virtualHosts(); + String[] virtualHosts = anWebContext.virtualHosts(); if (virtualHosts != null & virtualHosts.length > 0) { sepMetaData.setVirtualHosts(virtualHosts); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-01-16 13:11:09 UTC (rev 1982) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-01-16 14:29:43 UTC (rev 1983) @@ -110,10 +110,12 @@ // Process or generate WSDL processOrGenerateWSDL(seiClass, serviceMetaData, result.wsdlLocation, sepMetaData); - // process config name and config file amongst others - // Note, that @PortComponent needs to be defined on the endpoint not the SEI - processPortComponent(udi, sepClass, linkName, sepMetaData); + // process config + processEndpointConfig(udi, sepClass, linkName, sepMetaData); + // Note, that @WebContext needs to be defined on the endpoint not the SEI + processWebContext(udi, sepClass, linkName, sepMetaData); + // setup handler chain from config sepMetaData.configure(sepMetaData); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/EndpointEJB.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/EndpointEJB.java 2007-01-16 13:11:09 UTC (rev 1982) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/context/EndpointEJB.java 2007-01-16 14:29:43 UTC (rev 1983) @@ -33,10 +33,10 @@ import javax.xml.ws.WebServiceContext; import javax.xml.ws.WebServiceException; -import org.jboss.ws.annotation.PortComponent; +import org.jboss.ws.annotation.WebContext; @WebService(endpointInterface = "org.jboss.test.ws.jaxws.context.EndpointInterface", serviceName = "TestService", targetNamespace = "http://org.jboss.ws/jaxws/context") -@PortComponent(contextRoot = "/jaxws-context", urlPattern = "/*") +@WebContext(contextRoot = "/jaxws-context", urlPattern = "/*") @Stateless public class EndpointEJB { Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.java 2007-01-16 13:11:09 UTC (rev 1982) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.java 2007-01-16 14:29:43 UTC (rev 1983) @@ -27,12 +27,12 @@ import javax.jws.soap.SOAPBinding; import org.jboss.logging.Logger; -import org.jboss.ws.annotation.PortComponent; +import org.jboss.ws.annotation.WebContext; // Test that the wsdl can be read from the nested deployment @WebService(name="TestEndpoint", wsdlLocation="META-INF/wsdl/TestEndpoint.wsdl") @SOAPBinding(style = SOAPBinding.Style.RPC) -@PortComponent(contextRoot="/earejb3") +@WebContext(contextRoot="/earejb3") @Stateless public class EJB3Bean { Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2007-01-16 13:11:09 UTC (rev 1982) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2007-01-16 14:29:43 UTC (rev 1983) @@ -52,7 +52,7 @@ catch (Exception e) { log.error(e); - return "Unable to get WebModule MBean for virtual host - virtual-host not handled from @PortComponent"; + return "Unable to get WebModule MBean for virtual host - virtual-host not handled from @WebContext"; } return message; Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java 2007-01-16 13:11:09 UTC (rev 1982) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jbws981/EndpointInterface.java 2007-01-16 14:29:43 UTC (rev 1983) @@ -12,11 +12,11 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -import org.jboss.ws.annotation.PortComponent; +import org.jboss.ws.annotation.WebContext; @WebService(targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws981") @SOAPBinding(style = SOAPBinding.Style.RPC) -@PortComponent(virtualHosts = { "localhost", "www.jboss.org" }) +@WebContext(virtualHosts = { "localhost", "www.jboss.org" }) public interface EndpointInterface { String hello(String msg); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean01.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean01.java 2007-01-16 13:11:09 UTC (rev 1982) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean01.java 2007-01-16 14:29:43 UTC (rev 1983) @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.jaxws.jsr181.webservice; -import org.jboss.ws.annotation.PortComponent; +import org.jboss.ws.annotation.WebContext; import javax.ejb.EJBException; import javax.ejb.SessionBean; @@ -39,7 +39,7 @@ */ @WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService") @SOAPBinding(style = SOAPBinding.Style.RPC) -@PortComponent(contextRoot="/jsr181", urlPattern="/*") +@WebContext(contextRoot="/jsr181", urlPattern="/*") public class EJB21Bean01 implements SessionBean { Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean02.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean02.java 2007-01-16 13:11:09 UTC (rev 1982) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean02.java 2007-01-16 14:29:43 UTC (rev 1983) @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.jaxws.jsr181.webservice; -import org.jboss.ws.annotation.PortComponent; +import org.jboss.ws.annotation.WebContext; import javax.ejb.EJBException; import javax.ejb.SessionBean; @@ -41,7 +41,7 @@ */ @WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService", wsdlLocation = "META-INF/wsdl/TestService.wsdl") @SOAPBinding(style = SOAPBinding.Style.RPC) -@PortComponent(contextRoot="/jsr181", urlPattern="/*") +@WebContext(contextRoot="/jsr181", urlPattern="/*") public class EJB21Bean02 implements SessionBean { Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean01.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean01.java 2007-01-16 13:11:09 UTC (rev 1982) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean01.java 2007-01-16 14:29:43 UTC (rev 1983) @@ -22,7 +22,7 @@ package org.jboss.test.ws.jaxws.jsr181.webservice; import org.jboss.annotation.ejb.RemoteBinding; -import org.jboss.ws.annotation.PortComponent; +import org.jboss.ws.annotation.WebContext; import javax.jws.WebMethod; import javax.jws.WebService; @@ -37,7 +37,7 @@ * @since 29-Apr-2005 */ @WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService") -@PortComponent(contextRoot="/jsr181", urlPattern="/*") +@WebContext(contextRoot="/jsr181", urlPattern="/*") @SOAPBinding(style = SOAPBinding.Style.RPC) @Remote(EJB3RemoteInterface.class) @RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface") Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean02.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean02.java 2007-01-16 13:11:09 UTC (rev 1982) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean02.java 2007-01-16 14:29:43 UTC (rev 1983) @@ -22,7 +22,7 @@ package org.jboss.test.ws.jaxws.jsr181.webservice; import org.jboss.annotation.ejb.RemoteBinding; -import org.jboss.ws.annotation.PortComponent; +import org.jboss.ws.annotation.WebContext; import javax.jws.WebMethod; import javax.jws.WebService; @@ -41,7 +41,7 @@ * @since 29-Apr-2005 */ @WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService", wsdlLocation = "META-INF/wsdl/TestService.wsdl") -@PortComponent(contextRoot="/jsr181", urlPattern="/*") +@WebContext(contextRoot="/jsr181", urlPattern="/*") @SOAPBinding(style = SOAPBinding.Style.RPC) @Remote(EJB3RemoteInterface.class) @RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface") Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.java 2007-01-16 13:11:09 UTC (rev 1982) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.java 2007-01-16 14:29:43 UTC (rev 1983) @@ -27,7 +27,7 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -import org.jboss.ws.annotation.PortComponent; +import org.jboss.ws.annotation.WebContext; /** * Test the JSR-181 javax.jws.WebService annotation on an SEI @@ -36,7 +36,7 @@ * @since 29-Apr-2005 */ @WebService(targetNamespace = "http://foo") -@PortComponent(contextRoot="/jsr181", urlPattern="/*") +@WebContext(contextRoot="/jsr181", urlPattern="/*") @SOAPBinding(style = SOAPBinding.Style.RPC) public interface EndpointInterface03 extends Remote { Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java 2007-01-16 13:11:09 UTC (rev 1982) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java 2007-01-16 14:29:43 UTC (rev 1983) @@ -32,7 +32,8 @@ import org.jboss.annotation.ejb.RemoteBinding; import org.jboss.annotation.security.SecurityDomain; -import org.jboss.ws.annotation.PortComponent; +import org.jboss.ws.annotation.WebContext; +import org.jboss.ws.annotation.EndpointConfig; /** * Test the JSR-181 annotation: javax.jws.WebService @@ -52,7 +53,8 @@ // jboss propriatary annotations @RemoteBinding(jndiBinding = "/ejb3/EJB3Bean01") -@PortComponent(authMethod="BASIC", transportGuarantee="NONE", secureWSDLAccess=false, configName="Standard WSSecurity Endpoint") +@WebContext(authMethod="BASIC", transportGuarantee="NONE", secureWSDLAccess=false) +@EndpointConfig(configName="Standard WSSecurity Endpoint") @SecurityDomain("JBossWS") public class EJB3Bean01 implements EJB3RemoteInterface { Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.java 2007-01-16 13:11:09 UTC (rev 1982) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.java 2007-01-16 14:29:43 UTC (rev 1983) @@ -26,14 +26,12 @@ import java.rmi.Remote; import java.rmi.RemoteException; -import javax.jws.HandlerChain; import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -import org.jboss.ws.annotation.PortComponent; +import org.jboss.ws.annotation.WebContext; +import org.jboss.ws.annotation.EndpointConfig; /** * WS-Addressing stateful service endpoint interface @@ -44,7 +42,7 @@ */ @WebService(name = "StatefulEndpoint", targetNamespace = "http://org.jboss.ws/samples/wsaddressing", serviceName = "TestService") @SOAPBinding(style = SOAPBinding.Style.RPC) -@PortComponent(configName = "Standard WSAddressing Endpoint") +@EndpointConfig(configName = "Standard WSAddressing Endpoint") public interface StatefulEndpoint extends Remote { @WebMethod Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java 2007-01-16 13:11:09 UTC (rev 1982) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.java 2007-01-16 14:29:43 UTC (rev 1983) @@ -23,10 +23,8 @@ //$Id$ -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.jboss.logging.Logger; +import org.jboss.ws.annotation.EndpointConfig; import javax.annotation.Resource; import javax.jws.HandlerChain; @@ -36,10 +34,11 @@ import javax.xml.namespace.QName; import javax.xml.ws.WebServiceContext; import javax.xml.ws.handler.MessageContext; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import org.jboss.logging.Logger; -import org.jboss.ws.annotation.PortComponent; - /** * WS-Addressing stateful service endpoint * @@ -47,7 +46,7 @@ * @since 24-Nov-2005 */ @WebService(name = "StatefulEndpoint", targetNamespace = "http://org.jboss.ws/samples/wsaddressing", serviceName = "TestService") -@PortComponent(configName = "Standard WSAddressing Endpoint") +@EndpointConfig(configName = "Standard WSAddressing Endpoint") @HandlerChain(file = "WEB-INF/jaxws-handlers.xml") @SOAPBinding(style = SOAPBinding.Style.RPC) public class StatefulEndpointImpl implements StatefulEndpoint Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.java 2007-01-16 13:11:09 UTC (rev 1982) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.java 2007-01-16 14:29:43 UTC (rev 1983) @@ -30,7 +30,8 @@ import javax.jws.soap.SOAPBinding; import org.jboss.logging.Logger; -import org.jboss.ws.annotation.PortComponent; +import org.jboss.ws.annotation.WebContext; +import org.jboss.ws.annotation.EndpointConfig; /** * WS-Addressing service endpoint @@ -41,7 +42,7 @@ */ @SOAPBinding(style = SOAPBinding.Style.RPC) @WebService(name = "ActionEndpoint", targetNamespace = "http://org.jboss.ws/addressing/action", wsdlLocation = "WEB-INF/wsdl/ActionRpcService.wsdl") -@PortComponent(configName = "Standard WSAddressing Endpoint") +@EndpointConfig(configName = "Standard WSAddressing Endpoint") public class ActionRpcEndpointImpl implements ActionEndpoint { // provide logging Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.java 2007-01-16 13:11:09 UTC (rev 1982) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.java 2007-01-16 14:29:43 UTC (rev 1983) @@ -30,7 +30,8 @@ import javax.jws.soap.SOAPBinding; import org.jboss.logging.Logger; -import org.jboss.ws.annotation.PortComponent; +import org.jboss.ws.annotation.WebContext; +import org.jboss.ws.annotation.EndpointConfig; /** * WS-Addressing service endpoint @@ -41,7 +42,7 @@ */ @SOAPBinding(style = SOAPBinding.Style.RPC) @WebService(name = "InitialEndpoint", targetNamespace = "http://org.jboss.ws/addressing/replyto") -@PortComponent(configName = "Standard WSAddressing Endpoint") +@EndpointConfig(configName = "Standard WSAddressing Endpoint") public class InitialEndpointImpl implements InitialEndpoint { // provide logging