Author: ropalka Date: 2012-03-21 04:32:21 -0400 (Wed, 21 Mar 2012) New Revision: 16005 Removed: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/extensions/security/ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/wsse/ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/jboss-ws-security_1_0.xsd stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/oasis-200401-wss-wssecurity-secext-1.0.xsd stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/oasis-200401-wss-wssecurity-utility-1.0.xsd stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-interop.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/MicrosoftGeneratedWSDLTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/interop/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1121/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1188/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1316/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1309/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1814/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2011/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2014/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3182/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3277/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/wsdl11/microsoft-interop/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/interop/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1121/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1188/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws1316/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wssecurity/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1309/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1814/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1988/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1991/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1999/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2011/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2014/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2182/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3182/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3277/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/samples/news/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/samples/wssecurity/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/samples/wssecurityAnnotatedpolicy/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/samples/wssecuritypolicy/ Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/ConfigProvider.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/StubExt.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/serviceref/NativeServiceObjectFactoryJAXRPC.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/serviceref/NativeServiceReferenceableJAXRPC.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointConfigMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JAXBWSDLGenerator.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/jbossws-entities.properties stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wstools.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-benchmark.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml stack/native/branches/jbossws-native-4.0.x/pom.xml Log: [JBPAPP-7572] Merged revisions 16003 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r16003 | ropalka | 2012-03-20 16:25:16 +0100 (Tue, 20 Mar 2012) | 1 line [JBWS-3468] removing ws-security support ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003 Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/pom.xml 2012-03-21 08:32:21 UTC (rev 16005) @@ -70,18 +70,6 @@ </dependency> <!-- jboss provided --> <dependency> - <groupId>org.jboss.security</groupId> - <artifactId>jbosssx</artifactId> - <scope>provided</scope> - <version>${jboss.jbosssx.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.security</groupId> - <artifactId>jboss-security-spi</artifactId> - <scope>provided</scope> - <version>${jboss.jbosssx.version}</version> - </dependency> - <dependency> <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> <scope>provided</scope> @@ -150,10 +138,6 @@ <artifactId>wsdl4j</artifactId> </dependency> <dependency> - <groupId>org.apache.santuario</groupId> - <artifactId>xmlsec</artifactId> - </dependency> - <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </dependency> Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-03-21 08:32:21 UTC (rev 16005) @@ -21,7 +21,6 @@ */ package org.jboss.ws.core; -import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; @@ -68,8 +67,6 @@ import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; -import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; @@ -97,8 +94,6 @@ private Map<QName, UnboundHeader> unboundHeaders = new LinkedHashMap<QName, UnboundHeader>(); // A List<AttachmentPart> of attachment parts set through the proxy private List<AttachmentPart> attachmentParts = new ArrayList<AttachmentPart>(); - // The WS-Security config - private String securityConfig; /** Create a call that needs to be configured manually */ @@ -459,6 +454,7 @@ responseContext.put(MessageContext.HTTP_RESPONSE_HEADERS, remotingMetadata.get(NettyClient.RESPONSE_HEADERS)); } + @SuppressWarnings({"unchecked", "rawtypes"}) private void saveSessionInfo(Map<String, Object> remotingMetadata, Map<String, Object> requestContext) { Map<String, String> cookies = (Map)requestContext.get(SESSION_COOKIES); @@ -501,9 +497,10 @@ } } + @SuppressWarnings("unchecked") protected void addSessionInfo(MessageAbstraction reqMessage, Map<String, Object> callProperties) { - Map<String, String> cookies = (Map)callProperties.get(SESSION_COOKIES); + Map<String, String> cookies = (Map<String, String>)callProperties.get(SESSION_COOKIES); if (cookies != null) { for (Map.Entry<String, String> cookie : cookies.entrySet()) @@ -513,6 +510,7 @@ } } + @SuppressWarnings("unchecked") private void propagateRequestHeaders(MessageAbstraction reqMessage, CommonMessageContext callProperties) { Map<String, List<String>> requestHeaders = (Map<String, List<String>>)callProperties.get(MessageContext.HTTP_REQUEST_HEADERS); @@ -741,34 +739,4 @@ EndpointMetaData epMetaData = getEndpointMetaData(); return epMetaData.getConfigFile(); } - - public String getSecurityConfig() - { - return securityConfig; - } - - public void setSecurityConfig(String securityConfig) - { - this.securityConfig = securityConfig; - - if (securityConfig != null) - { - EndpointMetaData epMetaData = getEndpointMetaData(); - ServiceMetaData serviceMetaData = epMetaData.getServiceMetaData(); - if (serviceMetaData.getSecurityConfiguration() == null) - { - try - { - WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance(); - UnifiedVirtualFile vfsRoot = serviceMetaData.getUnifiedMetaData().getRootFile(); - WSSecurityConfiguration config = wsseConfFactory.createConfiguration(vfsRoot, securityConfig); - serviceMetaData.setSecurityConfiguration(config); - } - catch (IOException ex) - { - WSException.rethrow("Cannot set security config", ex); - } - } - } - } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/ConfigProvider.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/ConfigProvider.java 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/ConfigProvider.java 2012-03-21 08:32:21 UTC (rev 16005) @@ -48,14 +48,4 @@ * Set the port configuration name and file */ void setConfigName(String configName, String configFile); - - /** - * Get the WS-Security configuration - */ - String getSecurityConfig(); - - /** - * Set the WS-Security configuration - */ - void setSecurityConfig(String securityConfig); } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/StubExt.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/StubExt.java 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/StubExt.java 2012-03-21 08:32:21 UTC (rev 16005) @@ -65,8 +65,6 @@ static final String PROPERTY_AUTH_TYPE = "org.jboss.ws.authType"; /** Authentication type, BASIC */ static final String PROPERTY_AUTH_TYPE_BASIC = "org.jboss.ws.authType.basic"; - /** Authentication type, WSEE */ - static final String PROPERTY_AUTH_TYPE_WSSE = "org.jboss.ws.authType.wsse"; /** Enable MTOM on the stub */ static final String PROPERTY_MTOM_ENABLED= "org.jboss.ws.mtom.enabled"; /** HTTP chunk size */ Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2012-03-21 08:32:21 UTC (rev 16005) @@ -53,7 +53,7 @@ import org.jboss.netty.handler.codec.http.HttpRequest; import org.jboss.netty.handler.codec.http.HttpVersion; import org.jboss.netty.handler.ssl.SslHandler; -import org.jboss.security.Base64Encoder; +import org.jboss.util.Base64; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.StubExt; @@ -414,7 +414,7 @@ private static String getBasicAuthHeader(String username, String password) throws IOException { - return "Basic " + Base64Encoder.encode(username + ":" + password); + return "Basic " + new String(Base64.encodeBytes((username + ":" + password).getBytes("ISO-8859-1"), Base64.DONT_BREAK_LINES)); } /** Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2012-03-21 08:32:21 UTC (rev 16005) @@ -58,7 +58,6 @@ import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; @@ -90,9 +89,7 @@ // The optional WSDL location private URL wsdlLocation; private URL mappingURL; - private URL securityURL; private JavaWsdlMapping mappingConfig; - private WSSecurityConfiguration securityConfig; // The <service-ref> meta data private UnifiedServiceRefMetaData usrMetaData; @@ -120,19 +117,17 @@ this.serviceName = serviceName; this.wsdlLocation = wsdlURL; this.mappingURL = mappingURL; - this.securityURL = securityURL; init(); } /** * Construct a Service that has access to some WSDL meta data */ - public ServiceImpl(QName serviceName, URL wsdlURL, JavaWsdlMapping mappingURL, WSSecurityConfiguration securityConfig, UnifiedServiceRefMetaData usrMetaData) + public ServiceImpl(QName serviceName, URL wsdlURL, JavaWsdlMapping mappingURL, UnifiedServiceRefMetaData usrMetaData) { this.serviceName = serviceName; this.wsdlLocation = wsdlURL; this.mappingConfig = mappingURL; - this.securityConfig = securityConfig; this.usrMetaData = usrMetaData; init(); } @@ -141,9 +136,7 @@ out.writeObject(serviceName); out.writeObject(wsdlLocation); out.writeObject(mappingURL); - out.writeObject(securityURL); out.writeObject(mappingConfig); - out.writeObject(securityConfig); out.writeObject(usrMetaData); } @@ -151,30 +144,28 @@ serviceName = (QName)in.readObject(); wsdlLocation = (URL)in.readObject(); mappingURL = (URL)in.readObject(); - securityURL = (URL)in.readObject(); mappingConfig = (JavaWsdlMapping)in.readObject(); - securityConfig = (WSSecurityConfiguration)in.readObject(); usrMetaData = (UnifiedServiceRefMetaData)in.readObject(); init(); } private void init() { - if ((wsdlLocation == null) && (mappingURL == null) && (securityURL == null) && (securityConfig == null) && (mappingConfig == null) && (usrMetaData == null)) { + if ((wsdlLocation == null) && (mappingURL == null) && (mappingConfig == null) && (usrMetaData == null)) { UnifiedMetaData wsMetaData = new UnifiedMetaData(new ResourceLoaderAdapter()); serviceMetaData = new ServiceMetaData(wsMetaData, serviceName); handlerRegistry = new HandlerRegistryImpl(serviceMetaData); return; } - if ((mappingURL != null) || (securityURL != null)) { + if (mappingURL != null) { JAXRPCClientMetaDataBuilder builder = new JAXRPCClientMetaDataBuilder(); ClassLoader ctxClassLoader = SecurityActions.getContextClassLoader(); - serviceMetaData = builder.buildMetaData(serviceName, wsdlLocation, mappingURL, securityURL, null, ctxClassLoader); + serviceMetaData = builder.buildMetaData(serviceName, wsdlLocation, mappingURL, null, ctxClassLoader); handlerRegistry = new HandlerRegistryImpl(serviceMetaData); return; } JAXRPCClientMetaDataBuilder builder = new JAXRPCClientMetaDataBuilder(); ClassLoader ctxClassLoader = SecurityActions.getContextClassLoader(); - serviceMetaData = builder.buildMetaData(serviceName, wsdlLocation, mappingConfig, securityConfig, usrMetaData, ctxClassLoader); + serviceMetaData = builder.buildMetaData(serviceName, wsdlLocation, mappingConfig, usrMetaData, ctxClassLoader); handlerRegistry = new HandlerRegistryImpl(serviceMetaData); } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/serviceref/NativeServiceObjectFactoryJAXRPC.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/serviceref/NativeServiceObjectFactoryJAXRPC.java 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/serviceref/NativeServiceObjectFactoryJAXRPC.java 2012-03-21 08:32:21 UTC (rev 16005) @@ -63,7 +63,6 @@ import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Endpoint; @@ -131,24 +130,6 @@ throw ne; } - // Unmarshall the WSSecurityConfiguration - WSSecurityConfiguration securityConfig = null; - RefAddr wsseRefAddr = ref.get(NativeServiceReferenceableJAXRPC.SECURITY_CONFIG); - if (wsseRefAddr != null) - { - bais = new ByteArrayInputStream((byte[])wsseRefAddr.getContent()); - try - { - ObjectInputStream ois = new ObjectInputStream(bais); - securityConfig = (WSSecurityConfiguration)ois.readObject(); - ois.close(); - } - catch (IOException e) - { - throw new NamingException(BundleUtils.getMessage(bundle, "CANNOT_UNMARSHALL_SECURITY_CONFIG", e.toString())); - } - } - ServiceImpl jaxrpcService = null; URL wsdlLocation = serviceRef.getWsdlLocation(); if (wsdlLocation != null) @@ -159,7 +140,7 @@ // Create the actual service object QName serviceName = serviceRef.getServiceQName(); JavaWsdlMapping javaWsdlMapping = getJavaWsdlMapping(serviceRef); - jaxrpcService = new ServiceImpl(serviceName, wsdlLocation, javaWsdlMapping, securityConfig, serviceRef); + jaxrpcService = new ServiceImpl(serviceName, wsdlLocation, javaWsdlMapping, serviceRef); } else { Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/serviceref/NativeServiceReferenceableJAXRPC.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/serviceref/NativeServiceReferenceableJAXRPC.java 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/serviceref/NativeServiceReferenceableJAXRPC.java 2012-03-21 08:32:21 UTC (rev 16005) @@ -24,7 +24,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectOutputStream; -import java.net.URL; import java.util.ResourceBundle; import javax.naming.BinaryRefAddr; @@ -34,12 +33,8 @@ import javax.naming.StringRefAddr; import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; -import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; -import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; @@ -58,12 +53,10 @@ { private static final ResourceBundle bundle = BundleUtils.getBundle(NativeServiceReferenceableJAXRPC.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"; public static final String PORT_COMPONENT_LINK_SERVLET = "PORT_COMPONENT_LINK_SERVLET"; private UnifiedServiceRefMetaData refMetaData; - private UnifiedVirtualFile vfsRoot; /** * A service referenceable for a WSDL document that is part of the deployment @@ -71,7 +64,6 @@ public NativeServiceReferenceableJAXRPC(UnifiedServiceRefMetaData refMetaData) { this.refMetaData = refMetaData; - this.vfsRoot = refMetaData.getVfsRoot(); } /** @@ -87,10 +79,6 @@ // Add a reference to the ServiceRefMetaData and WSDLDefinitions myRef.add(new BinaryRefAddr(SERVICE_REF_META_DATA, marshallServiceRef())); - // FIXME: JBWS-1431 Merge ws-security config with jaxrpc/jaxws config - if (getSecurityConfig() != null) - myRef.add(new BinaryRefAddr(SECURITY_CONFIG, marshallSecurityConfig())); - // Add references to port component links for (UnifiedPortComponentRefMetaData pcr : refMetaData.getPortComponentRefs()) { @@ -137,49 +125,4 @@ return baos.toByteArray(); } - /** Marshall the WSSecurityConfiguration to an byte array - */ - private byte[] marshallSecurityConfig() throws NamingException - { - ByteArrayOutputStream baos = new ByteArrayOutputStream(512); - try - { - WSSecurityConfiguration securityConfig = WSSecurityConfigFactory.newInstance().createConfiguration( - refMetaData.getVfsRoot(), WSSecurityOMFactory.CLIENT_RESOURCE_NAME - ); - - ObjectOutputStream oos = new ObjectOutputStream(baos); - oos.writeObject(securityConfig); - oos.close(); - } - catch (IOException e) - { - throw new NamingException(BundleUtils.getMessage(bundle, "CANNOT_MARSHALL_SECURITY_CONFIG", e.toString())); - } - return baos.toByteArray(); - } - - private URL getSecurityConfig() - { - URL securityConfigURL = null; - try - { - UnifiedVirtualFile vfConfig = vfsRoot.findChild("WEB-INF/" + WSSecurityOMFactory.CLIENT_RESOURCE_NAME); - securityConfigURL = vfConfig.toURL(); - } - catch (IOException ex) - { - // ignore - } - try - { - UnifiedVirtualFile vfConfig = vfsRoot.findChild("META-INF/" + WSSecurityOMFactory.CLIENT_RESOURCE_NAME); - securityConfigURL = vfConfig.toURL(); - } - catch (IOException ex) - { - // ignore - } - return securityConfigURL; - } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2012-03-21 08:32:21 UTC (rev 16005) @@ -81,8 +81,6 @@ import org.jboss.ws.metadata.umdm.FeatureAwareEndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; -import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.w3c.dom.Node; @@ -599,35 +597,6 @@ epMetaData.setConfigName(configName, configFile); } - public String getSecurityConfig() - { - return securityConfig; - } - - public void setSecurityConfig(String securityConfig) - { - this.securityConfig = securityConfig; - - if (securityConfig != null) - { - ServiceMetaData serviceMetaData = epMetaData.getServiceMetaData(); - if (serviceMetaData.getSecurityConfiguration() == null) - { - try - { - WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance(); - UnifiedVirtualFile vfsRoot = serviceMetaData.getUnifiedMetaData().getRootFile(); - WSSecurityConfiguration config = wsseConfFactory.createConfiguration(vfsRoot, securityConfig); - serviceMetaData.setSecurityConfiguration(config); - } - catch (IOException ex) - { - WSException.rethrow("Cannot set security config", ex); - } - } - } - } - private boolean callRequestHandlerChain(QName portName, HandlerType type) { BindingExt binding = (BindingExt)bindingProvider.getBinding(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2012-03-21 08:32:21 UTC (rev 16005) @@ -125,7 +125,7 @@ throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "INVALID_ADDRESS", addr)); } - // Check with the security manger + // Check with the security manager this.checkPublishEndpointPermission(); // Get HTTP server @@ -154,7 +154,7 @@ if (isDestroyed) throw new IllegalStateException(BundleUtils.getMessage(bundle, "ENDPOINT_ALREADY_DESTROYED")); - // Check with the security manger + // Check with the security manager checkPublishEndpointPermission(); if (context instanceof HttpContext) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/utils/ThreadLocalAssociation.java 2012-03-21 08:32:21 UTC (rev 16005) @@ -21,13 +21,9 @@ */ package org.jboss.ws.core.utils; -import java.security.PublicKey; -import java.util.List; import java.util.Stack; -import org.jboss.security.auth.callback.CallbackHandlerPolicyContextHandler; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.extensions.security.SecurityStore; /** * Maintain thread locals at a single point. @@ -38,46 +34,15 @@ */ public class ThreadLocalAssociation { - /** - * SOAP message context - * @see org.jboss.ws.core.soap.MessageContextAssociation - */ private static ThreadLocal<Stack<CommonMessageContext>> msgContextAssoc = new ThreadLocal<Stack<CommonMessageContext>>(); - /** - * @see org.jboss.ws.extensions.security.STRTransform - */ - private static ThreadLocal<SecurityStore> strTransformAssoc = new ThreadLocal<SecurityStore>(); - - /** - * Public keys used to sign incoming message - */ - private static ThreadLocal<List<PublicKey>> signatureKeysAssoc = new ThreadLocal<List<PublicKey>>(); - public static ThreadLocal<Stack<CommonMessageContext>> localMsgContextAssoc() { return msgContextAssoc; } - public static ThreadLocal<SecurityStore> localStrTransformAssoc() - { - return strTransformAssoc; - } - - public static ThreadLocal<List<PublicKey>> localSignatureKeysAssoc() - { - return signatureKeysAssoc; - } - public static void clear() { msgContextAssoc.remove(); - strTransformAssoc.remove(); - signatureKeysAssoc.remove(); - //This removes a custom callback security handler that might have - //been set if using UsernameTokenProfile with digest; doing this - //here won't be required anymore once our custom security manager - //will be used in our wsse implementation. - CallbackHandlerPolicyContextHandler.setCallbackHandler(null); } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2012-03-21 08:32:21 UTC (rev 16005) @@ -46,9 +46,6 @@ import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLService; -import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; -import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; @@ -67,7 +64,7 @@ /** Build from WSDL and jaxrpc-mapping.xml */ - public ServiceMetaData buildMetaData(QName serviceQName, URL wsdlURL, URL mappingURL, URL securityURL, + public ServiceMetaData buildMetaData(QName serviceQName, URL wsdlURL, URL mappingURL, UnifiedServiceRefMetaData serviceRefMetaData, ClassLoader loader) { try @@ -79,13 +76,7 @@ javaWsdlMapping = mappingFactory.parse(mappingURL); } - WSSecurityConfiguration securityConfig = null; - if (securityURL != null) - { - securityConfig = WSSecurityOMFactory.newInstance().parse(securityURL); - } - - return buildMetaData(serviceQName, wsdlURL, javaWsdlMapping, securityConfig, serviceRefMetaData, loader); + return buildMetaData(serviceQName, wsdlURL, javaWsdlMapping, serviceRefMetaData, loader); } catch (RuntimeException rte) { @@ -99,7 +90,7 @@ /** Build from WSDL and jaxrpc-mapping.xml */ - public ServiceMetaData buildMetaData(QName serviceQName, URL wsdlURL, JavaWsdlMapping javaWsdlMapping, WSSecurityConfiguration securityConfig, + public ServiceMetaData buildMetaData(QName serviceQName, URL wsdlURL, JavaWsdlMapping javaWsdlMapping, UnifiedServiceRefMetaData usrMetaData, ClassLoader loader) { if(log.isDebugEnabled()) log.debug("START buildMetaData: [service=" + serviceQName + "]"); @@ -127,12 +118,6 @@ serviceMetaData.setMappingLocation(mappingURL); } - if (securityConfig != null) - { - serviceMetaData.setSecurityConfiguration(securityConfig); - setupSecurity(securityConfig, wsMetaData.getRootFile()); - } - buildMetaDataInternal(serviceMetaData, wsdlDefinitions, javaWsdlMapping, usrMetaData); // eagerly initialize @@ -242,27 +227,4 @@ } } } - - private void setupSecurity(WSSecurityConfiguration securityConfig, UnifiedVirtualFile vfsRoot) - { - if (securityConfig.getKeyStoreFile() != null) - { - try { - UnifiedVirtualFile child = vfsRoot.findChild( securityConfig.getKeyStoreFile() ); - securityConfig.setKeyStoreURL(child.toURL()); - } catch (IOException e) { - // ignore - } - } - - if (securityConfig.getTrustStoreFile() != null) - { - try { - UnifiedVirtualFile child = vfsRoot.findChild( securityConfig.getTrustStoreFile() ); - securityConfig.setTrustStoreURL(child.toURL()); - } catch (IOException e) { - // Ignore - } - } - } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2012-03-21 08:32:21 UTC (rev 16005) @@ -40,9 +40,6 @@ import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLService; -import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; -import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; -import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; @@ -109,11 +106,6 @@ // Build type mapping meta data setupTypesMetaData(serviceMetaData); - // Assign the WS-Security configuration, - WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance(); - WSSecurityConfiguration securityConfiguration = wsseConfFactory.createConfiguration(wsMetaData.getRootFile(), WSSecurityOMFactory.SERVER_RESOURCE_NAME); - serviceMetaData.setSecurityConfiguration(securityConfiguration); - // For every port-component build the EndpointMetaData PortComponentMetaData[] pcMetaDataArr = wsdMetaData.getPortComponents(); for (PortComponentMetaData pcMetaData : pcMetaDataArr) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2012-03-21 08:32:21 UTC (rev 16005) @@ -53,9 +53,6 @@ import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; -import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; -import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; import org.jboss.ws.tools.ToolsUtils; import org.jboss.ws.tools.wsdl.JAXBWSDLGenerator; import org.jboss.ws.tools.wsdl.WSDLGenerator; @@ -125,11 +122,6 @@ sepMetaData.setServiceEndpointImplName(sepClass.getName()); sepMetaData.setServiceEndpointInterfaceName(seiClass.getName()); - // Assign the WS-Security configuration, - WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance(); - WSSecurityConfiguration securityConfiguration = wsseConfFactory.createConfiguration(wsMetaData.getRootFile(), WSSecurityOMFactory.SERVER_RESOURCE_NAME); - serviceMetaData.setSecurityConfiguration(securityConfiguration); - // Process an optional @SOAPBinding annotation processSOAPBinding(sepMetaData, seiClass); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointConfigMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointConfigMetaData.java 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointConfigMetaData.java 2012-03-21 08:32:21 UTC (rev 16005) @@ -153,12 +153,6 @@ return epMetaData; } - void validate() - { - for (HandlerMetaData handler : handlers) - handler.validate(); - } - void initializeInternal() { // Initialize handlers Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-03-21 08:32:21 UTC (rev 16005) @@ -544,8 +544,6 @@ public void validate() { - getEndpointConfigMetaData().validate(); - for (OperationMetaData opMetaData : operations) opMetaData.validate(); } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java 2012-03-21 08:32:21 UTC (rev 16005) @@ -151,21 +151,6 @@ return initParams; } - public void validate() - { - List<String> securityHandlers = new ArrayList<String>(); - securityHandlers.add(org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerInbound.class.getName()); - securityHandlers.add(org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerOutbound.class.getName()); - securityHandlers.add(org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer.class.getName()); - securityHandlers.add(org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerClient.class.getName()); - - if (securityHandlers.contains(handlerClassName) && epMetaData != null) - { - if (epMetaData.getServiceMetaData().getSecurityConfiguration() == null) - log.warn(BundleUtils.getMessage(bundle, "REQUIRES_SECURITY_CONFIGURATION")); - } - } - public void eagerInitialize() { handlerClass = getHandlerClass(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2012-03-21 08:32:21 UTC (rev 16005) @@ -49,10 +49,8 @@ import org.jboss.ws.metadata.wsdl.WSDLTypes; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; /** @@ -95,9 +93,6 @@ // derived cached encoding style private Use encStyle; - // The security configuration - private WSSecurityConfiguration securityConfig; - // The key to the wsdl cache private String wsdlCacheKey; @@ -343,16 +338,6 @@ return typeMapping; } - public WSSecurityConfiguration getSecurityConfiguration() - { - return securityConfig; - } - - public void setSecurityConfiguration(WSSecurityConfiguration securityConfiguration) - { - this.securityConfig = securityConfiguration; - } - public Use getEncodingStyle() { if (encStyle == null) @@ -393,19 +378,6 @@ public void validate() { - // Validate that there is at least one handler configured - // if we have a security configuration - if (securityConfig != null) - { - int handlerCount = 0; - for (EndpointMetaData epMetaData : endpoints.values()) - { - handlerCount += epMetaData.getHandlerMetaData(HandlerType.ALL).size(); - } - if (handlerCount == 0) - log.warn(BundleUtils.getMessage(bundle, "REQUIRES_A_SECURITY_HANDLER")); - } - // Validate endpoints for (EndpointMetaData epMetaData : endpoints.values()) epMetaData.validate(); @@ -457,7 +429,6 @@ buffer.append("\n wsdlLocation=" + wsdlLocation); buffer.append("\n jaxrpcMapping=" + mappingLocation); buffer.append("\n publishLocation=" + wsdlPublishLocation); - buffer.append("\n securityConfig=" + (securityConfig != null ? "found" : null)); buffer.append("\n properties=" + properties); buffer.append("\n" + types); buffer.append("\n"); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JAXBWSDLGenerator.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JAXBWSDLGenerator.java 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/JAXBWSDLGenerator.java 2012-03-21 08:32:21 UTC (rev 16005) @@ -33,10 +33,10 @@ import org.jboss.ws.WSException; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; -import org.jboss.ws.extensions.security.Util; import org.jboss.ws.metadata.wsdl.DOMTypes; import org.w3c.dom.Document; import org.w3c.dom.Element; +import org.w3c.dom.Node; import com.sun.xml.bind.api.JAXBRIContext; @@ -112,7 +112,7 @@ private void removeSchemaLocations(Element element) { - for (Element child = Util.getFirstChildElement(element); child != null; child = Util.getNextSiblingElement(child)) + for (Element child = getFirstChildElement(element); child != null; child = getNextSiblingElement(child)) { if ("import".equals(child.getLocalName()) && Constants.NS_SCHEMA_XSD.equals(child.getNamespaceURI()) && "replace-me".equals(child.getAttribute("schemaLocation"))) @@ -130,4 +130,23 @@ } } } + + public static Element getFirstChildElement(Node node) + { + Node child = node.getFirstChild(); + while (child != null && child.getNodeType() != Node.ELEMENT_NODE) + child = child.getNextSibling(); + + return (Element)child; + } + + public static Element getNextSiblingElement(Element element) + { + Node sibling = element.getNextSibling(); + while (sibling != null && sibling.getNodeType() != Node.ELEMENT_NODE) + sibling = sibling.getNextSibling(); + + return (Element)sibling; + } + } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/jbossws-entities.properties =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2012-03-21 08:32:21 UTC (rev 16005) @@ -1,6 +1,5 @@ urn\:jboss\:jaxrpc-config\:2.0=schema/jaxrpc-config_2_0.xsd urn\:jboss\:jaxws-config\:2.0=schema/jaxws-config_2_0.xsd -http\://www.jboss.com/ws-security/config=schema/jboss-ws-security_1_0.xsd http\://www.jboss.org/jbossws-tools=schema/jbossws-tool_1_0.xsd http\://java.sun.com/xml/ns/javaee=schema/javaee_web_services_1_2.xsd http\://www.w3.org/2005/08/addressing=schema/ws-addr-2006-03.xsd @@ -15,7 +14,5 @@ http\://www.w3.org/2003/11/wsdl=schema/wsdl20.xsd http\://www.w3.org/2005/05/xmlmime=schema/xml-media-types.xsd http\://www.w3.org/XML/1998/namespace=schema/xml.xsd -http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd=schema/oasis-200401-wss-wssecurity-secext-1.0.xsd -http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd=schema/oasis-200401-wss-wssecurity-utility-1.0.xsd http\://www.w3.org/2000/09/xmldsig#=schema/xmldsig-core-schema.xsd http\://java.sun.com/xml/ns/javaee/javaee_web_services_metadata_handler_2_0.xsd=schema/javaee_web_services_metadata_handler_2_0.xsd Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml 2012-03-21 08:32:21 UTC (rev 16005) @@ -23,15 +23,4 @@ </post-handler-chain> </client-config> - <client-config> - <config-name>Standard WSSecurity Client</config-name> - <post-handler-chain> - <handler-chain-name>WSSecurity Handlers</handler-chain-name> - <handler> - <j2ee:handler-name>WSSecurityHandlerOutbound</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerOutbound</j2ee:handler-class> - </handler> - </post-handler-chain> - </client-config> - </jaxrpc-config> \ No newline at end of file Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml 2012-03-21 08:32:21 UTC (rev 16005) @@ -23,15 +23,4 @@ </pre-handler-chain> </endpoint-config> - <endpoint-config> - <config-name>Standard WSSecurity Endpoint</config-name> - <pre-handler-chain> - <handler-chain-name>WSSecurity Handlers</handler-chain-name> - <handler> - <j2ee:handler-name>WSSecurityHandlerInbound</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerInbound</j2ee:handler-class> - </handler> - </pre-handler-chain> - </endpoint-config> - </jaxrpc-config> \ No newline at end of file Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml 2012-03-21 08:32:21 UTC (rev 16005) @@ -43,17 +43,4 @@ </post-handler-chains> </client-config> - <client-config> - <config-name>Standard WSSecurity Client</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSSecurityHandlerOutbound</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerClient</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </client-config> - </jaxws-config> Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml 2012-03-21 08:32:21 UTC (rev 16005) @@ -59,21 +59,4 @@ </post-handler-chains> </endpoint-config> - <endpoint-config> - <config-name>Standard WSSecurity Endpoint</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSSecurity Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class> - </javaee:handler> - <javaee:handler> - <javaee:handler-name>Recording Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </endpoint-config> - </jaxws-config> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/jboss-ws-security_1_0.xsd =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/jboss-ws-security_1_0.xsd 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/jboss-ws-security_1_0.xsd 2012-03-21 08:32:21 UTC (rev 16005) @@ -1,416 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.jboss.com/ws-security/config" targetNamespace="http://www.jboss.com/ws-security/config" elementFormDefault="qualified"> - <xs:element name="jboss-ws-security"> - <xs:complexType> - <xs:sequence> - <xs:element name="security-domain" type="securityDomainType" minOccurs="0"> - <xs:annotation> - <xs:documentation>JAAS security domain to be used for centralized security configuration; this overrides key-store-file, key-store-type, - key-store-password, trust-store-file, trust-store-type, trust-store-password.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="key-store-file" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:documentation>The key store file that will be used for all operations. This file is relative to the deployment. For example, WEB-INF/foo.keystore </xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="key-store-type" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:documentation>The type of the key store. For example, JKS.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="key-store-password" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:documentation>This specifies the key store's password.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="trust-store-file" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:documentation>This specifies the trust store. The truststore is used to validate all X.509v3 tokens that are included in the message. This file is relative to the deployment. For example, WEB-INF/foo.truststore.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="trust-store-type" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:documentation>This specifies the type of the trust store. For example, JKS.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="trust-store-password" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:documentation>This specifies the trust store's password.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="key-passwords" type="passwordsType" minOccurs="0"> - <xs:annotation> - <xs:documentation>The passwords for the private keys in the keystore. Only required if the passwords are different from that of the keystore.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="timestamp-verification" type="timestampVerificationType" minOccurs="0"> - <xs:annotation> - <xs:documentation>The tolerances and logging required when verifying the 'created' and 'expires' value of the timestamps.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="config" type="configType" minOccurs="0"> - <xs:annotation> - <xs:documentation>The default security configuration that is applied to all operations on all ports. This is only used if there is no port/operation config.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="port" type="portType" minOccurs="0" maxOccurs="unbounded"> - <xs:annotation> - <xs:documentation>The WSDL port.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="nonce-factory-class" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:documentation>This specifies the nonce factory class name. It is used to get the custom generator and store of nonces.</xs:documentation> - </xs:annotation> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:complexType name="securityDomainType"> - <xs:attribute name="jndi" type="xs:string" use="required"> - <xs:annotation> - <xs:documentation>The JNDI location of a JAAS security domain.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="authToken" type="xs:string" use="optional"> - <xs:annotation> - <xs:documentation>The shared token for authenticating to the security domain.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="useSecurityDomainAliases" type="xs:boolean" use="optional" default="true"> - <xs:annotation> - <xs:documentation>When true allows the security domain configuration to override selection of aliases for signature and encryption.</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - <xs:complexType name="passwordsType"> - <xs:sequence> - <xs:element name="key-password" type="passwordType" minOccurs="0" maxOccurs="unbounded"> - <xs:annotation> - <xs:documentation>The password for a private key in the keystore. Necessary only if the password is different from that of the keystore.</xs:documentation> - </xs:annotation> - </xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="passwordType"> - <xs:attribute name="alias" type="xs:string" use="required"> - <xs:annotation> - <xs:documentation>The name of the private key.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="password" type="xs:string"> - <xs:annotation> - <xs:documentation>The password of this private key. If not specified, the keystore password will be used.</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - <xs:complexType name="timestampVerificationType"> - <xs:attribute name="createdTolerance" type="xs:long" use="optional"> - <xs:annotation> - <xs:documentation>The number of seconds in the future the created value on a message will be accepted.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="warnCreated" type="xs:boolean" use="optional"> - <xs:annotation> - <xs:documentation>Specifies if a WARN should be logged if a message in the future is accepted within the configured 'createdTolerance'.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="expiresTolerance" type="xs:long" use="optional"> - <xs:annotation> - <xs:documentation>The number of seconds tolerance when checking the expires value of the timestamp.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="warnExpires" type="xs:boolean" use="optional"> - <xs:annotation> - <xs:documentation>Specifies if a WARN should be logged if an expired message is accepted that is within the 'expiresTolerance'.</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - <xs:complexType name="configType" mixed="true"> - <xs:all> - <xs:element name="timestamp" type="timestampType" minOccurs="0"> - <xs:annotation> - <xs:documentation>The timestamp options that can be used to configure WS-Security message expiration.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="username" type="usernameType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Specifies that the message should include a username token if there is a username set on the Call or Proxy object.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="encrypt" type="encryptType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Specifies that the message should be encrypted. If no targets are specified, then just the body will be encrypted.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="sign" type="signType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Specifies that the message should be signed. If no targets are specified then the entire body will be signed.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="requires" type="requiresType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Specifies the security requirements that should be applied when receiving a response from the communicating party. If this is not specified, all messages will be allowed through.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="authenticate" type="authenticateType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Specifies the token to be used for JAAS authentication. If this is not specified, the username token will be used if available.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="authorize" type="authorizeType" minOccurs="0"> - <xs:annotation> - <xs:documentation> - Specifies that authentication is required and either provides a list of roles authorized to access the endpoint or unchecked if any - authenticated user can access the endpoint. - - This should only be used for POJO endpoints, EJB3 endpoints should configure security as for any other EJB3 session bean. - </xs:documentation> - </xs:annotation> - </xs:element> - </xs:all> - </xs:complexType> - <xs:complexType name="requireTimestampType"> - <xs:attribute name="maxAge" type="xs:long" use="optional"> - <xs:annotation> - <xs:documentation>The maximum age that a message can be and still be processed.</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - <xs:complexType name="requireEncryptionType"> - <xs:sequence> - <xs:element name="targets" type="targetsType" minOccurs="0"/> - </xs:sequence> - <xs:attribute name="includeFaults" type="xs:boolean" use="optional" default="false"/> - </xs:complexType> - <xs:complexType name="requireSignatureType"> - <xs:sequence> - <xs:element name="targets" type="targetsType" minOccurs="0"/> - </xs:sequence> - <xs:attribute name="includeFaults" type="xs:boolean" use="optional" default="false"/> - </xs:complexType> - <xs:complexType name="requiresType"> - <xs:all> - <xs:element name="timestamp" type="requireTimestampType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Indicates that a timestamp element must be present in the message, and that the message can not be older than maxAge.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="encryption" type="requireEncryptionType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Indicates that the specified targets in this message must be encrypted. If no targets are specified, then the full body of the message must be encrypted</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="signature" type="requireSignatureType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Indicates that the specified targets in this message must be signed. If no targets are specified, then the full body of the message must be signed.</xs:documentation> - </xs:annotation> - </xs:element> - </xs:all> - </xs:complexType> - <xs:complexType name="timestampType"> - <xs:attribute name="ttl" use="optional"> - <xs:annotation> - <xs:documentation>The Time-To-Live for a message in seconds. The default is no expiration.</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - <xs:complexType name="usernameType"> - <xs:attribute name="digestPassword" type="xs:boolean" use="optional"> - <xs:annotation> - <xs:documentation>If true a password digest will be used as password element. The default is false.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="useNonce" type="xs:boolean" use="optional"> - <xs:annotation> - <xs:documentation>Enables/disables nonce usage in the password digest. The default is true.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="useCreated" type="xs:boolean" use="optional"> - <xs:annotation> - <xs:documentation>Enables/disables usage of the Created element in the password digest. The default is true.</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - <xs:complexType name="encryptType"> - <xs:sequence> - <xs:element name="targets" type="targetsType" minOccurs="0"> - <xs:annotation> - <xs:documentation>A list of targets to apply the parent operation on.</xs:documentation> - </xs:annotation> - </xs:element> - </xs:sequence> - <xs:attribute name="type" use="required"> - <xs:annotation> - <xs:documentation>The type of token that should should be used when performing encryption. The only supported value is "x509v3", which means to use an X.509v3 cert to encrypt the symmetric key.</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value="x509v3"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="alias" type="xs:string"> - <xs:annotation> - <xs:documentation>The name of the certificate to use.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="algorithm"> - <xs:annotation> - <xs:documentation>The symmetric encryption algorithm to use. If not specified aes-128 will be used.</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value="aes-128"/> - <xs:enumeration value="aes-192"/> - <xs:enumeration value="aes-256"/> - <xs:enumeration value="tripledes"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="keyWrapAlgorithm"> - <xs:annotation> - <xs:documentation>The algorithm to use to encrypt the symmetric secret key. If not specified rsa_15 will be used.</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value="rsa_15"/> - <xs:enumeration value="rsa_oaep"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="tokenReference" type="tokenReferenceType" use="optional"> - <xs:annotation> - <xs:documentation>Specify the token reference type to be used; default direct reference to the token.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="securityDomainAliasLabel" type="xs:string"> - <xs:annotation> - <xs:documentation>The label the ws-security engine needs for looking up (in the security domain) the alias that is to be used for encryption</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="includeFaults" type="xs:boolean" use="optional" default="false"/> - </xs:complexType> - <xs:complexType name="signType"> - <xs:sequence> - <xs:element name="targets" type="targetsType" minOccurs="0"/> - </xs:sequence> - <xs:attribute name="type" use="required"> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value="x509v3"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="alias" type="xs:string" use="required"/> - <xs:attribute name="includeTimestamp" type="xs:boolean" use="optional"/> - <xs:attribute name="tokenReference" type="tokenReferenceType" use="optional"> - <xs:annotation> - <xs:documentation>Specify the token reference type to be used; default direct reference to the token.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="securityDomainAliasLabel" type="xs:string"> - <xs:annotation> - <xs:documentation>The label the ws-security engine needs for looking up (in the security domain) the alias that is to be used for signing</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="includeFaults" type="xs:boolean" use="optional" default="false"/> - </xs:complexType> - <xs:simpleType name="tokenReferenceType"> - <xs:restriction base="xs:string"> - <xs:enumeration value="directReference"/> - <xs:enumeration value="keyIdentifier"/> - <xs:enumeration value="x509IssuerSerial"/> - </xs:restriction> - </xs:simpleType> - <xs:complexType name="operationType"> - <xs:sequence> - <xs:element name="config" type="configType"> - <xs:annotation> - <xs:documentation>The security configuration for a specific operation on a specific port. If specified the default configuration values are not used.</xs:documentation> - </xs:annotation> - </xs:element> - </xs:sequence> - <xs:attribute name="name" type="xs:string" use="required"/> - </xs:complexType> - <xs:complexType name="portType"> - <xs:sequence> - <xs:element name="config" type="configType" minOccurs="0"> - <xs:annotation> - <xs:documentation>The default security configuration that is applied to all operations on this port. This is only used if there is no operation configuration defined.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="operation" type="operationType"> - <xs:annotation> - <xs:documentation>The WSDL operation.</xs:documentation> - </xs:annotation> - </xs:element> - </xs:sequence> - <xs:attribute name="name" type="xs:string" use="required"/> - </xs:complexType> - <xs:complexType name="targetType" mixed="true"> - <xs:attribute name="contentOnly" type="xs:string" use="optional"> - <xs:annotation> - <xs:documentation>If true, the content of this element will be encrypted as opposed to the entire element.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="type" use="required"> - <xs:annotation> - <xs:documentation>The type of target. Current allowed values are qname, which specifies an XML fully qualified name, and wsuid which maps to an internal WS-Security id</xs:documentation> - </xs:annotation> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value="qname"/> - <xs:enumeration value="wsuid"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:complexType> - <xs:complexType name="targetsType"> - <xs:sequence> - <xs:element name="target" type="targetType" minOccurs="0" maxOccurs="unbounded"> - <xs:annotation> - <xs:documentation>An element in the message to perform an operation on. The content of this field should match the rules of the specified type.</xs:documentation> - </xs:annotation> - </xs:element> - </xs:sequence> - </xs:complexType> - <xs:complexType name="authenticateType"> - <xs:choice minOccurs="1" maxOccurs="1"> - <xs:element name="usernameAuth" type="usernameAuthType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Specifies that the username token should be used for JAAS authentication.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="signatureCertAuth" type="signatureCertAuthType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Specifies that the certificate token referenced from the signature should be used for JAAS authentication.</xs:documentation> - </xs:annotation> - </xs:element> - </xs:choice> - </xs:complexType> - <xs:complexType name="usernameAuthType"/> - <xs:complexType name="signatureCertAuthType"> - <xs:attribute name="certificatePrincipal" use="optional"> - <xs:annotation> - <xs:documentation>This specifies the class to be used to map certificates to principal. It must implement org.jboss.security.auth.certs.CertificatePrincipal. Default is org.jboss.security.auth.certs.SubjectCNMapping</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:complexType> - <xs:complexType name="authorizeType"> - <xs:choice minOccurs="1" maxOccurs="1"> - <xs:element name="role" type="xs:string" minOccurs="0" maxOccurs="unbounded"> - <xs:annotation> - <xs:documentation>Specifies a role that is allowed to call the endpoint.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="unchecked" type="uncheckedType" minOccurs="0"> - <xs:annotation> - <xs:documentation>Specifies that any authenticated user can call the endpoint.</xs:documentation> - </xs:annotation> - </xs:element> - </xs:choice> - </xs:complexType> - <xs:complexType name="uncheckedType"/> -</xs:schema> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/oasis-200401-wss-wssecurity-secext-1.0.xsd =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/oasis-200401-wss-wssecurity-secext-1.0.xsd 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/oasis-200401-wss-wssecurity-secext-1.0.xsd 2012-03-21 08:32:21 UTC (rev 16005) @@ -1,195 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director. -OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director. -Copyright © OASIS Open 2002-2004. All Rights Reserved. -This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself does not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. -The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. -This document and the information contained herein is provided on an “AS IS” basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. ---> -<xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401... xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssec... xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-... xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" elementFormDefault="qualified" attributeFormDefault="unqualified" blockDefault="#all" version="0.2"> - <xsd:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-... - <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/> - <xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schem... - <xsd:complexType name="AttributedString"> - <xsd:annotation> - <xsd:documentation>This type represents an element with arbitrary attributes.</xsd:documentation> - </xsd:annotation> - <xsd:simpleContent> - <xsd:extension base="xsd:string"> - <xsd:attribute ref="wsu:Id"/> - <xsd:anyAttribute namespace="##other" processContents="lax"/> - </xsd:extension> - </xsd:simpleContent> - </xsd:complexType> - <xsd:complexType name="PasswordString"> - <xsd:annotation> - <xsd:documentation>This type is used for password elements per Section 4.1.</xsd:documentation> - </xsd:annotation> - <xsd:simpleContent> - <xsd:extension base="wsse:AttributedString"> - <xsd:attribute name="Type" type="xsd:anyURI"/> - </xsd:extension> - </xsd:simpleContent> - </xsd:complexType> - <xsd:complexType name="EncodedString"> - <xsd:annotation> - <xsd:documentation>This type is used for elements containing stringified binary data.</xsd:documentation> - </xsd:annotation> - <xsd:simpleContent> - <xsd:extension base="wsse:AttributedString"> - <xsd:attribute name="EncodingType" type="xsd:anyURI"/> - </xsd:extension> - </xsd:simpleContent> - </xsd:complexType> - <xsd:complexType name="UsernameTokenType"> - <xsd:annotation> - <xsd:documentation>This type represents a username token per Section 4.1</xsd:documentation> - </xsd:annotation> - <xsd:sequence> - <xsd:element name="Username" type="wsse:AttributedString"/> - <xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - <xsd:attribute ref="wsu:Id"/> - <xsd:anyAttribute namespace="##other" processContents="lax"/> - </xsd:complexType> - <xsd:complexType name="BinarySecurityTokenType"> - <xsd:annotation> - <xsd:documentation>A security token that is encoded in binary</xsd:documentation> - </xsd:annotation> - <xsd:simpleContent> - <xsd:extension base="wsse:EncodedString"> - <xsd:attribute name="ValueType" type="xsd:anyURI"/> - </xsd:extension> - </xsd:simpleContent> - </xsd:complexType> - <xsd:complexType name="KeyIdentifierType"> - <xsd:annotation> - <xsd:documentation>A security token key identifier</xsd:documentation> - </xsd:annotation> - <xsd:simpleContent> - <xsd:extension base="wsse:EncodedString"> - <xsd:attribute name="ValueType" type="xsd:anyURI"/> - </xsd:extension> - </xsd:simpleContent> - </xsd:complexType> - <xsd:simpleType name="tUsage"> - <xsd:annotation> - <xsd:documentation>Typedef to allow a list of usages (as URIs).</xsd:documentation> - </xsd:annotation> - <xsd:list itemType="xsd:anyURI"/> - </xsd:simpleType> - <xsd:attribute name="Usage" type="tUsage"> - <xsd:annotation> - <xsd:documentation>This global attribute is used to indicate the usage of a referenced or indicated token within the containing context</xsd:documentation> - </xsd:annotation> - </xsd:attribute> - <xsd:complexType name="ReferenceType"> - <xsd:annotation> - <xsd:documentation>This type represents a reference to an external security token.</xsd:documentation> - </xsd:annotation> - <xsd:attribute name="URI" type="xsd:anyURI"/> - <xsd:attribute name="ValueType" type="xsd:anyURI"/> - <xsd:anyAttribute namespace="##other" processContents="lax"/> - </xsd:complexType> - <xsd:complexType name="EmbeddedType"> - <xsd:annotation> - <xsd:documentation>This type represents a reference to an embedded security token.</xsd:documentation> - </xsd:annotation> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:any processContents="lax"/> - </xsd:choice> - <xsd:attribute name="ValueType" type="xsd:anyURI"/> - <xsd:anyAttribute namespace="##other" processContents="lax"/> - </xsd:complexType> - <xsd:complexType name="SecurityTokenReferenceType"> - <xsd:annotation> - <xsd:documentation>This type is used reference a security token.</xsd:documentation> - </xsd:annotation> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:any processContents="lax"/> - </xsd:choice> - <xsd:attribute ref="wsu:Id"/> - <xsd:attribute ref="wsse:Usage"/> - <xsd:anyAttribute namespace="##other" processContents="lax"/> - </xsd:complexType> - <xsd:complexType name="SecurityHeaderType"> - <xsd:annotation> - <xsd:documentation>This complexType defines header block to use for security-relevant data directed at a specific SOAP actor.</xsd:documentation> - </xsd:annotation> - <xsd:sequence> - <xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded"> - <xsd:annotation> - <xsd:documentation>The use of "any" is to allow extensibility and different forms of security data.</xsd:documentation> - </xsd:annotation> - </xsd:any> - </xsd:sequence> - <xsd:anyAttribute namespace="##other" processContents="lax"/> - </xsd:complexType> - <xsd:complexType name="TransformationParametersType"> - <xsd:annotation> - <xsd:documentation>This complexType defines a container for elements to be specified from any namespace as properties/parameters of a DSIG transformation.</xsd:documentation> - </xsd:annotation> - <xsd:sequence> - <xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded"> - <xsd:annotation> - <xsd:documentation>The use of "any" is to allow extensibility from any namespace.</xsd:documentation> - </xsd:annotation> - </xsd:any> - </xsd:sequence> - <xsd:anyAttribute namespace="##other" processContents="lax"/> - </xsd:complexType> - <xsd:element name="UsernameToken" type="wsse:UsernameTokenType"> - <xsd:annotation> - <xsd:documentation>This element defines the wsse:UsernameToken element per Section 4.1.</xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element name="BinarySecurityToken" type="wsse:BinarySecurityTokenType"> - <xsd:annotation> - <xsd:documentation>This element defines the wsse:BinarySecurityToken element per Section 4.2.</xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element name="Reference" type="wsse:ReferenceType"> - <xsd:annotation> - <xsd:documentation>This element defines a security token reference</xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element name="Embedded" type="wsse:EmbeddedType"> - <xsd:annotation> - <xsd:documentation>This element defines a security token embedded reference</xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element name="KeyIdentifier" type="wsse:KeyIdentifierType"> - <xsd:annotation> - <xsd:documentation>This element defines a key identifier reference</xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element name="SecurityTokenReference" type="wsse:SecurityTokenReferenceType"> - <xsd:annotation> - <xsd:documentation>This element defines the wsse:SecurityTokenReference per Section 4.3.</xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element name="Security" type="wsse:SecurityHeaderType"> - <xsd:annotation> - <xsd:documentation>This element defines the wsse:Security SOAP header element per Section 4.</xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element name="TransformationParameters" type="wsse:TransformationParametersType"> - <xsd:annotation> - <xsd:documentation>This element contains properties for transformations from any namespace, including DSIG.</xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element name="Password" type="wsse:PasswordString"/> - <xsd:element name="Nonce" type="wsse:EncodedString"/> - <xsd:simpleType name="FaultcodeEnum"> - <xsd:restriction base="xsd:QName"> - <xsd:enumeration value="wsse:UnsupportedSecurityToken"/> - <xsd:enumeration value="wsse:UnsupportedAlgorithm"/> - <xsd:enumeration value="wsse:InvalidSecurity"/> - <xsd:enumeration value="wsse:InvalidSecurityToken"/> - <xsd:enumeration value="wsse:FailedAuthentication"/> - <xsd:enumeration value="wsse:FailedCheck"/> - <xsd:enumeration value="wsse:SecurityTokenUnavailable"/> - </xsd:restriction> - </xsd:simpleType> -</xsd:schema> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/oasis-200401-wss-wssecurity-utility-1.0.xsd =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/oasis-200401-wss-wssecurity-utility-1.0.xsd 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/oasis-200401-wss-wssecurity-utility-1.0.xsd 2012-03-21 08:32:21 UTC (rev 16005) @@ -1,108 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director. -OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director. -Copyright © OASIS Open 2002-2004. All Rights Reserved. -This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself does not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English. -The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns. -This document and the information contained herein is provided on an “AS IS” basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. ---> -<xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401... xmlns:xsd="http://www.w3.org/2001/XMLSchema" - - - -xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssec... -elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.1"> - <!-- // Fault Codes /////////////////////////////////////////// --> - <xsd:simpleType name="tTimestampFault"> - <xsd:annotation> - <xsd:documentation> -This type defines the fault code value for Timestamp message expiration. - </xsd:documentation> - </xsd:annotation> - <xsd:restriction base="xsd:QName"> - <xsd:enumeration value="wsu:MessageExpired"/> - </xsd:restriction> - </xsd:simpleType> - <!-- // Global attributes //////////////////////////////////// --> - <xsd:attribute name="Id" type="xsd:ID"> - <xsd:annotation> - <xsd:documentation> -This global attribute supports annotating arbitrary elements with an ID. - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> - <xsd:attributeGroup name="commonAtts"> - <xsd:annotation> - <xsd:documentation> -Convenience attribute group used to simplify this schema. - </xsd:documentation> - </xsd:annotation> - <xsd:attribute ref="wsu:Id" use="optional"/> - <xsd:anyAttribute namespace="##other" processContents="lax"/> - </xsd:attributeGroup> - <!-- // Utility types //////////////////////////////////////// --> - <xsd:complexType name="AttributedDateTime"> - <xsd:annotation> - <xsd:documentation> -This type is for elements whose [children] is a psuedo-dateTime and can have arbitrary attributes. - </xsd:documentation> - </xsd:annotation> - <xsd:simpleContent> - <xsd:extension base="xsd:string"> - <xsd:attributeGroup ref="wsu:commonAtts"/> - </xsd:extension> - </xsd:simpleContent> - </xsd:complexType> - <xsd:complexType name="AttributedURI"> - <xsd:annotation> - <xsd:documentation> -This type is for elements whose [children] is an anyURI and can have arbitrary attributes. - </xsd:documentation> - </xsd:annotation> - <xsd:simpleContent> - <xsd:extension base="xsd:anyURI"> - <xsd:attributeGroup ref="wsu:commonAtts"/> - </xsd:extension> - </xsd:simpleContent> - </xsd:complexType> - <!-- // Timestamp header components /////////////////////////// --> - <xsd:complexType name="TimestampType"> - <xsd:annotation> - <xsd:documentation> -This complex type ties together the timestamp related elements into a composite type. - </xsd:documentation> - </xsd:annotation> - <xsd:sequence> - <xsd:element ref="wsu:Created" minOccurs="0"/> - <xsd:element ref="wsu:Expires" minOccurs="0"/> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:any namespace="##other" processContents="lax"/> - </xsd:choice> - </xsd:sequence> - <xsd:attributeGroup ref="wsu:commonAtts"/> - </xsd:complexType> - <xsd:element name="Timestamp" type="wsu:TimestampType"> - <xsd:annotation> - <xsd:documentation> -This element allows Timestamps to be applied anywhere element wildcards are present, -including as a SOAP header. - </xsd:documentation> - </xsd:annotation> - </xsd:element> - <!-- global element decls to allow individual elements to appear anywhere --> - <xsd:element name="Expires" type="wsu:AttributedDateTime"> - <xsd:annotation> - <xsd:documentation> -This element allows an expiration time to be applied anywhere element wildcards are present. - </xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element name="Created" type="wsu:AttributedDateTime"> - <xsd:annotation> - <xsd:documentation> -This element allows a creation time to be applied anywhere element wildcards are present. - </xsd:documentation> - </xsd:annotation> - </xsd:element> -</xsd:schema> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/xmldsig-core-schema.xsd 2012-03-21 08:32:21 UTC (rev 16005) @@ -1,318 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE schema - PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd" - [ - <!ATTLIST schema - xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#"> - <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'> - <!ENTITY % p ''> - <!ENTITY % s ''> - ]> - -<!-- Schema for XML Signatures - http://www.w3.org/2000/09/xmldsig# - $Revision$ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $ - - Copyright 2001 The Internet Society and W3C (Massachusetts Institute - of Technology, Institut National de Recherche en Informatique et en - Automatique, Keio University). All Rights Reserved. - http://www.w3.org/Consortium/Legal/ - - This document is governed by the W3C Software License [1] as described - in the FAQ [2]. - - [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720 - [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD ---> - - -<schema xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:ds="http://www.w3.org/2000/09/xmldsig#" - targetNamespace="http://www.w3.org/2000/09/xmldsig#" - version="0.1" elementFormDefault="qualified"> - -<!-- Basic Types Defined for Signatures --> - -<simpleType name="CryptoBinary"> - <restriction base="base64Binary"> - </restriction> -</simpleType> - -<!-- Start Signature --> - -<element name="Signature" type="ds:SignatureType"/> -<complexType name="SignatureType"> - <sequence> - <element ref="ds:SignedInfo"/> - <element ref="ds:SignatureValue"/> - <element ref="ds:KeyInfo" minOccurs="0"/> - <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - <attribute name="Id" type="ID" use="optional"/> -</complexType> - - <element name="SignatureValue" type="ds:SignatureValueType"/> - <complexType name="SignatureValueType"> - <simpleContent> - <extension base="base64Binary"> - <attribute name="Id" type="ID" use="optional"/> - </extension> - </simpleContent> - </complexType> - -<!-- Start SignedInfo --> - -<element name="SignedInfo" type="ds:SignedInfoType"/> -<complexType name="SignedInfoType"> - <sequence> - <element ref="ds:CanonicalizationMethod"/> - <element ref="ds:SignatureMethod"/> - <element ref="ds:Reference" maxOccurs="unbounded"/> - </sequence> - <attribute name="Id" type="ID" use="optional"/> -</complexType> - - <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/> - <complexType name="CanonicalizationMethodType" mixed="true"> - <sequence> - <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/> - <!-- (0,unbounded) elements from (1,1) namespace --> - </sequence> - <attribute name="Algorithm" type="anyURI" use="required"/> - </complexType> - - <element name="SignatureMethod" type="ds:SignatureMethodType"/> - <complexType name="SignatureMethodType" mixed="true"> - <sequence> - <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/> - <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/> - <!-- (0,unbounded) elements from (1,1) external namespace --> - </sequence> - <attribute name="Algorithm" type="anyURI" use="required"/> - </complexType> - -<!-- Start Reference --> - -<element name="Reference" type="ds:ReferenceType"/> -<complexType name="ReferenceType"> - <sequence> - <element ref="ds:Transforms" minOccurs="0"/> - <element ref="ds:DigestMethod"/> - <element ref="ds:DigestValue"/> - </sequence> - <attribute name="Id" type="ID" use="optional"/> - <attribute name="URI" type="anyURI" use="optional"/> - <attribute name="Type" type="anyURI" use="optional"/> -</complexType> - - <element name="Transforms" type="ds:TransformsType"/> - <complexType name="TransformsType"> - <sequence> - <element ref="ds:Transform" maxOccurs="unbounded"/> - </sequence> - </complexType> - - <element name="Transform" type="ds:TransformType"/> - <complexType name="TransformType" mixed="true"> - <choice minOccurs="0" maxOccurs="unbounded"> - <any namespace="##other" processContents="lax"/> - <!-- (1,1) elements from (0,unbounded) namespaces --> - <element name="XPath" type="string"/> - </choice> - <attribute name="Algorithm" type="anyURI" use="required"/> - </complexType> - -<!-- End Reference --> - -<element name="DigestMethod" type="ds:DigestMethodType"/> -<complexType name="DigestMethodType" mixed="true"> - <sequence> - <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - <attribute name="Algorithm" type="anyURI" use="required"/> -</complexType> - -<element name="DigestValue" type="ds:DigestValueType"/> -<simpleType name="DigestValueType"> - <restriction base="base64Binary"/> -</simpleType> - -<!-- End SignedInfo --> - -<!-- Start KeyInfo --> - -<element name="KeyInfo" type="ds:KeyInfoType"/> -<complexType name="KeyInfoType" mixed="true"> - <choice maxOccurs="unbounded"> - <element ref="ds:KeyName"/> - <element ref="ds:KeyValue"/> - <element ref="ds:RetrievalMethod"/> - <element ref="ds:X509Data"/> - <element ref="ds:PGPData"/> - <element ref="ds:SPKIData"/> - <element ref="ds:MgmtData"/> - <any processContents="lax" namespace="##other"/> - <!-- (1,1) elements from (0,unbounded) namespaces --> - </choice> - <attribute name="Id" type="ID" use="optional"/> -</complexType> - - <element name="KeyName" type="string"/> - <element name="MgmtData" type="string"/> - - <element name="KeyValue" type="ds:KeyValueType"/> - <complexType name="KeyValueType" mixed="true"> - <choice> - <element ref="ds:DSAKeyValue"/> - <element ref="ds:RSAKeyValue"/> - <any namespace="##other" processContents="lax"/> - </choice> - </complexType> - - <element name="RetrievalMethod" type="ds:RetrievalMethodType"/> - <complexType name="RetrievalMethodType"> - <sequence> - <element ref="ds:Transforms" minOccurs="0"/> - </sequence> - <attribute name="URI" type="anyURI"/> - <attribute name="Type" type="anyURI" use="optional"/> - </complexType> - -<!-- Start X509Data --> - -<element name="X509Data" type="ds:X509DataType"/> -<complexType name="X509DataType"> - <sequence maxOccurs="unbounded"> - <choice> - <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/> - <element name="X509SKI" type="base64Binary"/> - <element name="X509SubjectName" type="string"/> - <element name="X509Certificate" type="base64Binary"/> - <element name="X509CRL" type="base64Binary"/> - <any namespace="##other" processContents="lax"/> - </choice> - </sequence> -</complexType> - -<complexType name="X509IssuerSerialType"> - <sequence> - <element name="X509IssuerName" type="string"/> - <element name="X509SerialNumber" type="integer"/> - </sequence> -</complexType> - -<!-- End X509Data --> - -<!-- Begin PGPData --> - -<element name="PGPData" type="ds:PGPDataType"/> -<complexType name="PGPDataType"> - <choice> - <sequence> - <element name="PGPKeyID" type="base64Binary"/> - <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/> - <any namespace="##other" processContents="lax" minOccurs="0" - maxOccurs="unbounded"/> - </sequence> - <sequence> - <element name="PGPKeyPacket" type="base64Binary"/> - <any namespace="##other" processContents="lax" minOccurs="0" - maxOccurs="unbounded"/> - </sequence> - </choice> -</complexType> - -<!-- End PGPData --> - -<!-- Begin SPKIData --> - -<element name="SPKIData" type="ds:SPKIDataType"/> -<complexType name="SPKIDataType"> - <sequence maxOccurs="unbounded"> - <element name="SPKISexp" type="base64Binary"/> - <any namespace="##other" processContents="lax" minOccurs="0"/> - </sequence> -</complexType> - -<!-- End SPKIData --> - -<!-- End KeyInfo --> - -<!-- Start Object (Manifest, SignatureProperty) --> - -<element name="Object" type="ds:ObjectType"/> -<complexType name="ObjectType" mixed="true"> - <sequence minOccurs="0" maxOccurs="unbounded"> - <any namespace="##any" processContents="lax"/> - </sequence> - <attribute name="Id" type="ID" use="optional"/> - <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet --> - <attribute name="Encoding" type="anyURI" use="optional"/> -</complexType> - -<element name="Manifest" type="ds:ManifestType"/> -<complexType name="ManifestType"> - <sequence> - <element ref="ds:Reference" maxOccurs="unbounded"/> - </sequence> - <attribute name="Id" type="ID" use="optional"/> -</complexType> - -<element name="SignatureProperties" type="ds:SignaturePropertiesType"/> -<complexType name="SignaturePropertiesType"> - <sequence> - <element ref="ds:SignatureProperty" maxOccurs="unbounded"/> - </sequence> - <attribute name="Id" type="ID" use="optional"/> -</complexType> - - <element name="SignatureProperty" type="ds:SignaturePropertyType"/> - <complexType name="SignaturePropertyType" mixed="true"> - <choice maxOccurs="unbounded"> - <any namespace="##other" processContents="lax"/> - <!-- (1,1) elements from (1,unbounded) namespaces --> - </choice> - <attribute name="Target" type="anyURI" use="required"/> - <attribute name="Id" type="ID" use="optional"/> - </complexType> - -<!-- End Object (Manifest, SignatureProperty) --> - -<!-- Start Algorithm Parameters --> - -<simpleType name="HMACOutputLengthType"> - <restriction base="integer"/> -</simpleType> - -<!-- Start KeyValue Element-types --> - -<element name="DSAKeyValue" type="ds:DSAKeyValueType"/> -<complexType name="DSAKeyValueType"> - <sequence> - <sequence minOccurs="0"> - <element name="P" type="ds:CryptoBinary"/> - <element name="Q" type="ds:CryptoBinary"/> - </sequence> - <element name="G" type="ds:CryptoBinary" minOccurs="0"/> - <element name="Y" type="ds:CryptoBinary"/> - <element name="J" type="ds:CryptoBinary" minOccurs="0"/> - <sequence minOccurs="0"> - <element name="Seed" type="ds:CryptoBinary"/> - <element name="PgenCounter" type="ds:CryptoBinary"/> - </sequence> - </sequence> -</complexType> - -<element name="RSAKeyValue" type="ds:RSAKeyValueType"/> -<complexType name="RSAKeyValueType"> - <sequence> - <element name="Modulus" type="ds:CryptoBinary"/> - <element name="Exponent" type="ds:CryptoBinary"/> - </sequence> -</complexType> - -<!-- End KeyValue Element-types --> - -<!-- End Signature --> - -</schema> Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-21 08:32:21 UTC (rev 16005) @@ -50,7 +50,6 @@ <include>org.jvnet.staxex:stax-ex:jar</include> <include>com.sun.xml.stream.buffer:streambuffer:jar</include> <include>wsdl4j:wsdl4j:jar</include> - <include>org.apache.santuario:xmlsec:jar</include> <include>org.jboss.netty:netty:jar</include> <include>commons-beanutils:commons-beanutils:jar</include> </includes> Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-21 08:32:21 UTC (rev 16005) @@ -40,9 +40,7 @@ <module name="javax.xml.stream.api" /> <module name="javax.xml.rpc.api" /> <module name="javax.xml.ws.api" /> - <module name="org.picketbox"/> <module name="org.apache.xerces" services="import"/> - <module name="org.apache.santuario.xmlsec" /> <module name="org.javassist" /> <module name="org.jboss.netty" /> <module name="org.jboss.xb" /> Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-21 08:32:21 UTC (rev 16005) @@ -88,11 +88,6 @@ <include name="**/jbossxb.jar"/> </fileset> </copy> - <copy todir="@{targetdir}/org/apache/santuario/xmlsec/main" flatten="false" overwrite="true"> - <fileset dir="@{thirdpartydir}/lib"> - <include name="**/xmlsec.jar"/> - </fileset> - </copy> <copy todir="@{targetdir}/com/sun/tools/ws/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/jaxws-tools.jar"/> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml 2012-03-21 08:32:21 UTC (rev 16005) @@ -115,7 +115,6 @@ <ant antfile="scripts/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" /> <ant antfile="scripts/build-jars-jaxws.xml" target="build-jars-jaxws" /> <ant antfile="scripts/build-samples-jaxws.xml" target="build-samples-jaxws" /> - <ant antfile="scripts/build-jars-interop.xml" target="build-jars-interop" /> </tasks> </configuration> </execution> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2012-03-21 08:32:21 UTC (rev 16005) @@ -42,56 +42,6 @@ loggingDir="${log4j.output.dir}" /> - <wsconsume-macro - wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" - package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" - outputDir="${tests.output.dir}" - javaEndorsedDirs="${endorsed.dirs}" - jbossHome="${jboss.home}" - log4jConf="${log4j.conf}" - loggingDir="${log4j.output.dir}" - /> - - <wsconsume-macro - wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" - package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" - outputDir="${tests.output.dir}" - javaEndorsedDirs="${endorsed.dirs}" - jbossHome="${jboss.home}" - log4jConf="${log4j.conf}" - loggingDir="${log4j.output.dir}" - /> - - <wsconsume-macro - wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" - package="org.jboss.test.ws.interop.soapwsdl.baserpclit" - outputDir="${tests.output.dir}" - javaEndorsedDirs="${endorsed.dirs}" - jbossHome="${jboss.home}" - log4jConf="${log4j.conf}" - loggingDir="${log4j.output.dir}" - /> - - <wsconsume-macro - wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" - package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" - outputDir="${tests.output.dir}" - javaEndorsedDirs="${endorsed.dirs}" - jbossHome="${jboss.home}" - log4jConf="${log4j.conf}" - loggingDir="${log4j.output.dir}" - /> - - <wsconsume-macro - wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" - package="org.jboss.test.ws.jaxws.samples.wssecurity" - outputDir="${tests.output.dir}" - javaEndorsedDirs="${endorsed.dirs}" - jbossHome="${jboss.home}" - log4jConf="${log4j.conf}" - loggingDir="${log4j.output.dir}" - /> - </target> <macrodef name="wsconsume-macro"> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2012-03-21 08:32:21 UTC (rev 16005) @@ -32,17 +32,6 @@ </classpath> </taskdef> - <wsprovide-macro - sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean" - destDir="" - javaEndorsedDirs="${endorsed.dirs}" - jbossHome="${jboss.home}" - outputDir="${tests.output.dir}" - log4jConf="${log4j.conf}" - loggingDir="${log4j.output.dir}" - resourcesDir="wsprovide/jaxws/samples/wssecurity" - /> - </target> <macrodef name="wsprovide-macro"> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wstools.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2012-03-21 08:32:21 UTC (rev 16005) @@ -59,7 +59,6 @@ <macro-wstools dest="jaxrpc/samples/secureejb/META-INF" config="jaxrpc/samples/secureejb/wstools-config.xml"/> <macro-wstools dest="jaxrpc/samples/wsaddr/hello/WEB-INF" config="jaxrpc/samples/wsaddr/hello/wstools-config.xml"/> <macro-wstools dest="jaxrpc/samples/wsaddr/replyto/WEB-INF" config="jaxrpc/samples/wsaddr/replyto/wstools-config.xml"/> - <macro-wstools dest="jaxrpc/samples/wssecurity/WEB-INF" config="jaxrpc/samples/wssecurity/wstools-config.xml"/> </target> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-benchmark.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-benchmark.xml 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-benchmark.xml 2012-03-21 08:32:21 UTC (rev 16005) @@ -22,7 +22,7 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project name="JBossWS Benchamrks"> +<project name="JBossWS Benchmarks"> <!-- ================================================================== --> <!-- Building --> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-interop.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-interop.xml 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-interop.xml 2012-03-21 08:32:21 UTC (rev 16005) @@ -1,300 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ JBoss, Home of Professional Open Source. - ~ Copyright 2011, Red Hat, Inc., and individual contributors - ~ as indicated by the @author tags. See the copyright.txt file 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. - --> - -<project> - - <description>JBossWS test archive builder</description> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <target name="build-jars-interop"> - - <mkdir dir="${tests.output.dir}/test-libs"/> - - <!-- Root.war --> - <war warfile="${tests.output.dir}/test-libs/jbossws-interop-root.war" webxml="${tests.output.dir}/test-resources/interop/root/WEB-INF/web.xml"> - <webinf dir="${tests.output.dir}/test-resources/interop/root/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - <fileset dir="${tests.output.dir}/test-resources/interop/root"> - <include name="*.*"/> - </fileset> - </war> - - <!-- jbossws-interop-BaseDataTypesDocLitB.war --> - <war warfile="${tests.output.dir}/test-libs/jbossws-interop-BaseDataTypesDocLitB.war" - webxml="${tests.output.dir}/test-resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitb/**/*.class"/> - <include name="org/jboss/test/ws/interop/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF"> - <include name="wsdl/**.*"/> - <include name="jboss-web.xml"/> - <include name="scenarios.xml"/> - </webinf> - <fileset dir="${tests.output.dir}/test-resources/interop/soapwsdl/BaseDataTypesDocLitB"> - <include name="*.*"/> - </fileset> - </war> - - <!-- jbossws-interop-BaseDataTypesDocLitW.war --> - <war warfile="${tests.output.dir}/test-libs/jbossws-interop-BaseDataTypesDocLitW.war" - webxml="${tests.output.dir}/test-resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/interop/soapwsdl/basedoclitw/**/*.class"/> - <include name="org/jboss/test/ws/interop/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF"> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - <include name="scenarios.xml"/> - </webinf> - <fileset dir="${tests.output.dir}/test-resources/interop/soapwsdl/BaseDataTypesDocLitW"> - <include name="*.*"/> - </fileset> - </war> - - <!-- jbossws-interop-BaseDataTypesRpcLit.war --> - <war warfile="${tests.output.dir}/test-libs/jbossws-interop-BaseDataTypesRpcLit.war" - webxml="${tests.output.dir}/test-resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/interop/soapwsdl/baserpclit/**/*.class"/> - <include name="org/jboss/test/ws/interop/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF"> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - <include name="scenarios.xml"/> - </webinf> - <fileset dir="${tests.output.dir}/test-resources/interop/soapwsdl/BaseDataTypesRpcLit"> - <include name="*.*"/> - </fileset> - </war> - - <!-- jbossws-interop-wsa10.war --> - <war warfile="${tests.output.dir}/test-libs/jbossws-interop-wsa10.war" webxml="${tests.output.dir}/test-resources/interop/wsa/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/interop/wsa/**/*.class"/> - <include name="org/jboss/test/ws/interop/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/interop/wsa/WEB-INF"> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - <include name="scenarios.xml"/> - </webinf> - <fileset dir="${tests.output.dir}/test-resources/interop/wsa"> - <include name="*.*"/> - </fileset> - </war> - - <!-- jbossws-interop-wsse10Encrypt.war --> - <war warfile="${tests.output.dir}/test-libs/jbossws-interop-wsse10Encrypt.war" webxml="${tests.output.dir}/test-resources/interop/wsse/encrypt/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/interop/wsse/**/*.class"/> - <include name="org/jboss/test/ws/interop/*.class"/> - </classes> - - <webinf dir="${tests.output.dir}/test-resources/interop/wsse/encrypt/WEB-INF"> - <include name="wsdl/**.*"/> - <include name="jboss-wsse-server.xml"/> - <include name="jboss-web.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/interop/wsse/shared/META-INF"> - <include name="alice.jks"/> - <include name="wsse10.truststore"/> - </webinf> - - <fileset dir="${tests.output.dir}/test-resources/interop/wsse/"> - <include name="*.*"/> - </fileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </war> - <!-- jbossws-interop-wsse10Encrypt-client.jar --> - <jar destfile="${tests.output.dir}/test-libs/jbossws-interop-wsse10Encrypt-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/interop/wsse/encrypt/META-INF"/> - </jar> - - <!-- jbossws-interop-wsse10Sign.war --> - <war warfile="${tests.output.dir}/test-libs/jbossws-interop-wsse10Sign.war" webxml="${tests.output.dir}/test-resources/interop/wsse/sign/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/interop/wsse/**/*.class"/> - <include name="org/jboss/test/ws/interop/*.class"/> - </classes> - - <webinf dir="${tests.output.dir}/test-resources/interop/wsse/sign/WEB-INF"> - <include name="wsdl/**.*"/> - <include name="jboss-wsse-server.xml"/> - <include name="jboss-web.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/interop/wsse/shared/META-INF"> - <include name="alice.jks"/> - <include name="wsse10.truststore"/> - </webinf> - - <fileset dir="${tests.output.dir}/test-resources/interop/wsse/"> - <include name="*.*"/> - </fileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </war> - <!-- jbossws-interop-wsse10Sign-client.jar --> - <jar destfile="${tests.output.dir}/test-libs/jbossws-interop-wsse10Sign-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/interop/wsse/sign/META-INF"/> - </jar> - - <!-- WCF Interoperability Plug-fest November 2007 --> - - <!-- jbossws-interop-nov2007-wsaSoap12.war --> - <war warfile="${tests.output.dir}/test-libs/jbossws-interop-nov2007-wsaSoap12.war" - webxml="${tests.output.dir}/test-resources/interop/nov2007/wsaSoap12/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/interop/nov2007/wsaSoap12/**/*.class"/> - <include name="org/jboss/test/ws/interop/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/interop/nov2007/wsaSoap12/WEB-INF"> - <include name="wsdl/**"/> - <include name="jboss-web.xml"/> - <include name="scenarios.xml"/> - </webinf> - <fileset dir="${tests.output.dir}/test-resources/interop/nov2007/wsaSoap12"> - <include name="*.*"/> - </fileset> - </war> - <!-- jbossws-interop-nov2007-wsaSoap12-client.jar --> - <jar destfile="${tests.output.dir}/test-libs/jbossws-interop-nov2007-wsaSoap12-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/interop/nov2007/wsaSoap12/META-INF"/> - </jar> - - <!-- jbossws-interop-nov2007-wsseEncrypt.war --> - <war warfile="${tests.output.dir}/test-libs/jbossws-interop-nov2007-wsseEncrypt.war" - webxml="${tests.output.dir}/test-resources/interop/nov2007/wsse/encrypt/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/interop/nov2007/wsse/**/*.class"/> - <exclude name="org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestService.class"/> - <exclude name="org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestService.class"/> - <exclude name="org/jboss/test/ws/interop/nov2007/wsse/*TestCase.class"/> - <include name="org/jboss/test/ws/interop/*.class"/> - </classes> - - <webinf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/encrypt/WEB-INF"> - <include name="jboss-wsse-server.xml"/> - <include name="jboss-web.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/shared/WEB-INF"> - <include name="wsdl/**/*"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/shared/META-INF"> - <include name="bob-sign_enc.jks"/> - <include name="wsse10.truststore"/> - </webinf> - - <fileset dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/"> - <include name="*.*"/> - </fileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </war> - <!-- jbossws-interop-nov2007-wsseEncrypt.jar --> - <jar destfile="${tests.output.dir}/test-libs/jbossws-interop-nov2007-wsseEncrypt-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/encrypt/META-INF"/> - </jar> - - <!-- jbossws-interop-nov2007-wsseEncrypt3DES.war --> - <war warfile="${tests.output.dir}/test-libs/jbossws-interop-nov2007-wsseEncrypt3DES.war" - webxml="${tests.output.dir}/test-resources/interop/nov2007/wsse/encrypt3DES/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/interop/nov2007/wsse/**/*.class"/> - <exclude name="org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestService.class"/> - <exclude name="org/jboss/test/ws/interop/nov2007/wsse/EncryptTestService.class"/> - <exclude name="org/jboss/test/ws/interop/nov2007/wsse/*TestCase.class"/> - <include name="org/jboss/test/ws/interop/*.class"/> - </classes> - - <webinf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/encrypt3DES/WEB-INF"> - <include name="jboss-wsse-server.xml"/> - <include name="jboss-web.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/shared/WEB-INF"> - <include name="wsdl/**/*"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/shared/META-INF"> - <include name="bob-sign_enc.jks"/> - <include name="wsse10.truststore"/> - </webinf> - - <fileset dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/"> - <include name="*.*"/> - </fileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </war> - <!-- jbossws-interop-nov2007-wsseEncrypt3DES.jar --> - <jar destfile="${tests.output.dir}/test-libs/jbossws-interop-nov2007-wsseEncrypt3DES-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/encrypt3DES/META-INF"/> - </jar> - - <!-- jbossws-interop-nov2007-wsseUsernameTokenHTTPS.war --> - <war warfile="${tests.output.dir}/test-libs/jbossws-interop-nov2007-wsseUsernameTokenHTTPS.war" - webxml="${tests.output.dir}/test-resources/interop/nov2007/wsse/usernameTokenHTTPS/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/interop/nov2007/wsse/**/*.class"/> - <exclude name="org/jboss/test/ws/interop/nov2007/wsse/Encrypt3DESTestService.class"/> - <exclude name="org/jboss/test/ws/interop/nov2007/wsse/EncryptTestService.class"/> - <exclude name="org/jboss/test/ws/interop/nov2007/wsse/*TestCase.class"/> - <include name="org/jboss/test/ws/interop/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/usernameTokenHTTPS/WEB-INF"> - <include name="jboss-wsse-server.xml"/> - <include name="jboss-web.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/shared/WEB-INF"> - <include name="wsdl/**/*"/> - </webinf> - <fileset dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/"> - <include name="*.*"/> - </fileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </war> - <!-- jbossws-interop-nov2007-wsseUsernameTokenHTTPS-client.jar --> - <jar destfile="${tests.output.dir}/test-libs/jbossws-interop-nov2007-wsseUsernameTokenHTTPS-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/interop/nov2007/wsse/usernameTokenHTTPS/META-INF"/> - </jar> - - <!-- wrap up in an *.ear for easier deployment --> - <ear destfile="${tests.output.dir}/test-libs/jbossws-interop.ear" appxml="${tests.output.dir}/test-resources/interop/root/META-INF/application.xml"> - <fileset dir="${tests.output.dir}/test-libs" includes="*interop*.war"/> - </ear> - - </target> -</project> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-21 08:32:21 UTC (rev 16005) @@ -2653,56 +2653,6 @@ </fileset> </jar> - <!-- jaxrpc-jbws1121 --> - <war destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1121.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1121/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorld.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorldBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1121/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="jboss-wsse-server.xml"/> - <include name="wsdl/*"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1121"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1121-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorld.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1121/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1121/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/*"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1121"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1121-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-jbws1121-appclient.jar"/> - </fileset> - </jar> - <ear destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1121.ear" appxml="${tests.output.dir}/test-resources/jaxrpc/jbws1121/META-INF/application.xml"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-jbws1121.war"/> - </fileset> - </ear> - <!-- jaxrpc-jbws1124one --> <copy todir="${tests.output.dir}/test-resources" overwrite="true"> <fileset dir="${tests.resources.dir}"> @@ -2895,20 +2845,6 @@ </manifest> </war> - <!-- jaxrpc-jbws1188 --> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1188.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1188/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1188/TestEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/jbws1188/TestEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1188/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - <include name="jboss-wsse-server.xml"/> - </webinf> - </war> - <!-- jaxrpc-jbws1190 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1190.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1190/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -3048,43 +2984,6 @@ </fileset> </jar> - <!-- jaxrpc-jbws1316 --> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1316.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1316/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1316/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws1316/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1316/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="jboss-wsse-server.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1316-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/jbws1316/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws1316/*TestCase.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1316/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws1316/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws1316-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-jbws1316-appclient.jar"/> - </fileset> - </jar> - <!-- jaxrpc-jbws1378 --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws1378.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws1378/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -3524,405 +3423,6 @@ </webinf> </war> - <!-- jaxrpc-wsse-account-signup.war --> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-account-signup.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup_signup_RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup_signup_ResponseStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/account-signup/WEB-INF"> - <include name="jboss-webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="jboss-wsse-server.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-account-signup-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup_*.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/account-signup/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/account-signup/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-account-signup-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-wsse-account-signup-appclient.jar"/> - </fileset> - </jar> - - <!-- jaxrpc-wsse-rpc.war --> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="jboss-webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="jboss-wsse-server.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-wsse-rpc-appclient.jar"/> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-none-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF"> - <include name="application-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF-no-wsse"> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-none-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-wsse-rpc-none-appclient.jar"/> - </fileset> - </jar> - - <!-- jaxrpc-wsse-simple-sign-encrypt --> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-simple-sign-encrypt.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="jboss-web.xml"/> - <include name="jboss-webservices.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/simple-sign-encrypt"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-simple-sign-encrypt-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/simple-sign-encrypt"> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-simple-sign-encrypt-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-wsse-simple-sign-encrypt-appclient.jar"/> - </fileset> - </jar> - - <!-- jaxrpc-wsse-sign-fault.war --> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-fault.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="jboss-web.xml"/> - <include name="jboss-webservices.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/sign-fault"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-fault-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/sign-fault"> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-fault-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-wsse-sign-fault-appclient.jar"/> - </fileset> - </jar> - - <!-- jaxrpc-wsse-sign-encrypt-fault.war --> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-encrypt-fault.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="jboss-web.xml"/> - <include name="jboss-webservices.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/sign-encrypt-fault"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-encrypt-fault-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/sign-encrypt-fault"> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-encrypt-fault-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-wsse-sign-encrypt-fault-appclient.jar"/> - </fileset> - </jar> - - <!-- jaxrpc-wsse-store-pass-encrypt-class-cmd.war --> - <replace file="${tests.output.dir}/test-resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-store-pass-encrypt-class-cmd.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/PasswordUtil.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="jboss-web.xml"/> - <include name="jboss-webservices.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/store-pass-encrypt-class-cmd"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/store-pass-encrypt-class-cmd"> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - - <!-- jaxrpc-wsse-web-client.war --> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-web-client.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/webclient/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/RpcTestClientServlet.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="jboss-wsse-server.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/webclient/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="jboss-webservices.xml"/> - <include name="jboss-wsse-client.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/wsse"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - - <!-- jaxrpc-wsse-username --> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-username.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/*Type.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/*Struct.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/*EJBEndpoint.class"/> - </fileset> - <fileset dir="${tests.output.dir}/test-resources"> - <include name="*.properties"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/username/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="jboss-ejb3.xml"/> - <include name="jboss-webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="jboss-wsse-server.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-username-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Type.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Struct.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/JaxRpcTestService*.class"/> - <include name="org/jboss/test/ws/jaxrpc/wsse/SimpleUserType.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/username/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="jboss-wsse-client.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-username-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-wsse-username-appclient.jar"/> - </fileset> - </jar> - <!-- jaxrpc-xop-doclit without handlers --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-21 08:32:21 UTC (rev 16005) @@ -160,29 +160,6 @@ </metainf> </jar> - <!-- jaxws-jbws1309--> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1309.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1309/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws1309/*TestCase.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1309/META-INF"> - <include name="jboss-wsse-server.xml" /> - <include name="jboss.xml" /> - <include name="jboss-webservices.xml" /> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1309/"> - <include name="wsse.truststore" /> - <include name="wsse.keystore" /> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1309-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1309"> - <include name="wsse.truststore" /> - <include name="wsse.keystore" /> - </metainf> - </jar> - <!-- jaxws-jbws1809 --> <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1809.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -192,19 +169,6 @@ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1809/META-INF" /> </jar> - <!-- jaxws-jbws1814 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1814.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1814/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1814/HelloJavaBean.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1814/WEB-INF"> - <include name="*" /> - </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </war> - <!-- jaxws-jbws1850 --> <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1850.jar"> <fileset dir="${tests.output.dir}/test-classes"> @@ -223,110 +187,6 @@ </fileset> </jar> - <!-- jaxws-jbws1988 --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1988.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws1988/META-INF/MANIFEST.MF"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1988/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws1988/*TestCase.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1988/META-INF"> - <include name="jboss-wsse-server.xml" /> - <include name="jboss.xml" /> - </metainf> - </jar> - - <!-- jaxws-jbws1991 --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1991.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws1991/META-INF/MANIFEST.MF"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1991/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws1991/*TestCase.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1991/META-INF"> - <include name="jboss-wsse-server.xml" /> - <include name="jboss.xml" /> - </metainf> - </jar> - - <!-- jaxws-jbws1999 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1999.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1999/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1999/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws1999/*TestCase.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1999/WEB-INF"> - <include name="*" /> - </webinf> - </war> - - <!-- jaxws-jbws2011--> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2011.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2011/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2011/*TestCase.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2011/META-INF"> - <include name="jboss-wsse-server.xml" /> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2011/"> - <include name="wsse.truststore" /> - <include name="wsse.keystore" /> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2011-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2011"> - <include name="wsse.truststore" /> - <include name="wsse.keystore" /> - </metainf> - </jar> - - <!-- jaxws-jbws2014--> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2014-sign.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2014/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2014/*TestCase.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2014/sign/META-INF"> - <include name="jboss-wsse-server.xml" /> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2014/"> - <include name="wsse.*" /> - </metainf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2014-encrypt.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2014/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2014/*TestCase.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2014/encrypt/META-INF"> - <include name="jboss-wsse-server.xml" /> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2014/"> - <include name="wsse.*" /> - </metainf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </jar> - - <!-- jaxws-jbws2116--> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2116.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws2116/META-INF/MANIFEST.MF"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2116/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2116/*TestCase.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2116/META-INF"> - <include name="jboss-wsse-server.xml" /> - <include name="jboss.xml" /> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2116/"> - <include name="wsse10.truststore" /> - <include name="bob-sign.jks" /> - </metainf> - </jar> - <!-- jaxws-jbws2166--> <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2166-A.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws2166/META-INF/MANIFEST.MF"> <fileset dir="${tests.output.dir}/test-classes"> @@ -342,27 +202,6 @@ </fileset> </jar> - <!-- jaxws-jbws2182--> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2182.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2182/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2182/*TestCase.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2182/META-INF"> - <include name="jboss-wsse-server.xml" /> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2182/"> - <include name="wsse.truststore" /> - <include name="wsse.keystore" /> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2182-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2182"> - <include name="wsse.truststore" /> - <include name="wsse.keystore" /> - </metainf> - </jar> - <!-- jaxws-jbws2187 --> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2187.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2187/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -641,30 +480,6 @@ </classes> </war> - <!-- jaxws-jbws3182 --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws3182.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws3182/META-INF/MANIFEST.MF"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3182/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws3182/*TestCase.class" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws3182/META-INF"> - <include name="jboss-wsse-server.xml" /> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws3182-service.sar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws3182/META-INF"> - <include name="jboss-service.xml" /> - <include name="wsse.keystore" /> - <include name="wsse.truststore" /> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws3182-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws3182/META-INF"> - <include name="wsse.truststore" /> - <include name="wsse.keystore" /> - </metainf> - </jar> - <!-- jaxws-jbws3250 --> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3250.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3250/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -673,14 +488,6 @@ </classes> </war> - <!-- jaxws-jbws3277 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3277.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3277/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3277/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws3277/*TestCase*.class" /> - </classes> - </war> - <!-- jaxws-webserviceref --> <war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-03-21 08:32:21 UTC (rev 16005) @@ -571,29 +571,6 @@ </metainf> </jar> - <!-- jaxrpc-samples-store-pass-encrypt.war --> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-store-pass-encrypt.war" - webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/PasswordUtil.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/store-pass-encrypt"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <!-- jaxrpc-samples-wsaddr-hello.war --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsaddr-hello.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -651,97 +628,6 @@ </fileset> </jar> - <!-- jaxrpc-samples-wssecurity-sign --> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/simple-sign"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-sign-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/simple-sign/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-sign-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-samples-wssecurity-sign-appclient.jar"/> - </fileset> - </jar> - - <!-- jaxrpc-samples-wssecurity-encrypt --> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-encrypt.war" - webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/simple-encrypt"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-encrypt-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-encrypt-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-samples-wssecurity-encrypt-appclient.jar"/> - </fileset> - </jar> - <!-- Please add alphabetically --> </target> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2012-03-21 08:32:21 UTC (rev 16005) @@ -49,80 +49,6 @@ </metainf> </jar> - <!-- jaxws-samples-news --> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-news-step1-newspaper.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/news/PressRelease.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/AbstractPressReleaseEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/PressReleaseEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/NewspaperSWA.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/AbstractNewspaperSWAEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/NewspaperSWAEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/NewspaperMTOM.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/AbstractNewspaperMTOMEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/NewspaperMTOMEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/EditionSWA.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/EditionMTOM.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/jaxws-handlers-server.xml"/> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-news-step1-agency.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/news/generated/agency/*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/Agency.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/XMLGregorianCalendarHelper.class"/> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-news-step1-printer.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/news/generated/printer/**/*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/Printer.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/XMLGregorianCalendarHelper.class"/> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-news-step2-newspaper.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/news/PressRelease.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/AbstractPressReleaseEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/SecurePressReleaseEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/NewspaperSWA.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/AbstractNewspaperSWAEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/SecureNewspaperSWAEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/NewspaperMTOM.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/AbstractNewspaperMTOMEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/SecureNewspaperMTOMEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/EditionSWA.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/EditionMTOM.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/jaxws-handlers-server.xml"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/news/META-INF"> - <include name="jboss-wsse-server.xml"/> - <include name="bob-sign_enc.jks"/> - <include name="wsse10.truststore"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-news-step2-agency-client.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/news/generated/agency/*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/Agency.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/XMLGregorianCalendarHelper.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/SecureAgency.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/news/META-INF"> - <include name="jboss-wsse-client.xml"/> - <include name="alice-sign_enc.jks"/> - <include name="wsse10.truststore"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-news-step2-printer.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/news/generated/printer/**/*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/Printer.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/XMLGregorianCalendarHelper.class"/> - <include name="org/jboss/test/ws/jaxws/samples/news/SecurePrinter.class"/> - </fileset> - </jar> - <!-- jaxws-samples-wsa --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war" @@ -136,132 +62,6 @@ prefix="WEB-INF/wsdl"/> </war> - <!-- jaxws-samples-wssecurity-encrypt --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssecurity-encrypt.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloException.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloException_Exception.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UserType.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/ObjectFactory.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </war> - - <!-- jaxws-samples-wssecurity-sign --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssecurity-sign.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloException.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloException_Exception.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UserType.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/ObjectFactory.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/simple-sign/WEB-INF"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </war> - - <!-- jaxws-samples-wssecurity-sign-fault --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssecurity-sign-fault.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloException.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloException_Exception.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UserType.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/ObjectFactory.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/sign-fault/WEB-INF"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </war> - - <!-- jaxws-samples-wssecurity-sign-encrypt-fault --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssecurity-sign-encrypt-fault.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloException.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloException_Exception.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UserType.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/ObjectFactory.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/sign-encrypt-fault/WEB-INF"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </war> - - <!-- jaxws-samples-wssecurity-username --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssecurity-username.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/simple-username/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UsernameEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecurity/simple-username/WEB-INF"> - <include name="jboss-web.xml"/> - <include name="jboss-wsse-server.xml"/> - </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </war> - - <!-- jaxws-samples-wssecuritypolicy-encrypt --> - <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wssecuritypolicy-encrypt.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/wssecuritypolicy/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wssecuritypolicy/Hello.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecuritypolicy/UserType.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wssecuritypolicy/ObjectFactory.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecuritypolicy"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wssecuritypolicy/WEB-INF"> - <include name="wsdl/**"/> - </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </war> - <!-- Please add alphabetically --> </target> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/MicrosoftGeneratedWSDLTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/MicrosoftGeneratedWSDLTestCase.java 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/wsdl11/MicrosoftGeneratedWSDLTestCase.java 2012-03-21 08:32:21 UTC (rev 16005) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.common.wsdl11; - -import java.net.URL; - -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLTypes; -import org.jboss.ws.metadata.wsdl.WSDLUtils; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.wsf.test.JBossWSTest; - -/** - * Tests WSDL11Reader ability to parse WSDL Files - * generated by the microsoft world - * - * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana - * @since November 10, 2005 - */ -public class MicrosoftGeneratedWSDLTestCase extends JBossWSTest -{ - public void testBaseRpcLit() throws Exception - { - URL wsdlFile = getResourceURL("common/wsdl11/microsoft-interop/rpclit/BaseTypesRpcLit.wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile); - - // check if the schema has been extracted - WSDLTypes wsdlTypes = wsdlDefinitions.getWsdlTypes(); - assertNotNull(WSDLUtils.getSchemaModel(wsdlTypes)); - } -} Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/EndpointReferenceTestCase.java 2012-03-21 08:32:21 UTC (rev 16005) @@ -1,66 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.wsaddressing; - -import org.jboss.ws.extensions.addressing.EndpointReferenceImpl; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.ws.common.DOMUtils; -import org.w3c.dom.Element; - -/** - * Test the EndpointReferenceImpl - * - * @author Thomas.Diesler(a)jboss.org - * @since 13-Nov-2005 - */ -public class EndpointReferenceTestCase extends JBossWSTest -{ - public void testEndpointReferenceParser() throws Exception - { - String inStr = - "<wsa:EndpointReference fabrikam:eprAttr='eprAttrValue' xmlns:wsa='http://www.w3.org/2005/08/addressing' xmlns:fabrikam='http://www.fabrikam.com/ns'>" + - " <wsa:Address fabrikam:addrAttr='addrAttrValue'>http://www.fabrikam123.example/acct</wsa:Address>" + - " <wsa:ReferenceParameters fabrikam:paramAttr='paramAttrValue'>" + - " <fabrikam:CustomerKey>123456789</fabrikam:CustomerKey>" + - " <fabrikam:ShoppingCart>ABCDEFG</fabrikam:ShoppingCart>" + - " </wsa:ReferenceParameters>" + - " <wsa:Metadata fabrikam:metaAttr='metaAttrValue'>" + - " <wsp:Policy xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy' xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wssws... + - " <wsp:ExactlyOne>" + - " <wsp:All>" + - " <wsse:SecurityToken>" + - " <wsse:TokenType>wsse:Kerberosv5TGT</wsse:TokenType>" + - " </wsse:SecurityToken>" + - " </wsp:All>" + - " </wsp:ExactlyOne>" + - " </wsp:Policy>" + - " </wsa:Metadata>" + - " <fabrikam:eprElement>123456789</fabrikam:eprElement>" + - "</wsa:EndpointReference>"; - - Element inElement = DOMUtils.parse(inStr); - EndpointReferenceImpl epr = new EndpointReferenceImpl(inElement); - Element outElement = epr.toElement(); - - assertEquals(inElement, outElement); - } -} Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-21 08:32:21 UTC (rev 16005) @@ -301,30 +301,6 @@ <value>${project.build.directory}/test-classes/jbossws-roles.properties</value> </property> <property> - <name>org.jboss.ws.wsse.keyStore</name> - <value>${test.resources.directory}/jaxws/samples/wssecurity/wsse.keystore</value> - </property> - <property> - <name>org.jboss.ws.wsse.trustStore</name> - <value>${test.resources.directory}/jaxws/samples/wssecurity/wsse.truststore</value> - </property> - <property> - <name>org.jboss.ws.wsse.keyStorePassword</name> - <value>jbossws</value> - </property> - <property> - <name>org.jboss.ws.wsse.trustStorePassword</name> - <value>jbossws</value> - </property> - <property> - <name>org.jboss.ws.wsse.keyStoreType</name> - <value>jks</value> - </property> - <property> - <name>org.jboss.ws.wsse.trustStoreType</name> - <value>jks</value> - </property> - <property> <name>test.archive.directory</name> <value>${test.archive.directory}</value> </property> @@ -534,17 +510,11 @@ <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine> <excludes> - <!-- # UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration--> - <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude> - <!-- # [JBWS-3150] This test causes hudson to freeze --> <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> <exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude> - <!-- # [JBWS-3252] Investigate WSA interop tests regression --> - <exclude>org/jboss/test/ws/interop/wsa/AddressingTestCase*</exclude> - <!-- ////////////////////////// --> <!-- AS7 integration exclusions --> <!-- ////////////////////////// --> Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-20 17:09:06 UTC (rev 16004) +++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-21 08:32:21 UTC (rev 16005) @@ -85,7 +85,6 @@ <stax.api.version>1.0-2</stax.api.version> <woodstox.version>3.2.6</woodstox.version> <wsdl4j.version>1.6.2</wsdl4j.version> - <xmlsec.version>1.5.1</xmlsec.version> <xerces.version>2.9.1</xerces.version> <jbossxb.version>2.0.3.GA</jbossxb.version> <junit.version>3.8.1</junit.version> @@ -345,11 +344,6 @@ <version>${xerces.version}</version> </dependency> <dependency> - <groupId>org.apache.santuario</groupId> - <artifactId>xmlsec</artifactId> - <version>${xmlsec.version}</version> - </dependency> - <dependency> <groupId>org.jboss.netty</groupId> <artifactId>netty</artifactId> <version>${netty.version}</version>