[jbossws-commits] JBossWS SVN: r1363 - in trunk: . src/main/java/org/jboss/ws/deployment src/main/java/org/jboss/ws/integration src/main/java/org/jboss/ws/integration/jboss src/main/java/org/jboss/ws/integration/jboss50 src/main/java/org/jboss/ws/integration/tomcat src/main/java/org/jboss/ws/jaxrpc src/main/java/org/jboss/ws/jaxws/spi src/main/java/org/jboss/ws/metadata src/main/java/org/jboss/ws/metadata/j2ee src/main/java/org/jboss/ws/server src/main/resources/jbossws.beans/META-INF

Author: thomas.diesler(a)jboss.com Date: 2006-11-03 15:23:13 -0500 (Fri, 03 Nov 2006) New Revision: 1363 Added: trunk/src/main/java/org/jboss/ws/integration/jboss/ trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebSecurityMetaData.java Removed: trunk/src/main/java/org/jboss/ws/integration/jbossall/ Modified: trunk/ant.properties.example trunk/build.xml trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/deployment/JAXWSProviderMetaDataBuilderJSE.java trunk/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilderEJB21.java trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilderEJB3.java trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilderJSE.java trunk/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java trunk/src/main/java/org/jboss/ws/deployment/UnifiedDeploymentInfo.java trunk/src/main/java/org/jboss/ws/integration/jboss/ServerConfigImpl.java trunk/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointServlet.java trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java trunk/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdaptor.java trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerEJB3.java trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java trunk/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java trunk/src/main/java/org/jboss/ws/jaxws/spi/ServiceDelegateImpl.java trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java trunk/src/main/java/org/jboss/ws/metadata/UnifiedMetaData.java trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java trunk/src/main/java/org/jboss/ws/server/WSDLFilePublisher.java trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml Log: Done: JAXRPC JSE Modified: trunk/ant.properties.example =================================================================== --- trunk/ant.properties.example 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/ant.properties.example 2006-11-03 20:23:13 UTC (rev 1363) @@ -3,7 +3,7 @@ # # Required JBoss Home -#jboss.jdk15.home=/home/tdiesler/svn/jboss/jbossas/trunk/build/output/jboss-5.0.0.Beta +#jboss.jdk15.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta # Optional JBoss Home Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/build.xml 2006-11-03 20:23:13 UTC (rev 1363) @@ -246,7 +246,7 @@ <jar jarfile="${build.lib.dir}/jbossws-jboss-integration.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${build.classes.dir}"> <include name="org/jboss/ws/integration/*.class"/> - <include name="org/jboss/ws/integration/jbossall/**"/> + <include name="org/jboss/ws/integration/jboss/**"/> <include name="org/jboss/ws/integration/jboss50/**"/> </fileset> </jar> Modified: trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -80,7 +80,6 @@ try { UnifiedMetaData wsMetaData = new UnifiedMetaData(); - wsMetaData.setResourceLoader(resourceLoader); wsMetaData.setClassLoader(classLoader); ServiceMetaData serviceMetaData = new ServiceMetaData(wsMetaData, serviceName); Modified: trunk/src/main/java/org/jboss/ws/deployment/JAXWSProviderMetaDataBuilderJSE.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/JAXWSProviderMetaDataBuilderJSE.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/deployment/JAXWSProviderMetaDataBuilderJSE.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -71,21 +71,20 @@ { UnifiedMetaData wsMetaData = new UnifiedMetaData(); wsMetaData.setDeploymentName(udi.getCanonicalName()); - wsMetaData.setResourceLoader(resourceLoader); wsMetaData.setClassLoader(classLoader); - if (udi.annotationsCl == null) - throw new WSException("Annotations class loader not initialized"); + if (udi.classLoader == null) + throw new WSException("Deployment class loader not initialized"); // For every bean UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.metaData; - Map<String, String> servletClassMap = webMetaData.getServletClassMap(); + Map<String, String> servletClassMap = webMetaData.getServletClassNames(); for (String servletName : servletClassMap.keySet()) { String servletClassName = servletClassMap.get(servletName); try { - Class beanClass = udi.annotationsCl.loadClass(servletClassName); + Class beanClass = udi.classLoader.loadClass(servletClassName); if (beanClass.isAnnotationPresent(WebServiceProvider.class)) { setupEndpointFromAnnotations(wsMetaData, udi, beanClass, servletName); Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -104,7 +104,6 @@ try { UnifiedMetaData wsMetaData = new UnifiedMetaData(); - wsMetaData.setResourceLoader(resourceLoader); wsMetaData.setClassLoader(classLoader); ServiceMetaData serviceMetaData = new ServiceMetaData(wsMetaData, serviceQName); @@ -245,14 +244,14 @@ { if (securityConfig.getKeyStoreFile() != null) { - URL location = resourceLoader.getResource(securityConfig.getKeyStoreFile()); + URL location = classLoader.getResource(securityConfig.getKeyStoreFile()); if (location != null) securityConfig.setKeyStoreURL(location); } if (securityConfig.getTrustStoreFile() != null) { - URL location = resourceLoader.getResource(securityConfig.getTrustStoreFile()); + URL location = classLoader.getResource(securityConfig.getTrustStoreFile()); if (location != null) securityConfig.setTrustStoreURL(location); } Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -26,6 +26,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.util.Iterator; +import java.util.Map; import java.util.Set; import javax.management.ObjectName; @@ -78,7 +79,6 @@ // For every webservice-description build the ServiceMetaData UnifiedMetaData wsMetaData = new UnifiedMetaData(); wsMetaData.setDeploymentName(udi.getCanonicalName()); - wsMetaData.setResourceLoader(resourceLoader); wsMetaData.setClassLoader(classLoader); WebserviceDescriptionMetaData[] wsDescriptionArr = udi.getWebservicesMetaData().getWebserviceDescriptions(); @@ -136,7 +136,7 @@ serviceMetaData.addEndpoint(sepMetaData); initEndpointEncodingStyle(sepMetaData); - + initEndpointAddress(udi, sepMetaData, linkName); if (udi.metaData instanceof UnifiedApplicationMetaData) @@ -184,7 +184,7 @@ UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.metaData; wsMetaData.setSecurityDomain(webMetaData.getSecurityDomain()); - String targetBean = webMetaData.getServletClassMap().get(linkName); + String targetBean = webMetaData.getServletClassNames().get(linkName); sepMetaData.setServiceEndpointImplName(targetBean); // Copy the wsdl publish location from jboss-web.xml @@ -274,52 +274,7 @@ */ protected void initTransportGuaranteeJSE(UnifiedDeploymentInfo udi, EndpointMetaData epMetaData, String servletLink) throws IOException { - File warFile = new File(udi.url.getFile()); - if (warFile.isDirectory() == false) - throw new WSException("Expected a war directory: " + udi.url); - - File webXML = new File(udi.url.getFile() + "/WEB-INF/web.xml"); - if (webXML.isFile() == false) - throw new WSException("Cannot find web.xml: " + webXML); - - Element rootElement = DOMUtils.parse(new FileInputStream(webXML)); - - Element elServletMapping = null; - Iterator itServlet = DOMUtils.getChildElements(rootElement, "servlet-mapping"); - while (itServlet.hasNext() && elServletMapping == null) - { - Element elAux = (Element)itServlet.next(); - String servletName = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(elAux, "servlet-name")); - if (servletLink.equals(servletName)) - elServletMapping = elAux; - } - if (elServletMapping != null) - { - // find servlet-mapping/url-pattern - String urlPattern = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(elServletMapping, "url-pattern")); - if (urlPattern == null) - throw new WSException("Cannot find <url-pattern> for servlet-name: " + servletLink); - - Iterator itSecConstraint = DOMUtils.getChildElements(rootElement, "security-constraint"); - while (itSecConstraint.hasNext()) - { - Element elSecurityConstraint = (Element)itSecConstraint.next(); - Iterator itWebResourceCollection = DOMUtils.getChildElements(elSecurityConstraint, "web-resource-collection"); - while (itWebResourceCollection.hasNext()) - { - Element elWebResourceCollection = (Element)itWebResourceCollection.next(); - String wrcurlPattern = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(elWebResourceCollection, "url-pattern")); - if (urlPattern.equals(wrcurlPattern)) - { - Element elUserDataConstraint = DOMUtils.getFirstChildElement(elSecurityConstraint, "user-data-constraint"); - if (elUserDataConstraint != null) - { - String transportGuarantee = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(elUserDataConstraint, "transport-guarantee")); - epMetaData.setTransportGuarantee(transportGuarantee); - } - } - } - } - } + UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.metaData; + epMetaData.setTransportGuarantee(getTransportGuarantee(webMetaData, servletLink)); } } Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -63,8 +63,6 @@ import org.jboss.ws.WSException; import org.jboss.ws.addressing.AddressingPropertiesImpl; import org.jboss.ws.addressing.metadata.AddressingOpMetaExt; -import org.jboss.ws.annotation.PortComponent; -import org.jboss.ws.deployment.UnifiedDeploymentInfo.DeploymentType; import org.jboss.ws.jaxrpc.Style; import org.jboss.ws.jaxrpc.Use; import org.jboss.ws.jaxws.DynamicWrapperGenerator; @@ -82,7 +80,6 @@ import org.jboss.ws.metadata.ParameterMetaData.WrappedParameter; import org.jboss.ws.metadata.config.jaxws.WSEndpointConfigJAXWS; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; import org.jboss.ws.metadata.jsr181.HandlerChainFactory; import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; import org.jboss.ws.metadata.jsr181.HandlerChainsMetaData; @@ -139,7 +136,7 @@ if (anWebService.endpointInterface().length() > 0) { seiName = anWebService.endpointInterface(); - seiClass = udi.annotationsCl.loadClass(seiName); + seiClass = udi.classLoader.loadClass(seiName); anWebService = (WebService)seiClass.getAnnotation(WebService.class); if (anWebService == null) throw new WSException("Interface does not have a @WebService annotation: " + seiName); @@ -149,7 +146,7 @@ WSDLUtils wsdlUtils = WSDLUtils.getInstance(); - initialize(udi.annotationsCl); + initialize(udi.classLoader); String name = anWebService.name(); if (name.length() == 0) @@ -672,7 +669,7 @@ // Try the filename as Resource if (fileURL == null) { - fileURL = epMetaData.getResourceLoader().getResource(filename); + fileURL = epMetaData.getClassLoader().getResource(filename); } // Try the filename relative to class Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilderEJB21.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilderEJB21.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilderEJB21.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -54,11 +54,10 @@ { UnifiedMetaData wsMetaData = new UnifiedMetaData(); wsMetaData.setDeploymentName(udi.getCanonicalName()); - wsMetaData.setResourceLoader(resourceLoader); wsMetaData.setClassLoader(classLoader); - if (udi.annotationsCl == null) - throw new WSException("Annotations class loader not initialized"); + if (udi.classLoader == null) + throw new WSException("Deployment class loader not initialized"); // For every bean UnifiedApplicationMetaData appMetaData = (UnifiedApplicationMetaData)udi.metaData; @@ -69,7 +68,7 @@ String ejbName = beanMetaData.getEjbName(); String ejbClassName = beanMetaData.getEjbClass(); - Class beanClass = udi.annotationsCl.loadClass(ejbClassName); + Class beanClass = udi.classLoader.loadClass(ejbClassName); if (beanClass.isAnnotationPresent(WebService.class)) { setupEndpointFromAnnotations(wsMetaData, udi, beanClass, ejbName); Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilderEJB3.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilderEJB3.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilderEJB3.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -56,11 +56,10 @@ { UnifiedMetaData wsMetaData = new UnifiedMetaData(); wsMetaData.setDeploymentName(udi.getCanonicalName()); - wsMetaData.setResourceLoader(resourceLoader); wsMetaData.setClassLoader(classLoader); - if (udi.annotationsCl == null) - throw new WSException("Annotations class loader not initialized"); + if (udi.classLoader == null) + throw new WSException("Deployment class loader not initialized"); // The container objects below provide access to all of the ejb metadata UnifiedApplicationMetaData appMetaData = (UnifiedApplicationMetaData)udi.metaData; @@ -69,7 +68,7 @@ { UnifiedBeanMetaData beanMetaData = it.next(); String ejbClassName = beanMetaData.getEjbClass(); - Class beanClass = udi.annotationsCl.loadClass(ejbClassName); + Class beanClass = udi.classLoader.loadClass(ejbClassName); if (beanClass.isAnnotationPresent(WebService.class)) { String ejbLink = beanMetaData.getEjbName(); Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilderJSE.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilderJSE.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilderJSE.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -53,21 +53,20 @@ { UnifiedMetaData wsMetaData = new UnifiedMetaData(); wsMetaData.setDeploymentName(udi.getCanonicalName()); - wsMetaData.setResourceLoader(resourceLoader); wsMetaData.setClassLoader(classLoader); - if (udi.annotationsCl == null) - throw new WSException("Annotations class loader not initialized"); + if (udi.classLoader == null) + throw new WSException("Deployment class loader not initialized"); // For every bean UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.metaData; - Map<String, String> servletClassMap = webMetaData.getServletClassMap(); + Map<String, String> servletClassMap = webMetaData.getServletClassNames(); for (String servletName : servletClassMap.keySet()) { String servletClassName = servletClassMap.get(servletName); try { - Class beanClass = udi.annotationsCl.loadClass(servletClassName); + Class beanClass = udi.classLoader.loadClass(servletClassName); if (beanClass.isAnnotationPresent(WebService.class)) { setupEndpointFromAnnotations(wsMetaData, udi, beanClass, servletName); Modified: trunk/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -28,7 +28,6 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -import java.net.URLClassLoader; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -67,6 +66,8 @@ import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData; import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData; import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; @@ -96,18 +97,12 @@ private final static Logger log = Logger.getLogger(MetaDataBuilder.class); protected ClassLoader classLoader; - protected ClassLoader resourceLoader; public void setClassLoader(ClassLoader classLoader) { this.classLoader = classLoader; } - public void setResourceLoader(ClassLoader resourceLoader) - { - this.resourceLoader = resourceLoader; - } - protected WSSecurityConfiguration getWsSecurityConfiguration(UnifiedDeploymentInfo udi) throws IOException { WSSecurityConfiguration config = null; @@ -122,7 +117,7 @@ resource = "META-INF/" + resource; } - URL location = resourceLoader.getResource(resource); + URL location = classLoader.getResource(resource); if (location != null) { config = WSSecurityConfigurationFactory.newInstance().parse(location); @@ -130,14 +125,14 @@ // Get and set deployment path to the keystore file if (config.getKeyStoreFile() != null) { - location = resourceLoader.getResource(config.getKeyStoreFile()); + location = classLoader.getResource(config.getKeyStoreFile()); if (location != null) config.setKeyStoreURL(location); } if (config.getTrustStoreFile() != null) { - location = resourceLoader.getResource(config.getTrustStoreFile()); + location = classLoader.getResource(config.getTrustStoreFile()); if (location != null) config.setTrustStoreURL(location); } @@ -409,6 +404,37 @@ } } + protected String getTransportGuarantee(final UnifiedWebMetaData webMetaData, final String servletLink) + { + String transportGuarantee = ""; + + Map<String, String> servletMappings = webMetaData.getServletMappings(); + String urlPattern = servletMappings.get(servletLink); + + if (urlPattern == null) + throw new WSException("Cannot find <url-pattern> for servlet-name: " + servletLink); + + List<UnifiedWebSecurityMetaData> securityList = webMetaData.getSecurityMetaData(); + for (UnifiedWebSecurityMetaData currentSecurity : securityList) + { + if (currentSecurity.getTransportGuarantee() != null && currentSecurity.getTransportGuarantee().length() > 0) + { + for (UnifiedWebResourceCollection currentCollection : currentSecurity.getWebResources()) + { + for (String currentUrlPattern : currentCollection.getUrlPatterns()) + { + if (urlPattern.equals(currentUrlPattern)) + { + transportGuarantee = currentSecurity.getTransportGuarantee(); + } + } + } + } + } + + return transportGuarantee; + } + /** Replace the address locations for a given port component. */ protected void replaceAddressLocation(ServerEndpointMetaData epMetaData) Modified: trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/deployment/ServiceEndpointDeployer.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -76,43 +76,37 @@ if (udi.type == UnifiedDeploymentInfo.DeploymentType.JSR109_JSE) { JSR109ServerMetaDataBuilder builder = new JSR109ServerMetaDataBuilder(); - builder.setClassLoader(null); // the web context loader is not available yet - builder.setResourceLoader(udi.localCl); + builder.setClassLoader(udi.classLoader); wsMetaData = builder.buildMetaData((JSR109Deployment)udi); } else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JSR109_EJB21) { JSR109ServerMetaDataBuilder builder = new JSR109ServerMetaDataBuilder(); - builder.setClassLoader(udi.ucl); - builder.setResourceLoader(udi.localCl); + builder.setClassLoader(udi.classLoader); wsMetaData = builder.buildMetaData((JSR109Deployment)udi); } else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JSR181_JSE) { JSR181MetaDataBuilderJSE builder = new JSR181MetaDataBuilderJSE(); - builder.setClassLoader(udi.annotationsCl); - builder.setResourceLoader(udi.localCl); + builder.setClassLoader(udi.classLoader); wsMetaData = builder.buildMetaData(udi); } else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JSR181_EJB21) { JSR181MetaDataBuilderEJB21 builder = new JSR181MetaDataBuilderEJB21(); - builder.setClassLoader(udi.annotationsCl); - builder.setResourceLoader(udi.localCl); + builder.setClassLoader(udi.classLoader); wsMetaData = builder.buildMetaData(udi); } else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JSR181_EJB3) { JSR181MetaDataBuilderEJB3 builder = new JSR181MetaDataBuilderEJB3(); - builder.setClassLoader(udi.annotationsCl); - builder.setResourceLoader(udi.localCl); + builder.setClassLoader(udi.classLoader); wsMetaData = builder.buildMetaData(udi); } else if (udi.type == UnifiedDeploymentInfo.DeploymentType.JAXWS_PROVIDER_JSE) { JAXWSProviderMetaDataBuilderJSE builder = new JAXWSProviderMetaDataBuilderJSE(); - builder.setClassLoader(udi.annotationsCl); - builder.setResourceLoader(udi.localCl); + builder.setClassLoader(udi.classLoader); wsMetaData = builder.buildMetaData(udi); } else @@ -150,8 +144,8 @@ if (wsMetaData != null) { // late initialization of the web context loader - if (wsMetaData.getClassLoader() != udi.ucl) - wsMetaData.setClassLoader(udi.ucl); + if (wsMetaData.getClassLoader() != udi.classLoader) + wsMetaData.setClassLoader(udi.classLoader); // Publish the WSDL file WSDLFilePublisher wsdlfp = new WSDLFilePublisher(udi); Modified: trunk/src/main/java/org/jboss/ws/deployment/UnifiedDeploymentInfo.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/UnifiedDeploymentInfo.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/deployment/UnifiedDeploymentInfo.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -57,12 +57,8 @@ public URL expandedWebApp; /** We can hold "typed" metadata */ public Object metaData; - /** A CL for preloading annotations */ - public ClassLoader annotationsCl; - /** Local Cl is a CL that is used for metadata loading */ - public ClassLoader localCl; - /** Unified CL is a global scope class loader **/ - public ClassLoader ucl; + /** The deployment classloader **/ + public ClassLoader classLoader; /** An arbitrary map of state associated with the deployment */ public Map<String, Object> context = new HashMap<String, Object>(); Copied: trunk/src/main/java/org/jboss/ws/integration/jboss (from rev 1361, trunk/src/main/java/org/jboss/ws/integration/jbossall) Modified: trunk/src/main/java/org/jboss/ws/integration/jboss/ServerConfigImpl.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jbossall/ServerConfigImpl.java 2006-11-03 15:40:44 UTC (rev 1361) +++ trunk/src/main/java/org/jboss/ws/integration/jboss/ServerConfigImpl.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -19,7 +19,7 @@ * 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.integration.jbossall; +package org.jboss.ws.integration.jboss; //$Id$ Modified: trunk/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointServlet.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jbossall/ServiceEndpointServlet.java 2006-11-03 15:40:44 UTC (rev 1361) +++ trunk/src/main/java/org/jboss/ws/integration/jboss/ServiceEndpointServlet.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -19,7 +19,7 @@ * 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.integration.jbossall; +package org.jboss.ws.integration.jboss; // $Id$ Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -45,45 +45,45 @@ /** Depending on the type of deployment, this method should return true * if the deployment contains web service endpoints. */ - public abstract boolean isWebService(DeploymentUnit unit); + public abstract boolean isWebServiceDeployment(DeploymentUnit unit); /** Deploy the web service endpoints if there are any */ @Override public void deploy(DeploymentUnit unit) throws DeploymentException { - if (isWebService(unit)) - deployWebService(unit); + if (isWebServiceDeployment(unit)) + deployWebServiceDeployment(unit); } + /** Undeploy the web service endpoints if there are any + */ + @Override + public void undeploy(DeploymentUnit unit) + { + UnifiedDeploymentInfo udi = getUnifiedDeploymentInfo(unit); + if (udi != null) + undeployWebServiceDeployment(unit, udi); + } + /** Create the unified deployment info from the deployment unit */ protected abstract UnifiedDeploymentInfo createUnifiedDeploymentInfo(DeploymentUnit unit); - /** Create the unified deployment info and create and start th eservice endpoints + /** Create the unified deployment info and create the service endpoints * through the ServiceEndpointDeployer */ - protected void deployWebService(DeploymentUnit unit) throws DeploymentException + protected void deployWebServiceDeployment(DeploymentUnit unit) throws DeploymentException { UnifiedDeploymentInfo udi = createUnifiedDeploymentInfo(unit); unit.addAttachment(UnifiedDeploymentInfo.class, udi); - + createServiceEndpoint(udi, unit); } - /** Undeploy the web service endpoints if there are any - */ - @Override - public void undeploy(DeploymentUnit unit) - { - UnifiedDeploymentInfo udi = getUnifiedDeploymentInfo(unit); - if (udi != null) - undeployWebService(unit, udi); - } - /** Stop and destroy the service endpoints through the ServiceEndpointDeployer */ - protected void undeployWebService(DeploymentUnit unit, UnifiedDeploymentInfo udi) + protected void undeployWebServiceDeployment(DeploymentUnit unit, UnifiedDeploymentInfo udi) { destroyServiceEndpoint(udi, unit); } @@ -100,6 +100,17 @@ getServiceEndpointDeployer().destroy(udi); } + /** Override to provide the deployment type + */ + protected abstract DeploymentType getDeploymentType(); + + protected UnifiedDeploymentInfo getUnifiedDeploymentInfo(DeploymentUnit unit) + { + UnifiedDeploymentInfo udi = unit.getAttachment(UnifiedDeploymentInfo.class); + return (udi != null && udi.type == getDeploymentType() ? udi : null); + + } + protected ServiceEndpointDeployer getServiceEndpointDeployer() { KernelRegistry registry = KernelLocator.getKernel().getRegistry(); @@ -113,13 +124,4 @@ KernelRegistryEntry entry = registry.getEntry(AbstractServiceEndpointPublisher.BEAN_NAME); return (ServiceEndpointPublisher)entry.getTarget(); } - - protected abstract DeploymentType getDeploymentType(); - - protected UnifiedDeploymentInfo getUnifiedDeploymentInfo(DeploymentUnit unit) - { - UnifiedDeploymentInfo udi = unit.getAttachment(UnifiedDeploymentInfo.class); - return (udi != null && udi.type == getDeploymentType() ? udi : null); - - } } Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/AbstractJSEDeployer.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -96,13 +96,10 @@ * through the ServiceEndpointDeployer */ @Override - protected void deployWebService(DeploymentUnit unit) throws DeploymentException + protected void deployWebServiceDeployment(DeploymentUnit unit) throws DeploymentException { - // modify the WebMetaData - modifyWebMetaData(unit); - // Call the super implementation - super.deployWebService(unit); + super.deployWebServiceDeployment(unit); // FIXME: JBAS-3812 - TomcatDeployment should use modified WebMetaData URL expWebAppURL = expandWebDeployment(unit); @@ -111,13 +108,16 @@ getServiceEndpointPublisher().rewriteWebXML(expWebAppURL); unit.addAttachment(JBOSSWS_EXPANDED_WAR_URL, expWebAppURL); } + + // modify the WebMetaData + modifyWebMetaData(unit); } @Override - protected void undeployWebService(DeploymentUnit unit, UnifiedDeploymentInfo udi) + protected void undeployWebServiceDeployment(DeploymentUnit unit, UnifiedDeploymentInfo udi) { // Call the super implementation - super.undeployWebService(unit, udi); + super.undeployWebServiceDeployment(unit, udi); // FIXME: JBAS-3812 - TomcatDeployment should use modified WebMetaData URL warURL = (URL)unit.getAttachment(JBOSSWS_EXPANDED_WAR_URL); Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdaptor.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdaptor.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/DeploymentInfoAdaptor.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -55,9 +55,7 @@ udi.shortName = getShortName(unit); udi.url = getDeploymentURL(unit); udi.metaData = buildMetaData(unit); - udi.annotationsCl = unit.getClassLoader(); - udi.localCl = unit.getClassLoader(); - udi.ucl = unit.getClassLoader(); + udi.classLoader = unit.getClassLoader(); log.debug("UnifiedDeploymentInfo:\n" + udi); Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -52,14 +52,10 @@ } @Override - public boolean isWebService(DeploymentUnit unit) + public boolean isWebServiceDeployment(DeploymentUnit unit) { - boolean isWebServiceDeployment = false; - - if (getWebServicesURL(unit) != null) - isWebServiceDeployment = true; - - return isWebServiceDeployment; + URL wsURL = getWebServicesURL(unit); + return wsURL != null; } @Override Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerEJB3.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerEJB3.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerEJB3.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -58,7 +58,7 @@ } @Override - public boolean isWebService(DeploymentUnit unit) + public boolean isWebServiceDeployment(DeploymentUnit unit) { boolean isWebServiceDeployment = false; Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/JAXWSDeployerJSE.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -56,7 +56,7 @@ } @Override - public boolean isWebService(DeploymentUnit unit) + public boolean isWebServiceDeployment(DeploymentUnit unit) { boolean isWebServiceDeployment = false; Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -23,11 +23,14 @@ //$Id$ +import java.util.Set; + import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer; import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; +import org.jboss.metadata.WebMetaData; import org.jboss.ws.deployment.ServiceEndpointDeployer; import org.jboss.ws.deployment.UnifiedDeploymentInfo; import org.jboss.ws.metadata.UnifiedMetaData; @@ -49,10 +52,13 @@ UnifiedDeploymentInfo udi = unit.getAttachment(UnifiedDeploymentInfo.class); if (udi != null) { - // Always use the context class loader to initialize the endpoint - UnifiedMetaData wsMetaData = getServiceEndpointDeployer().getUnifiedMetaData(udi); - ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); - wsMetaData.setClassLoader(ctxClassLoader); + // Get the webapp context classloader and use it as the deploymet class loader + Set<? extends WebMetaData> allMetaData = unit.getAllMetaData(WebMetaData.class); + if (allMetaData.size() > 0) + { + WebMetaData webMetaData = allMetaData.iterator().next(); + udi.classLoader = webMetaData.getContextLoader(); + } log.debug("startServiceEndpoint: " + udi.getCanonicalName()); getServiceEndpointDeployer().start(udi); Modified: trunk/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/integration/jboss50/WebMetaDataAdaptor.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -23,14 +23,20 @@ // $Id$ +import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import java.util.Map; import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.WebSecurityMetaData; +import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; import org.jboss.metadata.web.Servlet; import org.jboss.metadata.web.ServletMapping; import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; /** * Build container independent web meta data @@ -45,15 +51,42 @@ UnifiedWebMetaData umd = new UnifiedWebMetaData(); umd.setContextRoot(wmd.getContextRoot()); umd.setServletMappings(getServletMappings(wmd)); - umd.setServletClassMap(getServletClassMap(wmd)); + umd.setServletClassNames(getServletClassMap(wmd)); umd.setConfigName(wmd.getConfigName()); umd.setConfigFile(wmd.getConfigFile()); - umd.setContextLoader(wmd.getContextLoader()); umd.setSecurityDomain(wmd.getSecurityDomain()); - //umd.setWsdlPublishLocationMap(wmd.getWsdlPublishLocationMap()); + umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints())); + return umd; } + protected static List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Iterator securityConstraints) + { + ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new ArrayList<UnifiedWebSecurityMetaData>(); + + while (securityConstraints.hasNext()) + { + WebSecurityMetaData securityMetaData = (WebSecurityMetaData)securityConstraints.next(); + + UnifiedWebSecurityMetaData current = new UnifiedWebSecurityMetaData(); + unifiedsecurityMetaData.add(current); + + current.setTransportGuarantee(securityMetaData.getTransportGuarantee()); + + Map<String, WebResourceCollection> resources = securityMetaData.getWebResources(); + for (WebResourceCollection webResource : resources.values()) + { + UnifiedWebResourceCollection currentResource = current.addWebResource(webResource.getName()); + for (String currentPattern : webResource.getUrlPatterns()) + { + currentResource.addPattern(currentPattern); + } + } + } + + return unifiedsecurityMetaData; + } + private static Map<String, String> getServletMappings(WebMetaData wmd) { Map<String, String> mappings = new HashMap<String, String>(); @@ -77,4 +110,15 @@ } return mappings; } + + private static Map<String, String> getTransportGuaranties(WebMetaData wmd) + { + Map<String, String> mappings = new HashMap<String, String>(); + Iterator it = wmd.getSecurityContraints(); + while(it.hasNext()) + { + WebSecurityMetaData secMetaData = (WebSecurityMetaData)it.next(); + } + return mappings; + } } Modified: trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java =================================================================== --- trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -67,9 +67,7 @@ udi.shortName = shortName; udi.url = warURL; udi.metaData = buildWebMetaData(udi, ctx); - udi.annotationsCl = loader.getParent(); - udi.localCl = loader; - udi.ucl = loader.getParent(); + udi.classLoader = loader; return udi; } @@ -80,11 +78,10 @@ UnifiedWebMetaData wmd = new UnifiedWebMetaData(); wmd.setServletMappings(getServetMappings(webXML)); - wmd.setServletClassMap(getServetClassMap(webXML)); + wmd.setServletClassNames(getServetClassMap(webXML)); wmd.setContextRoot(getContextRoot(udi.url)); wmd.setConfigName(ctx.getInitParameter("jbossws-config-name")); wmd.setConfigFile(ctx.getInitParameter("jbossws-config-file")); - wmd.setContextLoader(udi.ucl); return wmd; } Modified: trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java =================================================================== --- trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -90,7 +90,6 @@ JSR109ClientMetaDataBuilder builder = new JSR109ClientMetaDataBuilder(); ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); - builder.setResourceLoader(new URLClassLoader(new URL[] {}, ctxClassLoader)); builder.setClassLoader(ctxClassLoader); serviceMetaData = builder.buildMetaData(serviceName, wsdlURL, mappingURL, securityURL, null); @@ -106,7 +105,6 @@ JSR109ClientMetaDataBuilder builder = new JSR109ClientMetaDataBuilder(); ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); - builder.setResourceLoader(new URLClassLoader(new URL[] {}, ctxClassLoader)); builder.setClassLoader(ctxClassLoader); serviceMetaData = builder.buildMetaData(serviceName, wsdlURL, mappingURL, securityConfig, serviceRefMetaData); Modified: trunk/src/main/java/org/jboss/ws/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- trunk/src/main/java/org/jboss/ws/jaxws/spi/ServiceDelegateImpl.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/jaxws/spi/ServiceDelegateImpl.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -89,7 +89,6 @@ JAXWSClientMetaDataBuilder builder = new JAXWSClientMetaDataBuilder(); ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); - builder.setResourceLoader(new URLClassLoader(new URL[] {}, ctxClassLoader)); builder.setClassLoader(ctxClassLoader); serviceMetaData = builder.buildMetaData(serviceName, wsdlURL); Modified: trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -200,13 +200,6 @@ return classLoader; } - /** Get the class loader associated with the endpoint meta data */ - public ClassLoader getResourceLoader() - { - ClassLoader classLoader = getServiceMetaData().getUnifiedMetaData().getResourceLoader(); - return classLoader; - } - /** Lazily load the SEI. The SEI class loader may not be available at creation time. */ public Class getServiceEndpointInterface() Modified: trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -221,7 +221,7 @@ } if (mappingLocation == null) { - mappingLocation = wsMetaData.getResourceLoader().getResource(jaxrpcMappingFile); + mappingLocation = wsMetaData.getClassLoader().getResource(jaxrpcMappingFile); } if (mappingLocation == null) @@ -275,7 +275,7 @@ } if (wsdlLocation == null) { - wsdlLocation = wsMetaData.getResourceLoader().getResource(wsdlFile); + wsdlLocation = wsMetaData.getClassLoader().getResource(wsdlFile); } } return wsdlLocation; Modified: trunk/src/main/java/org/jboss/ws/metadata/UnifiedMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/UnifiedMetaData.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/metadata/UnifiedMetaData.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -23,7 +23,6 @@ // $Id$ -import java.net.URLClassLoader; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -52,8 +51,6 @@ { // The canonical deployment name private String deploymentName; - // The modules resource class loader - private ClassLoader resourceLoader; // The modules class loader private ClassLoader classLoader; // The optional security domain @@ -89,16 +86,6 @@ this.classLoader = Thread.currentThread().getContextClassLoader(); } - public ClassLoader getResourceLoader() - { - return resourceLoader; - } - - public void setResourceLoader(ClassLoader resourceLoader) - { - this.resourceLoader = resourceLoader; - } - public ClassLoader getClassLoader() { return classLoader; Modified: trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -24,6 +24,7 @@ //$Id$ import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -36,16 +37,16 @@ { /** The war context root as specified at the jboss-web.xml descriptor level. */ private String contextRoot; - /** The web.xml servlet-mapping <String, String> */ + /** The servlet-mapping <servlet-name, url-pattern> */ private Map<String, String> servletMappings = new HashMap<String, String>(); - /** The web.xml servlet <String, String> */ + /** The servlet <servlet-name, servlet-class> */ private Map<String, String> servletClassNames = new HashMap<String, String>(); + /** web.xml security-constraints */ + private List<UnifiedWebSecurityMetaData> securityMetaData; /** The optional JBossWS config-name */ private String configName; /** The optional JBossWS config-file */ private String configFile; - /** The web context class loader, used to create the ws4ee service endpoint */ - private ClassLoader ctxLoader; /** The security-domain value assigned to the application */ private String securityDomain; /** A HashMap<String, String> for webservice description publish locations */ @@ -71,12 +72,12 @@ this.servletMappings = servletMappings; } - public Map<String, String> getServletClassMap() + public Map<String, String> getServletClassNames() { return servletClassNames; } - public void setServletClassMap(Map<String, String> servletClassNames) + public void setServletClassNames(Map<String, String> servletClassNames) { this.servletClassNames = servletClassNames; } @@ -101,24 +102,24 @@ this.configFile = configFile; } - public ClassLoader getContextLoader() + public String getSecurityDomain() { - return ctxLoader; + return securityDomain; } - public void setContextLoader(ClassLoader ctxLoader) + public void setSecurityDomain(String securityDomain) { - this.ctxLoader = ctxLoader; + this.securityDomain = securityDomain; } - public String getSecurityDomain() + public List<UnifiedWebSecurityMetaData> getSecurityMetaData() { - return securityDomain; + return securityMetaData; } - public void setSecurityDomain(String securityDomain) + public void setSecurityMetaData(List<UnifiedWebSecurityMetaData> securityMetaData) { - this.securityDomain = securityDomain; + this.securityMetaData = securityMetaData; } public void setWsdlPublishLocationMap(Map<String, String> wsdlPublishLocationMap) Added: trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebSecurityMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebSecurityMetaData.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebSecurityMetaData.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -0,0 +1,95 @@ +/* + * 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.metadata.j2ee; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since Oct 22, 2006 + */ +public class UnifiedWebSecurityMetaData +{ + + /** The optional security-constraint/user-data-constraint/transport-guarantee */ + private String transportGuarantee; + + /** + * The HashMap for the security-constraint/web-resource-collection + * elements. + */ + private HashMap<String, UnifiedWebResourceCollection> webResources = new HashMap<String, UnifiedWebResourceCollection>(); + + public UnifiedWebResourceCollection addWebResource(final String name) + { + UnifiedWebResourceCollection wrc = new UnifiedWebResourceCollection(name); + webResources.put(name, wrc); + + return wrc; + } + + public Collection<UnifiedWebResourceCollection> getWebResources() + { + return webResources.values(); + } + + public String getTransportGuarantee() + { + return transportGuarantee; + } + + public void setTransportGuarantee(String transportGuarantee) + { + this.transportGuarantee = transportGuarantee; + } + + public static class UnifiedWebResourceCollection + { + private String name; + /** The required url-pattern element(s) */ + private HashSet<String> urlPatterns = new HashSet<String>(); + + public UnifiedWebResourceCollection(final String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + + public void addPattern(String pattern) + { + urlPatterns.add(pattern); + } + + public HashSet<String> getUrlPatterns() + { + return urlPatterns; + } + } + +} Property changes on: trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebSecurityMetaData.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/src/main/java/org/jboss/ws/server/WSDLFilePublisher.java =================================================================== --- trunk/src/main/java/org/jboss/ws/server/WSDLFilePublisher.java 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/java/org/jboss/ws/server/WSDLFilePublisher.java 2006-11-03 20:23:13 UTC (rev 1363) @@ -215,7 +215,7 @@ resourcePath = resourcePath + "/"; resourcePath = expLocation + resourcePath + schemaLocation; - InputStream is = udi.localCl.getResourceAsStream(resourcePath); + InputStream is = udi.classLoader.getResourceAsStream(resourcePath); if (is == null) throw new IllegalArgumentException("Cannot find schema import in deployment: " + resourcePath); Modified: trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2006-11-03 16:55:52 UTC (rev 1362) +++ trunk/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2006-11-03 20:23:13 UTC (rev 1363) @@ -19,9 +19,9 @@ <property name="alwaysModifySOAPAddress">true</property> <property name="serviceEndpointInvokerJSE">org.jboss.ws.server.ServiceEndpointInvokerJSE</property> - <property name="serviceEndpointInvokerEJB21">org.jboss.ws.integration.jbossall.ServiceEndpointInvokerEJB21</property> + <property name="serviceEndpointInvokerEJB21">org.jboss.ws.integration.jboss.ServiceEndpointInvokerEJB21</property> <property name="serviceEndpointInvokerEJB3">org.jboss.ws.integration.jboss50.ServiceEndpointInvokerEJB3</property> - <property name="serviceEndpointInvokerMDB">org.jboss.ws.integration.jbossall.ServiceEndpointInvokerMDB</property> + <property name="serviceEndpointInvokerMDB">org.jboss.ws.integration.jboss.ServiceEndpointInvokerMDB</property> </bean> <bean name="ServiceEndpointDeployer" class="org.jboss.ws.deployment.ServiceEndpointDeployer"> @@ -32,13 +32,13 @@ <bean name="ServiceEndpointPublisher" class="org.jboss.ws.integration.jboss50.ServiceEndpointPublisher"> <property name="mainDeployer"><inject bean="MainDeployer"/></property> - <property name="serviceEndpointServlet">org.jboss.ws.integration.jbossall.ServiceEndpointServlet</property> + <property name="serviceEndpointServlet">org.jboss.ws.integration.jboss.ServiceEndpointServlet</property> </bean> <!-- A subscription manager for WS-Eventing --> <bean name="SubscriptionManager" class="org.jboss.ws.eventing.mgmt.SubscriptionManager"/> - <bean name="ServerConfig" class="org.jboss.ws.integration.jbossall.ServerConfigImpl"/> + <bean name="ServerConfig" class="org.jboss.ws.integration.jboss.ServerConfigImpl"/> <bean name="KernelLocator" class="org.jboss.ws.server.KernelLocator"> <!--property name="kernel">