July 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r16504 - in stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws: metadata/wsdl/xsd and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: klape Date: 2012-07-19 11:48:22 -0400 (Thu, 19 Jul 2012) New Revision: 16504 Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java Log: [JBPAPP-9520] Change temporary WSDL and XSD file names in JBossWS Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2012-07-19 14:20:47 UTC (rev 16503) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2012-07-19 15:48:22 UTC (rev 16504) @@ -26,6 +26,9 @@ import java.io.PrintStream; import java.io.Writer; import java.net.URL; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.math.BigInteger; import javax.jws.HandlerChain; import javax.jws.WebService; @@ -398,10 +401,11 @@ } } - private void writeWsdl(ServiceMetaData serviceMetaData, WSDLDefinitions wsdlDefinitions, EndpointMetaData epMetaData) throws IOException + private void writeWsdl(final ServiceMetaData serviceMetaData, WSDLDefinitions wsdlDefinitions, EndpointMetaData epMetaData) throws IOException { // The RI uses upper case, and the TCK expects it, so we just mimic this even though we don't really have to String wsdlName = ToolsUtils.firstLetterUpperCase(serviceMetaData.getServiceName().getLocalPart()); + // Ensure that types are only in the interface qname wsdlDefinitions.getWsdlTypes().setNamespace(epMetaData.getPortTypeName().getNamespaceURI()); @@ -415,8 +419,7 @@ else { dir = IOUtils.createTempDirectory(); - wsdlFile = File.createTempFile(wsdlName, ".wsdl", dir); - wsdlFile.deleteOnExit(); + wsdlFile = computeTempWsdlFile(serviceMetaData, dir, wsdlName); } message(wsdlFile.getName()); @@ -431,8 +434,7 @@ } else { - file = File.createTempFile(suggestedFile, ".wsdl", dir); - file.deleteOnExit(); + file = computeTempWsdlFile(serviceMetaData, dir, suggestedFile); } actualFile = file.getName(); message(actualFile); @@ -446,6 +448,35 @@ serviceMetaData.setWsdlLocation(wsdlFile.toURL()); } + private File computeTempWsdlFile(ServiceMetaData serviceMetaData, File dir, String wsdlName) throws IOException + { + File wsdlFile = null; + try + { + byte[] deploymentName = serviceMetaData.getUnifiedMetaData().getDeploymentName().getBytes("UTF-8"); + String deploymentNameHash = toHexString(MessageDigest.getInstance("MD5").digest(deploymentName)); + wsdlFile = new File(dir + File.separator + wsdlName + "_" + deploymentNameHash + ".wsdl"); + } + catch(NoSuchAlgorithmException ex) + { + if(log.isTraceEnabled()) + log.trace("MD5 has of deployment name failed for WSDL file name. Falling back to File.createTempFile()", ex); + else + log.debug("MD5 has of deployment name failed for WSDL file name. Falling back to File.createTempFile()"); + + wsdlFile = File.createTempFile(wsdlName, ".wsdl", dir); + } + + wsdlFile.deleteOnExit(); + return wsdlFile; + } + + private String toHexString(byte[] hash) + { + BigInteger bi = new BigInteger(1, hash); + return String.format("%0" + (hash.length << 1) + "x", bi); + } + private void message(String msg) { if (messageStream != null) Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java 2012-07-19 14:20:47 UTC (rev 16503) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java 2012-07-19 15:48:22 UTC (rev 16504) @@ -27,6 +27,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.math.BigInteger; import javax.xml.namespace.QName; @@ -508,7 +513,7 @@ /** Get the temp file for a given namespace */ - public static File getSchemaTempFile(String targetNS) throws IOException + public static File getSchemaTempFile(String targetNS, String fileName) throws IOException { if (targetNS.length() == 0) throw new IllegalArgumentException("Invalid null target namespace"); @@ -521,7 +526,8 @@ try { SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();File tmpDir = serverConfig.getServerTempDir(); + ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig(); + File tmpDir = serverConfig.getServerTempDir(); tmpdir = serverConfig.getServerTempDir(); tmpdir = new File(tmpdir.getCanonicalPath() + "/jbossws"); tmpdir.mkdirs(); @@ -537,9 +543,35 @@ fname = fname.replace('?', '_'); fname = fname.replace('#', '_'); - return File.createTempFile("JBossWS_" + fname, ".xsd", tmpdir); + File file = null; + try + { + String fileNameHash = toHexString(MessageDigest.getInstance("MD5").digest(fileName.getBytes("UTF-8"))); + if(tmpdir == null) + { + tmpdir = (File) AccessController.doPrivileged(new PrivilegedAction() { + public Object run() + { + return new File(System.getProperty("java.io.tmpdir")); + } + }); + } + file = new File(tmpdir + File.separator + "JBossWS_" + fname + "_" + fileNameHash + ".xsd"); + } + catch(NoSuchAlgorithmException noAlgEx) + { + file = File.createTempFile("JBossWS_" + fname, ".xsd", tmpdir); + } + + return file; } + private static String toHexString(byte[] hash) + { + BigInteger bi = new BigInteger(1, hash); + return String.format("%0" + (hash.length << 1) + "x", bi); + } + /** * Get the TargetNamespace from the schema model */ Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2012-07-19 14:20:47 UTC (rev 16503) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2012-07-19 15:48:22 UTC (rev 16504) @@ -544,14 +544,14 @@ { log.trace("processSchemaInclude: [targetNS=" + targetNS + ",parentURL=" + wsdlLoc + "]"); - tmpFile = SchemaUtils.getSchemaTempFile(targetNS); + tmpFile = SchemaUtils.getSchemaTempFile(targetNS, getFileName(wsdlLoc)); tempFiles.add(tmpFile); publishedLocations.put(wsdlLoc, tmpFile.toURL()); } else { - tmpFile = SchemaUtils.getSchemaTempFile("no_namespace"); + tmpFile = SchemaUtils.getSchemaTempFile("no_namespace", getFileName(wsdlLoc)); tempFiles.add(tmpFile); publishedLocations.put(wsdlLoc, tmpFile.toURL()); @@ -600,6 +600,22 @@ handleSchemaImports(schemaEl, wsdlLoc); } + private String getFileName(URL url) + { + String query = url.getQuery(); + if(query != null) + { + if(query.contains("=")) + { + return query.split("=")[1]; + } + } + + String exUrl = url.toExternalForm(); + String[] paths = exUrl.split("/"); + return paths[paths.length-1]; + } + private void handleSchemaImports(Element schemaEl, URL parentURL) throws WSDLException, IOException { if (parentURL == null)

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r16503 - stack/cxf/branches.

by jbossws-commits＠lists.jboss.org

Author: mmusaji Date: 2012-07-19 10:20:47 -0400 (Thu, 19 Jul 2012) New Revision: 16503 Added: stack/cxf/branches/jbossws-cxf-3.1.2.SP7_JBPAPP-9534/ Log: [JBPAPP-9534] Create one off patch branch

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r16502 - in container/jboss71/branches/jbossws-jboss710: tests-integration and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-07-19 09:20:13 -0400 (Thu, 19 Jul 2012) New Revision: 16502 Modified: container/jboss71/branches/jbossws-jboss710/server-integration/ container/jboss71/branches/jbossws-jboss710/tests-integration/ Log: updating svn:ignore property Property changes on: container/jboss71/branches/jbossws-jboss710/server-integration ___________________________________________________________________ Added: svn:ignore + .classpath .project .settings target Property changes on: container/jboss71/branches/jbossws-jboss710/tests-integration ___________________________________________________________________ Added: svn:ignore + .classpath .project .settings target

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r16500 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-07-19 06:50:39 -0400 (Thu, 19 Jul 2012) New Revision: 16500 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3484] refactoring AS 720 integration layer Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-07-19 10:50:26 UTC (rev 16499) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-07-19 10:50:39 UTC (rev 16500) @@ -800,140 +800,7 @@ <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> <version>${jboss.version}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-transactions</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-remote-naming</artifactId> - </exclusion> - </exclusions> </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-remote-naming</artifactId> - <version>1.0.4.Final</version> - </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-ejb-client</artifactId> - <version>1.0.10.Final</version> - <exclusions> - <exclusion> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.xnio</groupId> - <artifactId>xnio-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-ext-api</artifactId> - <version>2.0.0</version> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.12.1.GA</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - <version>${jboss.xb.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>apache-xerces</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - <exclusion> - <groupId>apache-xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - <exclusion> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-log4j</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - <exclusion> - <groupId>wutka-dtdparser</groupId> - <artifactId>dtdparser121</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.remotingjmx</groupId> - <artifactId>remoting-jmx</artifactId> - <version>1.0.3.Final</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - <version>3.2.8.GA</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hornetq</groupId> - <artifactId>hornetq-jms</artifactId> - <version>2.2.16.Final</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hornetq</groupId> - <artifactId>hornetq-core</artifactId> - <version>2.2.16.Final</version> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins>

12 years, 7 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-07-19 06:50:26 -0400 (Thu, 19 Jul 2012) New Revision: 16499 Modified: stack/native/trunk/modules/testsuite/pom.xml Log: [JBWS-3484] refactoring AS 720 integration layer Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-07-19 10:47:20 UTC (rev 16498) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-07-19 10:50:26 UTC (rev 16499) @@ -295,57 +295,7 @@ <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> <version>${jboss.version}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-transactions</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-remote-naming</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-security</artifactId> - </exclusion> - </exclusions> </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-remote-naming</artifactId> - <version>1.0.4.Final</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-ejb-client</artifactId> - <version>1.0.10.Final</version> - <exclusions> - <exclusion> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.xnio</groupId> - <artifactId>xnio-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.remotingjmx</groupId> - <artifactId>remoting-jmx</artifactId> - <version>1.0.3.Final</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - <version>3.2.8.GA</version> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins>

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r16498 - in container/jboss71/branches/jbossws-jboss711: tests-integration and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-07-19 06:47:20 -0400 (Thu, 19 Jul 2012) New Revision: 16498 Modified: container/jboss71/branches/jbossws-jboss711/server-integration/ container/jboss71/branches/jbossws-jboss711/tests-integration/ Log: updating svn:ignore properties Property changes on: container/jboss71/branches/jbossws-jboss711/server-integration ___________________________________________________________________ Added: svn:ignore + .classpath .project .settings target Property changes on: container/jboss71/branches/jbossws-jboss711/tests-integration ___________________________________________________________________ Added: svn:ignore + .classpath .project .settings target

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r16496 - in container/jboss71/branches/jbossws-jboss712: server-integration and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-07-19 06:43:00 -0400 (Thu, 19 Jul 2012) New Revision: 16496 Modified: container/jboss71/branches/jbossws-jboss712/ container/jboss71/branches/jbossws-jboss712/server-integration/ container/jboss71/branches/jbossws-jboss712/tests-integration/ Log: updating svn:ignore properties Property changes on: container/jboss71/branches/jbossws-jboss712 ___________________________________________________________________ Added: svnignore + .classpath .projects .settings target Property changes on: container/jboss71/branches/jbossws-jboss712/server-integration ___________________________________________________________________ Added: svn:ignore + .classpath .project .settings target Added: svnignore + .classpath .project .settings target Property changes on: container/jboss71/branches/jbossws-jboss712/tests-integration ___________________________________________________________________ Added: svn:ignore + .classpath .project .settings target Added: svnignore + .classpath .project .settings target

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r16495 - container/jboss71/branches/jbossws-jboss712/tests-integration/src/main/java/org/jboss/as/webservices/deployer.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-07-19 06:36:18 -0400 (Thu, 19 Jul 2012) New Revision: 16495 Modified: container/jboss71/branches/jbossws-jboss712/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java Log: [JBWS-3446] Adding methods to AS 7.1.2 CI RemoteDeployer Modified: container/jboss71/branches/jbossws-jboss712/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java =================================================================== --- container/jboss71/branches/jbossws-jboss712/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2012-07-19 10:35:31 UTC (rev 16494) +++ container/jboss71/branches/jbossws-jboss712/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2012-07-19 10:36:18 UTC (rev 16495) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat, Inc., and individual contributors + * Copyright 2012, Red Hat, Inc., and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -30,6 +30,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.Semaphore; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; @@ -47,12 +48,14 @@ import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentActionResult; import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentManager; import org.jboss.as.controller.client.helpers.standalone.ServerDeploymentPlanResult; +import org.jboss.as.controller.operations.common.Util; import org.jboss.dmr.ModelNode; import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployer.Deployer; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ALLOW_RESOURCE_SERVICE_RESTART; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.COMPOSITE; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.FAILURE_DESCRIPTION; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.NAME; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP; @@ -65,6 +68,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REQUIRED; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.RESULT; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ROLLBACK_ON_RUNTIME_FAILURE; +import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.STEPS; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUCCESS; import static org.jboss.as.security.Constants.AUTHENTICATION; @@ -98,6 +102,7 @@ private final ModelControllerClient modelControllerClient; private final Map<String, Integer> securityDomainUsers = new HashMap<String, Integer>(1); private final Map<String, Integer> archiveCounters = new HashMap<String, Integer>(); + private final Semaphore httpsConnSemaphore = new Semaphore(1); public RemoteDeployer() throws IOException { final String host = System.getProperty(JBWS_DEPLOYER_HOST); @@ -108,8 +113,8 @@ address = InetAddress.getByName("localhost"); } final Integer port = Integer.getInteger(JBWS_DEPLOYER_PORT, PORT); + deploymentManager = ServerDeploymentManager.Factory.create(address, port, callbackHandler); modelControllerClient = ModelControllerClient.Factory.create(address, port, callbackHandler); - deploymentManager = ServerDeploymentManager.Factory.create(modelControllerClient); } @Override @@ -234,7 +239,6 @@ } } - @Override public void removeSecurityDomain(String name) throws Exception { synchronized (securityDomainUsers) { int count = securityDomainUsers.get(name); @@ -255,6 +259,43 @@ } } + @Override + public void addHttpsConnector(Map<String, String> sslOptions) throws Exception { + httpsConnSemaphore.acquire(); + try { + final ModelNode composite = Util.getEmptyOperation(COMPOSITE, new ModelNode()); + final ModelNode steps = composite.get(STEPS); + ModelNode op = createOpNode("subsystem=web/connector=jbws-test-https-connector", ADD); + op.get("socket-binding").set("https"); + op.get("scheme").set("https"); + op.get("protocol").set("HTTP/1.1"); + op.get("secure").set(true); + op.get("enabled").set(true); + steps.add(op); + ModelNode ssl = createOpNode("subsystem=web/connector=jbws-test-https-connector/ssl=configuration", ADD); + if (sslOptions != null) { + for (final String k : sslOptions.keySet()) { + ssl.get(k).set(sslOptions.get(k)); + } + } + steps.add(ssl); + applyUpdate(composite, getModelControllerClient()); + } catch (Exception e) { + httpsConnSemaphore.release(); + throw e; + } + } + + @Override + public void removeHttpsConnector() throws Exception { + try { + ModelNode op = createOpNode("subsystem=web/connector=jbws-test-https-connector", REMOVE); + applyUpdate(op, getModelControllerClient()); + } finally { + httpsConnSemaphore.release(); + } + } + private ModelControllerClient getModelControllerClient() { return modelControllerClient; } @@ -315,6 +356,21 @@ }; } + public static ModelNode createOpNode(String address, String operation) { + ModelNode op = new ModelNode(); + // set address + ModelNode list = op.get("address").setEmptyList(); + if (address != null) { + String[] pathSegments = address.split("/"); + for (String segment : pathSegments) { + String[] elements = segment.split("="); + list.add(elements[0], elements[1]); + } + } + op.get("operation").set(operation); + return op; + } + private static String getSystemProperty(final String name, final String defaultValue) { PrivilegedAction<String> action = new PrivilegedAction<String>() { public String run() {

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r16494 - in container/jboss71/branches/jbossws-jboss712: server-integration and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-07-19 06:35:31 -0400 (Thu, 19 Jul 2012) New Revision: 16494 Modified: container/jboss71/branches/jbossws-jboss712/pom.xml container/jboss71/branches/jbossws-jboss712/server-integration/pom.xml container/jboss71/branches/jbossws-jboss712/tests-integration/pom.xml Log: [JBWS-3484] cleanup dependencies Modified: container/jboss71/branches/jbossws-jboss712/pom.xml =================================================================== --- container/jboss71/branches/jbossws-jboss712/pom.xml 2012-07-19 10:32:17 UTC (rev 16493) +++ container/jboss71/branches/jbossws-jboss712/pom.xml 2012-07-19 10:35:31 UTC (rev 16494) @@ -34,7 +34,7 @@ <name>JBossWS JBoss AS 7.1.2.Final Integration Parent</name> <description>JBossWS JBoss AS 7.1.2.Final Integration Parent</description> <groupId>org.jboss.ws</groupId> - <artifactId>jboss712</artifactId> + <artifactId>jbossws-jboss712-parent</artifactId> <version>4.1.0-SNAPSHOT</version> <packaging>pom</packaging> @@ -68,6 +68,7 @@ <ejb3.ext.api.version>2.0.0</ejb3.ext.api.version> <javassist.version>3.15.0-GA</javassist.version> <jboss.common.core.version>2.2.17.GA</jboss.common.core.version> + <jboss.logging.processor.version>1.0.2.Final</jboss.logging.processor.version> </properties> <dependencyManagement> @@ -97,6 +98,12 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-processor</artifactId> + <version>${jboss.logging.processor.version}</version> + <scope>compile</scope> + </dependency> + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-server</artifactId> <version>${jboss.version}</version> @@ -136,6 +143,12 @@ <groupId>org.jboss.as</groupId> <artifactId>jboss-as-security</artifactId> <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-clustering-infinispan</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.marshalling</groupId> @@ -257,6 +270,20 @@ <groupId>org.jboss.remotingjmx</groupId> <artifactId>remoting-jmx</artifactId> <version>${remoting.jmx.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-processor</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.logmanager</groupId> + <artifactId>jboss-logmanager</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.xnio</groupId> + <artifactId>xnio-nio</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.remoting3</groupId> Modified: container/jboss71/branches/jbossws-jboss712/server-integration/pom.xml =================================================================== (Binary files differ) Modified: container/jboss71/branches/jbossws-jboss712/tests-integration/pom.xml =================================================================== (Binary files differ)

12 years, 7 months

1
0
0 / 0

JBossWS SVN: r16493 - in stack/cxf/trunk: modules/dist and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-07-19 06:32:17 -0400 (Thu, 19 Jul 2012) New Revision: 16493 Modified: stack/cxf/trunk/modules/dist/pom.xml stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml Log: [JBWS-3484] refactoring AS 71x integration layers Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2012-07-19 08:55:26 UTC (rev 16492) +++ stack/cxf/trunk/modules/dist/pom.xml 2012-07-19 10:32:17 UTC (rev 16493) @@ -131,68 +131,22 @@ <artifactId>opensaml</artifactId> <scope>provided</scope> </dependency> - -  +  <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710</artifactId> + <artifactId>jbossws-jboss710-server-integration</artifactId> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-controller-client</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-security</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.marshalling</groupId> - <artifactId>jboss-marshalling-river</artifactId> - </exclusion> - </exclusions> </dependency> - <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711</artifactId> + <artifactId>jbossws-jboss711-server-integration</artifactId> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-controller-client</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-security</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.marshalling</groupId> - <artifactId>jboss-marshalling-river</artifactId> - </exclusion> - </exclusions> </dependency> - <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712</artifactId> + <artifactId>jbossws-jboss712-server-integration</artifactId> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-controller-client</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-security</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.marshalling</groupId> - <artifactId>jboss-marshalling-river</artifactId> - </exclusion> - </exclusions> </dependency> -  <dependency> <groupId>junit</groupId> @@ -282,40 +236,23 @@  <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710</artifactId> - <classifier>tests-integration</classifier> + <artifactId>jbossws-jboss710-tests-integration</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711</artifactId> - <classifier>tests-integration</classifier> + <artifactId>jbossws-jboss711-tests-integration</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712</artifactId> - <classifier>tests-integration</classifier> + <artifactId>jbossws-jboss712-tests-integration</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-build-config</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-server</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.marshalling</groupId> - <artifactId>jboss-marshalling-river</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> <build> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-07-19 08:55:26 UTC (rev 16492) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-07-19 10:32:17 UTC (rev 16493) @@ -101,7 +101,7 @@ <target name="undeploy-jboss711" depends="target-jboss711,init" description="Remove jbossws from jboss711"> <fail message="Not available: ${jboss711.available.file}" unless="jboss711.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss711.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + <macro-undeploy-jbossws-modules targetdir="${jboss711.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target>  @@ -130,7 +130,7 @@ <target name="undeploy-jboss712" depends="target-jboss712,init" description="Remove jbossws from jboss712"> <fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss712.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + <macro-undeploy-jbossws-modules targetdir="${jboss712.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target>  Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-07-19 08:55:26 UTC (rev 16492) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-07-19 10:32:17 UTC (rev 16493) @@ -79,7 +79,6 @@ <include>org.opensaml:open*:jar</include> <include>org.opensaml:xmltooling:jar</include> <include>org.jboss.ws:jbossws-common-tools:jar</include> - <include>org.jboss.ws:jbossws-jboss*:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <scope>provided</scope> @@ -90,10 +89,21 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss*:jar:*:tests-integration</include> + <include>org.jboss.ws:jbossws-jboss*-tests-integration:jar</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + <scope>provided</scope> + <useProjectArtifact>false</useProjectArtifact> + </dependencySet> + + + <dependencySet> + <outputDirectory>deploy-artifacts/lib</outputDirectory> + <unpack>false</unpack> + <includes> <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include> </includes> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> + <outputFileNameMapping>jbossws-jboss720-tests-integration.jar</outputFileNameMapping> <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> </dependencySet> @@ -102,6 +112,17 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> + <include>org.jboss.ws:jbossws-jboss*-server-integration:jar</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + <scope>provided</scope> + <useProjectArtifact>false</useProjectArtifact> + </dependencySet> + + <dependencySet> + <outputDirectory>deploy-artifacts/lib</outputDirectory> + <unpack>false</unpack> + <includes> <include>org.jboss.ws.cxf:jbossws-cxf-resources:jar:*:jboss*</include> </includes> <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-07-19 08:55:26 UTC (rev 16492) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-07-19 10:32:17 UTC (rev 16493) @@ -131,7 +131,7 @@ <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/jbossws-cxf-resources-(a){jbossid}.jar"/> - <include name="**/jbossws-(a){jbossid}.jar"/> + <include name="**/jbossws-(a){jbossid}-server-integration.jar"/> </fileset> </copy>  Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-07-19 08:55:26 UTC (rev 16492) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-07-19 10:32:17 UTC (rev 16493) @@ -583,133 +583,8 @@ <dependencies> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710</artifactId> - <classifier>tests-integration</classifier> - <exclusions> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-transactions</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - </exclusion> - </exclusions> + <artifactId>jbossws-jboss710-tests-integration</artifactId> </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-ejb-client</artifactId> - <version>1.0.2.Final</version> - <exclusions> - <exclusion> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.xnio</groupId> - <artifactId>xnio-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-ext-api</artifactId> - <version>2.0.0</version> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.12.1.GA</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - <version>${jboss.xb.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>apache-xerces</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - <exclusion> - <groupId>apache-xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - <exclusion> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-log4j</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - <exclusion> - <groupId>wutka-dtdparser</groupId> - <artifactId>dtdparser121</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.remoting3</groupId> - <artifactId>remoting-jmx</artifactId> - <version>1.0.0.Final</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - <version>3.2.1.GA</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hornetq</groupId> - <artifactId>hornetq-jms</artifactId> - <version>2.2.11.Final</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hornetq</groupId> - <artifactId>hornetq-core</artifactId> - <version>2.2.11.Final</version> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins> @@ -750,7 +625,7 @@  <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude> - +  <exclude>org/jboss/test/ws/jaxws/jbws1666/**</exclude> @@ -800,142 +675,8 @@ <dependencies> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711</artifactId> - <classifier>tests-integration</classifier> - <exclusions> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-transactions</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-remote-naming</artifactId> - </exclusion> - </exclusions> + <artifactId>jbossws-jboss711-tests-integration</artifactId> </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-remote-naming</artifactId> - <version>1.0.2.Final</version> - </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-ejb-client</artifactId> - <version>1.0.4.Final</version> - <exclusions> - <exclusion> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.xnio</groupId> - <artifactId>xnio-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-ext-api</artifactId> - <version>2.0.0</version> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.12.1.GA</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - <version>${jboss.xb.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>apache-xerces</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - <exclusion> - <groupId>apache-xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - <exclusion> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-log4j</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - <exclusion> - <groupId>wutka-dtdparser</groupId> - <artifactId>dtdparser121</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.remotingjmx</groupId> - <artifactId>remoting-jmx</artifactId> - <version>1.0.2.Final</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - <version>3.2.2.GA</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hornetq</groupId> - <artifactId>hornetq-jms</artifactId> - <version>2.2.13.Final</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hornetq</groupId> - <artifactId>hornetq-core</artifactId> - <version>2.2.13.Final</version> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins> @@ -993,143 +734,9 @@ </properties> <dependencies> <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss.version}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-transactions</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss</groupId> - <artifactId>jboss-remote-naming</artifactId> - </exclusion> - </exclusions> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss712-tests-integration</artifactId> </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-remote-naming</artifactId> - <version>1.0.3.Final</version> - </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-ejb-client</artifactId> - <version>1.0.10.Final</version> - <exclusions> - <exclusion> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.xnio</groupId> - <artifactId>xnio-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-ext-api</artifactId> - <version>2.0.0</version> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.12.1.GA</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - <version>${jboss.xb.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>apache-xerces</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - <exclusion> - <groupId>apache-xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - <exclusion> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-log4j</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - <exclusion> - <groupId>wutka-dtdparser</groupId> - <artifactId>dtdparser121</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.remotingjmx</groupId> - <artifactId>remoting-jmx</artifactId> - <version>1.0.3.Final</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.remoting3</groupId> - <artifactId>jboss-remoting</artifactId> - <version>3.2.7.GA</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hornetq</groupId> - <artifactId>hornetq-jms</artifactId> - <version>2.2.16.Final</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hornetq</groupId> - <artifactId>hornetq-core</artifactId> - <version>2.2.16.Final</version> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-07-19 08:55:26 UTC (rev 16492) +++ stack/cxf/trunk/pom.xml 2012-07-19 10:32:17 UTC (rev 16493) @@ -149,36 +149,33 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710</artifactId> + <artifactId>jbossws-jboss710-server-integration</artifactId> <version>${jbossws.jboss710.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710</artifactId> + <artifactId>jbossws-jboss710-tests-integration</artifactId> <version>${jbossws.jboss710.version}</version> - <classifier>tests-integration</classifier> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711</artifactId> + <artifactId>jbossws-jboss711-server-integration</artifactId> <version>${jbossws.jboss711.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711</artifactId> + <artifactId>jbossws-jboss711-tests-integration</artifactId> <version>${jbossws.jboss711.version}</version> - <classifier>tests-integration</classifier> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712</artifactId> + <artifactId>jbossws-jboss712-server-integration</artifactId> <version>${jbossws.jboss712.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712</artifactId> + <artifactId>jbossws-jboss712-tests-integration</artifactId> <version>${jbossws.jboss712.version}</version> - <classifier>tests-integration</classifier> </dependency> <dependency> <groupId>org.jboss.as</groupId>

12 years, 7 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits July 2012