July 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r3973 - in trunk: integration/spi/src/main/java/org/jboss/wsf/spi/management and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-24 09:25:49 -0400 (Tue, 24 Jul 2007) New Revision: 3973 Removed: trunk/integration/sunri/src/test/resources/test-excludes-jboss40.txt trunk/integration/xfire/src/test/resources/test-excludes-jboss40.txt Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ServletControllerExt.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDEndpoint.java trunk/integration/xfire/src/main/resources/jbossws-xfire-config.xml trunk/integration/xfire/src/test/resources/test-excludes-jboss42.txt trunk/integration/xfire/src/test/resources/test-excludes-jboss50.txt trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.java Log: More work on cxf integration Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2007-07-24 12:30:15 UTC (rev 3972) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2007-07-24 13:25:49 UTC (rev 3973) @@ -21,12 +21,16 @@ */ package org.jboss.wsf.framework.deployment; +//$Id$ + +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; 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.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.ServerConfigFactory; -//$Id$ - /** * A deployer that assigns the endpoint address. * @@ -41,6 +45,14 @@ String contextRoot = dep.getService().getContextRoot(); if (contextRoot == null) throw new IllegalStateException("Cannot obtain context root"); + + SPIProvider provider = SPIProviderResolver.getInstance().getProvider(); + ServerConfigFactory spi = provider.getSPI(ServerConfigFactory.class); + ServerConfig serverConfig = spi.createServerConfig(); + + String host = serverConfig.getWebServiceHost(); + int port = serverConfig.getWebServicePort(); + String hostAndPort = host + (port > 0 ? ":" + port : ""); for (Endpoint ep : dep.getService().getEndpoints()) { @@ -51,7 +63,7 @@ if (urlPattern.endsWith("/*")) urlPattern = urlPattern.substring(0, urlPattern.length() - 2); - ep.setAddress(contextRoot + urlPattern); + ep.setAddress("http://" + hostAndPort + contextRoot + urlPattern); } } } \ No newline at end of file Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-07-24 12:30:15 UTC (rev 3972) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-07-24 13:25:49 UTC (rev 3973) @@ -25,8 +25,16 @@ import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.deployment.*; -import org.jboss.wsf.spi.invocation.*; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.LifecycleHandler; +import org.jboss.wsf.spi.deployment.LifecycleHandlerFactory; +import org.jboss.wsf.spi.invocation.InvocationHandler; +import org.jboss.wsf.spi.invocation.InvocationModelFactory; +import org.jboss.wsf.spi.invocation.InvocationType; +import org.jboss.wsf.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.invocation.RequestHandlerFactory; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; @@ -39,29 +47,26 @@ */ public class EndpointHandlerDeploymentAspect extends DeploymentAspect { - private String requestHandler; - private LifecycleHandler lifecycleHandler; - private SPIProvider spiProvider; public EndpointHandlerDeploymentAspect() { spiProvider = SPIProviderResolver.getInstance().getProvider(); - } + } @Override public void create(Deployment dep) { for (Endpoint ep : dep.getService().getEndpoints()) { - // associate a request handler + // Associate a request handler ep.setRequestHandler(getRequestHandler(dep)); - // associate a lifecycle handler + // Associate a lifecycle handler ep.setLifecycleHandler(getLifecycleHandler(dep)); - // associate a n invocation handler - // TODO: can this be null? + // Associate an invocation handler + // Invocation handlers are assigned per container or per stack InvocationHandler invocationHandler = getInvocationHandler(ep); if (invocationHandler != null) ep.setInvocationHandler(invocationHandler); @@ -94,9 +99,8 @@ } } - InvocationType type = InvocationType.valueOf(key); - InvocationHandler invocationHandler= spiProvider.getSPI(InvocationModelFactory.class).createInvocationHandler( type ); + InvocationHandler invocationHandler = spiProvider.getSPI(InvocationModelFactory.class).createInvocationHandler(type); return invocationHandler; } } \ No newline at end of file Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java 2007-07-24 12:30:15 UTC (rev 3972) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java 2007-07-24 13:25:49 UTC (rev 3973) @@ -21,13 +21,10 @@ */ package org.jboss.wsf.spi.management; -import org.jboss.kernel.spi.registry.KernelRegistry; -import org.jboss.logging.Logger; -import org.jboss.ws.integration.KernelLocator; +//$Id$ + import org.jboss.wsf.spi.SPIView; -// $Id$ - /** * Factory to container independent config * Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2007-07-24 12:30:15 UTC (rev 3972) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2007-07-24 13:25:49 UTC (rev 3973) @@ -117,8 +117,12 @@ if (implVendor == null) { Service service = Service.create(new QName("dummyService")); - service.addPort(new QName("dummyPort"), SOAPBinding.SOAP11HTTP_BINDING, "http://dummy-address"); - Dispatch<Source> obj = service.createDispatch(new QName("dummyPort"), Source.class, Mode.PAYLOAD); + Object obj = service.getHandlerResolver(); + if (obj == null) + { + service.addPort(new QName("dummyPort"), SOAPBinding.SOAP11HTTP_BINDING, "http://dummy-address"); + obj = service.createDispatch(new QName("dummyPort"), Source.class, Mode.PAYLOAD); + } implVendor = obj.getClass().getPackage().getImplementationVendor(); implTitle = obj.getClass().getPackage().getImplementationTitle(); implVersion = obj.getClass().getPackage().getImplementationVersion(); Deleted: trunk/integration/sunri/src/test/resources/test-excludes-jboss40.txt =================================================================== --- trunk/integration/sunri/src/test/resources/test-excludes-jboss40.txt 2007-07-24 12:30:15 UTC (rev 3972) +++ trunk/integration/sunri/src/test/resources/test-excludes-jboss40.txt 2007-07-24 13:25:49 UTC (rev 3973) @@ -1,19 +0,0 @@ -# -# $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $ -# - -################################################################### -# Exclude JBossWS-Native stuff -# -org/jboss/test/ws/jaxws/samples/wsaddressing/** -org/jboss/test/ws/jaxws/samples/wseventing/** -org/jboss/test/ws/jaxws/samples/wssecurity/** -# -################################################################### - -# [JBWS-1673] Fix JAXR samples for SunRI -org/jboss/test/ws/jaxws/samples/jaxr/** - -# [JBWS-1674] Fix @WebServiceRef with SunRI -org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/webserviceref/** Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ServletControllerExt.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ServletControllerExt.java 2007-07-24 12:30:15 UTC (rev 3972) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ServletControllerExt.java 2007-07-24 13:25:49 UTC (rev 3973) @@ -25,6 +25,9 @@ import java.io.IOException; import java.io.OutputStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Collection; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -64,20 +67,46 @@ { try { - // JBossWS always uses the request URI - EndpointInfo ei = new EndpointInfo(); - String address = req.getRequestURI(); - - ei.setAddress(address); - ServletDestination dest = (ServletDestination)transport.getDestinationForPath(ei.getAddress()); + // Find destination based on request URI + String requestURI = req.getRequestURI(); + ServletDestination dest = null; + Collection<ServletDestination> destinations = transport.getDestinations(); + for (ServletDestination aux : destinations) + { + EndpointInfo ei = aux.getEndpointInfo(); + String address = ei.getAddress(); + + // Fix invalid leading slash + if (address.startsWith("/http://")) + { + address = address.substring(1); + ei.setAddress(address); + } + + String path = address; + try + { + path = new URL(address).getPath(); + } + catch (MalformedURLException ex) + { + // ignore + } + + if (requestURI.startsWith(path)) + { + dest = aux; + break; + } + } if (dest == null) - throw new ServletException("Cannot obtain destination for: " + address); + throw new ServletException("Cannot obtain destination for: " + requestURI); - ei = dest.getEndpointInfo(); + EndpointInfo ei = dest.getEndpointInfo(); Bus bus = cxfServlet.getBus(); if (null != req.getQueryString() && req.getQueryString().length() > 0 && bus.getExtension(QueryHandlerRegistry.class) != null) { - String ctxUri = address; //req.getPathInfo(); + String ctxUri = requestURI; //req.getPathInfo(); String baseUri = req.getRequestURL().toString() + "?" + req.getQueryString(); for (QueryHandler qh : bus.getExtension(QueryHandlerRegistry.class).getHandlers()) Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDEndpoint.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDEndpoint.java 2007-07-24 12:30:15 UTC (rev 3972) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/metadata/services/DDEndpoint.java 2007-07-24 13:25:49 UTC (rev 3973) @@ -59,7 +59,10 @@ public void writeTo(Writer writer) throws IOException { - writer.write("<jaxws:endpoint id='" + id + "' address='"+ address +"' implementor='" + implementor + "'>"); + writer.write("<jaxws:endpoint id='" + id + "'"); + writer.write(" address='" + address + "'"); + writer.write(" implementor='" + implementor + "'"); + writer.write(">"); //writer.write("<jaxws:implementor><bean class='" + implementor + "'/></jaxws:implementor>"); // [JBWS-1746] Add support for configurable invoker in cxf.xml @@ -81,8 +84,6 @@ StringBuilder str = new StringBuilder("Service"); str.append("\n id=" + id); str.append("\n address=" + address); - // str.append("\n invoker=" + invoker); - str.append("\n serviceFactory=" + serviceFactory); str.append("\n implementor=" + implementor); return str.toString(); } Modified: trunk/integration/xfire/src/main/resources/jbossws-xfire-config.xml =================================================================== --- trunk/integration/xfire/src/main/resources/jbossws-xfire-config.xml 2007-07-24 12:30:15 UTC (rev 3972) +++ trunk/integration/xfire/src/main/resources/jbossws-xfire-config.xml 2007-07-24 13:25:49 UTC (rev 3973) @@ -23,7 +23,6 @@ </bean>  -  <bean name="WSEndpointRegistry" class="org.jboss.wsf.stack.xfire.ManagedEndpointRegistry"/> <!-- Deleted: trunk/integration/xfire/src/test/resources/test-excludes-jboss40.txt =================================================================== --- trunk/integration/xfire/src/test/resources/test-excludes-jboss40.txt 2007-07-24 12:30:15 UTC (rev 3972) +++ trunk/integration/xfire/src/test/resources/test-excludes-jboss40.txt 2007-07-24 13:25:49 UTC (rev 3973) @@ -1,50 +0,0 @@ -# -# $Id: test-excludes.txt 3915 2007-07-17 16:16:05Z heiko.braun(a)jboss.com $ -# - -################################################################### -# Exclude JBossWS-Native stuff -# -org/jboss/test/ws/jaxws/samples/wsaddressing/** -org/jboss/test/ws/jaxws/samples/wseventing/** -org/jboss/test/ws/jaxws/samples/wssecurity/** -# -################################################################### - -# [JBWS-1682] XFire does not generate proper service name -org/jboss/test/ws/jaxws/samples/asynchronous/** -org/jboss/test/ws/jaxws/samples/exception/** -org/jboss/test/ws/jaxws/samples/handlerchain/** -org/jboss/test/ws/jaxws/samples/oneway/** -org/jboss/test/ws/jaxws/samples/soapbinding/** -org/jboss/test/ws/jaxws/samples/webmethod/** -org/jboss/test/ws/jaxws/samples/webservice/** -org/jboss/test/ws/jaxws/samples/xop/** - -# [JBWS-1685] Add support for WebServiceContext propagation -org/jboss/test/ws/jaxws/samples/context/** - -# [JBWS-1686] Add support for @Provider -org/jboss/test/ws/jaxws/samples/httpbinding/** -org/jboss/test/ws/jaxws/samples/provider/** - -# [JBWS-1683] Fix JAXR samples for XFire -org/jboss/test/ws/jaxws/samples/jaxr/** - -# [JBWS-1687] Add support for @HandlerChain -org/jboss/test/ws/jaxws/samples/logicalhandler/** - -# [JBWS-1684] Fix @WebServiceRef with XFire -org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/serviceref/** -org/jboss/test/ws/jaxws/samples/webserviceref/** - -# ServiceRef Handling not yet implemented -org/jboss/test/ws/jaxws/samples/serviceref/** - -# [JBWS-1689] Add support for SwaRef -org/jboss/test/ws/jaxws/samples/swaref/** - -# [JBWS-1688] Fix @WebParam, @WebResult handling -org/jboss/test/ws/jaxws/samples/webparam/** -org/jboss/test/ws/jaxws/samples/webresult/** Modified: trunk/integration/xfire/src/test/resources/test-excludes-jboss42.txt =================================================================== --- trunk/integration/xfire/src/test/resources/test-excludes-jboss42.txt 2007-07-24 12:30:15 UTC (rev 3972) +++ trunk/integration/xfire/src/test/resources/test-excludes-jboss42.txt 2007-07-24 13:25:49 UTC (rev 3973) @@ -11,40 +11,46 @@ # ################################################################### -# [JBWS-1682] XFire does not generate proper service name -org/jboss/test/ws/jaxws/samples/asynchronous/** +# [JBWS-1746] Add support for configurable invoker in cxf.xml +org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.* +org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.* +org/jboss/test/ws/jaxws/samples/swaref/** + +# [JBWS-1750] Investigate CXF exception handling org/jboss/test/ws/jaxws/samples/exception/** + +# [JBWS-1751] Investigate CXF samples handlerchain org/jboss/test/ws/jaxws/samples/handlerchain/** -org/jboss/test/ws/jaxws/samples/oneway/** -org/jboss/test/ws/jaxws/samples/soapbinding/** -org/jboss/test/ws/jaxws/samples/webmethod/** -org/jboss/test/ws/jaxws/samples/webservice/** -org/jboss/test/ws/jaxws/samples/xop/** -# [JBWS-1685] Add support for WebServiceContext propagation -org/jboss/test/ws/jaxws/samples/context/** - -# [JBWS-1686] Add support for @Provider +# [JBWS-1752] Investigate CXF samples httpbinding org/jboss/test/ws/jaxws/samples/httpbinding/** -org/jboss/test/ws/jaxws/samples/provider/** # [JBWS-1683] Fix JAXR samples for XFire org/jboss/test/ws/jaxws/samples/jaxr/** -# [JBWS-1687] Add support for @HandlerChain +# [JBWS-1753] Investigate CXF samples logicalhandler org/jboss/test/ws/jaxws/samples/logicalhandler/** -# [JBWS-1684] Fix @WebServiceRef with XFire +# [JBWS-1754] Investigate CXF samples oneway +org/jboss/test/ws/jaxws/samples/oneway/** + +# [JBWS-1755] Investigate CXF samples provider +org/jboss/test/ws/jaxws/samples/provider/** + +# [JBWS-1756] Fix @WebServiceRef with CXF org/jboss/test/ws/jaxws/samples/retail/** org/jboss/test/ws/jaxws/samples/serviceref/** org/jboss/test/ws/jaxws/samples/webserviceref/** -# ServiceRef Handling not yet implemented -org/jboss/test/ws/jaxws/samples/serviceref/** +# [JBWS-1757] Investigate CXF samples soapbinding +org/jboss/test/ws/jaxws/samples/soapbinding/** -# [JBWS-1689] Add support for SwaRef -org/jboss/test/ws/jaxws/samples/swaref/** +# [JBWS-1758] Investigate CXF samples webmethod +org/jboss/test/ws/jaxws/samples/webmethod/** -# [JBWS-1688] Fix @WebParam, @WebResult handling -org/jboss/test/ws/jaxws/samples/webparam/** -org/jboss/test/ws/jaxws/samples/webresult/** +# [JBWS-1759] Investigate CXF samples webservice +org/jboss/test/ws/jaxws/samples/webservice/** + +# [JBWS-1759] Investigate CXF samples xop +org/jboss/test/ws/jaxws/samples/xop/** + Modified: trunk/integration/xfire/src/test/resources/test-excludes-jboss50.txt =================================================================== --- trunk/integration/xfire/src/test/resources/test-excludes-jboss50.txt 2007-07-24 12:30:15 UTC (rev 3972) +++ trunk/integration/xfire/src/test/resources/test-excludes-jboss50.txt 2007-07-24 13:25:49 UTC (rev 3973) @@ -11,40 +11,46 @@ # ################################################################### -# [JBWS-1682] XFire does not generate proper service name -org/jboss/test/ws/jaxws/samples/asynchronous/** +# [JBWS-1746] Add support for configurable invoker in cxf.xml +org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.* +org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.* +org/jboss/test/ws/jaxws/samples/swaref/** + +# [JBWS-1750] Investigate CXF exception handling org/jboss/test/ws/jaxws/samples/exception/** + +# [JBWS-1751] Investigate CXF samples handlerchain org/jboss/test/ws/jaxws/samples/handlerchain/** -org/jboss/test/ws/jaxws/samples/oneway/** -org/jboss/test/ws/jaxws/samples/soapbinding/** -org/jboss/test/ws/jaxws/samples/webmethod/** -org/jboss/test/ws/jaxws/samples/webservice/** -org/jboss/test/ws/jaxws/samples/xop/** -# [JBWS-1685] Add support for WebServiceContext propagation -org/jboss/test/ws/jaxws/samples/context/** - -# [JBWS-1686] Add support for @Provider +# [JBWS-1752] Investigate CXF samples httpbinding org/jboss/test/ws/jaxws/samples/httpbinding/** -org/jboss/test/ws/jaxws/samples/provider/** # [JBWS-1683] Fix JAXR samples for XFire org/jboss/test/ws/jaxws/samples/jaxr/** -# [JBWS-1687] Add support for @HandlerChain +# [JBWS-1753] Investigate CXF samples logicalhandler org/jboss/test/ws/jaxws/samples/logicalhandler/** -# [JBWS-1684] Fix @WebServiceRef with XFire +# [JBWS-1754] Investigate CXF samples oneway +org/jboss/test/ws/jaxws/samples/oneway/** + +# [JBWS-1755] Investigate CXF samples provider +org/jboss/test/ws/jaxws/samples/provider/** + +# [JBWS-1756] Fix @WebServiceRef with CXF org/jboss/test/ws/jaxws/samples/retail/** org/jboss/test/ws/jaxws/samples/serviceref/** org/jboss/test/ws/jaxws/samples/webserviceref/** -# ServiceRef Handling not yet implemented -org/jboss/test/ws/jaxws/samples/serviceref/** +# [JBWS-1757] Investigate CXF samples soapbinding +org/jboss/test/ws/jaxws/samples/soapbinding/** -# [JBWS-1689] Add support for SwaRef -org/jboss/test/ws/jaxws/samples/swaref/** +# [JBWS-1758] Investigate CXF samples webmethod +org/jboss/test/ws/jaxws/samples/webmethod/** -# [JBWS-1688] Fix @WebParam, @WebResult handling -org/jboss/test/ws/jaxws/samples/webparam/** -org/jboss/test/ws/jaxws/samples/webresult/** +# [JBWS-1759] Investigate CXF samples webservice +org/jboss/test/ws/jaxws/samples/webservice/** + +# [JBWS-1759] Investigate CXF samples xop +org/jboss/test/ws/jaxws/samples/xop/** + Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2007-07-24 12:30:15 UTC (rev 3972) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java 2007-07-24 13:25:49 UTC (rev 3973) @@ -23,6 +23,7 @@ // $Id$ +import java.io.IOException; import java.io.StringReader; import java.net.MalformedURLException; import java.net.URL; @@ -43,6 +44,8 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.DOMWriter; +import org.w3c.dom.Element; /** * Test JAXWS asynchrous dispatch @@ -67,8 +70,7 @@ { Source reqObj = new StreamSource(new StringReader(reqPayload)); Response response = createDispatch().invokeAsync(reqObj); - Source result = (Source)response.get(1000, TimeUnit.MILLISECONDS); - assertEquals(DOMUtils.parse(expPayload), DOMUtils.sourceToElement(result)); + verifyResponse((Source)response.get(3000, TimeUnit.MILLISECONDS)); } public void testInvokeAsynchHandler() throws Exception @@ -79,8 +81,7 @@ { try { - Source result = (Source)response.get(); - assertEquals(DOMUtils.parse(expPayload), DOMUtils.sourceToElement(result)); + verifyResponse((Source)response.get()); asyncHandlerCalled = true; } catch (Exception ex) @@ -108,4 +109,11 @@ Dispatch dispatch = service.createDispatch(portName, Source.class, Mode.PAYLOAD); return dispatch; } + + private void verifyResponse(Source result) throws IOException + { + Element resElement = DOMUtils.sourceToElement(result); + String resStr = DOMWriter.printNode(resElement, false); + assertTrue("Unexpected response: " + resStr, resStr.contains("<result>Hello</result>")); + } } Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.java 2007-07-24 12:30:15 UTC (rev 3972) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.java 2007-07-24 13:25:49 UTC (rev 3973) @@ -21,15 +21,12 @@ */ package org.jboss.test.ws.jaxws.samples.soapbinding; -import java.rmi.Remote; -import java.rmi.RemoteException; - import javax.jws.WebService; import javax.jws.soap.SOAPBinding; @WebService(name = "Example") @SOAPBinding(style = SOAPBinding.Style.RPC, use = SOAPBinding.Use.LITERAL) -public interface ExampleSEI extends Remote +public interface ExampleSEI { - String concat(String first, String second, String third) throws RemoteException; + String concat(String first, String second, String third); }

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3972 - in trunk: integration/native/src/main/java/org/jboss/wsf/stack/jbws and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-24 08:30:15 -0400 (Tue, 24 Jul 2007) New Revision: 3972 Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java Removed: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/PortComponentResolver.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/RegistryComponent.java Modified: trunk/JBossWS-Trunk.iws trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java Log: Introduce EndpointResolver API Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-07-24 09:32:33 UTC (rev 3971) +++ trunk/JBossWS-Trunk.iws 2007-07-24 12:30:15 UTC (rev 3972) @@ -186,6 +186,32 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java" line="87" class="org.jboss.wsf.framework.invocation.EndpointServlet" package="org.jboss.wsf.framework.invocation"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java" line="51" class="org.jboss.wsf.stack.jbws.ServiceEndpointServlet" package="org.jboss.wsf.stack.jbws"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> </line_breakpoints> <breakpoint_any> <breakpoint> @@ -241,74 +267,80 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="WSServletContextListenerJBWS.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerJBWS.java"> + <file leaf-file-name="EndpointRegistry.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="67" column="0" selection-start="2558" selection-end="2558" vertical-scroll-proportion="0.5031056"> + <state line="37" column="3" selection-start="1400" selection-end="1400" vertical-scroll-proportion="0.17073171"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="DeploymentAspectManagerFactoryImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java"> + <file leaf-file-name="ServiceEndpointServlet.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="46" column="0" selection-start="1907" selection-end="1907" vertical-scroll-proportion="0.5365854"> + <state line="67" column="28" selection-start="2753" selection-end="2753" vertical-scroll-proportion="0.4390244"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="WSServletContextListenerExt.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerExt.java"> + <file leaf-file-name="EndpointServlet.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="107" column="0" selection-start="4060" selection-end="4060" vertical-scroll-proportion="0.1863354"> - <folding /> + <state line="107" column="50" selection-start="4068" selection-end="4068" vertical-scroll-proportion="0.902439"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="NativeMethodAccessorImpl.class" pinned="false" current="false" current-in-tab="false"> - <entry file="jar:///usr/local/jdk/64/jdk1.5.0_11/jre/lib/rt.jar!/sun/reflect/NativeMethodAccessorImpl.class"> + <file leaf-file-name="SecurityAssociationValve.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jbossas/branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationValve.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="14" column="0" selection-start="433" selection-end="433" vertical-scroll-proportion="0.32298136"> + <state line="177" column="0" selection-start="6879" selection-end="6879" vertical-scroll-proportion="0.18902439"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="WebAppGeneratorDeploymentAspect.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java"> + <file leaf-file-name="DefaultEndpointRegistry.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="82" column="0" selection-start="2991" selection-end="2991" vertical-scroll-proportion="0.1863354"> + <state line="61" column="0" selection-start="2164" selection-end="2164" vertical-scroll-proportion="0.18902439"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="SunJaxwsDeploymentAspect.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java"> + <file leaf-file-name="WebAppResolver.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="50" column="0" selection-start="1832" selection-end="1832" vertical-scroll-proportion="0.1863354"> - <folding /> + <state line="66" column="0" selection-start="2298" selection-end="2298" vertical-scroll-proportion="0.7804878"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="AbstractDeployerHook.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java"> + <file leaf-file-name="Endpoint.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="74" column="0" selection-start="2569" selection-end="2569" vertical-scroll-proportion="0.19378883"> + <state line="40" column="17" selection-start="1544" selection-end="1544" vertical-scroll-proportion="-1.8780488"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="InvocationModelFactoryImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java"> + <file leaf-file-name="EndpointResolver.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="39" column="0" selection-start="1518" selection-end="1518" vertical-scroll-proportion="0.19378883"> - <folding /> + <state line="33" column="12" selection-start="1250" selection-end="1250" vertical-scroll-proportion="0.31707317"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> @@ -344,8 +376,8 @@ <setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" /> </component> <component name="ModuleEditorState"> - <option name="LAST_EDITED_MODULE_NAME" value="int-42" /> - <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" /> + <option name="LAST_EDITED_MODULE_NAME" value="int-native" /> + <option name="LAST_EDITED_TAB_NAME" value="Dependencies" /> </component> <component name="NamedScopeManager" /> <component name="PackagesPane"> @@ -453,7 +485,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-xfire" /> + <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> </PATH> @@ -463,11 +495,11 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-xfire" /> + <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -477,41 +509,31 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-xfire" /> + <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-xfire" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main/resources" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -521,35 +543,35 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-xfire" /> + <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main/resources" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire.jar" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -559,49 +581,39 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-xfire" /> + <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main/java" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-xfire" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -611,65 +623,35 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-sunri" /> + <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-sunri" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-sunri" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-sunri" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main/resources" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -679,37 +661,41 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-sunri" /> + <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main/resources" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri.jar" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -717,27 +703,27 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-sunri" /> + <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main/java" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -747,19 +733,19 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-sunri" /> + <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -796,6 +782,8 @@ </component> <component name="RecentsManager"> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> + <recent name="org.jboss.ws.core.server" /> + <recent name="org.jboss.wsf.stack.jbws" /> <recent name="org.jboss.wsf.spi.management" /> <recent name="org.jboss.wsf.framework.deployment" /> <recent name="org.jboss.wsf.framework" /> @@ -925,7 +913,7 @@ <layout> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.33600494" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.25647348" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.37342498" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25215784" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> @@ -1011,115 +999,119 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.deployment.LifecycleHandlerFactory"> + <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistry.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="62" selection-start="35" selection-end="62" vertical-scroll-proportion="0.0"> + <state line="39" column="13" selection-start="1457" selection-end="1457" vertical-scroll-proportion="0.3096647"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="51" selection-start="26" selection-end="51" vertical-scroll-proportion="0.0"> + <state line="189" column="89" selection-start="8285" selection-end="8285" vertical-scroll-proportion="0.20372671"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="55" column="3" selection-start="2045" selection-end="2045" vertical-scroll-proportion="0.44720498"> + <state line="81" column="80" selection-start="3425" selection-end="3425" vertical-scroll-proportion="0.4878049"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="26" selection-start="1386" selection-end="1386" vertical-scroll-proportion="0.34146342"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory"> - <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="47" selection-start="47" selection-end="47" vertical-scroll-proportion="0.0"> + <state line="58" column="0" selection-start="2118" selection-end="2118" vertical-scroll-proportion="0.29268292"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="52" column="3" selection-start="1942" selection-end="1942" vertical-scroll-proportion="0.44720498"> + <state line="21" column="40" selection-start="1040" selection-end="1072" vertical-scroll-proportion="0.023809524"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="22" selection-start="1382" selection-end="1382" vertical-scroll-proportion="0.34146342"> + <state line="34" column="13" selection-start="1356" selection-end="1356" vertical-scroll-proportion="0.33333334"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java"> + <entry file="file:///home/hbraun/dev/prj/jbossas/branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/security/SecurityAssociationValve.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="74" column="0" selection-start="2569" selection-end="2569" vertical-scroll-proportion="0.19378883"> + <state line="177" column="0" selection-start="6879" selection-end="6879" vertical-scroll-proportion="0.18902439"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="39" column="0" selection-start="1518" selection-end="1518" vertical-scroll-proportion="0.19378883"> + <state line="40" column="17" selection-start="1544" selection-end="1544" vertical-scroll-proportion="-1.8780488"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="46" column="0" selection-start="1907" selection-end="1907" vertical-scroll-proportion="0.5365854"> - <folding /> + <state line="33" column="12" selection-start="1250" selection-end="1250" vertical-scroll-proportion="0.31707317"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="82" column="0" selection-start="2991" selection-end="2991" vertical-scroll-proportion="0.1863354"> - <folding /> + <state line="66" column="0" selection-start="2298" selection-end="2298" vertical-scroll-proportion="0.7804878"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerJBWS.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="67" column="0" selection-start="2558" selection-end="2558" vertical-scroll-proportion="0.5031056"> + <state line="61" column="0" selection-start="2164" selection-end="2164" vertical-scroll-proportion="0.18902439"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerExt.java"> + <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="107" column="0" selection-start="4060" selection-end="4060" vertical-scroll-proportion="0.1863354"> + <state line="67" column="28" selection-start="2753" selection-end="2753" vertical-scroll-proportion="0.4390244"> <folding /> </state> </provider> </entry> - <entry file="jar:///usr/local/jdk/64/jdk1.5.0_11/jre/lib/rt.jar!/sun/reflect/NativeMethodAccessorImpl.class"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/samples/asynchronous/AsynchronousDispatchTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="14" column="0" selection-start="433" selection-end="433" vertical-scroll-proportion="0.32298136"> + <state line="52" column="13" selection-start="1869" selection-end="1869" vertical-scroll-proportion="0.09756097"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="50" column="0" selection-start="1832" selection-end="1832" vertical-scroll-proportion="0.1863354"> + <state line="37" column="3" selection-start="1400" selection-end="1400" vertical-scroll-proportion="0.17073171"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="107" column="50" selection-start="4068" selection-end="4068" vertical-scroll-proportion="0.902439"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> </component> </project> Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java 2007-07-24 09:32:33 UTC (rev 3971) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java 2007-07-24 12:30:15 UTC (rev 3972) @@ -57,44 +57,6 @@ return UnifiedMetaData.getImplementationVersion(); } - /** Resolve a port-component-link, like: - * - * [deployment.war]#PortComponentName - * [deployment.jar]#PortComponentName - * - */ - public Endpoint resolvePortComponentLink(String pcLink) - { - String pcName = pcLink; - int hashIndex = pcLink.indexOf("#"); - if (hashIndex > 0) - { - pcName = pcLink.substring(hashIndex + 1); - } - - Endpoint endpoint = null; - for (ObjectName sepID : getEndpoints()) - { - Endpoint auxEndpoint = getEndpoint(sepID); - ServerEndpointMetaData sepMetaData = auxEndpoint.getAttachment(ServerEndpointMetaData.class); - if (pcName.equals(sepMetaData.getPortComponentName())) - { - if (endpoint != null) - { - log.warn("Multiple service endoints found for: " + pcLink); - endpoint = null; - break; - } - endpoint = auxEndpoint; - } - } - - if (endpoint == null) - log.warn("No ServiceEndpoint found for pcLink: " + pcLink); - - return endpoint; - } - @Override public void register(Endpoint endpoint) { Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java 2007-07-24 09:32:33 UTC (rev 3971) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java 2007-07-24 12:30:15 UTC (rev 3972) @@ -23,7 +23,15 @@ // $Id$ -import java.io.IOException; +import org.jboss.wsf.common.ObjectNameFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; import javax.management.ObjectName; import javax.servlet.ServletConfig; @@ -32,18 +40,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.xml.ws.WebServiceException; +import java.io.IOException; -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.management.EndpointRegistry; -import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.jboss.wsf.common.ObjectNameFactory; -import org.jboss.wsf.spi.invocation.RequestHandler; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.framework.invocation.EndpointAssociation; - /** * The JAX-WS dispatcher servlet. * @@ -74,7 +72,7 @@ try { EndpointAssociation.setEndpoint(endpoint); - RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); + RequestHandler requestHandler = endpoint.getRequestHandler(); requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); } finally @@ -87,25 +85,15 @@ */ protected void initServiceEndpoint(String contextPath) { - if (contextPath.startsWith("/")) - contextPath = contextPath.substring(1); + WebAppResolver resolver = new WebAppResolver(contextPath, getServletName()); + this.endpoint = epRegistry.resolve(resolver); - String servletName = getServletName(); - for (ObjectName sepId : epRegistry.getEndpoints()) + if (this.endpoint == null) { - String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT); - String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); - if (servletName.equals(propEndpoint) && contextPath.equals(propContext)) - { - endpoint = epRegistry.getEndpoint(sepId); - break; - } - } - - if (endpoint == null) - { - ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," - + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName); + ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" + + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," + + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName() + ); throw new WebServiceException("Cannot obtain endpoint for: " + oname); } Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java 2007-07-24 12:30:15 UTC (rev 3972) @@ -0,0 +1,69 @@ +/* + * 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.framework.invocation; + +import org.jboss.wsf.spi.management.EndpointResolver; +import org.jboss.wsf.spi.deployment.Endpoint; + +import javax.management.ObjectName; +import java.util.Iterator; + +/** + * Resolves Endpoints by Servlet name and web context path. + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 24, 2007 + */ +public class WebAppResolver implements EndpointResolver +{ + private String contextPath; + private String servletName; + + public WebAppResolver(String contextPath, String servletName) + { + this.contextPath = contextPath; + this.servletName = servletName; + } + + public Endpoint query(Iterator<Endpoint> endpoints) + { + Endpoint endpoint = null; + + if (contextPath.startsWith("/")) + contextPath = contextPath.substring(1); + + while(endpoints.hasNext()) + { + Endpoint auxEndpoint = endpoints.next(); + ObjectName sepId = auxEndpoint.getName(); + String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT); + String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); + if (servletName.equals(propEndpoint) && contextPath.equals(propContext)) + { + endpoint = auxEndpoint; + break; + } + } + + return endpoint; + } +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/WebAppResolver.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java 2007-07-24 09:32:33 UTC (rev 3971) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java 2007-07-24 12:30:15 UTC (rev 3972) @@ -57,9 +57,9 @@ return endpoint; } - public Endpoint resolvePortComponentLink(String pcLink) + public Endpoint resolve(EndpointResolver resolver) { - throw new IllegalArgumentException("Not implemented"); + return resolver.query(endpoints.values().iterator()); } public boolean isRegistered(ObjectName epName) Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java 2007-07-24 09:32:33 UTC (rev 3971) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java 2007-07-24 12:30:15 UTC (rev 3972) @@ -34,6 +34,8 @@ * A general endpoint registry. * * @author Thomas.Diesler(a)jboss.com + * @author Heiko.Braun(a)jboss.com + * * @since 20-Apr-2007 */ public interface EndpointRegistry @@ -49,10 +51,10 @@ /** Get the registered endpoint */ Endpoint getEndpoint(ObjectName epName); + + /** Resolve endpoints thrrough a resolve instance **/ + Endpoint resolve(EndpointResolver resolver); - /** Resolve a port component link */ - Endpoint resolvePortComponentLink(String pcLink); - /** True is an endpoint for that name is registered */ boolean isRegistered(ObjectName epName); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java 2007-07-24 09:32:33 UTC (rev 3971) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java 2007-07-24 12:30:15 UTC (rev 3972) @@ -23,12 +23,13 @@ import org.jboss.wsf.spi.deployment.Endpoint; +import java.util.Iterator; + /** * @author Heiko.Braun(a)jboss.com * Created: Jul 23, 2007 */ public interface EndpointResolver { - Endpoint getResult(); - void setResult(Endpoint result); + Endpoint query(Iterator<Endpoint> endpoints); } Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/PortComponentResolver.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/PortComponentResolver.java 2007-07-24 09:32:33 UTC (rev 3971) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/PortComponentResolver.java 2007-07-24 12:30:15 UTC (rev 3972) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.spi.management; - -import org.jboss.wsf.spi.deployment.Endpoint; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jul 23, 2007 - */ -public class PortComponentResolver implements EndpointResolver -{ - private String pcref; - private Endpoint result; - - public PortComponentResolver(String pcref) - { - this.pcref = pcref; - } - - public String getPcref() - { - return pcref; - } - - public void setResult(Endpoint result) - { - this.result = result; - } - - public Endpoint getResult() - { - return this.result; - } -} Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/RegistryComponent.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/RegistryComponent.java 2007-07-24 09:32:33 UTC (rev 3971) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/RegistryComponent.java 2007-07-24 12:30:15 UTC (rev 3972) @@ -1,42 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.spi.management; - -import org.jboss.wsf.spi.deployment.Endpoint; - -/** - * Allows endpoint registry composition - * - * @author Heiko.Braun(a)jboss.com - * Created: Jul 23, 2007 - */ -public interface RegistryComponent -{ - /** Register an endpoint */ - void register(Endpoint endpoint); - - /** Unregister an endpoint */ - void unregister(Endpoint endpoint); - - /** Resolve a port component link */ - void resolve(EndpointResolver resolver); -} Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java 2007-07-24 09:32:33 UTC (rev 3971) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java 2007-07-24 12:30:15 UTC (rev 3972) @@ -52,6 +52,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.core.client.ServiceObjectFactory; +import org.jboss.ws.core.server.PortComponentResolver; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.metadata.umdm.EndpointMetaData; @@ -186,7 +187,7 @@ { SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); EndpointRegistry epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry(); - Endpoint endpoint = epRegistry.resolvePortComponentLink(pcLink); + Endpoint endpoint = epRegistry.resolve( new PortComponentResolver(pcLink) ); if (endpoint == null) throw new WSException("Cannot resolve port-component-link: " + pcLink); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java 2007-07-24 09:32:33 UTC (rev 3971) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java 2007-07-24 12:30:15 UTC (rev 3972) @@ -79,7 +79,7 @@ if (pcLink == null) throw new IllegalArgumentException("Cannot obtain request parameter 'pcLink'"); - Endpoint endpoint = epRegistry.resolvePortComponentLink(pcLink); + Endpoint endpoint = epRegistry.resolve( new PortComponentResolver(pcLink) ); if (endpoint == null) throw new WSException("Cannot resolve port-component-link: " + pcLink); Added: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java (rev 0) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java 2007-07-24 12:30:15 UTC (rev 3972) @@ -0,0 +1,78 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.core.server; + +import org.jboss.logging.Logger; +import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.management.EndpointResolver; + +import java.util.Iterator; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 23, 2007 + */ +public class PortComponentResolver implements EndpointResolver +{ + private static final Logger log = Logger.getLogger(PortComponentResolver.class); + + private String pcLink; + private Endpoint result; + + public PortComponentResolver(String pcref) + { + this.pcLink = pcref; + } + + public Endpoint query(Iterator<Endpoint> endpoints) + { + Endpoint endpoint = null; + + String pcName = this.pcLink; + int hashIndex = this.pcLink.indexOf("#"); + if (hashIndex > 0) + { + pcName = pcLink.substring(hashIndex + 1); + } + + while(endpoints.hasNext()) + { + Endpoint auxEndpoint = endpoints.next(); + ServerEndpointMetaData sepMetaData = auxEndpoint.getAttachment(ServerEndpointMetaData.class); + if (pcName.equals(sepMetaData.getPortComponentName())) + { + if (endpoint != null) + { + log.warn("Multiple service endoints found for: " + pcLink); + endpoint = null; + break; + } + endpoint = auxEndpoint; + } + + } + + return endpoint; + } + +} Property changes on: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentResolver.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3971 - in trunk: integration/sunri/src/main/java/org/jboss/wsf/stack/sunri and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-24 05:32:33 -0400 (Tue, 24 Jul 2007) New Revision: 3971 Added: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerFactoryImpl.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerFactoryImpl.java Modified: trunk/JBossWS-Trunk.iws trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory Log: Correct RequestHandlerFactories for sunri and xfire Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-07-24 08:39:35 UTC (rev 3970) +++ trunk/JBossWS-Trunk.iws 2007-07-24 09:32:33 UTC (rev 3971) @@ -134,7 +134,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java" line="39" class="org.jboss.wsf.container.jboss50.InvocationModelFactoryImpl" package="org.jboss.wsf.container.jboss50"> + <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java" line="80" class="org.jboss.wsf.framework.deployment.WebAppGeneratorDeploymentAspect" package="org.jboss.wsf.framework.deployment"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -147,7 +147,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java" line="74" class="org.jboss.wsf.container.jboss50.AbstractDeployerHook" package="org.jboss.wsf.container.jboss50"> + <breakpoint url="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java" line="50" class="org.jboss.wsf.stack.sunri.SunJaxwsDeploymentAspect" package="org.jboss.wsf.stack.sunri"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -160,7 +160,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java" line="46" class="org.jboss.wsf.container.jboss50.DeploymentAspectManagerFactoryImpl" package="org.jboss.wsf.container.jboss50"> + <breakpoint url="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerJBWS.java" line="57" class="org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS" package="org.jboss.wsf.stack.sunri"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -173,6 +173,19 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerExt.java" line="103" class="org.jboss.wsf.stack.sunri.WSServletContextListenerExt" package="org.jboss.wsf.stack.sunri"> + <option name="ENABLED" value="true" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> </line_breakpoints> <breakpoint_any> <breakpoint> @@ -227,7 +240,80 @@ <option name="myCurrentFavoritesList" value="JBossWS-Trunk" /> </component> <component name="FileEditorManager"> - <leaf /> + <leaf> + <file leaf-file-name="WSServletContextListenerJBWS.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerJBWS.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="67" column="0" selection-start="2558" selection-end="2558" vertical-scroll-proportion="0.5031056"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="DeploymentAspectManagerFactoryImpl.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="46" column="0" selection-start="1907" selection-end="1907" vertical-scroll-proportion="0.5365854"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="WSServletContextListenerExt.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerExt.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="107" column="0" selection-start="4060" selection-end="4060" vertical-scroll-proportion="0.1863354"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="NativeMethodAccessorImpl.class" pinned="false" current="false" current-in-tab="false"> + <entry file="jar:///usr/local/jdk/64/jdk1.5.0_11/jre/lib/rt.jar!/sun/reflect/NativeMethodAccessorImpl.class"> + <provider selected="true" editor-type-id="text-editor"> + <state line="14" column="0" selection-start="433" selection-end="433" vertical-scroll-proportion="0.32298136"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="WebAppGeneratorDeploymentAspect.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="82" column="0" selection-start="2991" selection-end="2991" vertical-scroll-proportion="0.1863354"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="SunJaxwsDeploymentAspect.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="50" column="0" selection-start="1832" selection-end="1832" vertical-scroll-proportion="0.1863354"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="AbstractDeployerHook.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="74" column="0" selection-start="2569" selection-end="2569" vertical-scroll-proportion="0.19378883"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="InvocationModelFactoryImpl.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="39" column="0" selection-start="1518" selection-end="1518" vertical-scroll-proportion="0.19378883"> + <folding /> + </state> + </provider> + </entry> + </file> + </leaf> </component> <component name="FindManager"> <FindUsagesManager> @@ -361,6 +447,322 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-xfire" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-xfire" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-xfire" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-xfire" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-xfire" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire.jar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-xfire" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-xfire" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-sunri" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-sunri" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-sunri" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-sunri" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-sunri" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri.jar" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-sunri" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-sunri" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/sunri/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> </component> <component name="ProjectReloadState"> <option name="STATE" value="0" /> @@ -518,18 +920,18 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="0" y="25" width="1680" height="1000" extended-state="1" /> - <editor active="false" /> + <frame x="0" y="25" width="1680" height="1000" extended-state="0" /> + <editor active="true" /> <layout> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.2891492" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.33600494" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.37342498" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25215784" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" /> <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3298397" order="3" /> - <window_info id="Dependency Viewer" active="true" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.66323024" order="8" /> + <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.66323024" order="8" /> <window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" /> @@ -609,109 +1011,111 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native-config.xml"> + <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.deployment.LifecycleHandlerFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="0" column="62" selection-start="35" selection-end="62" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java"> + <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="43" selection-start="1386" selection-end="1386" vertical-scroll-proportion="0.31707317"> + <state line="0" column="51" selection-start="26" selection-end="51" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="20" column="43" selection-start="1013" selection-end="1013" vertical-scroll-proportion="0.0"> + <state line="55" column="3" selection-start="2045" selection-end="2045" vertical-scroll-proportion="0.44720498"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="48" column="13" selection-start="1794" selection-end="1794" vertical-scroll-proportion="0.19756098"> - <folding /> + <state line="34" column="26" selection-start="1386" selection-end="1386" vertical-scroll-proportion="0.34146342"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-1.8606061"> + <state line="0" column="47" selection-start="47" selection-end="47" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml"> + <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="99" selection-start="2024" selection-end="2024" vertical-scroll-proportion="0.031055901"> + <state line="52" column="3" selection-start="1942" selection-end="1942" vertical-scroll-proportion="0.44720498"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectManagerFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="13" selection-start="1408" selection-end="1408" vertical-scroll-proportion="0.2195122"> - <folding /> + <state line="34" column="22" selection-start="1382" selection-end="1382" vertical-scroll-proportion="0.34146342"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookJSE.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="22" selection-start="1363" selection-end="1363" vertical-scroll-proportion="0.32298136"> + <state line="74" column="0" selection-start="2569" selection-end="2569" vertical-scroll-proportion="0.19378883"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationModelFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="22" selection-start="1328" selection-end="1328" vertical-scroll-proportion="0.31707317"> + <state line="39" column="0" selection-start="1518" selection-end="1518" vertical-scroll-proportion="0.19378883"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="46" column="13" selection-start="1888" selection-end="1888" vertical-scroll-proportion="0.31707317"> + <state line="46" column="0" selection-start="1907" selection-end="1907" vertical-scroll-proportion="0.5365854"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="43" column="13" selection-start="1862" selection-end="1862" vertical-scroll-proportion="0.20609756"> + <state line="82" column="0" selection-start="2991" selection-end="2991" vertical-scroll-proportion="0.1863354"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerJBWS.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="110" column="37" selection-start="3837" selection-end="3837" vertical-scroll-proportion="0.85119045"> + <state line="67" column="0" selection-start="2558" selection-end="2558" vertical-scroll-proportion="0.5031056"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WSServletContextListenerExt.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="76" column="0" selection-start="2055" selection-end="2788" vertical-scroll-proportion="0.6"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="107" column="0" selection-start="4060" selection-end="4060" vertical-scroll-proportion="0.1863354"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java"> + <entry file="jar:///usr/local/jdk/64/jdk1.5.0_11/jre/lib/rt.jar!/sun/reflect/NativeMethodAccessorImpl.class"> <provider selected="true" editor-type-id="text-editor"> - <state line="98" column="43" selection-start="3153" selection-end="3153" vertical-scroll-proportion="0.36969697"> + <state line="14" column="0" selection-start="433" selection-end="433" vertical-scroll-proportion="0.32298136"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="107" column="37" selection-start="3745" selection-end="3745" vertical-scroll-proportion="-0.0952381"> + <state line="50" column="0" selection-start="1832" selection-end="1832" vertical-scroll-proportion="0.1863354"> <folding /> </state> </provider> Added: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerFactoryImpl.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerFactoryImpl.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerFactoryImpl.java 2007-07-24 09:32:33 UTC (rev 3971) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.sunri; + +import org.jboss.wsf.spi.invocation.RequestHandlerFactory; +import org.jboss.wsf.spi.invocation.RequestHandler; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 24, 2007 + */ +public class RequestHandlerFactoryImpl extends RequestHandlerFactory +{ + public RequestHandler createRequestHandler() + { + return new RequestHandlerImpl(); + } +} Property changes on: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java 2007-07-24 08:39:35 UTC (rev 3970) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/RequestHandlerImpl.java 2007-07-24 09:32:33 UTC (rev 3971) @@ -53,6 +53,10 @@ // provide logging private static final Logger log = Logger.getLogger(RequestHandlerImpl.class); + RequestHandlerImpl() + { + } + public void handleHttpRequest(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException { WSServletDelegate delegate = (WSServletDelegate)context.getAttribute(WSServlet.JAXWS_RI_RUNTIME_INFO); Modified: trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2007-07-24 08:39:35 UTC (rev 3970) +++ trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2007-07-24 09:32:33 UTC (rev 3971) @@ -1 +1 @@ -org.jboss.wsf.stack.sunri.RequestHandlerImpl \ No newline at end of file +org.jboss.wsf.stack.sunri.RequestHandlerFactoryImpl \ No newline at end of file Added: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerFactoryImpl.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerFactoryImpl.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerFactoryImpl.java 2007-07-24 09:32:33 UTC (rev 3971) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.xfire; + +import org.jboss.wsf.spi.invocation.RequestHandlerFactory; +import org.jboss.wsf.spi.invocation.RequestHandler; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 24, 2007 + */ +public class RequestHandlerFactoryImpl extends RequestHandlerFactory +{ + public RequestHandler createRequestHandler() + { + return new RequestHandlerImpl(); + } +} Property changes on: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java 2007-07-24 08:39:35 UTC (rev 3970) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/RequestHandlerImpl.java 2007-07-24 09:32:33 UTC (rev 3971) @@ -50,6 +50,10 @@ // provide logging private static final Logger log = Logger.getLogger(RequestHandlerImpl.class); + RequestHandlerImpl() + { + } + public void handleHttpRequest(Endpoint ep, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException { ServletController controller = ep.getAttachment(ServletController.class); Modified: trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory =================================================================== --- trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2007-07-24 08:39:35 UTC (rev 3970) +++ trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2007-07-24 09:32:33 UTC (rev 3971) @@ -1 +1 @@ -org.jboss.wsf.stack.xfire.RequestHandlerImpl \ No newline at end of file +org.jboss.wsf.stack.xfire.RequestHandlerFactoryImpl \ No newline at end of file

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3970 - in trunk: integration/jboss42 and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-24 04:39:35 -0400 (Tue, 24 Jul 2007) New Revision: 3970 Removed: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/MainDeployerHook.java Modified: trunk/JBossWS-Trunk.ipr trunk/JBossWS-Trunk.iws trunk/integration/jboss42/int-42.iml trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java trunk/integration/jboss50/int-50.iml trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java Log: Respect MC lifecycle when initializing from SPI Modified: trunk/JBossWS-Trunk.ipr =================================================================== --- trunk/JBossWS-Trunk.ipr 2007-07-24 07:41:51 UTC (rev 3969) +++ trunk/JBossWS-Trunk.ipr 2007-07-24 08:39:35 UTC (rev 3970) @@ -217,6 +217,20 @@ <JAVADOC /> <SOURCES /> </library> + <library name="jboss-jmx"> + <CLASSES> + <root url="jar:///home/hbraun/dev/prj/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-jmx.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + <library name="jboss-system-jmx"> + <CLASSES> + <root url="jar:///home/hbraun/dev/prj/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-system-jmx.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> </component> <component name="uidesigner-configuration"> <option name="INSTRUMENT_CLASSES" value="true" /> Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-07-24 07:41:51 UTC (rev 3969) +++ trunk/JBossWS-Trunk.iws 2007-07-24 08:39:35 UTC (rev 3970) @@ -147,7 +147,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java" line="65" class="org.jboss.wsf.container.jboss50.AbstractDeployerHook" package="org.jboss.wsf.container.jboss50"> + <breakpoint url="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java" line="74" class="org.jboss.wsf.container.jboss50.AbstractDeployerHook" package="org.jboss.wsf.container.jboss50"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -227,26 +227,7 @@ <option name="myCurrentFavoritesList" value="JBossWS-Trunk" /> </component> <component name="FileEditorManager"> - <leaf> - <file leaf-file-name="EndpointServlet.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="53" column="20" selection-start="2126" selection-end="2126" vertical-scroll-proportion="0.19393939"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="jbossws-sunri-config.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="69" column="80" selection-start="3697" selection-end="3697" vertical-scroll-proportion="0.34424242"> - <folding /> - </state> - </provider> - </entry> - </file> - </leaf> + <leaf /> </component> <component name="FindManager"> <FindUsagesManager> @@ -277,7 +258,7 @@ <setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" /> </component> <component name="ModuleEditorState"> - <option name="LAST_EDITED_MODULE_NAME" value="int-xfire" /> + <option name="LAST_EDITED_MODULE_NAME" value="int-42" /> <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" /> </component> <component name="NamedScopeManager" /> @@ -294,7 +275,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="spi" /> + <option name="myItemId" value="int-42" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> </PATH> @@ -304,7 +285,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="spi" /> + <option name="myItemId" value="int-42" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> @@ -319,137 +300,15 @@ <option name="myItemId" value="wsf" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> + <option name="myItemId" value="container" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> + <option name="myItemId" value="jboss42" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="management" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="framework" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="framework" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="management" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> </component> <component name="PerforceChangeBrowserSettings"> <option name="USE_CLIENT_FILTER" value="true" /> @@ -502,182 +361,12 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </component> <component name="ProjectReloadState"> <option name="STATE" value="0" /> </component> <component name="ProjectView"> - <navigator currentView="PackagesPane" splitterProportion="0.5"> + <navigator currentView="ProjectPane" splitterProportion="0.5"> <flattenPackages PackagesPane="false" /> <showMembers /> <showModules /> @@ -829,22 +518,22 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="0" y="25" width="1680" height="1000" extended-state="0" /> + <frame x="0" y="25" width="1680" height="1000" extended-state="1" /> <editor active="false" /> <layout> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.2891492" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.2891492" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.37342498" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25215784" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" /> <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3298397" order="3" /> - <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.59335625" order="8" /> + <window_info id="Dependency Viewer" active="true" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.66323024" order="8" /> <window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.23551172" order="2" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.23366214" order="2" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39862543" order="4" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" /> @@ -920,109 +609,109 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java"> + <entry file="file://$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native-config.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="108" column="15" selection-start="4477" selection-end="4477" vertical-scroll-proportion="0.35776398"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="69" column="94" selection-start="2985" selection-end="2985" vertical-scroll-proportion="0.60121953"> + <state line="33" column="43" selection-start="1386" selection-end="1386" vertical-scroll-proportion="0.31707317"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="304" column="104" selection-start="12676" selection-end="12676" vertical-scroll-proportion="0.3416149"> + <state line="20" column="43" selection-start="1013" selection-end="1013" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="93" column="19" selection-start="3382" selection-end="3382" vertical-scroll-proportion="0.58536583"> + <state line="48" column="13" selection-start="1794" selection-end="1794" vertical-scroll-proportion="0.19756098"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="96" column="22" selection-start="3479" selection-end="3479" vertical-scroll-proportion="0.63414633"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-1.8606061"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="70" column="4" selection-start="2767" selection-end="2767" vertical-scroll-proportion="-0.9689441"> + <state line="47" column="99" selection-start="2024" selection-end="2024" vertical-scroll-proportion="0.031055901"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectManagerFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="59" column="14" selection-start="1776" selection-end="2413" vertical-scroll-proportion="-0.39130434"> + <state line="33" column="13" selection-start="1408" selection-end="1408" vertical-scroll-proportion="0.2195122"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookJSE.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="1" selection-start="1550" selection-end="1550" vertical-scroll-proportion="0.34146342"> + <state line="34" column="22" selection-start="1363" selection-end="1363" vertical-scroll-proportion="0.32298136"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointRegistryFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="13" selection-start="1440" selection-end="1440" vertical-scroll-proportion="0.34146342"> + <state line="33" column="22" selection-start="1328" selection-end="1328" vertical-scroll-proportion="0.31707317"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="61" column="41" selection-start="2210" selection-end="2210" vertical-scroll-proportion="0.9268293"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="46" column="13" selection-start="1888" selection-end="1888" vertical-scroll-proportion="0.31707317"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointRegistryFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="13" selection-start="1441" selection-end="1441" vertical-scroll-proportion="0.33333334"> + <state line="43" column="13" selection-start="1862" selection-end="1862" vertical-scroll-proportion="0.20609756"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="13" selection-start="1439" selection-end="1439" vertical-scroll-proportion="0.33333334"> + <state line="110" column="37" selection-start="3837" selection-end="3837" vertical-scroll-proportion="0.85119045"> <folding /> </state> </provider> </entry> - <entry file="jar://$PROJECT_DIR$/integration/spi/thirdparty/jboss-common-core.jar!/org/jboss/util/NotImplementedException.class"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="5" column="13" selection-start="152" selection-end="152" vertical-scroll-proportion="0.0952381"> - <folding /> + <state line="76" column="0" selection-start="2055" selection-end="2788" vertical-scroll-proportion="0.6"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="53" column="20" selection-start="2126" selection-end="2126" vertical-scroll-proportion="0.19393939"> + <state line="98" column="43" selection-start="3153" selection-end="3153" vertical-scroll-proportion="0.36969697"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="69" column="80" selection-start="3697" selection-end="3697" vertical-scroll-proportion="0.34424242"> + <state line="107" column="37" selection-start="3745" selection-end="3745" vertical-scroll-proportion="-0.0952381"> <folding /> </state> </provider> Modified: trunk/integration/jboss42/int-42.iml =================================================================== --- trunk/integration/jboss42/int-42.iml 2007-07-24 07:41:51 UTC (rev 3969) +++ trunk/integration/jboss42/int-42.iml 2007-07-24 08:39:35 UTC (rev 3970) @@ -30,6 +30,9 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="library" name="jboss-system" level="project" /> + <orderEntry type="library" name="jboss-jmx" level="project" /> + <orderEntry type="library" name="jboss-system-jmx" level="project" /> <orderEntryProperties /> </component> </module> Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2007-07-24 07:41:51 UTC (rev 3969) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2007-07-24 08:39:35 UTC (rev 3970) @@ -47,34 +47,39 @@ // provide logging protected final Logger log = Logger.getLogger(getClass()); - protected DeploymentAspectManager deploymentAspectManager; + private DeploymentAspectManager deploymentAspectManager; private DeploymentModelFactory deploymentModelFactory; private List<ObjectName> phaseOneInterceptors; private List<ObjectName> phaseTwoInterceptors; - /** - * MC callback in create step - * @throws Exception - */ - public void create() throws Exception + public DeploymentAspectManager getDeploymentAspectManager() { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); - deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).createDeploymentAspectManager(getDeploymentType()); + if(null == deploymentAspectManager) + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).createDeploymentAspectManager(getDeploymentType()); + } + return deploymentAspectManager; + } + + public DeploymentModelFactory getDeploymentModelFactory() + { if(null == deploymentModelFactory) - throw new IllegalStateException("Unable to create spi.deployment.DeploymentModelFactory"); + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); + } - if(null == deploymentAspectManager) - throw new IllegalStateException("Unable to create spi.deployment.DeploymentAspectManager"); - } + return deploymentModelFactory; + } public Deployment createDeployment() { try { - return deploymentModelFactory.createDeployment(); + return getDeploymentModelFactory().createDeployment(); } catch (Exception ex) { @@ -86,7 +91,7 @@ { try { - return deploymentModelFactory.createEndpoint(); + return getDeploymentModelFactory().createEndpoint(); } catch (Exception ex) { @@ -115,6 +120,7 @@ */ public void start() { + MBeanServer server = MBeanServerLocator.locateJBoss(); try { @@ -172,4 +178,8 @@ throw new WSFDeploymentException(e); } } + + /** Get the deployment type this deployer can handle + */ + public abstract Deployment.DeploymentType getDeploymentType(); } Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java 2007-07-24 07:41:51 UTC (rev 3969) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java 2007-07-24 08:39:35 UTC (rev 3970) @@ -21,6 +21,8 @@ */ package org.jboss.wsf.container.jboss42; +import org.jboss.wsf.spi.deployment.Deployment; + //$Id$ /** @@ -31,4 +33,5 @@ */ public abstract class AbstractDeployerHookEJB extends ArchiveDeployerHook { + } Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-07-24 07:41:51 UTC (rev 3969) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-07-24 08:39:35 UTC (rev 3970) @@ -94,7 +94,7 @@ dep.getContext().addAttachment(DeploymentInfo.class, unit); } - deploymentAspectManager.deploy(dep); + getDeploymentAspectManager().deploy(dep); unit.context.put(Deployment.class, dep); } } @@ -108,7 +108,7 @@ if (dep != null) { log.debug("undeploy: " + unit.shortName); - deploymentAspectManager.undeploy(dep); + getDeploymentAspectManager().undeploy(dep); unit.context.remove(Deployment.class); } } Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/MainDeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/MainDeployerHook.java 2007-07-24 07:41:51 UTC (rev 3969) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/MainDeployerHook.java 2007-07-24 08:39:35 UTC (rev 3970) @@ -1,61 +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$ - -import org.jboss.deployment.DeploymentException; -import org.jboss.deployment.DeploymentInfo; -import org.jboss.wsf.spi.deployment.Deployment; - -/** - * A basic hook that delegates a deployment manger. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class MainDeployerHook extends AbstractDeployerHook -{ - public void deploy(DeploymentInfo unit) throws DeploymentException - { - if (ignoreDeployment(unit)) - return; - - Deployment dep = (Deployment)unit.context.get(Deployment.class); - if (dep != null) - { - deploymentAspectManager.deploy(dep); - } - } - - public void undeploy(DeploymentInfo unit) - { - if (ignoreDeployment(unit)) - return; - - Deployment dep = (Deployment)unit.context.get(Deployment.class); - if (dep != null) - { - deploymentAspectManager.undeploy(dep); - } - } -} Modified: trunk/integration/jboss50/int-50.iml =================================================================== --- trunk/integration/jboss50/int-50.iml 2007-07-24 07:41:51 UTC (rev 3969) +++ trunk/integration/jboss50/int-50.iml 2007-07-24 08:39:35 UTC (rev 3970) @@ -494,30 +494,14 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../trunk/jbossws-core/thirdparty/jboss-deployers.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../trunk/jbossws-core/thirdparty/jboss-microcontainer.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/../spi/thirdparty/jaxws-api.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="library" name="jboss-system" level="project" /> + <orderEntry type="library" name="jboss-logging-spi" level="project" /> <orderEntryProperties /> </component> </module> Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-24 07:41:51 UTC (rev 3969) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-24 08:39:35 UTC (rev 3970) @@ -43,27 +43,36 @@ // provide logging protected final Logger log = Logger.getLogger(getClass()); - protected DeploymentAspectManager deploymentAspectManager; + private DeploymentAspectManager deploymentAspectManager; private DeploymentModelFactory deploymentModelFactory; - public void create() throws Exception + public DeploymentAspectManager getDeploymentAspectManager() { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); - deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).createDeploymentAspectManager(getDeploymentType()); + if(null == deploymentAspectManager) + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).createDeploymentAspectManager(getDeploymentType()); + } + return deploymentAspectManager; + } + + public DeploymentModelFactory getDeploymentModelFactory() + { if(null == deploymentModelFactory) - throw new IllegalStateException("Unable to create spi.deployment.DeploymentModelFactory"); + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); + } - if(null == deploymentAspectManager) - throw new IllegalStateException("Unable to create spi.deployment.DeploymentAspectManager"); + return deploymentModelFactory; } public Deployment createDeployment() { try { - return deploymentModelFactory.createDeployment(); + return getDeploymentModelFactory().createDeployment(); } catch (Exception ex) { @@ -75,7 +84,7 @@ { try { - return deploymentModelFactory.createService(); + return getDeploymentModelFactory().createService(); } catch (Exception ex) { @@ -87,7 +96,7 @@ { try { - return deploymentModelFactory.createEndpoint(); + return getDeploymentModelFactory().createEndpoint(); } catch (Exception ex) { Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-24 07:41:51 UTC (rev 3969) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-24 08:39:35 UTC (rev 3970) @@ -91,7 +91,7 @@ dep.getContext().addAttachment(DeploymentUnit.class, unit); } - deploymentAspectManager.deploy(dep); + getDeploymentAspectManager().deploy(dep); unit.addAttachment(Deployment.class, dep); } } @@ -105,7 +105,7 @@ if (dep != null) { log.debug("undeploy: " + unit.getName()); - deploymentAspectManager.undeploy(dep); + getDeploymentAspectManager().undeploy(dep); unit.removeAttachment(Deployment.class); } }

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3969 - in trunk: integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services and 26 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-24 03:41:51 -0400 (Tue, 24 Jul 2007) New Revision: 3969 Added: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java trunk/integration/native/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/PortComponentResolver.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/RegistryComponent.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointRegistryFactoryImpl.java trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointRegistryFactoryImpl.java trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory Removed: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/BasicEndpointRegistry.java Modified: trunk/JBossWS-Trunk.iws trunk/integration/native/int-native.iml trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java trunk/integration/spi/src/main/java/org/jboss/wsf/common/IOUtils.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/transport/jms/JMSTransportSupport.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java trunk/integration/sunri/int-sunri.iml trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ManagedEndpointRegistry.java trunk/integration/xfire/int-xfire.iml trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistry.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ContextServlet.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java Log: Provide EndpointRegistry and ServerConfig through SPIProvider Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/JBossWS-Trunk.iws 2007-07-24 07:41:51 UTC (rev 3969) @@ -121,7 +121,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="59" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> + <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="61" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> <option name="ENABLED" value="false" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -228,15 +228,24 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="LifecycleHandler.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java"> + <file leaf-file-name="EndpointServlet.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="17" selection-start="1179" selection-end="1179" vertical-scroll-proportion="0.23809524"> + <state line="53" column="20" selection-start="2126" selection-end="2126" vertical-scroll-proportion="0.19393939"> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="jbossws-sunri-config.xml" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="69" column="80" selection-start="3697" selection-end="3697" vertical-scroll-proportion="0.34424242"> + <folding /> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -268,8 +277,8 @@ <setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" /> </component> <component name="ModuleEditorState"> - <option name="LAST_EDITED_MODULE_NAME" value="int-40" /> - <option name="LAST_EDITED_TAB_NAME" value="Dependencies" /> + <option name="LAST_EDITED_MODULE_NAME" value="int-xfire" /> + <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" /> </component> <component name="NamedScopeManager" /> <component name="PackagesPane"> @@ -410,44 +419,16 @@ <option name="myItemId" value="jboss" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-xfire" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-xfire" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="wsf" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="stack" /> + <option name="myItemId" value="framework" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="xfire" /> + <option name="myItemId" value="management" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> </PATH> @@ -457,20 +438,10 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-sunri" /> + <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-sunri" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="org" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> @@ -478,99 +449,7 @@ <option name="myItemId" value="jboss" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="stack" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="sunri" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-native" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="stack" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jbws" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="container" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> </component> <component name="PerforceChangeBrowserSettings"> <option name="USE_CLIENT_FILTER" value="true" /> @@ -676,10 +555,6 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -702,22 +577,6 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -725,41 +584,9 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="spi" /> + <option name="myItemId" value="int-native" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -767,41 +594,13 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="spi" /> + <option name="myItemId" value="int-native" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -809,37 +608,17 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="spi" /> + <option name="myItemId" value="int-native" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -847,41 +626,21 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="spi" /> + <option name="myItemId" value="int-native" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -889,52 +648,30 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="spi" /> + <option name="myItemId" value="int-native" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/java" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </component> <component name="ProjectReloadState"> <option name="STATE" value="0" /> @@ -968,6 +705,7 @@ </component> <component name="RecentsManager"> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> + <recent name="org.jboss.wsf.spi.management" /> <recent name="org.jboss.wsf.framework.deployment" /> <recent name="org.jboss.wsf.framework" /> </key> @@ -975,22 +713,6 @@ <component name="RestoreUpdateTree" /> <component name="RunManager"> <activeType name="Remote" /> - <configuration selected="false" default="true" type="JUnit" factoryName="JUnit"> - <module name="" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="TEST_OBJECT" value="class" /> - <option name="VM_PARAMETERS" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ADDITIONAL_CLASS_PATH" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="wholeProject" /> - </option> - </configuration> <configuration selected="false" default="true" type="Application" factoryName="Application"> <option name="MAIN_CLASS_NAME" /> <option name="VM_PARAMETERS" /> @@ -1000,13 +722,6 @@ <option name="ALTERNATIVE_JRE_PATH" /> <module name="" /> </configuration> - <configuration selected="false" default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - </configuration> <configuration selected="false" default="true" type="Applet" factoryName="Applet"> <module name="" /> <option name="MAIN_CLASS_NAME" /> @@ -1019,6 +734,29 @@ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> </configuration> + <configuration selected="false" default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> + </configuration> + <configuration selected="false" default="true" type="JUnit" factoryName="JUnit"> + <module name="" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="PACKAGE_NAME" /> + <option name="MAIN_CLASS_NAME" /> + <option name="METHOD_NAME" /> + <option name="TEST_OBJECT" value="class" /> + <option name="VM_PARAMETERS" /> + <option name="PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ADDITIONAL_CLASS_PATH" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="wholeProject" /> + </option> + </configuration> <configuration selected="true" default="false" name="server" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> @@ -1096,8 +834,8 @@ <layout> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.32737362" order="0" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.43871707" order="1" /> + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.2891492" order="0" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.37342498" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25215784" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" /> @@ -1106,7 +844,7 @@ <window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.21393341" order="2" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.23551172" order="2" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39862543" order="4" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" /> @@ -1182,99 +920,113 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="39" column="26" selection-start="1665" selection-end="1665" vertical-scroll-proportion="1.0518292"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="108" column="15" selection-start="4477" selection-end="4477" vertical-scroll-proportion="0.35776398"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="93" column="91" selection-start="4099" selection-end="4099" vertical-scroll-proportion="0.33231708"> + <state line="69" column="94" selection-start="2985" selection-end="2985" vertical-scroll-proportion="0.60121953"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="92" column="91" selection-start="4061" selection-end="4061" vertical-scroll-proportion="0.33231708"> + <state line="304" column="104" selection-start="12676" selection-end="12676" vertical-scroll-proportion="0.3416149"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="146" column="91" selection-start="5639" selection-end="5639" vertical-scroll-proportion="0.33231708"> + <state line="93" column="19" selection-start="3382" selection-end="3382" vertical-scroll-proportion="0.58536583"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native-config.xml"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="97" selection-start="3430" selection-end="3430" vertical-scroll-proportion="0.33231708"> + <state line="96" column="22" selection-start="3479" selection-end="3479" vertical-scroll-proportion="0.63414633"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/output/lib/jbossws-native42/jbossws.beans/META-INF/jboss-beans.xml"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="67" column="61" selection-start="3777" selection-end="3777" vertical-scroll-proportion="0.27134147"> + <state line="70" column="4" selection-start="2767" selection-end="2767" vertical-scroll-proportion="-0.9689441"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/output/lib/jbossws-native40/jbossws.beans/META-INF/jboss-beans.xml"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="65" column="105" selection-start="3605" selection-end="3605" vertical-scroll-proportion="0.14939025"> + <state line="59" column="14" selection-start="1776" selection-end="2413" vertical-scroll-proportion="-0.39130434"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="44" selection-start="44" selection-end="44" vertical-scroll-proportion="0.0"> + <state line="38" column="1" selection-start="1550" selection-end="1550" vertical-scroll-proportion="0.34146342"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointRegistryFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="44" selection-start="44" selection-end="44" vertical-scroll-proportion="0.0"> + <state line="36" column="13" selection-start="1440" selection-end="1440" vertical-scroll-proportion="0.34146342"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="77" column="61" selection-start="4154" selection-end="4154" vertical-scroll-proportion="0.36091954"> + <state line="61" column="41" selection-start="2210" selection-end="2210" vertical-scroll-proportion="0.9268293"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointRegistryFactoryImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="36" column="13" selection-start="1441" selection-end="1441" vertical-scroll-proportion="0.33333334"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire-config.xml"> + <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="42" column="61" selection-start="2264" selection-end="2264" vertical-scroll-proportion="0.22424242"> + <state line="36" column="13" selection-start="1439" selection-end="1439" vertical-scroll-proportion="0.33333334"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/xfire/IntegrationIssues.txt"> + <entry file="jar://$PROJECT_DIR$/integration/spi/thirdparty/jboss-common-core.jar!/org/jboss/util/NotImplementedException.class"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="5" column="13" selection-start="152" selection-end="152" vertical-scroll-proportion="0.0952381"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="30" column="17" selection-start="1179" selection-end="1179" vertical-scroll-proportion="0.23809524"> + <state line="53" column="20" selection-start="2126" selection-end="2126" vertical-scroll-proportion="0.19393939"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="69" column="80" selection-start="3697" selection-end="3697" vertical-scroll-proportion="0.34424242"> + <folding /> + </state> + </provider> + </entry> </component> </project> Added: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory (rev 0) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory 2007-07-24 07:41:51 UTC (rev 3969) @@ -0,0 +1 @@ +org.jboss.wsf.framework.management.ServerConfigFactoryImpl \ No newline at end of file Added: trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory (rev 0) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory 2007-07-24 07:41:51 UTC (rev 3969) @@ -0,0 +1 @@ +org.jboss.wsf.framework.management.ServerConfigFactoryImpl \ No newline at end of file Added: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory =================================================================== --- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory (rev 0) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory 2007-07-24 07:41:51 UTC (rev 3969) @@ -0,0 +1 @@ +org.jboss.wsf.framework.management.ServerConfigFactoryImpl \ No newline at end of file Modified: trunk/integration/native/int-native.iml =================================================================== --- trunk/integration/native/int-native.iml 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/integration/native/int-native.iml 2007-07-24 07:41:51 UTC (rev 3969) @@ -11,6 +11,7 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="jbossws-core" /> <orderEntry type="module" module-name="spi" /> + <orderEntry type="library" name="jboss-logging-spi" level="project" /> <orderEntryProperties /> </component> </module> Added: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java (rev 0) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -0,0 +1,45 @@ +/* + * 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; + +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.framework.KernelAwareSPIFactory; + +/** + * An EndpointRegistryFactory implementation that retrieves + * the registry from MC kernel. + * + * @see EndpointRegistry.BEAN_NAME + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 23, 2007 + */ +public class EndpointRegistryFactoryImpl extends EndpointRegistryFactory +{ + public EndpointRegistry createEndpointRegistry() + { + return new KernelAwareSPIFactory().getKernelProvidedSPI( + EndpointRegistry.BEAN_NAME, EndpointRegistry.class + ); + } +} Property changes on: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/ManagedEndpointRegistry.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -34,7 +34,7 @@ import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.framework.management.BasicEndpointRegistry; +import org.jboss.wsf.spi.management.DefaultEndpointRegistry; /** * A Service Endpoint Registry @@ -42,7 +42,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 04-May-2007 */ -public class ManagedEndpointRegistry extends BasicEndpointRegistry implements ManagedEndpointRegistryMBean +public class ManagedEndpointRegistry extends DefaultEndpointRegistry implements ManagedEndpointRegistryMBean { // provide logging private static final Logger log = Logger.getLogger(ManagedEndpointRegistry.class); Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -88,6 +88,8 @@ import org.jboss.wsf.spi.management.EndpointMetrics; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.common.DOMWriter; import org.w3c.dom.Document; @@ -524,8 +526,8 @@ if (reqURL.getPort() != -1) wsdlHost += ":" + reqURL.getPort(); - ServerConfigFactory factory = ServerConfigFactory.getInstance(); - ServerConfig config = factory.getServerConfig(); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig(); if (ServerConfig.UNDEFINED_HOSTNAME.equals(config.getWebServiceHost()) == false) wsdlHost = config.getWebServiceHost(); Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -50,6 +50,8 @@ import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.common.IOUtils; import org.w3c.dom.Document; @@ -239,7 +241,8 @@ public void unpublishWsdlFiles() throws IOException { String deploymentDir = (udi.parent != null ? udi.parent.simpleName : udi.simpleName); - ServerConfig config = ServerConfigFactory.getInstance().getServerConfig(); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig(); File serviceDir = new File(config.getServerDataDir().getCanonicalPath() + "/wsdl/" + deploymentDir); deleteWsdlPublishDirectory(serviceDir); } @@ -293,7 +296,8 @@ File locationFile = null; if (predefinedLocation == false) { - ServerConfig config = ServerConfigFactory.getInstance().getServerConfig(); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig(); locationFile = new File(config.getServerDataDir().getCanonicalPath() + "/wsdl/" + archiveName); } else Added: trunk/integration/native/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory =================================================================== --- trunk/integration/native/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory (rev 0) +++ trunk/integration/native/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2007-07-24 07:41:51 UTC (rev 3969) @@ -0,0 +1 @@ +org.jboss.wsf.stack.jbws.EndpointRegistryFactoryImpl \ No newline at end of file Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/common/IOUtils.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/common/IOUtils.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/IOUtils.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -39,6 +39,8 @@ import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; /** * IO utilites @@ -123,9 +125,10 @@ try { - ServerConfigFactory factory = ServerConfigFactory.getInstance(); - ServerConfig config = factory.getServerConfig(); + // TODO: recursive dependency, ohoh + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig(); tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/jbossws"); tmpdir.mkdirs(); } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -26,6 +26,8 @@ import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.WSFException; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.management.ServerConfigFactory; import org.jboss.wsf.spi.deployment.DeploymentModelFactory; import org.jboss.wsf.spi.deployment.WebXMLRewriterFactory; import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory; @@ -100,10 +102,16 @@ } else if(RequestHandlerFactory.class.equals(spiType)) { - returnType = (T) loadService( - spiType, null - ); + returnType = (T) loadService(spiType, null); } + else if(EndpointRegistryFactory.class.equals(spiType)) + { + returnType = (T) loadService(spiType, null); + } + else if(ServerConfigFactory.class.equals(spiType)) + { + returnType = (T) loadService(spiType, null); + } // help debugging if(null == returnType) Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -26,6 +26,8 @@ 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.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; /** * A deployer that registers the endpoints @@ -37,7 +39,8 @@ { public void create(Deployment dep) { - EndpointRegistry registry = EndpointRegistryFactory.getEndpointRegistry(); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + EndpointRegistry registry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry(); for (Endpoint ep : dep.getService().getEndpoints()) { registry.register(ep); @@ -46,7 +49,9 @@ public void destroy(Deployment dep) { - EndpointRegistry registry = EndpointRegistryFactory.getEndpointRegistry(); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + EndpointRegistry registry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry(); + for (Endpoint ep : dep.getService().getEndpoints()) { registry.unregister(ep); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -41,6 +41,8 @@ import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; import org.jboss.wsf.spi.deployment.*; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; /** * A deployer that generates a webapp for an EJB endpoint @@ -88,7 +90,9 @@ File tmpWar = null; try { - ServerConfig config = ServerConfigFactory.getInstance().getServerConfig(); + // TODO: recursive dependency, ohoh + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig(); File tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/deploy"); UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/invocation/EndpointServlet.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -40,6 +40,8 @@ import org.jboss.wsf.spi.management.EndpointRegistryFactory; import org.jboss.wsf.common.ObjectNameFactory; import org.jboss.wsf.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.framework.invocation.EndpointAssociation; /** @@ -57,7 +59,8 @@ public void init(ServletConfig servletConfig) throws ServletException { super.init(servletConfig); - epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry(); } public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/BasicEndpointRegistry.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/BasicEndpointRegistry.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/BasicEndpointRegistry.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -1,108 +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.framework.management; - -// $Id$ - -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import javax.management.ObjectName; - -import org.jboss.logging.Logger; -import org.jboss.util.NotImplementedException; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.management.EndpointRegistry; - -/** - * A general endpoint registry. - * - * @author Thomas.Diesler(a)jboss.com - * @since 20-Apr-2007 - */ -public class BasicEndpointRegistry implements EndpointRegistry -{ - // provide logging - private static final Logger log = Logger.getLogger(BasicEndpointRegistry.class); - - private Map<ObjectName, Endpoint> endpoints = new HashMap<ObjectName, Endpoint>(); - - public Endpoint getEndpoint(ObjectName epName) - { - if (epName == null) - throw new IllegalArgumentException("Endpoint name cannot be null"); - - if (isRegistered(epName) == false) - throw new IllegalStateException("Endpoint not registered: " + epName); - - Endpoint endpoint = endpoints.get(epName); - return endpoint; - } - - public Endpoint resolvePortComponentLink(String pcLink) - { - throw new NotImplementedException(); - } - - public boolean isRegistered(ObjectName epName) - { - if (epName == null) - throw new IllegalArgumentException("Endpoint name cannot be null"); - - return endpoints.get(epName) != null; - } - - public Set<ObjectName> getEndpoints() - { - return endpoints.keySet(); - } - - public void register(Endpoint endpoint) - { - if (endpoint == null) - throw new IllegalArgumentException("Endpoint cannot be null"); - - ObjectName epName = endpoint.getName(); - if (epName == null) - throw new IllegalStateException("Endpoint name cannot be null for: " + endpoint); - - if (isRegistered(epName)) - throw new IllegalStateException("Endpoint already registered: " + epName); - - log.info("register: " + epName); - endpoints.put(epName, endpoint); - } - - public void unregister(Endpoint endpoint) - { - if (endpoint == null) - throw new IllegalArgumentException("Endpoint cannot be null"); - - ObjectName epName = endpoint.getName(); - if (isRegistered(epName) == false) - throw new IllegalStateException("Endpoint not registered: " + epName); - - log.info("remove: " + epName); - endpoints.remove(epName); - } -} Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.framework.management; + +import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.framework.KernelAwareSPIFactory; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 23, 2007 + */ +public class ServerConfigFactoryImpl extends ServerConfigFactory +{ + public ServerConfig createServerConfig() + { + return new KernelAwareSPIFactory().getKernelProvidedSPI( + ServerConfig.BEAN_NAME, ServerConfig.class + ); + } +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/transport/jms/JMSTransportSupport.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/transport/jms/JMSTransportSupport.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/transport/jms/JMSTransportSupport.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -30,6 +30,8 @@ import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.management.EndpointRegistry; import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; import javax.ejb.EJBException; import javax.ejb.MessageDrivenBean; @@ -123,7 +125,9 @@ protected void processSOAPMessage(String fromName, InputStream inputStream, OutputStream outStream) throws SOAPException, IOException, RemoteException { - EndpointRegistry epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + EndpointRegistry epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry(); + Endpoint endpoint = getEndpointForDestination(epRegistry, fromName); if (endpoint == null) Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -0,0 +1,106 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.management; + +// $Id$ + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.management.EndpointRegistry; + +import javax.management.ObjectName; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +/** + * A general endpoint registry. + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public class DefaultEndpointRegistry implements EndpointRegistry +{ + // provide logging + private static final Logger log = Logger.getLogger(DefaultEndpointRegistry.class); + + private Map<ObjectName, Endpoint> endpoints = new HashMap<ObjectName, Endpoint>(); + + public Endpoint getEndpoint(ObjectName epName) + { + if (epName == null) + throw new IllegalArgumentException("Endpoint name cannot be null"); + + if (isRegistered(epName) == false) + throw new IllegalStateException("Endpoint not registered: " + epName); + + Endpoint endpoint = endpoints.get(epName); + return endpoint; + } + + public Endpoint resolvePortComponentLink(String pcLink) + { + throw new IllegalArgumentException("Not implemented"); + } + + public boolean isRegistered(ObjectName epName) + { + if (epName == null) + throw new IllegalArgumentException("Endpoint name cannot be null"); + + return endpoints.get(epName) != null; + } + + public Set<ObjectName> getEndpoints() + { + return endpoints.keySet(); + } + + public void register(Endpoint endpoint) + { + if (endpoint == null) + throw new IllegalArgumentException("Endpoint cannot be null"); + + ObjectName epName = endpoint.getName(); + if (epName == null) + throw new IllegalStateException("Endpoint name cannot be null for: " + endpoint); + + if (isRegistered(epName)) + throw new IllegalStateException("Endpoint already registered: " + epName); + + log.info("register: " + epName); + endpoints.put(epName, endpoint); + } + + public void unregister(Endpoint endpoint) + { + if (endpoint == null) + throw new IllegalArgumentException("Endpoint cannot be null"); + + ObjectName epName = endpoint.getName(); + if (isRegistered(epName) == false) + throw new IllegalStateException("Endpoint not registered: " + epName); + + log.info("remove: " + epName); + endpoints.remove(epName); + } +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointRegistryFactory.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -27,6 +27,7 @@ import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; import org.jboss.ws.integration.KernelLocator; +import org.jboss.wsf.spi.SPIView; /** * Get the endpoint registry from the kernel @@ -34,19 +35,7 @@ * @author Thomas.Diesler(a)jboss.com * @since 20-Apr-2007 */ -public class EndpointRegistryFactory +public abstract class EndpointRegistryFactory implements SPIView { - private static EndpointRegistry epRegistry; - - public static EndpointRegistry getEndpointRegistry() - { - if (epRegistry == null) - { - Kernel kernel = KernelLocator.getKernel(); - KernelRegistry registry = kernel.getRegistry(); - KernelRegistryEntry entry = registry.getEntry(EndpointRegistry.BEAN_NAME); - epRegistry = (EndpointRegistry)entry.getTarget(); - } - return epRegistry; - } + public abstract EndpointRegistry createEndpointRegistry(); } Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.management; + +import org.jboss.wsf.spi.deployment.Endpoint; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 23, 2007 + */ +public interface EndpointResolver +{ + Endpoint getResult(); + void setResult(Endpoint result); +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/EndpointResolver.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/PortComponentResolver.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/PortComponentResolver.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/PortComponentResolver.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.management; + +import org.jboss.wsf.spi.deployment.Endpoint; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 23, 2007 + */ +public class PortComponentResolver implements EndpointResolver +{ + private String pcref; + private Endpoint result; + + public PortComponentResolver(String pcref) + { + this.pcref = pcref; + } + + public String getPcref() + { + return pcref; + } + + public void setResult(Endpoint result) + { + this.result = result; + } + + public Endpoint getResult() + { + return this.result; + } +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/PortComponentResolver.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/RegistryComponent.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/RegistryComponent.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/RegistryComponent.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.management; + +import org.jboss.wsf.spi.deployment.Endpoint; + +/** + * Allows endpoint registry composition + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 23, 2007 + */ +public interface RegistryComponent +{ + /** Register an endpoint */ + void register(Endpoint endpoint); + + /** Unregister an endpoint */ + void unregister(Endpoint endpoint); + + /** Resolve a port component link */ + void resolve(EndpointResolver resolver); +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/RegistryComponent.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/management/ServerConfigFactory.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -24,35 +24,17 @@ import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.logging.Logger; import org.jboss.ws.integration.KernelLocator; +import org.jboss.wsf.spi.SPIView; // $Id$ /** * Factory to container independent config * - * @author Thomas.Diesler(a)jboss.org + * @author Thomas.Diesler(a)jboss.org * @since 08-May-2006 */ -public class ServerConfigFactory +public abstract class ServerConfigFactory implements SPIView { - // provide logging - private static final Logger log = Logger.getLogger(ServerConfigFactory.class); - - private static ServerConfigFactory instance = new ServerConfigFactory(); - - // Hide ctor - protected ServerConfigFactory() - { - } - - public static ServerConfigFactory getInstance() - { - return instance; - } - - public ServerConfig getServerConfig() - { - KernelRegistry registry = KernelLocator.getKernel().getRegistry(); - return (ServerConfig)registry.getEntry(ServerConfig.BEAN_NAME).getTarget(); - } + public abstract ServerConfig createServerConfig(); } Modified: trunk/integration/sunri/int-sunri.iml =================================================================== --- trunk/integration/sunri/int-sunri.iml 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/integration/sunri/int-sunri.iml 2007-07-24 07:41:51 UTC (rev 3969) @@ -199,6 +199,7 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="library" name="jboss-logging-spi" level="project" /> <orderEntryProperties /> </component> </module> Added: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointRegistryFactoryImpl.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointRegistryFactoryImpl.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointRegistryFactoryImpl.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -0,0 +1,45 @@ +/* + * 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.sunri; + +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.framework.KernelAwareSPIFactory; + +/** + * An EndpointRegistryFactory implementation that retrieves + * the registry from MC kernel. + * + * @see EndpointRegistry.BEAN_NAME + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 23, 2007 + */ +public class EndpointRegistryFactoryImpl extends EndpointRegistryFactory +{ + public EndpointRegistry createEndpointRegistry() + { + return new KernelAwareSPIFactory().getKernelProvidedSPI( + EndpointRegistry.BEAN_NAME, EndpointRegistry.class + ); + } +} Property changes on: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/EndpointRegistryFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ManagedEndpointRegistry.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ManagedEndpointRegistry.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ManagedEndpointRegistry.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -29,7 +29,7 @@ import javax.management.MBeanServerFactory; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.management.BasicEndpointRegistry; +import org.jboss.wsf.spi.management.DefaultEndpointRegistry; /** * A Service Endpoint Registry @@ -37,7 +37,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 04-May-2007 */ -public class ManagedEndpointRegistry extends BasicEndpointRegistry implements ManagedEndpointRegistryMBean +public class ManagedEndpointRegistry extends DefaultEndpointRegistry implements ManagedEndpointRegistryMBean { // provide logging private static final Logger log = Logger.getLogger(ManagedEndpointRegistry.class); Added: trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory (rev 0) +++ trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2007-07-24 07:41:51 UTC (rev 3969) @@ -0,0 +1 @@ +org.jboss.wsf.stack.sunri.EndpointRegistryFactoryImpl \ No newline at end of file Modified: trunk/integration/xfire/int-xfire.iml =================================================================== --- trunk/integration/xfire/int-xfire.iml 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/integration/xfire/int-xfire.iml 2007-07-24 07:41:51 UTC (rev 3969) @@ -8,8 +8,8 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="commons-logging" level="project" /> <orderEntry type="module" module-name="spi" /> + <orderEntry type="library" name="jboss-logging-spi" level="project" /> <orderEntryProperties /> </component> </module> Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/CXFServletExt.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -45,6 +45,8 @@ import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.management.EndpointRegistry; import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.SPIProvider; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.context.ApplicationContext; import org.springframework.context.support.GenericApplicationContext; @@ -71,7 +73,8 @@ super.init(servletConfig); // Init the Endpoint - epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry(); String contextPath = servletConfig.getServletContext().getContextPath(); endpoint = initServiceEndpoint(contextPath); endpoint.addAttachment(ServletController.class, getController()); Added: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointRegistryFactoryImpl.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointRegistryFactoryImpl.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointRegistryFactoryImpl.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -0,0 +1,45 @@ +/* + * 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.xfire; + +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.framework.KernelAwareSPIFactory; + +/** + * An EndpointRegistryFactory implementation that retrieves + * the registry from MC kernel. + * + * @see EndpointRegistry.BEAN_NAME + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 23, 2007 + */ +public class EndpointRegistryFactoryImpl extends EndpointRegistryFactory +{ + public EndpointRegistry createEndpointRegistry() + { + return new KernelAwareSPIFactory().getKernelProvidedSPI( + EndpointRegistry.BEAN_NAME, EndpointRegistry.class + ); + } +} Property changes on: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/EndpointRegistryFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistry.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistry.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ManagedEndpointRegistry.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -29,7 +29,7 @@ import javax.management.MBeanServerFactory; import org.jboss.logging.Logger; -import org.jboss.wsf.framework.management.BasicEndpointRegistry; +import org.jboss.wsf.spi.management.DefaultEndpointRegistry; /** * A Service Endpoint Registry @@ -37,7 +37,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 04-May-2007 */ -public class ManagedEndpointRegistry extends BasicEndpointRegistry implements ManagedEndpointRegistryMBean +public class ManagedEndpointRegistry extends DefaultEndpointRegistry implements ManagedEndpointRegistryMBean { // provide logging private static final Logger log = Logger.getLogger(ManagedEndpointRegistry.class); Added: trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory =================================================================== --- trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory (rev 0) +++ trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2007-07-24 07:41:51 UTC (rev 3969) @@ -0,0 +1 @@ +org.jboss.wsf.stack.xfire.EndpointRegistryFactoryImpl \ No newline at end of file Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactoryJAXRPC.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -64,6 +64,8 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.SPIProvider; /** * This ServiceObjectFactory reconstructs a javax.xml.rpc.Service @@ -182,7 +184,8 @@ String endpointAddress = null; try { - EndpointRegistry epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + EndpointRegistry epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry(); Endpoint endpoint = epRegistry.resolvePortComponentLink(pcLink); if (endpoint == null) throw new WSException("Cannot resolve port-component-link: " + pcLink); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -27,6 +27,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectOutputStream; +import java.io.File; import java.net.URL; import javax.naming.BinaryRefAddr; @@ -43,6 +44,8 @@ import org.jboss.wsf.spi.management.ServerConfigFactory; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; /** * A JNDI reference to a javax.xml.rpc.Service @@ -57,7 +60,7 @@ { // provide logging private static Logger log = Logger.getLogger(ServiceReferenceable.class); - + public static final String SERVICE_REF_META_DATA = "SERVICE_REF_META_DATA"; public static final String SECURITY_CONFIG = "SECURITY_CONFIG"; public static final String PORT_COMPONENT_LINK = "PORT_COMPONENT_LINK"; @@ -101,8 +104,9 @@ myRef.add(new StringRefAddr(PORT_COMPONENT_LINK, pcLink)); try { - ServerConfigFactory factory = ServerConfigFactory.getInstance(); - ServerConfig config = factory.getServerConfig(); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig(); + String host = config.getWebServiceHost(); int port = config.getWebServicePort(); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -30,6 +30,7 @@ import java.util.Map; import java.util.StringTokenizer; import java.util.concurrent.Executor; +import java.io.File; import javax.xml.transform.Source; import javax.xml.ws.Binding; @@ -44,6 +45,9 @@ import org.jboss.ws.core.server.HttpContext; import org.jboss.ws.core.server.HttpServer; import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; import org.w3c.dom.Element; /** @@ -151,8 +155,8 @@ boolean isStandalone; try { - ServerConfigFactory factory = ServerConfigFactory.getInstance(); - factory.getServerConfig(); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig();File tmpDir = serverConfig.getServerTempDir(); isStandalone = false; } catch (Exception ex) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ContextServlet.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ContextServlet.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ContextServlet.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -41,6 +41,8 @@ import org.jboss.wsf.spi.management.EndpointMetrics; import org.jboss.wsf.spi.management.EndpointRegistry; import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; /** * The servlet that that is associated with context /jbossws @@ -58,7 +60,8 @@ public void init(ServletConfig config) throws ServletException { super.init(config); - epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry(); } /** Process GET requests. @@ -151,7 +154,7 @@ writer.print("</table>"); writer.print(""); } - + writer.print(" </td>"); writer.print("</tr>"); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/PortComponentLinkServlet.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -38,6 +38,8 @@ import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.management.EndpointRegistry; import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; /** * A servlet that reports the serviceURL for a given service ID. @@ -64,7 +66,8 @@ public void init(ServletConfig config) throws ServletException { super.init(config); - epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).createEndpointRegistry(); } /** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -24,6 +24,7 @@ // $Id$ import java.io.IOException; +import java.io.File; import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; @@ -76,6 +77,8 @@ import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.common.ObjectNameFactory; /** An abstract meta data builder. @@ -216,8 +219,9 @@ if (uriScheme == null) uriScheme = "http"; - ServerConfigFactory factory = ServerConfigFactory.getInstance(); - ServerConfig config = factory.getServerConfig(); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig(); + String host = config.getWebServiceHost(); int port = config.getWebServicePort(); if ("https".equals(uriScheme)) @@ -297,8 +301,8 @@ String servicePath = sepMetaData.getContextRoot() + sepMetaData.getURLPattern(); String serviceEndpointURL = getServiceEndpointAddress(uriScheme, servicePath); - ServerConfigFactory factory = ServerConfigFactory.getInstance(); - ServerConfig config = factory.getServerConfig(); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig(); boolean alwaysModify = config.isModifySOAPAddress(); if (alwaysModify || uriScheme == null || orgAddress.indexOf("REPLACE_WITH_ACTUAL_URL") >= 0) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -58,6 +58,8 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSTypeDefinition; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; /** * Util class that deals with XML Schema @@ -518,8 +520,8 @@ File tmpdir = null; try { - ServerConfigFactory factory = ServerConfigFactory.getInstance(); - ServerConfig serverConfig = factory.getServerConfig(); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig();File tmpDir = serverConfig.getServerTempDir(); tmpdir = serverConfig.getServerTempDir(); tmpdir = new File(tmpdir.getCanonicalPath() + "/jbossws"); tmpdir.mkdirs(); Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -31,6 +31,8 @@ import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; /** * @@ -42,8 +44,8 @@ public void testAddress(final String archive, final String service, final String scheme, final String port) { - ServerConfigFactory serverConfigFactory = ServerConfigFactory.getInstance(); - ServerConfig serverConfig = serverConfigFactory.getServerConfig(); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig(); File dataDir = serverConfig.getServerDataDir(); File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive); Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -30,8 +30,10 @@ import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; -/** +/** * @author darran.lofthouse(a)jboss.com * @since 21-September-2006 */ @@ -46,9 +48,8 @@ try { - ServerConfigFactory serverConfigFactory = ServerConfigFactory.getInstance(); - ServerConfig serverConfig = serverConfigFactory.getServerConfig(); - File tmpDir = serverConfig.getServerTempDir(); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig();File tmpDir = serverConfig.getServerTempDir(); tmpDir = new File(tmpDir.getCanonicalPath() + "/jbossws"); baseFiles = getXsdTempFiles(tmpDir); Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2007-07-24 07:39:54 UTC (rev 3968) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2007-07-24 07:41:51 UTC (rev 3969) @@ -33,6 +33,8 @@ import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; /** * [JBWS-1190] - WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account @@ -48,9 +50,9 @@ public void testAddress(final String archive, final String service, final String scheme, final String port) { - ServerConfigFactory serverConfigFactory = ServerConfigFactory.getInstance(); - ServerConfig serverConfig = serverConfigFactory.getServerConfig(); - + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).createServerConfig();File tmpDir = serverConfig.getServerTempDir(); + File dataDir = serverConfig.getServerDataDir(); File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive);

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3968 - trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-24 03:39:54 -0400 (Tue, 24 Jul 2007) New Revision: 3968 Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java Log: Fix initialization Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2007-07-23 16:11:06 UTC (rev 3967) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2007-07-24 07:39:54 UTC (rev 3968) @@ -48,24 +48,27 @@ protected final Logger log = Logger.getLogger(getClass()); protected DeploymentAspectManager deploymentAspectManager; + private DeploymentModelFactory deploymentModelFactory; + private List<ObjectName> phaseOneInterceptors; private List<ObjectName> phaseTwoInterceptors; - private DeploymentModelFactory deploymentModelFactory; - - public AbstractDeployerHook() + /** + * MC callback in create step + * @throws Exception + */ + public void create() throws Exception { SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); + deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).createDeploymentAspectManager(getDeploymentType()); if(null == deploymentModelFactory) throw new IllegalStateException("Unable to create spi.deployment.DeploymentModelFactory"); - } - public void setDeploymentAspectManager(DeploymentAspectManager manager) - { - this.deploymentAspectManager = manager; - } + if(null == deploymentAspectManager) + throw new IllegalStateException("Unable to create spi.deployment.DeploymentAspectManager"); + } public Deployment createDeployment() {

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3967 - in trunk: integration/jboss40/src/main/resources and 24 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-23 12:11:06 -0400 (Mon, 23 Jul 2007) New Revision: 3967 Added: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerFactoryImpl.java trunk/integration/native/src/main/resources/jbossws-native.jar/ trunk/integration/native/src/main/resources/jbossws-native.jar/META-INF/ trunk/integration/native/src/main/resources/jbossws-native.jar/META-INF/services/ trunk/integration/native/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.deployment.LifecycleHandlerFactory trunk/integration/native/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/LifecycleHandlerFactoryImpl.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandlerFactory.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/RequestHandlerFactory.java trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/ trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/ trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/ trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.deployment.LifecycleHandlerFactory trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/ trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/ trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/ trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.deployment.LifecycleHandlerFactory trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory Removed: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/LifecycleHandlerImpl.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/LifecycleHandlerImpl.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/LifecycleHandlerImpl.java Modified: trunk/JBossWS-Trunk.iws trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml trunk/integration/native/build.xml trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java trunk/integration/native/src/main/resources/jbossws-native-config.xml trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java trunk/integration/sunri/build.xml trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml trunk/integration/xfire/build.xml trunk/integration/xfire/src/main/resources/jbossws-xfire-config.xml Log: Provide RequestHandler and LifecycleHandler through SPIProvider API Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-07-23 13:02:36 UTC (rev 3966) +++ trunk/JBossWS-Trunk.iws 2007-07-23 16:11:06 UTC (rev 3967) @@ -121,7 +121,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="57" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> + <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="59" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> <option name="ENABLED" value="false" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -228,80 +228,15 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="DeploymentAspectManager.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java"> + <file leaf-file-name="LifecycleHandler.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="19" selection-start="1727" selection-end="1727" vertical-scroll-proportion="0.6878981"> + <state line="30" column="17" selection-start="1179" selection-end="1179" vertical-scroll-proportion="0.23809524"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="Deployment.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="37" column="17" selection-start="1370" selection-end="1370" vertical-scroll-proportion="-0.025477707"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="KernelAwareSPIFactory.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/KernelAwareSPIFactory.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="42" column="0" selection-start="1639" selection-end="1639" vertical-scroll-proportion="0.56050956"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="InvocationHandlerEJB3.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="51" column="13" selection-start="2041" selection-end="2041" vertical-scroll-proportion="-0.72611463"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="SecurityAdaptorImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdaptorImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="53" selection-start="1444" selection-end="1444" vertical-scroll-proportion="0.3312102"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="WebXMLRewriterFactory.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriterFactory.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="29" column="58" selection-start="1220" selection-end="1220" vertical-scroll-proportion="0.225"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="TestDeployerJBoss.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="80" column="53" selection-start="2771" selection-end="2771" vertical-scroll-proportion="0.17324841"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="SecurityAdaptorFactory.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="19" selection-start="1321" selection-end="1321" vertical-scroll-proportion="0.3312102"> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -449,6 +384,14 @@ <option name="myItemId" value="jboss" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="framework" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -456,9 +399,17 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> + <option name="myItemId" value="spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -466,10 +417,20 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> + <option name="myItemId" value="int-xfire" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-xfire" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="org" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> @@ -482,11 +443,11 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="container" /> + <option name="myItemId" value="stack" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jboss50" /> + <option name="myItemId" value="xfire" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> </PATH> @@ -496,7 +457,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> + <option name="myItemId" value="int-sunri" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> </PATH> @@ -506,7 +467,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> + <option name="myItemId" value="int-sunri" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> @@ -522,11 +483,91 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="stack" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="sunri" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-native" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="stack" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jbws" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-50" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="container" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jboss40" /> + <option name="myItemId" value="jboss50" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> </PATH> @@ -716,13 +757,9 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/metadata" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -762,7 +799,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/metadata" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -800,13 +837,51 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment" /> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="spi" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/invocation" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -865,7 +940,7 @@ <option name="STATE" value="0" /> </component> <component name="ProjectView"> - <navigator currentView="ProjectPane" splitterProportion="0.5"> + <navigator currentView="PackagesPane" splitterProportion="0.5"> <flattenPackages PackagesPane="false" /> <showMembers /> <showModules /> @@ -900,6 +975,22 @@ <component name="RestoreUpdateTree" /> <component name="RunManager"> <activeType name="Remote" /> + <configuration selected="false" default="true" type="JUnit" factoryName="JUnit"> + <module name="" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="PACKAGE_NAME" /> + <option name="MAIN_CLASS_NAME" /> + <option name="METHOD_NAME" /> + <option name="TEST_OBJECT" value="class" /> + <option name="VM_PARAMETERS" /> + <option name="PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ADDITIONAL_CLASS_PATH" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="wholeProject" /> + </option> + </configuration> <configuration selected="false" default="true" type="Application" factoryName="Application"> <option name="MAIN_CLASS_NAME" /> <option name="VM_PARAMETERS" /> @@ -916,22 +1007,6 @@ <option name="HOST" value="localhost" /> <option name="PORT" value="5005" /> </configuration> - <configuration selected="false" default="true" type="JUnit" factoryName="JUnit"> - <module name="" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="TEST_OBJECT" value="class" /> - <option name="VM_PARAMETERS" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ADDITIONAL_CLASS_PATH" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="wholeProject" /> - </option> - </configuration> <configuration selected="false" default="true" type="Applet" factoryName="Applet"> <module name="" /> <option name="MAIN_CLASS_NAME" /> @@ -1021,17 +1096,17 @@ <layout> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.2651048" order="0" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.465063" order="1" /> + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.32737362" order="0" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.43871707" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25215784" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" /> <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3298397" order="3" /> - <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.5956472" order="8" /> + <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.59335625" order="8" /> <window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" /> - <window_info id="Hierarchy" active="true" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.3162762" order="2" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.21393341" order="2" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39862543" order="4" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" /> @@ -1107,111 +1182,95 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/integration/jboss40/build.xml"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-1.299363"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="44" column="35" selection-start="1905" selection-end="1905" vertical-scroll-proportion="0.5714286"> + <state line="39" column="26" selection-start="1665" selection-end="1665" vertical-scroll-proportion="1.0518292"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/javax/xml/ws/Service.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="66" column="13" selection-start="2641" selection-end="2641" vertical-scroll-proportion="0.89575756"> + <state line="93" column="91" selection-start="4099" selection-end="4099" vertical-scroll-proportion="0.33231708"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/javax/xml/ws/Binding.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="31" column="17" selection-start="1255" selection-end="1255" vertical-scroll-proportion="0.26190478"> + <state line="92" column="91" selection-start="4061" selection-end="4061" vertical-scroll-proportion="0.33231708"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/javax/xml/ws/Dispatch.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="43" selection-start="1477" selection-end="1477" vertical-scroll-proportion="0.35714287"> + <state line="146" column="91" selection-start="5639" selection-end="5639" vertical-scroll-proportion="0.33231708"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/javax/xml/ws/BindingProvider.java"> + <entry file="file://$PROJECT_DIR$/integration/native/src/main/resources/jbossws-native-config.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="170" column="67" selection-start="7011" selection-end="7011" vertical-scroll-proportion="0.7380952"> + <state line="63" column="97" selection-start="3430" selection-end="3430" vertical-scroll-proportion="0.33231708"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java"> + <entry file="file://$PROJECT_DIR$/integration/native/output/lib/jbossws-native42/jbossws.beans/META-INF/jboss-beans.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="19" selection-start="1727" selection-end="1727" vertical-scroll-proportion="0.6878981"> + <state line="67" column="61" selection-start="3777" selection-end="3777" vertical-scroll-proportion="0.27134147"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java"> + <entry file="file://$PROJECT_DIR$/integration/native/output/lib/jbossws-native40/jbossws.beans/META-INF/jboss-beans.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="37" column="17" selection-start="1370" selection-end="1370" vertical-scroll-proportion="-0.025477707"> + <state line="65" column="105" selection-start="3605" selection-end="3605" vertical-scroll-proportion="0.14939025"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/KernelAwareSPIFactory.java"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="42" column="0" selection-start="1639" selection-end="1639" vertical-scroll-proportion="0.56050956"> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="jar://$PROJECT_DIR$/jbossws-core/thirdparty/jbosssx-client.jar!/org/jboss/security/SecurityAssociation.class"> - <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-1.4093959"> + <state line="0" column="44" selection-start="44" selection-end="44" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java"> + <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="51" column="13" selection-start="2041" selection-end="2041" vertical-scroll-proportion="-0.72611463"> + <state line="0" column="44" selection-start="44" selection-end="44" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java"> + <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/resources/jbossws-sunri-config.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="19" selection-start="1321" selection-end="1321" vertical-scroll-proportion="0.3312102"> + <state line="77" column="61" selection-start="4154" selection-end="4154" vertical-scroll-proportion="0.36091954"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java"> + <entry file="file://$PROJECT_DIR$/integration/xfire/src/main/resources/jbossws-xfire-config.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="80" column="53" selection-start="2771" selection-end="2771" vertical-scroll-proportion="0.17324841"> + <state line="42" column="61" selection-start="2264" selection-end="2264" vertical-scroll-proportion="0.22424242"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdaptorImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/xfire/IntegrationIssues.txt"> <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="53" selection-start="1444" selection-end="1444" vertical-scroll-proportion="0.3312102"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriterFactory.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="29" column="58" selection-start="1220" selection-end="1220" vertical-scroll-proportion="0.225"> + <state line="30" column="17" selection-start="1179" selection-end="1179" vertical-scroll-proportion="0.23809524"> <folding /> </state> </provider> Modified: trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-23 13:02:36 UTC (rev 3966) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-23 16:11:06 UTC (rev 3967) @@ -92,15 +92,7 @@ </bean> <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <property name="provides">ContainerEndpointHandler</property> - <property name="invocationHandler"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>JAXRPC_EJB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB21</value></entry> - <entry><key>JAXRPC_MDB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerMDB21</value></entry> - <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.spi.invocation.DefaultInvocationHandlerJAXWS</value></entry> - <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss40.InvocationHandlerEJB3</value></entry> - </map> - </property> + <property name="provides">ContainerEndpointHandler</property> </bean> <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> Modified: trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-23 13:02:36 UTC (rev 3966) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-23 16:11:06 UTC (rev 3967) @@ -91,15 +91,7 @@ </bean> <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <property name="provides">ContainerEndpointHandler</property> - <property name="invocationHandler"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>JAXRPC_EJB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB21</value></entry> - <entry><key>JAXRPC_MDB21</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerMDB21</value></entry> - <entry><key>JAXWS_JSE</key><value>org.jboss.wsf.spi.invocation.DefaultInvocationHandlerJAXWS</value></entry> - <entry><key>JAXWS_EJB3</key><value>org.jboss.wsf.container.jboss42.InvocationHandlerEJB3</value></entry> - </map> - </property> + <property name="provides">ContainerEndpointHandler</property> </bean> <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> Deleted: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java 2007-07-23 13:02:36 UTC (rev 3966) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/MainDeployerHook.java 2007-07-23 16:11:06 UTC (rev 3967) @@ -1,61 +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$ - -import org.jboss.deployers.spi.DeploymentException; -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.wsf.spi.deployment.Deployment; - -/** - * A basic hook that delegates a deployment manger. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class MainDeployerHook extends AbstractDeployerHook -{ - public void deploy(DeploymentUnit unit) throws DeploymentException - { - if (ignoreDeployment(unit)) - return; - - Deployment dep = unit.getAttachment(Deployment.class); - if (dep != null) - { - deploymentAspectManager.deploy(dep); - } - } - - public void undeploy(DeploymentUnit unit) - { - if (ignoreDeployment(unit)) - return; - - Deployment dep = unit.getAttachment(Deployment.class); - if (dep != null) - { - deploymentAspectManager.undeploy(dep); - } - } -} Modified: trunk/integration/native/build.xml =================================================================== --- trunk/integration/native/build.xml 2007-07-23 13:02:36 UTC (rev 3966) +++ trunk/integration/native/build.xml 2007-07-23 16:11:06 UTC (rev 3967) @@ -107,6 +107,7 @@ <fileset dir="${native.output.classes.dir}"> <include name="org/jboss/wsf/stack/jbws/**"/> </fileset> + <metainf dir="${native.resources.dir}/jbossws-native.jar/META-INF"/> </jar>  Deleted: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/LifecycleHandlerImpl.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/LifecycleHandlerImpl.java 2007-07-23 13:02:36 UTC (rev 3966) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/LifecycleHandlerImpl.java 2007-07-23 16:11:06 UTC (rev 3967) @@ -1,58 +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.stack.jbws; - -//$Id: LifecycleHandlerImpl.java 2923 2007-04-25 14:23:29Z thomas.diesler(a)jboss.com $ - -import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsf.framework.deployment.BasicLifecycleHandler; -import org.jboss.wsf.spi.deployment.Endpoint; - -/** - * A lifecycle handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class LifecycleHandlerImpl extends BasicLifecycleHandler -{ - public void start(Endpoint endpoint) - { - super.start(endpoint); - log.info("WebService started: " + getEndpointAddress(endpoint)); - } - - public void stop(Endpoint endpoint) - { - super.stop(endpoint); - log.info("WebService stopped: " + getEndpointAddress(endpoint)); - } - - private String getEndpointAddress(Endpoint ep) - { - ServerEndpointMetaData sepMetaData = ep.getAttachment(ServerEndpointMetaData.class); - if (sepMetaData == null) - throw new IllegalStateException("Cannot obtain endpoint meta data"); - - return sepMetaData.getEndpointAddress(); - } -} Added: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerFactoryImpl.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerFactoryImpl.java (rev 0) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerFactoryImpl.java 2007-07-23 16:11:06 UTC (rev 3967) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.stack.jbws; + +import org.jboss.wsf.spi.invocation.RequestHandlerFactory; +import org.jboss.wsf.spi.invocation.RequestHandler; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 23, 2007 + */ +public class RequestHandlerFactoryImpl extends RequestHandlerFactory +{ + public RequestHandler createRequestHandler() + { + return new RequestHandlerImpl(); + } +} Property changes on: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-07-23 13:02:36 UTC (rev 3966) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2007-07-23 16:11:06 UTC (rev 3967) @@ -102,6 +102,10 @@ // provide logging private static final Logger log = Logger.getLogger(RequestHandlerImpl.class); + RequestHandlerImpl() + { + } + public void handleHttpRequest(Endpoint endpoint, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException { String method = req.getMethod(); Modified: trunk/integration/native/src/main/resources/jbossws-native-config.xml =================================================================== --- trunk/integration/native/src/main/resources/jbossws-native-config.xml 2007-07-23 13:02:36 UTC (rev 3966) +++ trunk/integration/native/src/main/resources/jbossws-native-config.xml 2007-07-23 16:11:06 UTC (rev 3967) @@ -63,14 +63,7 @@ <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> <property name="requires">ContainerEndpointHandler, ContainerMetaData</property> - <property name="provides">StackEndpointHandler</property> - <property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property> - <property name="lifecycleHandler">org.jboss.wsf.stack.jbws.LifecycleHandlerImpl</property> - <property name="invocationHandler"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>JAXRPC_JSE</key><value>org.jboss.wsf.spi.invocation.DefaultInvocationHandlerJAXRPC</value></entry> - </map> - </property> + <property name="provides">StackEndpointHandler</property> </bean> <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect"> Added: trunk/integration/native/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.deployment.LifecycleHandlerFactory =================================================================== --- trunk/integration/native/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.deployment.LifecycleHandlerFactory (rev 0) +++ trunk/integration/native/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.deployment.LifecycleHandlerFactory 2007-07-23 16:11:06 UTC (rev 3967) @@ -0,0 +1 @@ +org.jboss.wsf.framework.deployment.LifecycleHandlerFactoryImpl \ No newline at end of file Added: trunk/integration/native/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory =================================================================== --- trunk/integration/native/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory (rev 0) +++ trunk/integration/native/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2007-07-23 16:11:06 UTC (rev 3967) @@ -0,0 +1 @@ +org.jboss.wsf.stack.jbws.RequestHandlerFactoryImpl \ No newline at end of file Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-23 13:02:36 UTC (rev 3966) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-23 16:11:06 UTC (rev 3967) @@ -29,8 +29,10 @@ import org.jboss.wsf.spi.deployment.DeploymentModelFactory; import org.jboss.wsf.spi.deployment.WebXMLRewriterFactory; import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory; +import org.jboss.wsf.spi.deployment.LifecycleHandlerFactory; import org.jboss.wsf.spi.invocation.InvocationModelFactory; import org.jboss.wsf.spi.invocation.ResourceInjectorFactory; +import org.jboss.wsf.spi.invocation.RequestHandlerFactory; /** * @author Heiko.Braun(a)jboss.com @@ -59,7 +61,7 @@ T returnType = null; - // SPI provided by framework + // SPI provided by framework, default that can be overridden if(DeploymentModelFactory.class.equals(spiType)) { @@ -79,6 +81,12 @@ spiType, "org.jboss.wsf.framework.deployment.WebXMLRewriterFactoryImpl" ); } + else if(LifecycleHandlerFactory.class.equals(spiType)) + { + returnType = (T) loadService( + spiType, "org.jboss.wsf.framework.deployment.LifecycleHandlerFactoryImpl" + ); + } // SPI provided by either container or stack integration @@ -90,6 +98,12 @@ { returnType = (T) loadService(spiType, null); } + else if(RequestHandlerFactory.class.equals(spiType)) + { + returnType = (T) loadService( + spiType, null + ); + } // help debugging if(null == returnType) Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-07-23 13:02:36 UTC (rev 3966) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-07-23 16:11:06 UTC (rev 3967) @@ -25,21 +25,12 @@ import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.LifecycleHandler; -import org.jboss.wsf.spi.invocation.InvocationHandler; -import org.jboss.wsf.spi.invocation.InvocationModelFactory; -import org.jboss.wsf.spi.invocation.InvocationType; -import org.jboss.wsf.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.deployment.*; +import org.jboss.wsf.spi.invocation.*; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; -import java.util.HashMap; -import java.util.Map; - /** * A deployer that assigns the handlers to the Endpoint * @@ -49,69 +40,42 @@ public class EndpointHandlerDeploymentAspect extends DeploymentAspect { private String requestHandler; - private String lifecycleHandler; + private LifecycleHandler lifecycleHandler; - private Map<String, String> invocationHandlerMap = new HashMap<String, String>(); + private SPIProvider spiProvider; - public void setLifecycleHandler(String handler) + public EndpointHandlerDeploymentAspect() { - this.lifecycleHandler = handler; - } + spiProvider = SPIProviderResolver.getInstance().getProvider(); + } - public void setRequestHandler(String handler) - { - this.requestHandler = handler; - } - - public void setInvocationHandler(Map<String, String> handlers) - { - this.invocationHandlerMap = handlers; - } - @Override public void create(Deployment dep) { for (Endpoint ep : dep.getService().getEndpoints()) { - if (requestHandler != null) - ep.setRequestHandler(getRequestHandler(dep)); + // associate a request handler + ep.setRequestHandler(getRequestHandler(dep)); - if (lifecycleHandler != null) - ep.setLifecycleHandler(getLifecycleHandler(dep)); + // associate a lifecycle handler + ep.setLifecycleHandler(getLifecycleHandler(dep)); - if (invocationHandlerMap != null) - { - InvocationHandler invocationHandler = getInvocationHandler(ep); - if (invocationHandler != null) - ep.setInvocationHandler(invocationHandler); - } + // associate a n invocation handler + // TODO: can this be null? + InvocationHandler invocationHandler = getInvocationHandler(ep); + if (invocationHandler != null) + ep.setInvocationHandler(invocationHandler); } } private RequestHandler getRequestHandler(Deployment dep) { - try - { - Class<?> handlerClass = dep.getInitialClassLoader().loadClass(requestHandler); - return (RequestHandler)handlerClass.newInstance(); - } - catch (Exception e) - { - throw new IllegalStateException("Cannot load request handler: " + requestHandler); - } + return spiProvider.getSPI(RequestHandlerFactory.class).createRequestHandler(); } private LifecycleHandler getLifecycleHandler(Deployment dep) { - try - { - Class<?> handlerClass = dep.getInitialClassLoader().loadClass(lifecycleHandler); - return (LifecycleHandler)handlerClass.newInstance(); - } - catch (Exception e) - { - throw new IllegalStateException("Cannot load lifecycle handler: " + lifecycleHandler); - } + return spiProvider.getSPI(LifecycleHandlerFactory.class).createLifecylceHandler(); } private InvocationHandler getInvocationHandler(Endpoint ep) @@ -130,7 +94,7 @@ } } - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + InvocationType type = InvocationType.valueOf(key); InvocationHandler invocationHandler= spiProvider.getSPI(InvocationModelFactory.class).createInvocationHandler( type ); return invocationHandler; Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/LifecycleHandlerFactoryImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/LifecycleHandlerFactoryImpl.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/LifecycleHandlerFactoryImpl.java 2007-07-23 16:11:06 UTC (rev 3967) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.framework.deployment; + +import org.jboss.wsf.spi.deployment.LifecycleHandlerFactory; +import org.jboss.wsf.spi.deployment.LifecycleHandler; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 23, 2007 + */ +public class LifecycleHandlerFactoryImpl extends LifecycleHandlerFactory +{ + public LifecycleHandler createLifecylceHandler() + { + return new BasicLifecycleHandler(); + } +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/LifecycleHandlerFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandlerFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandlerFactory.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandlerFactory.java 2007-07-23 16:11:06 UTC (rev 3967) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.deployment; + +import org.jboss.wsf.spi.SPIView; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 23, 2007 + */ +public abstract class LifecycleHandlerFactory implements SPIView +{ + public abstract LifecycleHandler createLifecylceHandler(); +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandlerFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/RequestHandlerFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/RequestHandlerFactory.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/RequestHandlerFactory.java 2007-07-23 16:11:06 UTC (rev 3967) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.invocation; + +import org.jboss.wsf.spi.SPIView; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 23, 2007 + */ +public abstract class RequestHandlerFactory implements SPIView +{ + public abstract RequestHandler createRequestHandler(); +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/RequestHandlerFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/sunri/build.xml =================================================================== --- trunk/integration/sunri/build.xml 2007-07-23 13:02:36 UTC (rev 3966) +++ trunk/integration/sunri/build.xml 2007-07-23 16:11:06 UTC (rev 3967) @@ -112,7 +112,8 @@ <include name="org/jboss/wsf/stack/sunri/metadata/**"/> <include name="org/jboss/wsf/stack/sunri/log/**"/> <include name="org/jboss/wsf/stack/sunri/*"/> - </fileset> + </fileset> + <metainf dir="${sunri.resources.dir}/jbossws-sunri.jar/META-INF"/> </jar>  Deleted: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/LifecycleHandlerImpl.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/LifecycleHandlerImpl.java 2007-07-23 13:02:36 UTC (rev 3966) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/LifecycleHandlerImpl.java 2007-07-23 16:11:06 UTC (rev 3967) @@ -1,48 +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.stack.sunri; - -//$Id$ - -import org.jboss.wsf.framework.deployment.BasicLifecycleHandler; -import org.jboss.wsf.spi.deployment.Endpoint; - -/** - * A lifecycle handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class LifecycleHandlerImpl extends BasicLifecycleHandler -{ - public void start(Endpoint ep) - { - super.start(ep); - log.info("WebService started: " + ep.getName()); - } - - public void stop(Endpoint ep) - { - super.stop(ep); - log.info("WebService stoped: " + ep.getName()); - } -} Modified: trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml 2007-07-23 13:02:36 UTC (rev 3966) +++ trunk/integration/sunri/src/main/resources/jbossws-sunri-config.xml 2007-07-23 16:11:06 UTC (rev 3967) @@ -75,9 +75,7 @@ <bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.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> + <property name="provides">StackEndpointHandler</property> </bean> <bean name="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.sunri.SunJaxwsDeploymentAspect"> Added: trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.deployment.LifecycleHandlerFactory =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.deployment.LifecycleHandlerFactory (rev 0) +++ trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.deployment.LifecycleHandlerFactory 2007-07-23 16:11:06 UTC (rev 3967) @@ -0,0 +1 @@ +org.jboss.wsf.framework.deployment.LifecycleHandlerFactoryImpl \ No newline at end of file Added: trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory (rev 0) +++ trunk/integration/sunri/src/main/resources/jbossws-sunri.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2007-07-23 16:11:06 UTC (rev 3967) @@ -0,0 +1 @@ +org.jboss.wsf.stack.sunri.RequestHandlerImpl \ No newline at end of file Modified: trunk/integration/xfire/build.xml =================================================================== --- trunk/integration/xfire/build.xml 2007-07-23 13:02:36 UTC (rev 3966) +++ trunk/integration/xfire/build.xml 2007-07-23 16:11:06 UTC (rev 3967) @@ -108,6 +108,7 @@ <fileset dir="${xfire.output.classes.dir}"> <include name="org/jboss/wsf/stack/xfire/**"/> </fileset> + <metainf dir="${xfire.resources.dir}/jbossws-xfire.jar/META-INF"/> </jar>  Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/LifecycleHandlerImpl.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/LifecycleHandlerImpl.java 2007-07-23 13:02:36 UTC (rev 3966) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/LifecycleHandlerImpl.java 2007-07-23 16:11:06 UTC (rev 3967) @@ -1,48 +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.stack.xfire; - -//$Id$ - -import org.jboss.wsf.framework.deployment.BasicLifecycleHandler; -import org.jboss.wsf.spi.deployment.Endpoint; - -/** - * A lifecycle handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class LifecycleHandlerImpl extends BasicLifecycleHandler -{ - public void start(Endpoint ep) - { - super.start(ep); - log.info("WebService started: " + ep.getName()); - } - - public void stop(Endpoint ep) - { - super.stop(ep); - log.info("WebService stoped: " + ep.getName()); - } -} Modified: trunk/integration/xfire/src/main/resources/jbossws-xfire-config.xml =================================================================== --- trunk/integration/xfire/src/main/resources/jbossws-xfire-config.xml 2007-07-23 13:02:36 UTC (rev 3966) +++ trunk/integration/xfire/src/main/resources/jbossws-xfire-config.xml 2007-07-23 16:11:06 UTC (rev 3967) @@ -40,9 +40,7 @@ <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> <property name="requires">ContainerEndpointHandler</property> - <property name="provides">StackEndpointHandler</property> - <property name="requestHandler">org.jboss.wsf.stack.xfire.RequestHandlerImpl</property> - <property name="lifecycleHandler">org.jboss.wsf.stack.xfire.LifecycleHandlerImpl</property> + <property name="provides">StackEndpointHandler</property> </bean> <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.xfire.DescriptorDeploymentAspect"> Added: trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.deployment.LifecycleHandlerFactory =================================================================== --- trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.deployment.LifecycleHandlerFactory (rev 0) +++ trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.deployment.LifecycleHandlerFactory 2007-07-23 16:11:06 UTC (rev 3967) @@ -0,0 +1 @@ +org.jboss.wsf.framework.deployment.LifecycleHandlerFactoryImpl \ No newline at end of file Added: trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory =================================================================== --- trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory (rev 0) +++ trunk/integration/xfire/src/main/resources/jbossws-xfire.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2007-07-23 16:11:06 UTC (rev 3967) @@ -0,0 +1 @@ +org.jboss.wsf.stack.xfire.RequestHandlerImpl \ No newline at end of file

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3966 - in trunk: integration/jboss40/src/main/resources and 10 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-23 09:02:36 -0400 (Mon, 23 Jul 2007) New Revision: 3966 Added: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectManagerFactoryImpl.java trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java Modified: trunk/JBossWS-Trunk.iws trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/SPIView.java Log: Introduce DeploymentAspectManagerFactory SPI Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-07-23 11:06:32 UTC (rev 3965) +++ trunk/JBossWS-Trunk.iws 2007-07-23 13:02:36 UTC (rev 3966) @@ -121,8 +121,8 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="56" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> - <option name="ENABLED" value="true" /> + <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="57" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> + <option name="ENABLED" value="false" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -147,7 +147,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java" line="49" class="org.jboss.wsf.container.jboss50.AbstractDeployerHook" package="org.jboss.wsf.container.jboss50"> + <breakpoint url="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java" line="65" class="org.jboss.wsf.container.jboss50.AbstractDeployerHook" package="org.jboss.wsf.container.jboss50"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -160,7 +160,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java" line="65" class="org.jboss.wsf.container.jboss50.AbstractDeployerHook" package="org.jboss.wsf.container.jboss50"> + <breakpoint url="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java" line="46" class="org.jboss.wsf.container.jboss50.DeploymentAspectManagerFactoryImpl" package="org.jboss.wsf.container.jboss50"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -228,24 +228,80 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="jbossws-deployer-beans.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml"> + <file leaf-file-name="DeploymentAspectManager.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="85" column="87" selection-start="3466" selection-end="3494" vertical-scroll-proportion="0.33333334"> + <state line="47" column="19" selection-start="1727" selection-end="1727" vertical-scroll-proportion="0.6878981"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="DeploymentAspectInstaller.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java"> + <file leaf-file-name="Deployment.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="13" selection-start="1460" selection-end="1460" vertical-scroll-proportion="0.33333334"> + <state line="37" column="17" selection-start="1370" selection-end="1370" vertical-scroll-proportion="-0.025477707"> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="KernelAwareSPIFactory.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/KernelAwareSPIFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="42" column="0" selection-start="1639" selection-end="1639" vertical-scroll-proportion="0.56050956"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="InvocationHandlerEJB3.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="51" column="13" selection-start="2041" selection-end="2041" vertical-scroll-proportion="-0.72611463"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="SecurityAdaptorImpl.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdaptorImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="36" column="53" selection-start="1444" selection-end="1444" vertical-scroll-proportion="0.3312102"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="WebXMLRewriterFactory.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriterFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="29" column="58" selection-start="1220" selection-end="1220" vertical-scroll-proportion="0.225"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="TestDeployerJBoss.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="80" column="53" selection-start="2771" selection-end="2771" vertical-scroll-proportion="0.17324841"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="SecurityAdaptorFactory.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="33" column="19" selection-start="1321" selection-end="1321" vertical-scroll-proportion="0.3312102"> + <folding /> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -660,9 +716,13 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/metadata" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -698,9 +758,13 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/metadata" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -736,11 +800,11 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -796,82 +860,6 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> </component> <component name="ProjectReloadState"> <option name="STATE" value="0" /> @@ -912,6 +900,22 @@ <component name="RestoreUpdateTree" /> <component name="RunManager"> <activeType name="Remote" /> + <configuration selected="false" default="true" type="Application" factoryName="Application"> + <option name="MAIN_CLASS_NAME" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <module name="" /> + </configuration> + <configuration selected="false" default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> + </configuration> <configuration selected="false" default="true" type="JUnit" factoryName="JUnit"> <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> @@ -940,22 +944,6 @@ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> </configuration> - <configuration selected="false" default="true" type="Application" factoryName="Application"> - <option name="MAIN_CLASS_NAME" /> - <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <module name="" /> - </configuration> - <configuration selected="false" default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - </configuration> <configuration selected="true" default="false" name="server" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> @@ -1029,21 +1017,21 @@ </component> <component name="ToolWindowManager"> <frame x="0" y="25" width="1680" height="1000" extended-state="0" /> - <editor active="true" /> + <editor active="false" /> <layout> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.31935883" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.2651048" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.465063" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25215784" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" /> <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3298397" order="3" /> - <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.6884307" order="8" /> + <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.5956472" order="8" /> <window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3162762" order="2" /> + <window_info id="Hierarchy" active="true" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.3162762" order="2" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39862543" order="4" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" /> @@ -1119,119 +1107,111 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/ExtendableWebServiceContext.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss40/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="65" column="60" selection-start="2361" selection-end="2361" vertical-scroll-proportion="0.33333334"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-1.299363"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationModelFactory.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="37" column="66" selection-start="1549" selection-end="1549" vertical-scroll-proportion="0.35714287"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployerMBean.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="27" column="27" selection-start="1194" selection-end="1194" vertical-scroll-proportion="0.16666667"> + <state line="44" column="35" selection-start="1905" selection-end="1905" vertical-scroll-proportion="0.5714286"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/javax/xml/ws/Service.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="54" column="4" selection-start="1926" selection-end="1926" vertical-scroll-proportion="0.52380955"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="66" column="13" selection-start="2641" selection-end="2641" vertical-scroll-proportion="0.89575756"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/javax/xml/ws/Binding.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="35" column="49" selection-start="1557" selection-end="1557" vertical-scroll-proportion="0.3090909"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="31" column="17" selection-start="1255" selection-end="1255" vertical-scroll-proportion="0.26190478"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/javax/xml/ws/Dispatch.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="66" column="45" selection-start="2559" selection-end="2559" vertical-scroll-proportion="0.621118"> + <state line="35" column="43" selection-start="1477" selection-end="1477" vertical-scroll-proportion="0.35714287"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationModelFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/javax/xml/ws/BindingProvider.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="79" column="24" selection-start="1291" selection-end="2750" vertical-scroll-proportion="0.9006211"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="170" column="67" selection-start="7011" selection-end="7011" vertical-scroll-proportion="0.7380952"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/build.xml"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="120" column="62" selection-start="5946" selection-end="5946" vertical-scroll-proportion="0.9503106"> + <state line="47" column="19" selection-start="1727" selection-end="1727" vertical-scroll-proportion="0.6878981"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.ws.core.server.HttpServer"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="37" column="17" selection-start="1370" selection-end="1370" vertical-scroll-proportion="-0.025477707"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationModelFactory"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/KernelAwareSPIFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="31" selection-start="31" selection-end="31" vertical-scroll-proportion="0.0"> + <state line="42" column="0" selection-start="1639" selection-end="1639" vertical-scroll-proportion="0.56050956"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="jar://$PROJECT_DIR$/jbossws-core/thirdparty/jbosssx-client.jar!/org/jboss/security/SecurityAssociation.class"> + <provider selected="true" editor-type-id="text-editor"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-1.4093959"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationModelFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="43" column="72" selection-start="1639" selection-end="1639" vertical-scroll-proportion="0.5031056"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="51" column="13" selection-start="2041" selection-end="2041" vertical-scroll-proportion="-0.72611463"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/SecurityAdaptorFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="55" column="3" selection-start="2129" selection-end="2129" vertical-scroll-proportion="0.3416149"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="33" column="19" selection-start="1321" selection-end="1321" vertical-scroll-proportion="0.3312102"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/test/TestDeployerJBoss.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="67" column="26" selection-start="2596" selection-end="2596" vertical-scroll-proportion="0.6787879"> + <state line="80" column="53" selection-start="2771" selection-end="2771" vertical-scroll-proportion="0.17324841"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectInstaller.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityAdaptorImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="13" selection-start="1460" selection-end="1460" vertical-scroll-proportion="0.33333334"> + <state line="36" column="53" selection-start="1444" selection-end="1444" vertical-scroll-proportion="0.3312102"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebXMLRewriterFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="85" column="87" selection-start="3466" selection-end="3494" vertical-scroll-proportion="0.33333334"> + <state line="29" column="58" selection-start="1220" selection-end="1220" vertical-scroll-proportion="0.225"> <folding /> </state> </provider> Modified: trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-23 11:06:32 UTC (rev 3965) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-23 13:02:36 UTC (rev 3966) @@ -39,7 +39,6 @@ Register DeployerHooks with JBoss deployers --> <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookJSE"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="phaseOneInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorJSE</value> @@ -47,7 +46,6 @@ </property> </bean> <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorEJB21</value> @@ -55,7 +53,6 @@ </property> </bean> <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookJSE"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="phaseOneInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorJSE</value> @@ -63,7 +60,6 @@ </property> </bean> <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorEJB3</value> Added: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory (rev 0) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory 2007-07-23 13:02:36 UTC (rev 3966) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss42.DeploymentAspectManagerFactoryImpl \ No newline at end of file Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectManagerFactoryImpl.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectManagerFactoryImpl.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectManagerFactoryImpl.java 2007-07-23 13:02:36 UTC (rev 3966) @@ -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.wsf.container.jboss42; + +import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory; +import org.jboss.wsf.spi.deployment.DeploymentAspectManager; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.framework.KernelAwareSPIFactory; +import org.jboss.logging.Logger; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 23, 2007 + */ +public class DeploymentAspectManagerFactoryImpl extends DeploymentAspectManagerFactory +{ + private static final Logger log = Logger.getLogger(DeploymentAspectManagerFactoryImpl.class); + + public DeploymentAspectManager createDeploymentAspectManager(Deployment.DeploymentType deploymentType) + { + String beanName; + + if(deploymentType.toString().indexOf("EJB")!=-1) + beanName = "WSDeploymentAspectManagerEJB"; + else + beanName = "WSDeploymentAspectManagerJSE"; + + log.debug("DeploymentAspectManager for " + deploymentType +": " +beanName); + + return new KernelAwareSPIFactory().getKernelProvidedSPI( + beanName, DeploymentAspectManager.class + ); + } +} Property changes on: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectManagerFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-23 11:06:32 UTC (rev 3965) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-23 13:02:36 UTC (rev 3966) @@ -39,7 +39,6 @@ Register DeployerHooks with JBoss deployers --> <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookJSE"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="phaseOneInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorJSE</value> @@ -47,7 +46,6 @@ </property> </bean> <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorEJB21</value> @@ -55,7 +53,6 @@ </property> </bean> <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookJSE"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="phaseOneInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorJSE</value> @@ -63,7 +60,6 @@ </property> </bean> <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="phaseTwoInterceptors"> <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> <value>jboss.ws:service=DeployerInterceptorEJB3</value> Added: trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory (rev 0) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory 2007-07-23 13:02:36 UTC (rev 3966) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss42.DeploymentAspectManagerFactoryImpl \ No newline at end of file Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-23 11:06:32 UTC (rev 3965) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-23 13:02:36 UTC (rev 3966) @@ -34,6 +34,8 @@ * An abstract web service deployer. * * @author Thomas.Diesler(a)jboss.org + * @author Heiko.Braun(a)jboss.com + * * @since 25-Apr-2007 */ public abstract class AbstractDeployerHook implements DeployerHook @@ -42,21 +44,19 @@ protected final Logger log = Logger.getLogger(getClass()); protected DeploymentAspectManager deploymentAspectManager; - private DeploymentModelFactory deploymentModelFactory; - public AbstractDeployerHook() + public void create() throws Exception { SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); + deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).createDeploymentAspectManager(getDeploymentType()); if(null == deploymentModelFactory) throw new IllegalStateException("Unable to create spi.deployment.DeploymentModelFactory"); - } - public void setDeploymentAspectManager(DeploymentAspectManager deploymentManager) - { - this.deploymentAspectManager = deploymentManager; + if(null == deploymentAspectManager) + throw new IllegalStateException("Unable to create spi.deployment.DeploymentAspectManager"); } public Deployment createDeployment() @@ -102,4 +102,8 @@ String name = unit.getName(); return (name.startsWith("jboss:id=") && name.indexOf("service=jacc") > 0); } + + /** Get the deployment type this deployer can handle + */ + public abstract Deployment.DeploymentType getDeploymentType(); } Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-23 11:06:32 UTC (rev 3965) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-23 13:02:36 UTC (rev 3966) @@ -58,9 +58,6 @@ */ public abstract class ArchiveDeployerHook extends AbstractDeployerHook { - /** Get the deployemnt type this deployer can handle - */ - public abstract DeploymentType getDeploymentType(); /** Depending on the type of deployment, this method should return true * if the deployment contains web service endpoints. Added: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java (rev 0) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java 2007-07-23 13:02:36 UTC (rev 3966) @@ -0,0 +1,58 @@ +/* + * 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; + +import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory; +import org.jboss.wsf.spi.deployment.DeploymentAspectManager; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.framework.KernelAwareSPIFactory; +import org.jboss.logging.Logger; + +/** + * A DeploymentAspectManagerFactory that retrieves a configured + * {@link DeploymentAspectManager} from MC kernel. + * + * @see org.jboss.wsf.framework.deployment.DeploymentAspectInstaller + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 20, 2007 + */ +public class DeploymentAspectManagerFactoryImpl extends DeploymentAspectManagerFactory +{ + private static final Logger log = Logger.getLogger(DeploymentAspectManagerFactoryImpl.class); + + public DeploymentAspectManager createDeploymentAspectManager(Deployment.DeploymentType deploymentType) + { + String beanName; + + if(deploymentType.toString().indexOf("EJB")!=-1) + beanName = "WSDeploymentAspectManagerEJB"; + else + beanName = "WSDeploymentAspectManagerJSE"; + + log.debug("DeploymentAspectManager for " + deploymentType +": " +beanName); + + return new KernelAwareSPIFactory().getKernelProvidedSPI( + beanName, DeploymentAspectManager.class + ); + } +} Property changes on: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectManagerFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-23 11:06:32 UTC (rev 3965) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-23 13:02:36 UTC (rev 3966) @@ -69,7 +69,6 @@ Register DeployerHooks with JBoss deployers --> <bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookJSE"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <install bean="WebServiceDeployerJSE" method="addDeployerHook"> <parameter> <this/> @@ -83,7 +82,6 @@ <depends>WebServiceDeployerJSE</depends> </bean> <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookEJB21"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> <this/> @@ -97,7 +95,6 @@ <depends>WebServiceDeployerEJB</depends> </bean> <bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookJSE"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <install bean="WebServiceDeployerJSE" method="addDeployerHook"> <parameter> <this/> @@ -111,7 +108,6 @@ <depends>WebServiceDeployerJSE</depends> </bean> <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookEJB3"> - <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <install bean="WebServiceDeployerEJB" method="addDeployerHook"> <parameter> <this/> Added: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory =================================================================== --- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory (rev 0) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory 2007-07-23 13:02:36 UTC (rev 3966) @@ -0,0 +1 @@ +org.jboss.wsf.container.jboss50.DeploymentAspectManagerFactoryImpl \ No newline at end of file Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-23 11:06:32 UTC (rev 3965) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-07-23 13:02:36 UTC (rev 3966) @@ -28,6 +28,7 @@ import org.jboss.wsf.spi.WSFException; import org.jboss.wsf.spi.deployment.DeploymentModelFactory; import org.jboss.wsf.spi.deployment.WebXMLRewriterFactory; +import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory; import org.jboss.wsf.spi.invocation.InvocationModelFactory; import org.jboss.wsf.spi.invocation.ResourceInjectorFactory; @@ -85,6 +86,10 @@ { returnType = (T) loadService(spiType, null); } + else if(DeploymentAspectManagerFactory.class.equals(spiType)) + { + returnType = (T) loadService(spiType, null); + } // help debugging if(null == returnType) Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/SPIView.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/SPIView.java 2007-07-23 11:06:32 UTC (rev 3965) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/SPIView.java 2007-07-23 13:02:36 UTC (rev 3966) @@ -22,8 +22,9 @@ package org.jboss.wsf.spi; /** - * Marks a specific subset onto the overall SPI. - * + * Marks a specific subset onto the overall SPI.<br> + * An SPIView can be passed to the {@link SPIProvider} to get an implementation. + * * @author Heiko.Braun(a)jboss.com * Created: Jul 18, 2007 */ Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java 2007-07-23 13:02:36 UTC (rev 3966) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.deployment; + +import org.jboss.wsf.spi.SPIView; + +/** + * Creates DeploymentAspectManager's by {@link org.jboss.wsf.spi.deployment.Deployment.DeploymentType} + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 20, 2007 + */ +public abstract class DeploymentAspectManagerFactory implements SPIView +{ + public abstract DeploymentAspectManager createDeploymentAspectManager(Deployment.DeploymentType deploymentType); +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3965 - trunk/integration/spi/src/main/java/org/jboss/wsf/test.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-23 07:06:32 -0400 (Mon, 23 Jul 2007) New Revision: 3965 Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java Log: Fix NPE in getImplementationVendor Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2007-07-23 08:58:46 UTC (rev 3964) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2007-07-23 11:06:32 UTC (rev 3965) @@ -31,8 +31,11 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import javax.xml.namespace.QName; +import javax.xml.transform.Source; +import javax.xml.ws.Dispatch; import javax.xml.ws.Service; -import javax.xml.ws.handler.HandlerResolver; +import javax.xml.ws.Service.Mode; +import javax.xml.ws.soap.SOAPBinding; import org.jboss.logging.Logger; import org.jboss.wsf.common.ObjectNameFactory; @@ -113,10 +116,12 @@ { if (implVendor == null) { - HandlerResolver resolver = Service.create(new QName("dummy")).getHandlerResolver(); - implVendor = resolver.getClass().getPackage().getImplementationVendor(); - implTitle = resolver.getClass().getPackage().getImplementationTitle(); - implVersion = resolver.getClass().getPackage().getImplementationVersion(); + Service service = Service.create(new QName("dummyService")); + service.addPort(new QName("dummyPort"), SOAPBinding.SOAP11HTTP_BINDING, "http://dummy-address"); + Dispatch<Source> obj = service.createDispatch(new QName("dummyPort"), Source.class, Mode.PAYLOAD); + implVendor = obj.getClass().getPackage().getImplementationVendor(); + implTitle = obj.getClass().getPackage().getImplementationTitle(); + implVersion = obj.getClass().getPackage().getImplementationVersion(); System.out.println(implVendor + ", " + implTitle + ", " + implVersion); } return implVendor; @@ -183,7 +188,7 @@ { // ignore, we are not running on jboss-4.2 or greater } - + if (jbossVersion != null && jbossVersion.equals(integrationTarget) == false) throw new IllegalStateException("Integration target mismatch, using: " + jbossVersion); }

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r3964 - trunk/integration/jboss40.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-23 04:58:46 -0400 (Mon, 23 Jul 2007) New Revision: 3964 Modified: trunk/integration/jboss40/build.xml Log: Fix jar targets Modified: trunk/integration/jboss40/build.xml =================================================================== --- trunk/integration/jboss40/build.xml 2007-07-20 16:11:24 UTC (rev 3963) +++ trunk/integration/jboss40/build.xml 2007-07-23 08:58:46 UTC (rev 3964) @@ -118,7 +118,7 @@ <include name="org/jboss/wsf/container/jboss40/**"/> <include name="org/jboss/wsf/container/jboss42/**"/> </fileset> - <metainf dir="${jbws40.resources.dir}/jbossws-jboss40JBo.jar/META-INF"/> + <metainf dir="${jbws40.resources.dir}/jbossws-jboss40.jar/META-INF"/> </jar>

16 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits July 2007