May 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r7121 - in stack/metro/trunk/modules/testsuite: metro-tests/src/test/etc and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-05-21 06:11:42 -0400 (Wed, 21 May 2008) New Revision: 7121 Modified: stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml Log: Fixing log4j output file Modified: stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml =================================================================== --- stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2008-05-21 01:11:08 UTC (rev 7120) +++ stack/metro/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2008-05-21 10:11:42 UTC (rev 7121) @@ -22,7 +22,7 @@  <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> - <param name="File" value="${build.testlog}/test.log"/> + <param name="File" value="${log4j.output.dir}/test.log"/> <param name="Append" value="false"/>  @@ -55,6 +55,9 @@ <category name="org.jboss.ws"> <priority value="DEBUG"/> </category> + <category name="com.sun"> + <priority value="DEBUG"/> + </category>   Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml 2008-05-21 01:11:08 UTC (rev 7120) +++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/etc/log4j.xml 2008-05-21 10:11:42 UTC (rev 7121) @@ -22,7 +22,7 @@  <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> - <param name="File" value="${build.testlog}/test.log"/> + <param name="File" value="${log4j.output.dir}/test.log"/> <param name="Append" value="false"/>  @@ -55,6 +55,9 @@ <category name="org.jboss.ws"> <priority value="DEBUG"/> </category> + <category name="com.sun"> + <priority value="DEBUG"/> + </category>

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r7120 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-20 21:11:08 -0400 (Tue, 20 May 2008) New Revision: 7120 Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt Log: JBWS-2175 test exclusion Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-21 00:20:59 UTC (rev 7119) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss421.txt 2008-05-21 01:11:08 UTC (rev 7120) @@ -25,3 +25,5 @@ # [JBWS-1911] Support the JMS transport with JAX-WS org/jboss/test/ws/jaxws/samples/jmstransport/** +# [JBWS-2175] wsconsume cannot run with jaxws-api from build output +org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-21 00:20:59 UTC (rev 7119) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-21 01:11:08 UTC (rev 7120) @@ -37,3 +37,5 @@ # [JBWS-2170] Fix embedded for maven build org/jboss/test/ws/embedded/** +# [JBWS-2175] wsconsume cannot run with jaxws-api from build output +org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-21 00:20:59 UTC (rev 7119) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-21 01:11:08 UTC (rev 7120) @@ -21,3 +21,5 @@ # [JBWS-2170] Fix embedded for maven build org/jboss/test/ws/embedded/** +# [JBWS-2175] wsconsume cannot run with jaxws-api from build output +org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-21 00:20:59 UTC (rev 7119) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-21 01:11:08 UTC (rev 7120) @@ -30,3 +30,5 @@ # [JBWS-2170] Fix embedded for maven build org/jboss/test/ws/embedded/** +# [JBWS-2175] wsconsume cannot run with jaxws-api from build output +org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.* Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-21 00:20:59 UTC (rev 7119) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-21 01:11:08 UTC (rev 7120) @@ -69,3 +69,6 @@ # [JBWS-2171] JBossClientMetaData.class not found org/jboss/test/ws/jaxws/webserviceref/ServiceRefOverridesTestCase.* + +# [JBWS-2175] wsconsume cannot run with jaxws-api from build output +org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.*

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r7119 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-20 20:20:59 -0400 (Tue, 20 May 2008) New Revision: 7119 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java Log: more on consumer Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-05-21 00:19:47 UTC (rev 7118) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-05-21 00:20:59 UTC (rev 7119) @@ -27,6 +27,7 @@ import java.io.File; import java.io.PrintStream; import java.lang.reflect.Method; +import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; @@ -71,7 +72,9 @@ // create a new consumer for every test case consumer = WSContractConsumer.newInstance(); if (toogleMessageOut) + { consumer.setMessageStream(System.out); + } // shared output directory, we go out of the test-resources directory outputDirectory = createResourceFile("../wsconsume/java"); @@ -93,9 +96,7 @@ consumeWSDL(); - URLClassLoader loader = new URLClassLoader(new URL[] { outputDirectory.toURL() }); - String seiClassName = "org.jboss.test.ws.tools.testBindingFiles.EndpointInterface"; - Class sei = loader.loadClass(seiClassName); + Class sei = loadEndpointInterface("testBindingFiles"); boolean containsAsyncOperations = false; for (Method m : sei.getDeclaredMethods()) @@ -182,8 +183,11 @@ File packageDir = new File(outputDirectory, "org/jboss/test/ws/tools/testTargetPackage"); assertTrue("Package not created", packageDir.exists()); - File sei = new File(outputDirectory, "org/jboss/test/ws/tools/testTargetPackage/EndpointInterface.java"); - assertTrue("SEI not generated", sei.exists()); + File seiSource = new File(outputDirectory, "org/jboss/test/ws/tools/testTargetPackage/EndpointInterface.java"); + assertTrue("SEI not generated", seiSource.exists()); + + Class seiClass = loadEndpointInterface("testTargetPackage"); + assertNotNull("Cannot load SEI class", seiClass); } /** @@ -329,4 +333,11 @@ consumer.consume(getResourceFile("jaxws/smoke/tools/wsdl/TestService.wsdl").getCanonicalPath()); } + private Class loadEndpointInterface(String testName) throws MalformedURLException, ClassNotFoundException + { + URLClassLoader loader = new URLClassLoader(new URL[] { outputDirectory.toURL() }); + String seiClassName = "org.jboss.test.ws.tools." + testName + ".EndpointInterface"; + Class sei = loader.loadClass(seiClassName); + return sei; + } }

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r7118 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-20 20:19:47 -0400 (Tue, 20 May 2008) New Revision: 7118 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java Log: Throw the RTEs Dont brute force wstx Restore value of system properties Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2008-05-20 22:58:46 UTC (rev 7117) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/jaxws/impl/SunRIConsumerImpl.java 2008-05-21 00:19:47 UTC (rev 7118) @@ -209,41 +209,50 @@ args.add(wsdl.toString()); // See WsimportTool#compileGeneratedClasses() - if(!additionalCompilerClassPath.isEmpty()) + String orgJavaClassPath = System.getProperty("java.class.path"); + String javaClassPath = (orgJavaClassPath != null ? orgJavaClassPath : ""); + if(additionalCompilerClassPath.isEmpty() == false) { - StringBuffer javaCP = new StringBuffer(); - for(String s : additionalCompilerClassPath) + for(String pathElement : additionalCompilerClassPath) { - javaCP.append(s).append(File.pathSeparator); + javaClassPath += pathElement + File.pathSeparator; } - System.setProperty("java.class.path", javaCP.toString()); + System.setProperty("java.class.path", javaClassPath); } try { - // enforce woodstox - if (null == System.getProperty("javax.xml.stream.XMLInputFactory")) - System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory"); - - - WsimportTool compileTool = new WsimportTool(stream); boolean success = compileTool.run(args.toArray(new String[args.size()])); if (!success) throw new IllegalStateException("WsImport invocation failed. Try the verbose switch for more information"); } - catch (Throwable t) + catch (RuntimeException rte) { if (messageStream != null) { messageStream.println("Failed to invoke WsImport"); - t.printStackTrace(messageStream); + rte.printStackTrace(messageStream); } else { - t.printStackTrace(); + rte.printStackTrace(); } + + throw rte; } + finally + { + // restore the original value of the java.class.path property + if (orgJavaClassPath != null) + { + System.setProperty("java.class.path", orgJavaClassPath); + } + else + { + System.clearProperty("java.class.path"); + } + } } }

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r7117 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/persistence.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-20 18:58:46 -0400 (Tue, 20 May 2008) New Revision: 7117 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/persistence/PersistenceTestCase.java Log: FIXME [JBWS-2044] Rewrite Server side file system based RM store Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/persistence/PersistenceTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/persistence/PersistenceTestCase.java 2008-05-20 22:33:44 UTC (rev 7116) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsrm/persistence/PersistenceTestCase.java 2008-05-20 22:58:46 UTC (rev 7117) @@ -47,7 +47,7 @@ if (true) { - System.out.println("FIXME [JBWS-2044]"); + System.out.println("FIXME [JBWS-2044] Rewrite Server side file system based RM store"); return; }

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r7116 - in stack/native/trunk/modules: core/src/main/java/org/jboss/ws/extensions/security and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-20 18:33:44 -0400 (Tue, 20 May 2008) New Revision: 7116 Removed: stack/native/trunk/modules/client/etc/ Modified: stack/native/trunk/modules/client/pom.xml stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityAPI.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java Log: Add WSSecurityAPI.cleanup() Modified: stack/native/trunk/modules/client/pom.xml =================================================================== --- stack/native/trunk/modules/client/pom.xml 2008-05-20 17:41:14 UTC (rev 7115) +++ stack/native/trunk/modules/client/pom.xml 2008-05-20 22:33:44 UTC (rev 7116) @@ -44,7 +44,9 @@ <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> - <manifestFile>etc/default.mf</manifestFile> + <manifestEntries> + <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-jaxrpc.jar jbossws-native-jaxws.jar jbossws-native-jaxws-ext.jar jbossws-native-saaj.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-remoting.jar jboss-xml-binding.jar policy.jar stax-api.jar wsdl4j.jar</Class-Path> + </manifestEntries> </archive> </configuration> </plugin> Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityAPI.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityAPI.java 2008-05-20 17:41:14 UTC (rev 7115) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityAPI.java 2008-05-20 22:33:44 UTC (rev 7116) @@ -72,4 +72,10 @@ * @throws SOAPException */ public void encodeMessage(WSSecurityConfiguration configuration, SOAPMessage message, Config operationConfig, String user, String password) throws SOAPException; + + /** + * Cleanup shared resources + */ + public void cleanup(); + } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2008-05-20 17:41:14 UTC (rev 7115) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/WSSecurityDispatcher.java 2008-05-20 22:33:44 UTC (rev 7116) @@ -65,6 +65,10 @@ import org.jboss.ws.metadata.wsse.Username; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.wsf.common.DOMWriter; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.invocation.SecurityAdaptor; +import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; import org.w3c.dom.Element; public class WSSecurityDispatcher implements WSSecurityAPI @@ -72,124 +76,6 @@ // provide logging private static Logger log = Logger.getLogger(WSSecurityDispatcher.class); - private static List<Target> convertTargets(List<org.jboss.ws.metadata.wsse.Target> targets) - { - if (targets == null) - return null; - - ArrayList<Target> newList = new ArrayList<Target>(targets.size()); - - for (org.jboss.ws.metadata.wsse.Target target : targets) - { - if ("qname".equals(target.getType())) - { - QNameTarget qnameTarget = new QNameTarget(QName.valueOf(target.getValue()), target.isContentOnly()); - newList.add(qnameTarget); - } - else if ("wsuid".equals(target.getType())) - { - newList.add(new WsuIdTarget(target.getValue())); - } - } - - return newList; - } - - private static CommonSOAPFaultException convertToFault(WSSecurityException e) - { - return new CommonSOAPFaultException(e.getFaultCode(), e.getFaultString()); - } - - private static List<RequireOperation> buildRequireOperations(Config operationConfig) - { - if (operationConfig == null) - return null; - - Requires requires = operationConfig.getRequires(); - if (requires == null) - return null; - - ArrayList<RequireOperation> operations = new ArrayList<RequireOperation>(); - RequireTimestamp requireTimestamp = requires.getRequireTimestamp(); - if (requireTimestamp != null) - operations.add(new RequireTimestampOperation(requireTimestamp.getMaxAge())); - - RequireSignature requireSignature = requires.getRequireSignature(); - if (requireSignature != null) - { - List<Target> targets = convertTargets(requireSignature.getTargets()); - operations.add(new RequireSignatureOperation(targets)); - } - - RequireEncryption requireEncryption = requires.getRequireEncryption(); - if (requireEncryption != null) - { - List<Target> targets = convertTargets(requireEncryption.getTargets()); - operations.add(new RequireEncryptionOperation(targets)); - } - - return operations; - } - - private static Config getActualConfig(WSSecurityConfiguration configuration, Config operationConfig) - { - if (operationConfig == null) - { - //if no configuration override, we try getting the right operation config - //according to the invoked operation that can be found using the context - CommonMessageContext ctx = MessageContextAssociation.peekMessageContext(); - if (ctx != null) - { - EndpointMetaData epMetaData = ctx.getEndpointMetaData(); - QName port = epMetaData.getPortName(); - - OperationMetaData opMetaData = ctx.getOperationMetaData(); - if (opMetaData == null) - { - // Get the operation meta data from the soap message - // for the server side inbound message. - SOAPMessageImpl soapMessage = (SOAPMessageImpl)ctx.getSOAPMessage(); - try - { - opMetaData = soapMessage.getOperationMetaData(epMetaData); - } - catch (SOAPException e) - { - throw new WebServiceException("Error while looking for the operation meta data: " + e); - } - } - if (opMetaData != null) - operationConfig = selectOperationConfig(configuration, port, opMetaData.getQName()); - } - } - //null operationConfig means default behavior - return operationConfig != null ? operationConfig : configuration.getDefaultConfig(); - } - - private static Config selectOperationConfig(WSSecurityConfiguration configuration, QName portName, QName opName) - { - Port port = configuration.getPorts().get(portName != null ? portName.getLocalPart() : null); - if (port == null) - return configuration.getDefaultConfig(); - - Operation operation = port.getOperations().get(opName != null ? opName.toString() : null); - if (operation == null) - { - //if the operation name was not available or didn't match any wsse configured operation, - //we fall back to the port wsse config (if available) or the default config. - Config portConfig = port.getDefaultConfig(); - return (portConfig == null) ? configuration.getDefaultConfig() : portConfig; - - } - return operation.getConfig(); - } - - - private static boolean hasRequirements(Config config) - { - return config != null && config.getRequires() != null; - } - public void decodeMessage(WSSecurityConfiguration configuration, SOAPMessage message, Config operationConfig) throws SOAPException { Config config = getActualConfig(configuration, operationConfig); @@ -307,4 +193,130 @@ } } + public void cleanup() + { + //Reset username/password since they're stored using a ThreadLocal + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).newSecurityAdapter(); + securityAdaptor.setPrincipal(null); + securityAdaptor.setCredential(null); + } + + private List<Target> convertTargets(List<org.jboss.ws.metadata.wsse.Target> targets) + { + if (targets == null) + return null; + + ArrayList<Target> newList = new ArrayList<Target>(targets.size()); + + for (org.jboss.ws.metadata.wsse.Target target : targets) + { + if ("qname".equals(target.getType())) + { + QNameTarget qnameTarget = new QNameTarget(QName.valueOf(target.getValue()), target.isContentOnly()); + newList.add(qnameTarget); + } + else if ("wsuid".equals(target.getType())) + { + newList.add(new WsuIdTarget(target.getValue())); + } + } + + return newList; + } + + private CommonSOAPFaultException convertToFault(WSSecurityException e) + { + return new CommonSOAPFaultException(e.getFaultCode(), e.getFaultString()); + } + + private List<RequireOperation> buildRequireOperations(Config operationConfig) + { + if (operationConfig == null) + return null; + + Requires requires = operationConfig.getRequires(); + if (requires == null) + return null; + + ArrayList<RequireOperation> operations = new ArrayList<RequireOperation>(); + RequireTimestamp requireTimestamp = requires.getRequireTimestamp(); + if (requireTimestamp != null) + operations.add(new RequireTimestampOperation(requireTimestamp.getMaxAge())); + + RequireSignature requireSignature = requires.getRequireSignature(); + if (requireSignature != null) + { + List<Target> targets = convertTargets(requireSignature.getTargets()); + operations.add(new RequireSignatureOperation(targets)); + } + + RequireEncryption requireEncryption = requires.getRequireEncryption(); + if (requireEncryption != null) + { + List<Target> targets = convertTargets(requireEncryption.getTargets()); + operations.add(new RequireEncryptionOperation(targets)); + } + + return operations; + } + + private Config getActualConfig(WSSecurityConfiguration configuration, Config operationConfig) + { + if (operationConfig == null) + { + //if no configuration override, we try getting the right operation config + //according to the invoked operation that can be found using the context + CommonMessageContext ctx = MessageContextAssociation.peekMessageContext(); + if (ctx != null) + { + EndpointMetaData epMetaData = ctx.getEndpointMetaData(); + QName port = epMetaData.getPortName(); + + OperationMetaData opMetaData = ctx.getOperationMetaData(); + if (opMetaData == null) + { + // Get the operation meta data from the soap message + // for the server side inbound message. + SOAPMessageImpl soapMessage = (SOAPMessageImpl)ctx.getSOAPMessage(); + try + { + opMetaData = soapMessage.getOperationMetaData(epMetaData); + } + catch (SOAPException e) + { + throw new WebServiceException("Error while looking for the operation meta data: " + e); + } + } + if (opMetaData != null) + operationConfig = selectOperationConfig(configuration, port, opMetaData.getQName()); + } + } + //null operationConfig means default behavior + return operationConfig != null ? operationConfig : configuration.getDefaultConfig(); + } + + private Config selectOperationConfig(WSSecurityConfiguration configuration, QName portName, QName opName) + { + Port port = configuration.getPorts().get(portName != null ? portName.getLocalPart() : null); + if (port == null) + return configuration.getDefaultConfig(); + + Operation operation = port.getOperations().get(opName != null ? opName.toString() : null); + if (operation == null) + { + //if the operation name was not available or didn't match any wsse configured operation, + //we fall back to the port wsse config (if available) or the default config. + Config portConfig = port.getDefaultConfig(); + return (portConfig == null) ? configuration.getDefaultConfig() : portConfig; + + } + return operation.getConfig(); + } + + + private boolean hasRequirements(Config config) + { + return config != null && config.getRequires() != null; + } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2008-05-20 17:41:14 UTC (rev 7115) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2008-05-20 22:33:44 UTC (rev 7116) @@ -53,10 +53,6 @@ import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; import org.jboss.wsf.common.DOMWriter; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.invocation.SecurityAdaptor; -import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; import org.jboss.wsf.test.JBossWSTest; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -71,12 +67,20 @@ /** Test that we can build an envelope from InputStream */ public void testRoundTrip() throws Exception { - String envStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + " <env:Header>" - + " <tns:someHeader xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'" - + " tns:test='hi' xmlns:tns='http://org.jboss.ws/2004'>some header value</tns:someHeader>" + " </env:Header> " + " <env:Body>" - + " <tns:echoString2 xmlns:tns='http://org.jboss.ws/2004'>" + " <string>Hello World!</string>" + " </tns:echoString2>" - + " <tns:echoString xmlns:tns='http://org.jboss.ws/2004'>" + " <string>Hello World!</string>" + " </tns:echoString>" + " </env:Body>" - + "</env:Envelope>"; + String envStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <env:Header>" + + " <tns:someHeader xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'" + + " tns:test='hi' xmlns:tns='http://org.jboss.ws/2004'>some header value</tns:someHeader>" + + " </env:Header> " + + " <env:Body>" + + " <tns:echoString2 xmlns:tns='http://org.jboss.ws/2004'>" + + " <string>Hello World!</string>" + + " </tns:echoString2>" + + " <tns:echoString xmlns:tns='http://org.jboss.ws/2004'>" + + " <string>Hello World!</string>" + + " </tns:echoString>" + + " </env:Body>" + + "</env:Envelope>"; ByteArrayInputStream inputStream = new ByteArrayInputStream(envStr.getBytes()); MessageFactory factory = new MessageFactoryImpl(); @@ -113,28 +117,43 @@ public void testRoundTripUsingAPI() throws Exception { - String envStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + " <env:Header>" - + " <tns:someHeader xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'" - + " tns:test='hi' xmlns:tns='http://org.jboss.ws/2004'>some header value</tns:someHeader>" + " </env:Header> " - + " <env:Body wsu:Id='element-9-1205139829909-17908832' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...'>" - + " <tns:echoString2 xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' xmlns:tns='http://org.jboss.ws/2004' " - + " xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...'>" + " <string>Hello World!</string>" - + " </tns:echoString2>" + " <tns:echoString xmlns:tns='http://org.jboss.ws/2004'>" + " <string>Hello World!</string>" + " </tns:echoString>" - + " </env:Body>" + "</env:Envelope>"; + String envStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <env:Header>" + + " <tns:someHeader xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'" + + " tns:test='hi' xmlns:tns='http://org.jboss.ws/2004'>some header value</tns:someHeader>" + + " </env:Header> " + + " <env:Body wsu:Id='element-9-1205139829909-17908832' xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...'>" + + " <tns:echoString2 xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' xmlns:tns='http://org.jboss.ws/2004' " + + " xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...'>" + + " <string>Hello World!</string>" + + " </tns:echoString2>" + + " <tns:echoString xmlns:tns='http://org.jboss.ws/2004'>" + + " <string>Hello World!</string>" + + " </tns:echoString>" + + " </env:Body>" + + "</env:Envelope>"; String conf = "<jboss-ws-security xmlns='http://www.jboss.com/ws-security/config' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'" - + " xsi:schemaLocation='http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd'>" + " <config>" - + " <encrypt type='x509v3' alias='wsse'/>" + " <sign alias='wsse'/>" + " <username/>" + " <requires>" + " <encryption/>" - + " <signature/>" + " </requires>" + " </config>" + "</jboss-ws-security>"; + + " xsi:schemaLocation='http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd'>" + + " <config>" + + " <encrypt type='x509v3' alias='wsse'/>" + + " <sign alias='wsse'/>" + + " <username/>" + + " <requires>" + + " <encryption/>" + + " <signature/>" + + " </requires>" + + " </config>" + + "</jboss-ws-security>"; WSSecurityConfiguration configuration = WSSecurityOMFactory.newInstance().parse(new StringReader(conf)); ByteArrayInputStream inputStream = new ByteArrayInputStream(envStr.getBytes()); MessageFactory factory = new MessageFactoryImpl(); SOAPMessage soapMsg = factory.createMessage(null, inputStream); String expected = DOMWriter.printNode(soapMsg.getSOAPPart().getEnvelope(), true); + WSSecurityAPI sec = new WSSecurityDispatcher(); try { - WSSecurityAPI sec = new WSSecurityDispatcher(); sec.encodeMessage(configuration, soapMsg, null, "kermit", "thefrog"); sec.decodeMessage(configuration, soapMsg, null); @@ -143,11 +162,7 @@ } finally { - //Reset username/password since they're stored using a ThreadLocal - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).newSecurityAdapter(); - securityAdaptor.setPrincipal(null); - securityAdaptor.setCredential(null); + sec.cleanup(); } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java 2008-05-20 17:41:14 UTC (rev 7115) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java 2008-05-20 22:33:44 UTC (rev 7116) @@ -40,10 +40,6 @@ import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.invocation.SecurityAdaptor; -import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; import org.jboss.wsf.test.JBossWSTest; import org.jboss.xb.binding.SimpleTypeBindings; import org.w3c.dom.Element; @@ -56,6 +52,22 @@ */ public class MessageTestCase extends JBossWSTest { + private WSSecurityAPI sec; + + @Override + protected void setUp() throws Exception + { + super.setUp(); + sec = new WSSecurityDispatcher(); + } + + @Override + protected void tearDown() throws Exception + { + super.tearDown(); + sec.cleanup(); + } + private String serverConf = "<jboss-ws-security xmlns='http://www.jboss.com/ws-security/config' " + "xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' " + "xsi:schemaLocation='http://www.jboss.com/ws-security/config " @@ -112,10 +124,9 @@ //"2008-03-12T17:12:31.310Z" Calendar created = new GregorianCalendar(TimeZone.getTimeZone("UTC")); - WSSecurityAPI sec = new WSSecurityDispatcher(); sec.decodeMessage(configuration, getMessage(created, envStr), null); + created.add(Calendar.MINUTE, -10); - created.add(Calendar.MINUTE, -10); try { sec.decodeMessage(configuration, getMessage(created, envStr), null); @@ -125,14 +136,6 @@ { //OK } - finally - { - //Reset username/password since they're stored using a ThreadLocal - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).newSecurityAdapter(); - securityAdaptor.setPrincipal(null); - securityAdaptor.setCredential(null); - } } private SOAPMessage getMessage(Calendar created, String envStr) throws Exception @@ -149,7 +152,6 @@ ByteArrayInputStream inputStream = new ByteArrayInputStream(testMessage.getBytes()); MessageFactory factory = new MessageFactoryImpl(); SOAPMessage soapMsg = factory.createMessage(null, inputStream); - WSSecurityAPI sec = new WSSecurityDispatcher(); sec.encodeMessage(configuration, soapMsg, null, "kermit", "therealfrog"); Element securityEl = (Element)soapMsg.getSOAPHeader().getChildElements(Constants.WSSE_HEADER_QNAME).next(); Element usernameTokenEl = (Element)DOMUtils.getChildElements(securityEl, new QName(Constants.WSSE_NS, "UsernameToken")).next(); @@ -169,7 +171,6 @@ ByteArrayInputStream inputStream = new ByteArrayInputStream(testMessage.getBytes()); MessageFactory factory = new MessageFactoryImpl(); SOAPMessage soapMsg = factory.createMessage(null, inputStream); - WSSecurityAPI sec = new WSSecurityDispatcher(); Username username = new Username(true, true, false); Config config = new Config(); config.setUsername(username); @@ -190,7 +191,6 @@ ByteArrayInputStream inputStream = new ByteArrayInputStream(testMessage.getBytes()); MessageFactory factory = new MessageFactoryImpl(); SOAPMessage soapMsg = factory.createMessage(null, inputStream); - WSSecurityAPI sec = new WSSecurityDispatcher(); Username username = new Username(true, false, true); Config config = new Config(); config.setUsername(username);

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r7115 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws: jaxws/jbws1988 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-05-20 13:41:14 -0400 (Tue, 20 May 2008) New Revision: 7115 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java Log: Fixing SecureEJBTestCase (cleaning up security principal/credential after playing with them on client side) Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2008-05-20 15:12:52 UTC (rev 7114) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RoundTripTestCase.java 2008-05-20 17:41:14 UTC (rev 7115) @@ -53,6 +53,10 @@ import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; import org.jboss.wsf.common.DOMWriter; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.invocation.SecurityAdaptor; +import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; import org.jboss.wsf.test.JBossWSTest; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -128,12 +132,23 @@ SOAPMessage soapMsg = factory.createMessage(null, inputStream); String expected = DOMWriter.printNode(soapMsg.getSOAPPart().getEnvelope(), true); - WSSecurityAPI sec = new WSSecurityDispatcher(); - sec.encodeMessage(configuration, soapMsg, null, "kermit", "thefrog"); - sec.decodeMessage(configuration, soapMsg, null); - - String actual = DOMWriter.printNode(soapMsg.getSOAPPart().getEnvelope(), true); - assertEquals(expected, actual); + try + { + WSSecurityAPI sec = new WSSecurityDispatcher(); + sec.encodeMessage(configuration, soapMsg, null, "kermit", "thefrog"); + sec.decodeMessage(configuration, soapMsg, null); + + String actual = DOMWriter.printNode(soapMsg.getSOAPPart().getEnvelope(), true); + assertEquals(expected, actual); + } + finally + { + //Reset username/password since they're stored using a ThreadLocal + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).newSecurityAdapter(); + securityAdaptor.setPrincipal(null); + securityAdaptor.setCredential(null); + } } // WS-Security leaves wsu:id attributes around on elements which are not Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java 2008-05-20 15:12:52 UTC (rev 7114) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java 2008-05-20 17:41:14 UTC (rev 7115) @@ -40,6 +40,10 @@ import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.invocation.SecurityAdaptor; +import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; import org.jboss.wsf.test.JBossWSTest; import org.jboss.xb.binding.SimpleTypeBindings; import org.w3c.dom.Element; @@ -121,6 +125,14 @@ { //OK } + finally + { + //Reset username/password since they're stored using a ThreadLocal + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + SecurityAdaptor securityAdaptor = spiProvider.getSPI(SecurityAdaptorFactory.class).newSecurityAdapter(); + securityAdaptor.setPrincipal(null); + securityAdaptor.setCredential(null); + } } private SOAPMessage getMessage(Calendar created, String envStr) throws Exception @@ -131,7 +143,6 @@ return factory.createMessage(null, inputStream); } - public void testEncodeMessageWithNonceAndCreated() throws Exception { WSSecurityConfiguration configuration = WSSecurityOMFactory.newInstance().parse(new StringReader(clientConf));

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r7114 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP: src/main/java/org/jboss/wsf/stack/jbws and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-05-20 11:12:52 -0400 (Tue, 20 May 2008) New Revision: 7114 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/CountryCodeType.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/CurrencyCodeType.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCountryCodes.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCountryCodesResponse.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCurrencyCodes.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCurrencyCodesResponse.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/ObjectFactory.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/Service.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/package-info.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/web.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/BaseComponents.xsd stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/CoreComponentTypes.xsd stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/TestService.wsdl Removed: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/CountryCodeType.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/CurrencyCodeType.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCountryCodes.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCountryCodesResponse.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCurrencyCodes.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCurrencyCodesResponse.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/ObjectFactory.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/Service.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/package-info.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/web.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/BaseComponents.xsd stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/CoreComponentTypes.xsd stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/TestService.wsdl Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java Log: [JBPAPP-849] WSDL with custom schema imports causes java.lang.OutOfMemoryError: Java heap space when there are circular schema imports dependencies. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2008-05-20 14:56:18 UTC (rev 7113) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2008-05-20 15:12:52 UTC (rev 7114) @@ -395,7 +395,7 @@ </metainf> </jar> -  +  <jar destfile="${tests.output.dir}/libs/jaxws-jbws2000.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws2000/*.class"/> @@ -411,8 +411,19 @@ </fileset> <metainf dir="${tests.output.dir}/resources/jaxws/jbws1809/META-INF"/> </jar> + +  + <war warfile="${tests.output.dir}/libs/jaxws-jbws1843.war" + webxml="${tests.output.dir}/resources/jaxws/jbws1843/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1843/**/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws1843/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws1843/WEB-INF"> + <include name="wsdl/**"/> + </webinf> + </war> -  <war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2008-05-20 14:56:18 UTC (rev 7113) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -32,6 +32,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import javax.wsdl.Definition; @@ -120,11 +121,12 @@ Definition wsdl11Definition = wsdlDefinitions.getWsdlOneOneDefinition(); if (wsdl11Definition != null) { - publishWsdlImports(wsdlFile.toURL(), wsdl11Definition); + List<String> published = new LinkedList<String>(); + publishWsdlImports(wsdlFile.toURL(), wsdl11Definition, published); // Publish XMLSchema imports Document document = wsdlDefinitions.getWsdlDocument(); - publishSchemaImports(wsdlFile.toURL(), document.getDocumentElement()); + publishSchemaImports(wsdlFile.toURL(), document.getDocumentElement(), published); } else { @@ -144,7 +146,7 @@ /** Publish the wsdl imports for a given wsdl definition */ - private void publishWsdlImports(URL parentURL, Definition parentDefinition) throws Exception + private void publishWsdlImports(URL parentURL, Definition parentDefinition, List<String> published) throws Exception { String baseURI = parentURL.toExternalForm(); @@ -159,6 +161,16 @@ // its an external import, don't publish locally if (locationURI.startsWith("http://") == false) { + // infinity loops prevention + if (published.contains(locationURI)) + { + return; + } + else + { + published.add(locationURI); + } + URL targetURL = new URL(baseURI.substring(0, baseURI.lastIndexOf("/") + 1) + locationURI); File targetFile = new File(targetURL.getPath()); targetFile.getParentFile().mkdirs(); @@ -172,12 +184,12 @@ if (log.isDebugEnabled()) log.debug("WSDL import published to: " + targetURL); - // recursivly publish imports - publishWsdlImports(targetURL, subdef); + // recursively publish imports + publishWsdlImports(targetURL, subdef, published); // Publish XMLSchema imports Element subdoc = DOMUtils.parse(targetURL.openStream()); - publishSchemaImports(targetURL, subdoc); + publishSchemaImports(targetURL, subdoc, published); } } } @@ -185,7 +197,7 @@ /** Publish the schema imports for a given wsdl definition */ - private void publishSchemaImports(URL parentURL, Element element) throws Exception + private void publishSchemaImports(URL parentURL, Element element, List<String> published) throws Exception { String baseURI = parentURL.toExternalForm(); @@ -200,6 +212,16 @@ { if (schemaLocation.startsWith("http://") == false) { + // infinity loops prevention + if (published.contains(schemaLocation)) + { + return; + } + else + { + published.add(schemaLocation); + } + URL xsdURL = new URL(baseURI.substring(0, baseURI.lastIndexOf("/") + 1) + schemaLocation); File targetFile = new File(xsdURL.getPath()); targetFile.getParentFile().mkdirs(); @@ -229,13 +251,13 @@ // recursivly publish imports Element subdoc = DOMUtils.parse(xsdURL.openStream()); - publishSchemaImports(xsdURL, subdoc); + publishSchemaImports(xsdURL, subdoc, published); } } } else { - publishSchemaImports(parentURL, childElement); + publishSchemaImports(parentURL, childElement, published); } } } Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843 (from rev 4729, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java 2007-10-10 15:32:16 UTC (rev 4729) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -1,90 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws1843; - -import java.net.URL; -import java.util.List; - -import javax.xml.namespace.QName; - -import junit.framework.Test; - -import org.jboss.test.ws.jaxws.jbws1843.generated.CountryCodeType; -import org.jboss.test.ws.jaxws.jbws1843.generated.CurrencyCodeType; -import org.jboss.test.ws.jaxws.jbws1843.generated.Service; -import org.jboss.test.ws.jaxws.jbws1843.generated.GetCountryCodesResponse.Response; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-1843] WSDL with custom schema imports causes - * <b>java.lang.OutOfMemoryError: Java heap space</b> - * when there are circular schema imports dependencies - * - * @author richard.opalka(a)jboss.com - * @since Oct 10, 2007 - */ -public class JBWS1843TestCase extends JBossWSTest -{ - private String targetNS = "http://jbws1843.jaxws.ws.test.jboss.org/"; - private Service proxy; - - public static Test suite() - { - return new JBossWSTestSetup(JBWS1843TestCase.class, "jaxws-jbws1843.war"); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - QName serviceName = new QName(targetNS, "Service"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1843/Service?wsdl"); - - javax.xml.ws.Service service = javax.xml.ws.Service.create(wsdlURL, serviceName); - proxy = (Service)service.getPort(Service.class); - } - - public void testCountryCodes() throws Exception - { - Response response = proxy.getCountryCodes(); - List<CountryCodeType> countryCodes = response.getCountry(); - assertEquals(countryCodes.get(0), CountryCodeType.CZ); - assertEquals(countryCodes.get(1), CountryCodeType.DE); - } - - public void testCurrencyCodes() throws Exception - { - org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response response = proxy.getCurrencyCodes(); - List<CurrencyCodeType> currencyCodes = response.getCurrency(); - assertEquals(currencyCodes.get(0), CurrencyCodeType.CZK); - assertEquals(currencyCodes.get(1), CurrencyCodeType.EUR); - } - - public void test() throws Exception - { - assertEquals(CurrencyCodeType.CZK, proxy.getCurrency(CountryCodeType.CZ)); - assertEquals(CurrencyCodeType.EUR, proxy.getCurrency(CountryCodeType.DE)); - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java (from rev 4729, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/JBWS1843TestCase.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -0,0 +1,90 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1843; + +import java.net.URL; +import java.util.List; + +import javax.xml.namespace.QName; + +import junit.framework.Test; + +import org.jboss.test.ws.jaxws.jbws1843.generated.CountryCodeType; +import org.jboss.test.ws.jaxws.jbws1843.generated.CurrencyCodeType; +import org.jboss.test.ws.jaxws.jbws1843.generated.Service; +import org.jboss.test.ws.jaxws.jbws1843.generated.GetCountryCodesResponse.Response; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * [JBWS-1843] WSDL with custom schema imports causes + * <b>java.lang.OutOfMemoryError: Java heap space</b> + * when there are circular schema imports dependencies + * + * @author richard.opalka(a)jboss.com + * @since Oct 10, 2007 + */ +public class JBWS1843TestCase extends JBossWSTest +{ + private String targetNS = "http://jbws1843.jaxws.ws.test.jboss.org/"; + private Service proxy; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS1843TestCase.class, "jaxws-jbws1843.war"); + } + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + QName serviceName = new QName(targetNS, "Service"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1843/Service?wsdl"); + + javax.xml.ws.Service service = javax.xml.ws.Service.create(wsdlURL, serviceName); + proxy = (Service)service.getPort(Service.class); + } + + public void testCountryCodes() throws Exception + { + Response response = proxy.getCountryCodes(); + List<CountryCodeType> countryCodes = response.getCountry(); + assertEquals(countryCodes.get(0), CountryCodeType.CZ); + assertEquals(countryCodes.get(1), CountryCodeType.DE); + } + + public void testCurrencyCodes() throws Exception + { + org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response response = proxy.getCurrencyCodes(); + List<CurrencyCodeType> currencyCodes = response.getCurrency(); + assertEquals(currencyCodes.get(0), CurrencyCodeType.CZK); + assertEquals(currencyCodes.get(1), CurrencyCodeType.EUR); + } + + public void test() throws Exception + { + assertEquals(CurrencyCodeType.CZK, proxy.getCurrency(CountryCodeType.CZ)); + assertEquals(CurrencyCodeType.EUR, proxy.getCurrency(CountryCodeType.DE)); + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java 2007-10-10 15:32:16 UTC (rev 4729) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -1,90 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.jbws1843; - -import java.util.List; - -import javax.jws.WebService; - -import org.jboss.test.ws.jaxws.jbws1843.generated.CountryCodeType; -import org.jboss.test.ws.jaxws.jbws1843.generated.CurrencyCodeType; -import org.jboss.test.ws.jaxws.jbws1843.generated.GetCountryCodesResponse.Response; -import org.jboss.test.ws.jaxws.jbws1843.generated.Service; - -/** - * Test service implementation - * - * @author richard.opalka(a)jboss.com - * - * @since Oct 10, 2007 - */ -@WebService -( - name="Service", - portName="Service", - serviceName="Service", - wsdlLocation="WEB-INF/wsdl/TestService.wsdl", - targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/", - endpointInterface = "org.jboss.test.ws.jaxws.jbws1843.generated.Service" -) -public class ServiceImpl implements Service -{ - - /* - * @see org.jboss.test.ws.jaxws.jbws1843.generated.Service#getCountryCodes() - */ - public Response getCountryCodes() - { - Response response = new Response(); - List<CountryCodeType> values = response.getCountry(); - values.add(CountryCodeType.CZ); - values.add(CountryCodeType.DE); - return response; - } - - /* - * @see org.jboss.test.ws.jaxws.jbws1843.generated.Service#getCurrency(org.jboss.test.ws.jaxws.jbws1843.generated.CountryCodeType) - */ - public CurrencyCodeType getCurrency(CountryCodeType parameters) - { - if (parameters == CountryCodeType.CZ) - return CurrencyCodeType.CZK; - if (parameters == CountryCodeType.DE) - return CurrencyCodeType.EUR; - - throw new IllegalArgumentException(); - } - - /* - * @see org.jboss.test.ws.jaxws.jbws1843.generated.Service#getCurrencyCodes() - */ - public org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response getCurrencyCodes() - { - org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response response = - new org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response(); - List<CurrencyCodeType> values = response.getCurrency(); - values.add(CurrencyCodeType.CZK); - values.add(CurrencyCodeType.EUR); - return response; - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java (from rev 4729, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/ServiceImpl.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -0,0 +1,90 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws1843; + +import java.util.List; + +import javax.jws.WebService; + +import org.jboss.test.ws.jaxws.jbws1843.generated.CountryCodeType; +import org.jboss.test.ws.jaxws.jbws1843.generated.CurrencyCodeType; +import org.jboss.test.ws.jaxws.jbws1843.generated.GetCountryCodesResponse.Response; +import org.jboss.test.ws.jaxws.jbws1843.generated.Service; + +/** + * Test service implementation + * + * @author richard.opalka(a)jboss.com + * + * @since Oct 10, 2007 + */ +@WebService +( + name="Service", + portName="Service", + serviceName="Service", + wsdlLocation="WEB-INF/wsdl/TestService.wsdl", + targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/", + endpointInterface = "org.jboss.test.ws.jaxws.jbws1843.generated.Service" +) +public class ServiceImpl implements Service +{ + + /* + * @see org.jboss.test.ws.jaxws.jbws1843.generated.Service#getCountryCodes() + */ + public Response getCountryCodes() + { + Response response = new Response(); + List<CountryCodeType> values = response.getCountry(); + values.add(CountryCodeType.CZ); + values.add(CountryCodeType.DE); + return response; + } + + /* + * @see org.jboss.test.ws.jaxws.jbws1843.generated.Service#getCurrency(org.jboss.test.ws.jaxws.jbws1843.generated.CountryCodeType) + */ + public CurrencyCodeType getCurrency(CountryCodeType parameters) + { + if (parameters == CountryCodeType.CZ) + return CurrencyCodeType.CZK; + if (parameters == CountryCodeType.DE) + return CurrencyCodeType.EUR; + + throw new IllegalArgumentException(); + } + + /* + * @see org.jboss.test.ws.jaxws.jbws1843.generated.Service#getCurrencyCodes() + */ + public org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response getCurrencyCodes() + { + org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response response = + new org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response(); + List<CurrencyCodeType> values = response.getCurrency(); + values.add(CurrencyCodeType.CZK); + values.add(CurrencyCodeType.EUR); + return response; + } + +} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated (from rev 4729, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/CountryCodeType.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/CountryCodeType.java 2007-10-10 15:32:16 UTC (rev 4729) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/CountryCodeType.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -1,38 +0,0 @@ - -package org.jboss.test.ws.jaxws.jbws1843.generated; - -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for CountryCodeType. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * <p> - * <pre> - * <simpleType name="CountryCodeType"> - * <restriction base="{http://www.w3.org/2001/XMLSchema}token"> - * <enumeration value="DE"/> - * <enumeration value="CZ"/> - * </restriction> - * </simpleType> - * </pre> - * - */ -@XmlType(name = "CountryCodeType", namespace = "urn:BaseComponents") -@XmlEnum -public enum CountryCodeType { - - DE, - CZ; - - public String value() { - return name(); - } - - public static CountryCodeType fromValue(String v) { - return valueOf(v); - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/CountryCodeType.java (from rev 4729, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/CountryCodeType.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/CountryCodeType.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/CountryCodeType.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -0,0 +1,38 @@ + +package org.jboss.test.ws.jaxws.jbws1843.generated; + +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for CountryCodeType. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * <p> + * <pre> + * <simpleType name="CountryCodeType"> + * <restriction base="{http://www.w3.org/2001/XMLSchema}token"> + * <enumeration value="DE"/> + * <enumeration value="CZ"/> + * </restriction> + * </simpleType> + * </pre> + * + */ +@XmlType(name = "CountryCodeType", namespace = "urn:BaseComponents") +@XmlEnum +public enum CountryCodeType { + + DE, + CZ; + + public String value() { + return name(); + } + + public static CountryCodeType fromValue(String v) { + return valueOf(v); + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/CurrencyCodeType.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/CurrencyCodeType.java 2007-10-10 15:32:16 UTC (rev 4729) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/CurrencyCodeType.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -1,38 +0,0 @@ - -package org.jboss.test.ws.jaxws.jbws1843.generated; - -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for CurrencyCodeType. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * <p> - * <pre> - * <simpleType name="CurrencyCodeType"> - * <restriction base="{http://www.w3.org/2001/XMLSchema}token"> - * <enumeration value="CZK"/> - * <enumeration value="EUR"/> - * </restriction> - * </simpleType> - * </pre> - * - */ -@XmlType(name = "CurrencyCodeType", namespace = "urn:BaseComponents") -@XmlEnum -public enum CurrencyCodeType { - - CZK, - EUR; - - public String value() { - return name(); - } - - public static CurrencyCodeType fromValue(String v) { - return valueOf(v); - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/CurrencyCodeType.java (from rev 4729, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/CurrencyCodeType.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/CurrencyCodeType.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/CurrencyCodeType.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -0,0 +1,38 @@ + +package org.jboss.test.ws.jaxws.jbws1843.generated; + +import javax.xml.bind.annotation.XmlEnum; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for CurrencyCodeType. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * <p> + * <pre> + * <simpleType name="CurrencyCodeType"> + * <restriction base="{http://www.w3.org/2001/XMLSchema}token"> + * <enumeration value="CZK"/> + * <enumeration value="EUR"/> + * </restriction> + * </simpleType> + * </pre> + * + */ +@XmlType(name = "CurrencyCodeType", namespace = "urn:BaseComponents") +@XmlEnum +public enum CurrencyCodeType { + + CZK, + EUR; + + public String value() { + return name(); + } + + public static CurrencyCodeType fromValue(String v) { + return valueOf(v); + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCountryCodes.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCountryCodes.java 2007-10-10 15:32:16 UTC (rev 4729) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCountryCodes.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -1,34 +0,0 @@ - -package org.jboss.test.ws.jaxws.jbws1843.generated; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for anonymous complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "") -@XmlRootElement(name = "getCountryCodes") -public class GetCountryCodes { - - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCountryCodes.java (from rev 4729, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCountryCodes.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCountryCodes.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCountryCodes.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -0,0 +1,34 @@ + +package org.jboss.test.ws.jaxws.jbws1843.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for anonymous complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "getCountryCodes") +public class GetCountryCodes { + + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCountryCodesResponse.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCountryCodesResponse.java 2007-10-10 15:32:16 UTC (rev 4729) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCountryCodesResponse.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -1,136 +0,0 @@ - -package org.jboss.test.ws.jaxws.jbws1843.generated; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for anonymous complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="response"> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="country" type="{urn:BaseComponents}CountryCodeType" maxOccurs="unbounded"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </element> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "response" -}) -@XmlRootElement(name = "getCountryCodesResponse") -public class GetCountryCodesResponse { - - @XmlElement(required = true) - protected GetCountryCodesResponse.Response response; - - /** - * Gets the value of the response property. - * - * @return - * possible object is - * {@link GetCountryCodesResponse.Response } - * - */ - public GetCountryCodesResponse.Response getResponse() { - return response; - } - - /** - * Sets the value of the response property. - * - * @param value - * allowed object is - * {@link GetCountryCodesResponse.Response } - * - */ - public void setResponse(GetCountryCodesResponse.Response value) { - this.response = value; - } - - - /** - * <p>Java class for anonymous complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="country" type="{urn:BaseComponents}CountryCodeType" maxOccurs="unbounded"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "country" - }) - public static class Response { - - @XmlElement(required = true, nillable = true) - protected List<CountryCodeType> country; - - /** - * Gets the value of the country property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the country property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getCountry().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link CountryCodeType } - * - * - */ - public List<CountryCodeType> getCountry() { - if (country == null) { - country = new ArrayList<CountryCodeType>(); - } - return this.country; - } - - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCountryCodesResponse.java (from rev 4729, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCountryCodesResponse.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCountryCodesResponse.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCountryCodesResponse.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -0,0 +1,136 @@ + +package org.jboss.test.ws.jaxws.jbws1843.generated; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for anonymous complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="response"> + * <complexType> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="country" type="{urn:BaseComponents}CountryCodeType" maxOccurs="unbounded"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </element> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "response" +}) +@XmlRootElement(name = "getCountryCodesResponse") +public class GetCountryCodesResponse { + + @XmlElement(required = true) + protected GetCountryCodesResponse.Response response; + + /** + * Gets the value of the response property. + * + * @return + * possible object is + * {@link GetCountryCodesResponse.Response } + * + */ + public GetCountryCodesResponse.Response getResponse() { + return response; + } + + /** + * Sets the value of the response property. + * + * @param value + * allowed object is + * {@link GetCountryCodesResponse.Response } + * + */ + public void setResponse(GetCountryCodesResponse.Response value) { + this.response = value; + } + + + /** + * <p>Java class for anonymous complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="country" type="{urn:BaseComponents}CountryCodeType" maxOccurs="unbounded"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "country" + }) + public static class Response { + + @XmlElement(required = true, nillable = true) + protected List<CountryCodeType> country; + + /** + * Gets the value of the country property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the country property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getCountry().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link CountryCodeType } + * + * + */ + public List<CountryCodeType> getCountry() { + if (country == null) { + country = new ArrayList<CountryCodeType>(); + } + return this.country; + } + + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCurrencyCodes.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCurrencyCodes.java 2007-10-10 15:32:16 UTC (rev 4729) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCurrencyCodes.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -1,34 +0,0 @@ - -package org.jboss.test.ws.jaxws.jbws1843.generated; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for anonymous complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "") -@XmlRootElement(name = "getCurrencyCodes") -public class GetCurrencyCodes { - - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCurrencyCodes.java (from rev 4729, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCurrencyCodes.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCurrencyCodes.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCurrencyCodes.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -0,0 +1,34 @@ + +package org.jboss.test.ws.jaxws.jbws1843.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for anonymous complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "") +@XmlRootElement(name = "getCurrencyCodes") +public class GetCurrencyCodes { + + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCurrencyCodesResponse.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCurrencyCodesResponse.java 2007-10-10 15:32:16 UTC (rev 4729) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCurrencyCodesResponse.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -1,136 +0,0 @@ - -package org.jboss.test.ws.jaxws.jbws1843.generated; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for anonymous complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="response"> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="currency" type="{urn:BaseComponents}CurrencyCodeType" maxOccurs="unbounded"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </element> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "response" -}) -@XmlRootElement(name = "getCurrencyCodesResponse") -public class GetCurrencyCodesResponse { - - @XmlElement(required = true) - protected GetCurrencyCodesResponse.Response response; - - /** - * Gets the value of the response property. - * - * @return - * possible object is - * {@link GetCurrencyCodesResponse.Response } - * - */ - public GetCurrencyCodesResponse.Response getResponse() { - return response; - } - - /** - * Sets the value of the response property. - * - * @param value - * allowed object is - * {@link GetCurrencyCodesResponse.Response } - * - */ - public void setResponse(GetCurrencyCodesResponse.Response value) { - this.response = value; - } - - - /** - * <p>Java class for anonymous complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="currency" type="{urn:BaseComponents}CurrencyCodeType" maxOccurs="unbounded"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "currency" - }) - public static class Response { - - @XmlElement(required = true, nillable = true) - protected List<CurrencyCodeType> currency; - - /** - * Gets the value of the currency property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the currency property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getCurrency().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link CurrencyCodeType } - * - * - */ - public List<CurrencyCodeType> getCurrency() { - if (currency == null) { - currency = new ArrayList<CurrencyCodeType>(); - } - return this.currency; - } - - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCurrencyCodesResponse.java (from rev 4729, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCurrencyCodesResponse.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCurrencyCodesResponse.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/GetCurrencyCodesResponse.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -0,0 +1,136 @@ + +package org.jboss.test.ws.jaxws.jbws1843.generated; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for anonymous complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="response"> + * <complexType> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="currency" type="{urn:BaseComponents}CurrencyCodeType" maxOccurs="unbounded"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </element> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "response" +}) +@XmlRootElement(name = "getCurrencyCodesResponse") +public class GetCurrencyCodesResponse { + + @XmlElement(required = true) + protected GetCurrencyCodesResponse.Response response; + + /** + * Gets the value of the response property. + * + * @return + * possible object is + * {@link GetCurrencyCodesResponse.Response } + * + */ + public GetCurrencyCodesResponse.Response getResponse() { + return response; + } + + /** + * Sets the value of the response property. + * + * @param value + * allowed object is + * {@link GetCurrencyCodesResponse.Response } + * + */ + public void setResponse(GetCurrencyCodesResponse.Response value) { + this.response = value; + } + + + /** + * <p>Java class for anonymous complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="currency" type="{urn:BaseComponents}CurrencyCodeType" maxOccurs="unbounded"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = { + "currency" + }) + public static class Response { + + @XmlElement(required = true, nillable = true) + protected List<CurrencyCodeType> currency; + + /** + * Gets the value of the currency property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the currency property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getCurrency().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link CurrencyCodeType } + * + * + */ + public List<CurrencyCodeType> getCurrency() { + if (currency == null) { + currency = new ArrayList<CurrencyCodeType>(); + } + return this.currency; + } + + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/ObjectFactory.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/ObjectFactory.java 2007-10-10 15:32:16 UTC (rev 4729) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/ObjectFactory.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -1,103 +0,0 @@ - -package org.jboss.test.ws.jaxws.jbws1843.generated; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the org.jboss.test.ws.jaxws.jbws1843.generated package. - * <p>An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _GetCurrencyResponse_QNAME = new QName("http://jbws1843.jaxws.ws.test.jboss.org/", "getCurrencyResponse"); - private final static QName _GetCurrency_QNAME = new QName("http://jbws1843.jaxws.ws.test.jboss.org/", "getCurrency"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.jbws1843.generated - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link GetCurrencyCodesResponse } - * - */ - public GetCurrencyCodesResponse createGetCurrencyCodesResponse() { - return new GetCurrencyCodesResponse(); - } - - /** - * Create an instance of {@link GetCurrencyCodesResponse.Response } - * - */ - public GetCurrencyCodesResponse.Response createGetCurrencyCodesResponseResponse() { - return new GetCurrencyCodesResponse.Response(); - } - - /** - * Create an instance of {@link GetCountryCodesResponse.Response } - * - */ - public GetCountryCodesResponse.Response createGetCountryCodesResponseResponse() { - return new GetCountryCodesResponse.Response(); - } - - /** - * Create an instance of {@link GetCountryCodesResponse } - * - */ - public GetCountryCodesResponse createGetCountryCodesResponse() { - return new GetCountryCodesResponse(); - } - - /** - * Create an instance of {@link GetCountryCodes } - * - */ - public GetCountryCodes createGetCountryCodes() { - return new GetCountryCodes(); - } - - /** - * Create an instance of {@link GetCurrencyCodes } - * - */ - public GetCurrencyCodes createGetCurrencyCodes() { - return new GetCurrencyCodes(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CurrencyCodeType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://jbws1843.jaxws.ws.test.jboss.org/", name = "getCurrencyResponse") - public JAXBElement<CurrencyCodeType> createGetCurrencyResponse(CurrencyCodeType value) { - return new JAXBElement<CurrencyCodeType>(_GetCurrencyResponse_QNAME, CurrencyCodeType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CountryCodeType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://jbws1843.jaxws.ws.test.jboss.org/", name = "getCurrency") - public JAXBElement<CountryCodeType> createGetCurrency(CountryCodeType value) { - return new JAXBElement<CountryCodeType>(_GetCurrency_QNAME, CountryCodeType.class, null, value); - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/ObjectFactory.java (from rev 4729, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/ObjectFactory.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/ObjectFactory.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/ObjectFactory.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -0,0 +1,103 @@ + +package org.jboss.test.ws.jaxws.jbws1843.generated; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.test.ws.jaxws.jbws1843.generated package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetCurrencyResponse_QNAME = new QName("http://jbws1843.jaxws.ws.test.jboss.org/", "getCurrencyResponse"); + private final static QName _GetCurrency_QNAME = new QName("http://jbws1843.jaxws.ws.test.jboss.org/", "getCurrency"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.jbws1843.generated + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetCurrencyCodesResponse } + * + */ + public GetCurrencyCodesResponse createGetCurrencyCodesResponse() { + return new GetCurrencyCodesResponse(); + } + + /** + * Create an instance of {@link GetCurrencyCodesResponse.Response } + * + */ + public GetCurrencyCodesResponse.Response createGetCurrencyCodesResponseResponse() { + return new GetCurrencyCodesResponse.Response(); + } + + /** + * Create an instance of {@link GetCountryCodesResponse.Response } + * + */ + public GetCountryCodesResponse.Response createGetCountryCodesResponseResponse() { + return new GetCountryCodesResponse.Response(); + } + + /** + * Create an instance of {@link GetCountryCodesResponse } + * + */ + public GetCountryCodesResponse createGetCountryCodesResponse() { + return new GetCountryCodesResponse(); + } + + /** + * Create an instance of {@link GetCountryCodes } + * + */ + public GetCountryCodes createGetCountryCodes() { + return new GetCountryCodes(); + } + + /** + * Create an instance of {@link GetCurrencyCodes } + * + */ + public GetCurrencyCodes createGetCurrencyCodes() { + return new GetCurrencyCodes(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CurrencyCodeType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://jbws1843.jaxws.ws.test.jboss.org/", name = "getCurrencyResponse") + public JAXBElement<CurrencyCodeType> createGetCurrencyResponse(CurrencyCodeType value) { + return new JAXBElement<CurrencyCodeType>(_GetCurrencyResponse_QNAME, CurrencyCodeType.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link CountryCodeType }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://jbws1843.jaxws.ws.test.jboss.org/", name = "getCurrency") + public JAXBElement<CountryCodeType> createGetCurrency(CountryCodeType value) { + return new JAXBElement<CountryCodeType>(_GetCurrency_QNAME, CountryCodeType.class, null, value); + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/Service.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/Service.java 2007-10-10 15:32:16 UTC (rev 4729) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/Service.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -1,58 +0,0 @@ - -package org.jboss.test.ws.jaxws.jbws1843.generated; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.xml.ws.RequestWrapper; -import javax.xml.ws.ResponseWrapper; - - -/** - * This class was generated by the JAX-WS RI. - * JAX-WS RI 2.1.1-b03- - * Generated source version: 2.0 - * - */ -@WebService(name = "Service", targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/") -public interface Service { - - - /** - * - * @return - * returns org.jboss.test.ws.jaxws.jbws1843.generated.GetCountryCodesResponse.Response - */ - @WebMethod(action = "countryCodesAction") - @WebResult(name = "response", targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/") - @RequestWrapper(localName = "getCountryCodes", targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.jbws1843.generated.GetCountryCodes") - @ResponseWrapper(localName = "getCountryCodesResponse", targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.jbws1843.generated.GetCountryCodesResponse") - public org.jboss.test.ws.jaxws.jbws1843.generated.GetCountryCodesResponse.Response getCountryCodes(); - - /** - * - * @param parameters - * @return - * returns org.jboss.test.ws.jaxws.jbws1843.generated.CurrencyCodeType - */ - @WebMethod(action = "currencyAction") - @WebResult(name = "getCurrencyResponse", targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/", partName = "parameters") - @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) - public CurrencyCodeType getCurrency( - @WebParam(name = "getCurrency", targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/", partName = "parameters") - CountryCodeType parameters); - - /** - * - * @return - * returns org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response - */ - @WebMethod(action = "currencyCodesAction") - @WebResult(name = "response", targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/") - @RequestWrapper(localName = "getCurrencyCodes", targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodes") - @ResponseWrapper(localName = "getCurrencyCodesResponse", targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse") - public org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response getCurrencyCodes(); - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/Service.java (from rev 4729, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/Service.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/Service.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/Service.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -0,0 +1,58 @@ + +package org.jboss.test.ws.jaxws.jbws1843.generated; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.1-b03- + * Generated source version: 2.0 + * + */ +@WebService(name = "Service", targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/") +public interface Service { + + + /** + * + * @return + * returns org.jboss.test.ws.jaxws.jbws1843.generated.GetCountryCodesResponse.Response + */ + @WebMethod(action = "countryCodesAction") + @WebResult(name = "response", targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/") + @RequestWrapper(localName = "getCountryCodes", targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.jbws1843.generated.GetCountryCodes") + @ResponseWrapper(localName = "getCountryCodesResponse", targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.jbws1843.generated.GetCountryCodesResponse") + public org.jboss.test.ws.jaxws.jbws1843.generated.GetCountryCodesResponse.Response getCountryCodes(); + + /** + * + * @param parameters + * @return + * returns org.jboss.test.ws.jaxws.jbws1843.generated.CurrencyCodeType + */ + @WebMethod(action = "currencyAction") + @WebResult(name = "getCurrencyResponse", targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/", partName = "parameters") + @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) + public CurrencyCodeType getCurrency( + @WebParam(name = "getCurrency", targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/", partName = "parameters") + CountryCodeType parameters); + + /** + * + * @return + * returns org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response + */ + @WebMethod(action = "currencyCodesAction") + @WebResult(name = "response", targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/") + @RequestWrapper(localName = "getCurrencyCodes", targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodes") + @ResponseWrapper(localName = "getCurrencyCodesResponse", targetNamespace = "http://jbws1843.jaxws.ws.test.jboss.org/", className = "org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse") + public org.jboss.test.ws.jaxws.jbws1843.generated.GetCurrencyCodesResponse.Response getCurrencyCodes(); + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/package-info.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/package-info.java 2007-10-10 15:32:16 UTC (rev 4729) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/package-info.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -1,2 +0,0 @@ -(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://jbws1843.jaxws.ws.test.jboss.org/", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package org.jboss.test.ws.jaxws.jbws1843.generated; Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/package-info.java (from rev 4729, stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/package-info.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/package-info.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws1843/generated/package-info.java 2008-05-20 15:12:52 UTC (rev 7114) @@ -0,0 +1,2 @@ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://jbws1843.jaxws.ws.test.jboss.org/", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +package org.jboss.test.ws.jaxws.jbws1843.generated; Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843 (from rev 4729, stack/native/trunk/src/test/resources/jaxws/jbws1843) Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF (from rev 4729, stack/native/trunk/src/test/resources/jaxws/jbws1843/WEB-INF) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/web.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1843/WEB-INF/web.xml 2007-10-10 15:32:16 UTC (rev 4729) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/web.xml 2008-05-20 15:12:52 UTC (rev 7114) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>Service</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws1843.ServiceImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>Service</servlet-name> - <url-pattern>/Service</url-pattern> - </servlet-mapping> - -</web-app> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/web.xml (from rev 4729, stack/native/trunk/src/test/resources/jaxws/jbws1843/WEB-INF/web.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/web.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/web.xml 2008-05-20 15:12:52 UTC (rev 7114) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>Service</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws1843.ServiceImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Service</servlet-name> + <url-pattern>/Service</url-pattern> + </servlet-mapping> + +</web-app> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl (from rev 4729, stack/native/trunk/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/BaseComponents.xsd =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/BaseComponents.xsd 2007-10-10 15:32:16 UTC (rev 4729) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/BaseComponents.xsd 2008-05-20 15:12:52 UTC (rev 7114) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema targetNamespace="urn:BaseComponents" elementFormDefault="qualified" attributeFormDefault="unqualified" - xmlns:cc="urn:CoreComponentTypes" - xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:import namespace="urn:CoreComponentTypes" schemaLocation="CoreComponentTypes.xsd"/> - <xs:simpleType name="CountryCodeType"> - <xs:restriction base="xs:token"> - <xs:enumeration value="DE"/> - <xs:enumeration value="CZ"/> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="CurrencyCodeType"> - <xs:restriction base="xs:token"> - <xs:enumeration value="CZK"/> - <xs:enumeration value="EUR"/> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="RequestType"> - <xs:restriction base="cc:CountryType"/> - </xs:simpleType> - <xs:simpleType name="ResponseType"> - <xs:restriction base="cc:CurrencyType"/> - </xs:simpleType> -</xs:schema> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/BaseComponents.xsd (from rev 4729, stack/native/trunk/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/BaseComponents.xsd) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/BaseComponents.xsd (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/BaseComponents.xsd 2008-05-20 15:12:52 UTC (rev 7114) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema targetNamespace="urn:BaseComponents" elementFormDefault="qualified" attributeFormDefault="unqualified" + xmlns:cc="urn:CoreComponentTypes" + xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:import namespace="urn:CoreComponentTypes" schemaLocation="CoreComponentTypes.xsd"/> + <xs:simpleType name="CountryCodeType"> + <xs:restriction base="xs:token"> + <xs:enumeration value="DE"/> + <xs:enumeration value="CZ"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="CurrencyCodeType"> + <xs:restriction base="xs:token"> + <xs:enumeration value="CZK"/> + <xs:enumeration value="EUR"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="RequestType"> + <xs:restriction base="cc:CountryType"/> + </xs:simpleType> + <xs:simpleType name="ResponseType"> + <xs:restriction base="cc:CurrencyType"/> + </xs:simpleType> +</xs:schema> Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/CoreComponentTypes.xsd =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/CoreComponentTypes.xsd 2007-10-10 15:32:16 UTC (rev 4729) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/CoreComponentTypes.xsd 2008-05-20 15:12:52 UTC (rev 7114) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema targetNamespace="urn:CoreComponentTypes" elementFormDefault="qualified" attributeFormDefault="unqualified" - xmlns:bc="urn:BaseComponents" - xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:import namespace="urn:BaseComponents" schemaLocation="BaseComponents.xsd"/> - <xs:simpleType name="CountryType"> - <xs:restriction base="bc:CountryCodeType"/> - </xs:simpleType> - <xs:simpleType name="CurrencyType"> - <xs:restriction base="bc:CurrencyCodeType"/> - </xs:simpleType> -</xs:schema> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/CoreComponentTypes.xsd (from rev 4729, stack/native/trunk/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/CoreComponentTypes.xsd) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/CoreComponentTypes.xsd (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/CoreComponentTypes.xsd 2008-05-20 15:12:52 UTC (rev 7114) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema targetNamespace="urn:CoreComponentTypes" elementFormDefault="qualified" attributeFormDefault="unqualified" + xmlns:bc="urn:BaseComponents" + xmlns:xs="http://www.w3.org/2001/XMLSchema"> + <xs:import namespace="urn:BaseComponents" schemaLocation="BaseComponents.xsd"/> + <xs:simpleType name="CountryType"> + <xs:restriction base="bc:CountryCodeType"/> + </xs:simpleType> + <xs:simpleType name="CurrencyType"> + <xs:restriction base="bc:CurrencyCodeType"/> + </xs:simpleType> +</xs:schema> Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/TestService.wsdl =================================================================== --- stack/native/trunk/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/TestService.wsdl 2007-10-10 15:32:16 UTC (rev 4729) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/TestService.wsdl 2008-05-20 15:12:52 UTC (rev 7114) @@ -1,133 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?> -<definitions name='Service' targetNamespace='http://jbws1843.jaxws.ws.test.jboss.org/' - xmlns:tns='http://jbws1843.jaxws.ws.test.jboss.org/' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:cc="urn:CoreComponentTypes" - xmlns:bc="urn:BaseComponents" - xmlns='http://schemas.xmlsoap.org/wsdl/'> - <types> - <xsd:schema elementFormDefault="qualified" - targetNamespace="http://jbws1843.jaxws.ws.test.jboss.org/" - xmlns:tns="http://jbws1843.jaxws.ws.test.jboss.org/" - xmlns:xns4="http://jbws1843.jaxws.ws.test.jboss.org/java/lang/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <xsd:import namespace="urn:BaseComponents" schemaLocation="BaseComponents.xsd"/> - <xsd:import namespace="urn:CoreComponentTypes" schemaLocation="CoreComponentTypes.xsd"/> - <xsd:element name="getCountryCodes"> - <xsd:complexType> - <xsd:sequence/> - </xsd:complexType> - </xsd:element> - <xsd:element name="getCurrencyCodes"> - <xsd:complexType> - <xsd:sequence/> - </xsd:complexType> - </xsd:element> - <xsd:element name="getCountryCodesResponse"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="response" nillable="false"> - <xsd:complexType> - <xsd:sequence> - <xsd:element - maxOccurs="unbounded" - minOccurs="1" - name="country" - nillable="true" - type="bc:CountryCodeType"/> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element name="getCurrency" type="bc:RequestType"/> - <xsd:element name="getCurrencyResponse" type="bc:ResponseType"/> - <xsd:element name="getCurrencyCodesResponse"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="response" nillable="false"> - <xsd:complexType> - <xsd:sequence> - <xsd:element - maxOccurs="unbounded" - minOccurs="1" - name="currency" - nillable="true" - type="bc:CurrencyCodeType"/> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - </xsd:schema> - </types> - <message name='Service_getCountryCodes_Request_Soap'> - <part name='parameters' element='tns:getCountryCodes'/> - </message> - <message name='Service_getCountryCodes_Response_Soap'> - <part name='parameters' element='tns:getCountryCodesResponse'/> - </message> - <message name='Service_getCurrencyCodes_Request_Soap'> - <part name='parameters' element='tns:getCurrencyCodes'/> - </message> - <message name='Service_getCurrencyCodes_Response_Soap'> - <part name='parameters' element='tns:getCurrencyCodesResponse'/> - </message> - <message name='Service_getCurrency_Request_Soap'> - <part name='parameters' element='tns:getCurrency'/> - </message> - <message name='Service_getCurrency_Response_Soap'> - <part name='parameters' element='tns:getCurrencyResponse'/> - </message> - <portType name='Service'> - <operation name='getCountryCodes'> - <input message='tns:Service_getCountryCodes_Request_Soap'/> - <output message='tns:Service_getCountryCodes_Response_Soap'/> - </operation> - <operation name='getCurrency'> - <input message='tns:Service_getCurrency_Request_Soap'/> - <output message='tns:Service_getCurrency_Response_Soap'/> - </operation> - <operation name='getCurrencyCodes'> - <input message='tns:Service_getCurrencyCodes_Request_Soap'/> - <output message='tns:Service_getCurrencyCodes_Response_Soap'/> - </operation> - </portType> - <binding name='Service' type='tns:Service'> - <soap:binding transport='http://schemas.xmlsoap.org/soap/http' style='document'/> - <operation name='getCountryCodes'> - <soap:operation soapAction='countryCodesAction' style='document'/> - <input> - <soap:body parts='parameters' use='literal'/> - </input> - <output> - <soap:body parts='parameters' use='literal'/> - </output> - </operation> - <operation name='getCurrency'> - <soap:operation soapAction='currencyAction' style='document'/> - <input> - <soap:body parts='parameters' use='literal'/> - </input> - <output> - <soap:body parts='parameters' use='literal'/> - </output> - </operation> - <operation name='getCurrencyCodes'> - <soap:operation soapAction='currencyCodesAction' style='document'/> - <input> - <soap:body parts='parameters' use='literal'/> - </input> - <output> - <soap:body parts='parameters' use='literal'/> - </output> - </operation> - </binding> - <service name='Service'> - <port name='Service' binding='tns:Service'> - <soap:address location='http:unknown-location-uri'/> - </port> - </service> -</definitions> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/TestService.wsdl (from rev 4729, stack/native/trunk/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/TestService.wsdl) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/TestService.wsdl (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws1843/WEB-INF/wsdl/TestService.wsdl 2008-05-20 15:12:52 UTC (rev 7114) @@ -0,0 +1,133 @@ +<?xml version='1.0' encoding='utf-8' ?> +<definitions name='Service' targetNamespace='http://jbws1843.jaxws.ws.test.jboss.org/' + xmlns:tns='http://jbws1843.jaxws.ws.test.jboss.org/' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:cc="urn:CoreComponentTypes" + xmlns:bc="urn:BaseComponents" + xmlns='http://schemas.xmlsoap.org/wsdl/'> + <types> + <xsd:schema elementFormDefault="qualified" + targetNamespace="http://jbws1843.jaxws.ws.test.jboss.org/" + xmlns:tns="http://jbws1843.jaxws.ws.test.jboss.org/" + xmlns:xns4="http://jbws1843.jaxws.ws.test.jboss.org/java/lang/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <xsd:import namespace="urn:BaseComponents" schemaLocation="BaseComponents.xsd"/> + <xsd:import namespace="urn:CoreComponentTypes" schemaLocation="CoreComponentTypes.xsd"/> + <xsd:element name="getCountryCodes"> + <xsd:complexType> + <xsd:sequence/> + </xsd:complexType> + </xsd:element> + <xsd:element name="getCurrencyCodes"> + <xsd:complexType> + <xsd:sequence/> + </xsd:complexType> + </xsd:element> + <xsd:element name="getCountryCodesResponse"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="response" nillable="false"> + <xsd:complexType> + <xsd:sequence> + <xsd:element + maxOccurs="unbounded" + minOccurs="1" + name="country" + nillable="true" + type="bc:CountryCodeType"/> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:element name="getCurrency" type="bc:RequestType"/> + <xsd:element name="getCurrencyResponse" type="bc:ResponseType"/> + <xsd:element name="getCurrencyCodesResponse"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="response" nillable="false"> + <xsd:complexType> + <xsd:sequence> + <xsd:element + maxOccurs="unbounded" + minOccurs="1" + name="currency" + nillable="true" + type="bc:CurrencyCodeType"/> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + </xsd:schema> + </types> + <message name='Service_getCountryCodes_Request_Soap'> + <part name='parameters' element='tns:getCountryCodes'/> + </message> + <message name='Service_getCountryCodes_Response_Soap'> + <part name='parameters' element='tns:getCountryCodesResponse'/> + </message> + <message name='Service_getCurrencyCodes_Request_Soap'> + <part name='parameters' element='tns:getCurrencyCodes'/> + </message> + <message name='Service_getCurrencyCodes_Response_Soap'> + <part name='parameters' element='tns:getCurrencyCodesResponse'/> + </message> + <message name='Service_getCurrency_Request_Soap'> + <part name='parameters' element='tns:getCurrency'/> + </message> + <message name='Service_getCurrency_Response_Soap'> + <part name='parameters' element='tns:getCurrencyResponse'/> + </message> + <portType name='Service'> + <operation name='getCountryCodes'> + <input message='tns:Service_getCountryCodes_Request_Soap'/> + <output message='tns:Service_getCountryCodes_Response_Soap'/> + </operation> + <operation name='getCurrency'> + <input message='tns:Service_getCurrency_Request_Soap'/> + <output message='tns:Service_getCurrency_Response_Soap'/> + </operation> + <operation name='getCurrencyCodes'> + <input message='tns:Service_getCurrencyCodes_Request_Soap'/> + <output message='tns:Service_getCurrencyCodes_Response_Soap'/> + </operation> + </portType> + <binding name='Service' type='tns:Service'> + <soap:binding transport='http://schemas.xmlsoap.org/soap/http' style='document'/> + <operation name='getCountryCodes'> + <soap:operation soapAction='countryCodesAction' style='document'/> + <input> + <soap:body parts='parameters' use='literal'/> + </input> + <output> + <soap:body parts='parameters' use='literal'/> + </output> + </operation> + <operation name='getCurrency'> + <soap:operation soapAction='currencyAction' style='document'/> + <input> + <soap:body parts='parameters' use='literal'/> + </input> + <output> + <soap:body parts='parameters' use='literal'/> + </output> + </operation> + <operation name='getCurrencyCodes'> + <soap:operation soapAction='currencyCodesAction' style='document'/> + <input> + <soap:body parts='parameters' use='literal'/> + </input> + <output> + <soap:body parts='parameters' use='literal'/> + </output> + </operation> + </binding> + <service name='Service'> + <port name='Service' binding='tns:Service'> + <soap:address location='http:unknown-location-uri'/> + </port> + </service> +</definitions>

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r7113 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-20 10:56:18 -0400 (Tue, 20 May 2008) New Revision: 7113 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java Log: Reenable all consume tests Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-05-20 14:52:15 UTC (rev 7112) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2008-05-20 14:56:18 UTC (rev 7113) @@ -298,12 +298,6 @@ */ public void testSOAP12Extension() throws Exception { - if (isIntegrationNative()) - { - System.out.println("FIXME [JBWS-2175] wsconsume cannot run with jaxws-api from build output"); - return; - } - consumer.setOutputDirectory(outputDirectory); consumer.setTargetPackage("org.jboss.test.ws.tools.testSOAP12Extension"); consumer.setGenerateSource(true);

17 years, 11 months

1
0
0 / 0

JBossWS SVN: r7112 - common/trunk/src/main/java/org/jboss/wsf/test.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-20 10:52:15 -0400 (Tue, 20 May 2008) New Revision: 7112 Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java Log: [JBWS-2179] Fallback to package name for vendor detection Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-05-20 14:20:31 UTC (rev 7111) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-05-20 14:52:15 UTC (rev 7112) @@ -24,17 +24,12 @@ // $Id$ import java.io.File; -import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.util.Hashtable; -import javax.management.AttributeNotFoundException; -import javax.management.InstanceNotFoundException; -import javax.management.MBeanException; import javax.management.MBeanServerConnection; import javax.management.ObjectName; -import javax.management.ReflectionException; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.xml.namespace.QName; @@ -106,55 +101,55 @@ public boolean isIntegrationNative() { String vendor = getImplementationVendor(); - if (vendor == null) - { - System.out.println("FIXME: [CXF-1506] - No Implementation-Vendor in manifest"); - return false; - } - return vendor.indexOf("JBoss") != -1; + return vendor.toLowerCase().indexOf("jboss") != -1; } public boolean isIntegrationMetro() { String vendor = getImplementationVendor(); - if (vendor == null) - { - System.out.println("FIXME: [CXF-1506] - No Implementation-Vendor in manifest"); - return false; - } - return vendor.indexOf("Sun") != -1; + return vendor.toLowerCase().indexOf("sun") != -1; } public boolean isIntegrationCXF() { String vendor = getImplementationVendor(); - if (vendor == null) - { - System.out.println("FIXME: [CXF-1506] - No Implementation-Vendor in manifest"); - return true; - } - return vendor.indexOf("Apache") != -1; + return vendor.toLowerCase().indexOf("cxf") != -1; } private String getImplementationVendor() { if (implVendor == null) { - Service service = Service.create(new QName("dummyService")); - Object obj = service.getHandlerResolver(); - if (obj == null) - { - service.addPort(new QName("dummyPort"), SOAPBinding.SOAP11HTTP_BINDING, "http://dummy-address"); - obj = service.createDispatch(new QName("dummyPort"), Source.class, Mode.PAYLOAD); - } + Object obj = getImplementationObject(); implVendor = obj.getClass().getPackage().getImplementationVendor(); + if (implVendor == null) + implVendor = getImplementationPackage(); + implTitle = obj.getClass().getPackage().getImplementationTitle(); implVersion = obj.getClass().getPackage().getImplementationVersion(); + System.out.println(implVendor + ", " + implTitle + ", " + implVersion); } return implVendor; } + private Object getImplementationObject() + { + Service service = Service.create(new QName("dummyService")); + Object obj = service.getHandlerResolver(); + if (obj == null) + { + service.addPort(new QName("dummyPort"), SOAPBinding.SOAP11HTTP_BINDING, "http://dummy-address"); + obj = service.createDispatch(new QName("dummyPort"), Source.class, Mode.PAYLOAD); + } + return obj; + } + + private String getImplementationPackage() + { + return getImplementationObject().getClass().getPackage().getName(); + } + /** * Get the JBoss server host from system property "jboss.bind.address" * This defaults to "localhost" @@ -206,7 +201,7 @@ jbossVersion = (String)getServer().getAttribute(oname, "SpecificationVersion"); if (jbossVersion == null) throw new IllegalStateException("Cannot obtain jboss version"); - + if (jbossVersion.startsWith("5.0")) jbossVersion = "jboss50"; else if (jbossVersion.startsWith("4.2")) @@ -235,7 +230,7 @@ { return getArchiveFile(archive).toURL(); } - + /** Try to discover the File for the deployment archive */ public File getArchiveFile(String archive) { @@ -256,7 +251,7 @@ { return getResourceFile(resource).toURL(); } - + /** Try to discover the File for the test resource */ public File getResourceFile(String resource) {

17 years, 11 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2008