September 2010 - jbossws-commits - Jboss List Archives

JBossWS SVN: r13000 - in projects/plugins/maven/jaxws-tools/trunk/src/test: resources/test-embedded/testEndorse and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-09-22 02:40:27 -0400 (Wed, 22 Sep 2010) New Revision: 13000 Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestEndorseHelper.java projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml Log: [JBWS-3130] Improving embedded test by adding executions in test phase too Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestEndorseHelper.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestEndorseHelper.java 2010-09-21 17:43:13 UTC (rev 12999) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestEndorseHelper.java 2010-09-22 06:40:27 UTC (rev 13000) @@ -36,6 +36,7 @@ public class TestEndorseHelper implements VerifyScriptHelper, SetupScriptHelper { private Long lastModificationTime = null; + private Long lastModificationTime2 = null; private static final String JAXWS_22_ENDPOINT_SERVICE_CONSTRUCTOR = "public EndpointService(URL wsdlLocation, WebServiceFeature... features)"; private static final String JAXWS_22_ENDPOINT_SERVICE_CONSTRUCTOR_CONTENTS = "super(wsdlLocation, serviceName, features);"; @@ -61,6 +62,25 @@ return false; } + //second execution checks + File endpointServiceFile2 = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "wsconsume" + File.separator + "java" + + File.separator + "foo" + File.separator + "test" + File.separator + "bar" + File.separator + "EndpointService.java"); + if (!endpointServiceFile2.exists()) + { + System.out.println(endpointServiceFile2 + " not found!"); + return false; + } + if (lastModificationTime2 != null && endpointServiceFile2.lastModified() == lastModificationTime2) + { + System.out.println(endpointServiceFile2 + " was not modified by the plugin!"); + return false; + } + if (!readContents(endpointServiceFile2).contains(JAXWS_22_ENDPOINT_SERVICE_CONSTRUCTOR_CONTENTS)) + { + System.out.println("Could not find JAXWS 2.2 constructor '" + JAXWS_22_ENDPOINT_SERVICE_CONSTRUCTOR + "' in " + endpointServiceFile2); + return false; + } + //classes checks File classesFoo = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "classes" + File.separator + "foo"); if (!classesFoo.exists()) @@ -68,6 +88,18 @@ System.out.println(classesFoo + " dir not found!"); return false; } + File classesFooBar = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "classes" + File.separator + "foo" + File.separator + "bar"); + if (!classesFooBar.exists()) + { + System.out.println(classesFooBar + " dir not found!"); + return false; + } + File classesFooTest = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "test-classes" + File.separator + "foo" + File.separator + "test"); + if (!classesFooTest.exists()) + { + System.out.println(classesFooTest + " dir not found!"); + return false; + } return true; } @@ -75,12 +107,21 @@ @Override public void setup(File basedir, File localRepositoryPath, Map<?, ?> context) throws Exception { + //first execution File endpointServiceFile = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "wsconsume" + File.separator + "java" + File.separator + "foo" + File.separator + "bar" + File.separator + "EndpointService.java"); if (endpointServiceFile.exists()) { this.lastModificationTime = endpointServiceFile.lastModified(); } + + //second execution + File endpointServiceFile2 = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "wsconsume" + File.separator + "java" + + File.separator + "foo" + File.separator + "test" + File.separator + "bar" + File.separator + "EndpointService.java"); + if (endpointServiceFile2.exists()) + { + this.lastModificationTime2 = endpointServiceFile2.lastModified(); + } } private String readContents(File file) throws Exception Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml 2010-09-21 17:43:13 UTC (rev 12999) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml 2010-09-22 06:40:27 UTC (rev 13000) @@ -34,9 +34,9 @@ <artifactId>maven-jaxws-tools-plugin</artifactId> <version>@pom.version@</version> <configuration> - <target>2.2</target> + <target>2.2</target>  <verbose>true</verbose> - <fork>true</fork> + <fork>true</fork>  <argLine>-Djava.endorsed.dirs=${basedir}/target/endorsed</argLine> </configuration> <executions> @@ -52,6 +52,18 @@ <targetPackage>foo.bar</targetPackage> </configuration> </execution> + <execution> + <id>Second execution</id> + <goals> + <goal>wsconsume-test</goal> + </goals> + <configuration> + <wsdls> + <wsdl>${basedir}/test.wsdl</wsdl> + </wsdls> + <targetPackage>foo.test.bar</targetPackage> + </configuration> + </execution> </executions> </plugin> <plugin> Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml 2010-09-21 17:43:13 UTC (rev 12999) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml 2010-09-22 06:40:27 UTC (rev 13000) @@ -52,6 +52,18 @@ <targetPackage>foo.bar</targetPackage> </configuration> </execution> + <execution> + <id>Second execution</id> + <goals> + <goal>wsconsume-test</goal> + </goals> + <configuration> + <wsdls> + <wsdl>${basedir}/test.wsdl</wsdl> + </wsdls> + <targetPackage>foo.test.bar</targetPackage> + </configuration> + </execution> </executions> </plugin> <plugin>

13 years, 7 months

1
0
0 / 0

JBossWS SVN: r12999 - in projects/plugins/maven/jaxws-tools/trunk: src/main/java/org/jboss/ws/plugins/tools and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-09-21 13:43:13 -0400 (Tue, 21 Sep 2010) New Revision: 12999 Added: projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestEndorseHelper.java projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/invoker.properties projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/setup.bsh projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/test.wsdl projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/verify.bsh Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java Log: [JBWS-3130] Adding initial testcase (wsconsume only) for jaxws 2.2 / endorsing. Implemented fork mode for wsconsume maven plugin Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/pom.xml 2010-09-20 17:00:04 UTC (rev 12998) +++ projects/plugins/maven/jaxws-tools/trunk/pom.xml 2010-09-21 17:43:13 UTC (rev 12999) @@ -13,7 +13,7 @@ <parent> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-parent</artifactId> - <version>1.0.6.GA</version> + <version>1.0.8.GA</version> </parent>  @@ -26,7 +26,7 @@  <properties> <jbossws.spi.version>1.3.0.GA</jbossws.spi.version> - <maven.project.version>2.0.4</maven.project.version> + <maven.project.version>2.0.11</maven.project.version> <maven.plugin.api.version>2.0.4</maven.plugin.api.version> <maven.invoker.plugin.version>1.5</maven.invoker.plugin.version>  Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java 2010-09-20 17:00:04 UTC (rev 12998) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractToolsMojo.java 2010-09-21 17:43:13 UTC (rev 12999) @@ -61,6 +61,17 @@ protected Boolean verbose; /** + * An optional additional argLine to be used when running in fork mode; can be used to set endorse dir, enable debugging, etc. + * @parameter + */ + protected String argLine; + + /** + * @parameter default-value="false" + */ + protected Boolean fork; + + /** * Either ${build.outputDirectory} or ${build.testOutputDirectory}. */ public abstract File getOutputDirectory(); @@ -104,4 +115,14 @@ return verbose; } + public String getArgLine() + { + return argLine; + } + + public Boolean isFork() + { + return fork; + } + } Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2010-09-20 17:00:04 UTC (rev 12998) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2010-09-21 17:43:13 UTC (rev 12999) @@ -128,6 +128,8 @@ params.setTarget(target); params.setTargetPackage(targetPackage); params.setWsdlLocation(wsdlLocation); + params.setArgLine(argLine); + params.setFork(fork); WSContractDelegate delegate = new WSContractDelegate(); for (String wsdl : wsdls) Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java 2010-09-20 17:00:04 UTC (rev 12998) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java 2010-09-21 17:43:13 UTC (rev 12999) @@ -1,8 +1,3 @@ -package org.jboss.ws.plugins.tools; - -import java.io.File; -import java.util.List; - /* * JBoss, Home of Professional Open Source. * Copyright 2010, Red Hat Middleware LLC, and individual contributors @@ -24,8 +19,14 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ +package org.jboss.ws.plugins.tools; + +import java.io.File; +import java.util.List; + public class WSContractConsumerParams { + private boolean fork; private ClassLoader loader; private List<String> additionalCompilerClassPath; private List<String> bindingFiles; @@ -38,7 +39,24 @@ private String target; private String targetPackage; private String wsdlLocation; + private String argLine; + public String getArgLine() + { + return argLine; + } + public void setArgLine(String argLine) + { + this.argLine = argLine; + } + public void setFork(boolean fork) + { + this.fork = fork; + } + public boolean isFork() + { + return fork; + } public void setLoader(ClassLoader loader) { this.loader = loader; Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java 2010-09-20 17:00:04 UTC (rev 12998) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java 2010-09-21 17:43:13 UTC (rev 12999) @@ -24,11 +24,16 @@ import java.io.File; import java.io.PrintStream; import java.lang.reflect.Method; +import java.util.ArrayList; import java.util.LinkedList; import java.util.List; +import org.codehaus.plexus.util.Os; + public class WSContractDelegate { + private static final PrintStream PS = System.out; + public void runProvider(WSContractProviderParams params) throws Exception { ClassLoader loader = params.getLoader(); @@ -41,6 +46,18 @@ public void runConsumer(WSContractConsumerParams params, String wsdl) throws Exception { + if (params.isFork()) + { + runConsumerOutOfProcess(params, wsdl); + } + else + { + runConsumerInProcess(params, wsdl); + } + } + + private void runConsumerInProcess(WSContractConsumerParams params, String wsdl) throws Exception + { ClassLoader loader = params.getLoader(); Class<?> consumerClass = loader.loadClass("org.jboss.wsf.spi.tools.WSContractConsumer"); Object consumer = consumerClass.getMethod("newInstance").invoke(null); @@ -49,11 +66,108 @@ m.invoke(consumer, new Object[]{wsdl}); } + private void runConsumerOutOfProcess(WSContractConsumerParams params, String wsdl) throws Exception + { + List<String> commandList = new ArrayList<String>(); + if ( Os.isFamily( Os.FAMILY_WINDOWS ) ) + { + if ( Os.isFamily( Os.FAMILY_WIN9X ) ) + { + commandList.add("command.com /c"); + } + else + { + commandList.add("cmd.exe /c"); + } + } + commandList.add("java"); + if (params.getArgLine() != null) + { + commandList.add(params.getArgLine()); + } + List<String> cp = params.getAdditionalCompilerClassPath(); + if (cp != null && !cp.isEmpty()) + { + commandList.add("-classpath "); + StringBuilder additionalClasspath = new StringBuilder(); + for (String c : cp) + { + additionalClasspath.append(c); + additionalClasspath.append(File.pathSeparator); + } + additionalClasspath.deleteCharAt(additionalClasspath.length() - 1); + commandList.add(additionalClasspath.toString()); + } + commandList.add("org.jboss.wsf.spi.tools.cmd.WSConsume"); + List<String> bindingFiles = params.getBindingFiles(); + if (bindingFiles != null && !bindingFiles.isEmpty()) + { + commandList.add("-b"); + commandList.addAll(bindingFiles); + } + if (params.isGenerateSource()) + { + commandList.add("-k"); + } + if (params.getCatalog() != null) + { + commandList.add("-c"); + commandList.add(params.getCatalog().getAbsolutePath()); + } + if (params.getTargetPackage() != null) + { + commandList.add("-p"); + commandList.add(params.getTargetPackage()); + } + if (params.getWsdlLocation() != null) + { + commandList.add("-w"); + commandList.add(params.getWsdlLocation()); + } + if (params.getOutputDirectory() != null) + { + commandList.add("-o"); + commandList.add(params.getOutputDirectory().getAbsolutePath()); + } + if (params.getSourceDirectory() != null) + { + commandList.add("-s"); + commandList.add(params.getSourceDirectory().getAbsolutePath()); + } + if (params.getTarget() != null) + { + commandList.add("-t"); + commandList.add(params.getTarget()); + } + if (params.isExtension()) + { + commandList.add("-e"); + } + if (params.isNoCompile()) + { + commandList.add("-n"); + } + commandList.add(wsdl); + StringBuilder command = new StringBuilder(); + for (String s : commandList) + { + command.append(s); + command.append(" "); + } + System.out.println("************** commandline: ***" + command.toString()+"***"); + Process p = Runtime.getRuntime().exec(command.toString()); + int result = p.waitFor(); + if (result != 0) + { + throw new Exception("Process terminated with code " + result); + } + } + private static void setupConsumer(Class<?> consumerClass, Object consumer, WSContractConsumerParams params) throws Exception { callMethod(consumerClass, consumer, "setAdditionalCompilerClassPath", params.getAdditionalCompilerClassPath()); Method m = consumerClass.getMethod("setMessageStream", new Class<?>[]{PrintStream.class}); - m.invoke(consumer, new Object[]{System.out}); + m.invoke(consumer, new Object[]{PS}); List<String> bindingFiles = params.getBindingFiles(); if (bindingFiles != null && !bindingFiles.isEmpty()) { @@ -120,7 +234,7 @@ callMethod(providerClass, provider, "setGenerateSource", params.isGenerateSource()); callMethod(providerClass, provider, "setGenerateWsdl", params.isGenerateWsdl()); Method m2 = providerClass.getMethod("setMessageStream", new Class<?>[]{PrintStream.class}); - m2.invoke(provider, new Object[]{System.out}); + m2.invoke(provider, new Object[]{PS}); if (params.getOutputDirectory() != null) { callMethod(providerClass, provider, "setOutputDirectory", params.getOutputDirectory()); Added: projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestEndorseHelper.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestEndorseHelper.java (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/helpers/TestEndorseHelper.java 2010-09-21 17:43:13 UTC (rev 12999) @@ -0,0 +1,99 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.plugins.tools.helpers; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.util.Map; + +/** + * A helper class for testing the plugin through bsh scripts + * + * @author alessio.soldano(a)jboss.com + * @since 21-Sep-2010 + * + */ +public class TestEndorseHelper implements VerifyScriptHelper, SetupScriptHelper +{ + private Long lastModificationTime = null; + private static final String JAXWS_22_ENDPOINT_SERVICE_CONSTRUCTOR = "public EndpointService(URL wsdlLocation, WebServiceFeature... features)"; + private static final String JAXWS_22_ENDPOINT_SERVICE_CONSTRUCTOR_CONTENTS = "super(wsdlLocation, serviceName, features);"; + + @Override + public boolean verify(File basedir, File localRepositoryPath, Map<?, ?> context) throws Exception + { + //fist execution checks + File endpointServiceFile = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "wsconsume" + File.separator + "java" + + File.separator + "foo" + File.separator + "bar" + File.separator + "EndpointService.java"); + if (!endpointServiceFile.exists()) + { + System.out.println(endpointServiceFile + " not found!"); + return false; + } + if (lastModificationTime != null && endpointServiceFile.lastModified() == lastModificationTime) + { + System.out.println(endpointServiceFile + " was not modified by the plugin!"); + return false; + } + if (!readContents(endpointServiceFile).contains(JAXWS_22_ENDPOINT_SERVICE_CONSTRUCTOR_CONTENTS)) + { + System.out.println("Could not find JAXWS 2.2 constructor '" + JAXWS_22_ENDPOINT_SERVICE_CONSTRUCTOR + "' in " + endpointServiceFile); + return false; + } + + //classes checks + File classesFoo = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "classes" + File.separator + "foo"); + if (!classesFoo.exists()) + { + System.out.println(classesFoo + " dir not found!"); + return false; + } + + return true; + } + + @Override + public void setup(File basedir, File localRepositoryPath, Map<?, ?> context) throws Exception + { + File endpointServiceFile = new File(basedir.getAbsolutePath() + File.separator + "target" + File.separator + "wsconsume" + File.separator + "java" + + File.separator + "foo" + File.separator + "bar" + File.separator + "EndpointService.java"); + if (endpointServiceFile.exists()) + { + this.lastModificationTime = endpointServiceFile.lastModified(); + } + } + + private String readContents(File file) throws Exception + { + BufferedReader in = new BufferedReader(new FileReader(file)); + StringBuffer buffer = new StringBuffer(); + String line; + while ((line = in.readLine()) != null) + { + buffer.append(line); + } + in.close(); + return buffer.toString(); + } + +} Added: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/invoker.properties =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/invoker.properties (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/invoker.properties 2010-09-21 17:43:13 UTC (rev 12999) @@ -0,0 +1 @@ +invoker.goals = -e clean package Added: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml 2010-09-21 17:43:13 UTC (rev 12999) @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>testWsConsume</name> + <groupId>org.jboss.ws.plugins.maven.tests</groupId> + <artifactId>testEndorse</artifactId> + <packaging>jar</packaging> + <version>@pom.version@</version> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + <maxmem>256M</maxmem> + <fork>${compiler.fork}</fork> + <compilerArguments> + <endorseddirs>${basedir}/target/endorsed</endorseddirs> + </compilerArguments> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.jboss.ws.plugins</groupId> + <artifactId>maven-jaxws-tools-plugin</artifactId> + <version>@pom.version@</version> + <configuration> + <target>2.2</target> + <verbose>true</verbose> + <fork>true</fork> + <argLine>-Djava.endorsed.dirs=${basedir}/target/endorsed</argLine> + </configuration> + <executions> + <execution> + <id>First execution</id> + <goals> + <goal>wsconsume</goal> + </goals> + <configuration> + <wsdls> + <wsdl>${basedir}/test.wsdl</wsdl> + </wsdls> + <targetPackage>foo.bar</targetPackage> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>create-endorsed-dir</id> + <phase>validate</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> + <outputDirectory>${basedir}/target/endorsed</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-factories</artifactId> + <outputDirectory>${basedir}/target/endorsed</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-client</artifactId> + <version>3.4.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-factories</artifactId> + <version>3.4.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> + <version>1.0.0.Beta1</version> + </dependency> + </dependencies> +</project> Added: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml 2010-09-21 17:43:13 UTC (rev 12999) @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>testWsConsume</name> + <groupId>org.jboss.ws.plugins.maven.tests</groupId> + <artifactId>testEndorse</artifactId> + <packaging>jar</packaging> + <version>@pom.version@</version> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + <maxmem>256M</maxmem> + <fork>${compiler.fork}</fork> + <compilerArguments> + <endorseddirs>${basedir}/target/endorsed</endorseddirs> + </compilerArguments> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.jboss.ws.plugins</groupId> + <artifactId>maven-jaxws-tools-plugin</artifactId> + <version>@pom.version@</version> + <configuration> + <target>2.2</target> + <verbose>true</verbose> + <fork>true</fork> + <argLine>-Djava.endorsed.dirs=${basedir}/target/endorsed</argLine> + </configuration> + <executions> + <execution> + <id>First execution</id> + <goals> + <goal>wsconsume</goal> + </goals> + <configuration> + <wsdls> + <wsdl>${basedir}/test.wsdl</wsdl> + </wsdls> + <targetPackage>foo.bar</targetPackage> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>create-endorsed-dir</id> + <phase>validate</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> + <outputDirectory>${basedir}/target/endorsed</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-client</artifactId> + <version>3.3.1.GA</version> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> + <version>1.0.0.Beta1</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + <version>2.0.1.GA</version> + </dependency> + </dependencies> +</project> Added: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/setup.bsh =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/setup.bsh (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/setup.bsh 2010-09-21 17:43:13 UTC (rev 12999) @@ -0,0 +1,7 @@ +import java.io.*; +import org.jboss.test.ws.plugins.tools.helpers.*; +import java.util.*; +import java.util.regex.*; + +TestEndorseHelper helper = new TestEndorseHelper(); +helper.setup(basedir, localRepositoryPath, context); \ No newline at end of file Added: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/test.wsdl =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/test.wsdl (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/test.wsdl 2010-09-21 17:43:13 UTC (rev 12999) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://testendorse.samples.jaxws.ws.test.jboss.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://testendorse.samples.jaxws.ws.test.jboss.org/" name="EndpointService"> +<types/> +<message name="echoString"> +<part name="arg0" type="xsd:string"/> +</message> +<message name="echoStringResponse"> +<part name="return" type="xsd:string"/> +</message> +<portType name="Endpoint"> +<operation name="echoString"> +<input message="tns:echoString"/> +<output message="tns:echoStringResponse"/> +</operation> +</portType> +<binding name="EndpointPortBinding" type="tns:Endpoint"> +<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/> +<operation name="echoString"> +<soap:operation soapAction="urn:EchoString"/> +<input> +<soap:body use="literal" namespace="http://testendorse.samples.jaxws.ws.test.jboss.org/"/> +</input> +<output> +<soap:body use="literal" namespace="http://testendorse.samples.jaxws.ws.test.jboss.org/"/> +</output> +</operation> +</binding> +<service name="EndpointService"> +<port name="EndpointPort" binding="tns:EndpointPortBinding"> +<soap:address location="http://127.0.0.1:8080/jaxws-samples-testendorse"/> +</port> +</service> +</definitions> \ No newline at end of file Added: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/verify.bsh =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/verify.bsh (rev 0) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/verify.bsh 2010-09-21 17:43:13 UTC (rev 12999) @@ -0,0 +1,16 @@ +import java.io.*; +import org.jboss.test.ws.plugins.tools.helpers.*; +import java.util.*; +import java.util.regex.*; + +try +{ + TestEndorseHelper helper = new TestEndorseHelper(); + return helper.verify(basedir, localRepositoryPath, context); + +} +catch( Throwable t ) +{ + t.printStackTrace(); + return false; +}

13 years, 7 months

1
0
0 / 0

JBossWS SVN: r12998 - in stack/native/trunk: modules/client and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-09-20 13:00:04 -0400 (Mon, 20 Sep 2010) New Revision: 12998 Modified: stack/native/trunk/modules/client/pom.xml stack/native/trunk/modules/core/pom.xml stack/native/trunk/pom.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2928] Using org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec artifact Modified: stack/native/trunk/modules/client/pom.xml =================================================================== --- stack/native/trunk/modules/client/pom.xml 2010-09-20 16:58:46 UTC (rev 12997) +++ stack/native/trunk/modules/client/pom.xml 2010-09-20 17:00:04 UTC (rev 12998) @@ -31,8 +31,8 @@ <version>${version}</version> </dependency> <dependency> - <groupId>javax.xml</groupId> - <artifactId>jaxrpc-api</artifactId> + <groupId>org.jboss.spec.javax.xml.rpc</groupId> + <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId> </dependency> <dependency> <groupId>org.jboss.logging</groupId> Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2010-09-20 16:58:46 UTC (rev 12997) +++ stack/native/trunk/modules/core/pom.xml 2010-09-20 17:00:04 UTC (rev 12998) @@ -35,8 +35,8 @@ <artifactId>jbossws-spi</artifactId> </dependency> <dependency> - <groupId>javax.xml</groupId> - <artifactId>jaxrpc-api</artifactId> + <groupId>org.jboss.spec.javax.xml.rpc</groupId> + <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId> </dependency> <dependency> <groupId>org.jboss.spec.javax.xml.soap</groupId> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2010-09-20 16:58:46 UTC (rev 12997) +++ stack/native/trunk/pom.xml 2010-09-20 17:00:04 UTC (rev 12998) @@ -62,7 +62,7 @@ <commons.logging.version>1.1.1</commons.logging.version> <javassist.version>3.12.1.GA</javassist.version> <jaxws.api.version>1.0.0.Beta1</jaxws.api.version> - <jaxrpc.api.version>1.1</jaxrpc.api.version> + <jaxrpc.api.version>1.0.0.Beta1</jaxrpc.api.version> <saaj.api.version>1.0.0.Beta1</saaj.api.version> <jsr181.api.version>1.0-MR1</jsr181.api.version> <jaxb.api.version>1.0.0.Beta1</jaxb.api.version> @@ -298,15 +298,9 @@ <version>${jaxws.api.version}</version> </dependency> <dependency> - <groupId>javax.xml</groupId> - <artifactId>jaxrpc-api</artifactId> + <groupId>org.jboss.spec.javax.xml.rpc</groupId> + <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId> <version>${jaxrpc.api.version}</version> - <exclusions> - <exclusion> - <groupId>javax.xml.soap</groupId> - <artifactId>saaj-api</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.jboss.spec.javax.xml.soap</groupId> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-09-20 16:58:46 UTC (rev 12997) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-09-20 17:00:04 UTC (rev 12998) @@ -52,7 +52,6 @@ <include>junit:junit:jar</include> <include>org.jboss.ws:jbossws-common:jar</include> <include>org.jboss.ws:jbossws-spi:jar</include> - <include>javax.xml:jaxrpc-api:jar</include> <include>org.codehaus.jettison:jettison:jar</include> <include>com.sun.xml.ws:policy:jar</include> <include>stax:stax-api:jar</include> @@ -86,6 +85,13 @@ </includes> </dependencySet> <dependencySet> + <outputFileNameMapping>jaxrpc-api.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar</include> + </includes> + </dependencySet> + <dependencySet> <outputFileNameMapping>saaj-api.jar</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <includes>

13 years, 7 months

1
0
0 / 0

JBossWS SVN: r12997 - in stack/cxf/trunk: modules/client and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-09-20 12:58:46 -0400 (Mon, 20 Sep 2010) New Revision: 12997 Modified: stack/cxf/trunk/modules/client/pom.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2928] Using org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec artifact Modified: stack/cxf/trunk/modules/client/pom.xml =================================================================== --- stack/cxf/trunk/modules/client/pom.xml 2010-09-20 15:48:25 UTC (rev 12996) +++ stack/cxf/trunk/modules/client/pom.xml 2010-09-20 16:58:46 UTC (rev 12997) @@ -185,8 +185,8 @@ http://jira.codehaus.org/browse/MASSEMBLY-317 --> <dependency> - <groupId>javax.xml</groupId> - <artifactId>jaxrpc-api</artifactId> + <groupId>org.jboss.spec.javax.xml.rpc</groupId> + <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId> </dependency> <dependency> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2010-09-20 15:48:25 UTC (rev 12996) +++ stack/cxf/trunk/modules/server/pom.xml 2010-09-20 16:58:46 UTC (rev 12997) @@ -138,8 +138,8 @@ <artifactId>commons-lang</artifactId> </dependency> <dependency> - <groupId>javax.xml</groupId> - <artifactId>jaxrpc-api</artifactId> + <groupId>org.jboss.spec.javax.xml.rpc</groupId> + <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId> </dependency> <dependency> <groupId>stax</groupId> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2010-09-20 15:48:25 UTC (rev 12996) +++ stack/cxf/trunk/pom.xml 2010-09-20 16:58:46 UTC (rev 12997) @@ -71,7 +71,7 @@ <jaxws-httpserver-httpspi.version>1.0.0-SNAPSHOT</jaxws-httpserver-httpspi.version> <jaxb.api.version>1.0.0.Beta1</jaxb.api.version> <jaxb.impl.version>2.2</jaxb.impl.version> - <jaxrpc.api.version>1.1</jaxrpc.api.version> + <jaxrpc.api.version>1.0.0.Beta1</jaxrpc.api.version> <jaxws.api.version>1.0.0.Beta1</jaxws.api.version> <jboss.jaxr.version>2.0.1</jboss.jaxr.version> <jsr181.api.version>1.0-MR1</jsr181.api.version> @@ -937,8 +937,8 @@ </dependency> <dependency> - <groupId>javax.xml</groupId> - <artifactId>jaxrpc-api</artifactId> + <groupId>org.jboss.spec.javax.xml.rpc</groupId> + <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId> <version>${jaxrpc.api.version}</version> </dependency> <dependency> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-09-20 15:48:25 UTC (rev 12996) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-09-20 16:58:46 UTC (rev 12997) @@ -29,7 +29,6 @@ <include>org.apache.cxf.xjcplugins:cxf-*</include> <include>com.sun.xml.bind:jaxb-impl:jar</include> <include>com.sun.xml.bind:jaxb-xjc:jar</include> - <include>javax.xml:jaxrpc-api:jar</include> <include>org.jboss.ws:jbossws-common:jar</include> <include>org.jboss.ws:jbossws-spi:jar</include> <include>junit:junit:jar</include> @@ -70,6 +69,13 @@ <include>org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar</include> </includes> </dependencySet> + <dependencySet> + <outputFileNameMapping>jaxrpc-api.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar</include> + </includes> + </dependencySet> </dependencySets> </binaries> </moduleSet>

13 years, 7 months

1
0
0 / 0

JBossWS SVN: r12996 - stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-09-20 11:48:25 -0400 (Mon, 20 Sep 2010) New Revision: 12996 Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/Install.txt Log: [JBPAPP-5021] Fixing Install.txt removing references to TP Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/Install.txt =================================================================== --- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/Install.txt 2010-09-20 13:20:53 UTC (rev 12995) +++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/Install.txt 2010-09-20 15:48:25 UTC (rev 12996) @@ -1,3 +1,3 @@ -This is the JBossWS-CXF Tech Preview (TP) installer for JBoss EAP. +This is the JBossWS-CXF installer for JBoss EAP. Simply run "ant" from the jbossws-cxf-tp-installer dir you got after -extracting the jbossws-cxf-tp-installer.zip in your EAP JBOSS_HOME. +extracting the jbossws-cxf-installer.zip in your EAP JBOSS_HOME.

13 years, 7 months

1
0
0 / 0

JBossWS SVN: r12995 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport.

by jbossws-commits＠lists.jboss.org

Author: sergeyb Date: 2010-09-20 09:20:53 -0400 (Mon, 20 Sep 2010) New Revision: 12995 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java Log: [JBWS-3116] Applying a slightly modified patch on behalf of Sverker Abrahamsson with NettyClient now sending absolute RequestURIs only for proxy bound requests Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2010-09-20 10:02:56 UTC (rev 12994) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/transport/NettyClient.java 2010-09-20 13:20:53 UTC (rev 12995) @@ -172,9 +172,11 @@ WSResponseHandler responseHandler = new WSResponseHandler(); NettyHelper.setResponseHandler(channel, responseHandler); - + //Send the HTTP request - HttpRequest request = new DefaultHttpRequest(HttpVersion.HTTP_1_1, reqMessage != null ? HttpMethod.POST : HttpMethod.GET, targetAddress); + String targetRequestUri = isProxyRequest(additionalHeaders) ? targetAddress : getRelativeRequestUri(target); + + HttpRequest request = new DefaultHttpRequest(HttpVersion.HTTP_1_1, reqMessage != null ? HttpMethod.POST : HttpMethod.GET, targetRequestUri); request.addHeader(HttpHeaders.Names.HOST, target.getHost()); request.addHeader(HttpHeaders.Names.CONNECTION, HttpHeaders.Values.KEEP_ALIVE); setAdditionalHeaders(request, additionalHeaders); @@ -271,7 +273,20 @@ transport.finished(resMetadata, resHeaders); //provide both headers and metadata to the transport to allow for proper keepAlive checks } } + + private static boolean isProxyRequest(Map<String, Object> additionalHeaders) + { + // callProps may also need to be checked + return additionalHeaders.containsKey(HttpHeaders.Names.PROXY_AUTHORIZATION); + } + private static String getRelativeRequestUri(URL target) + { + return target.getPath() + + (target.getQuery() != null ? "?" + target.getQuery() : "") + + (target.getRef() != null ? "#" + target.getRef() : ""); + } + private static SslHandler getSSLHandler(URL target, Map<String, Object> callProps) throws IOException { SslHandler handler = null;

13 years, 7 months

1
0
0 / 0

JBossWS SVN: r12994 - projects/jaxws-httpserver-httpspi/trunk.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-09-20 06:02:56 -0400 (Mon, 20 Sep 2010) New Revision: 12994 Modified: projects/jaxws-httpserver-httpspi/trunk/pom.xml Log: Moving to latest maven parent Modified: projects/jaxws-httpserver-httpspi/trunk/pom.xml =================================================================== --- projects/jaxws-httpserver-httpspi/trunk/pom.xml 2010-09-20 09:08:31 UTC (rev 12993) +++ projects/jaxws-httpserver-httpspi/trunk/pom.xml 2010-09-20 10:02:56 UTC (rev 12994) @@ -21,7 +21,7 @@ <parent> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-parent</artifactId> - <version>1.0.8.GA</version> + <version>1.0.9-SNAPSHOT</version> </parent>

13 years, 7 months

1
0
0 / 0

JBossWS SVN: r12993 - projects/plugins/maven/jaxws-tools/trunk.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-09-20 05:08:31 -0400 (Mon, 20 Sep 2010) New Revision: 12993 Modified: projects/plugins/maven/jaxws-tools/trunk/ Log: Updating svn:ignore props Property changes on: projects/plugins/maven/jaxws-tools/trunk ___________________________________________________________________ Name: svn:ignore - bin target + .project .classpath .settings bin target

13 years, 7 months

1
0
0 / 0

JBossWS SVN: r12992 - projects/plugins/maven/jaxws-tools/trunk.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-09-20 04:37:32 -0400 (Mon, 20 Sep 2010) New Revision: 12992 Removed: projects/plugins/maven/jaxws-tools/trunk/.classpath projects/plugins/maven/jaxws-tools/trunk/.project projects/plugins/maven/jaxws-tools/trunk/.settings/ Log: Removing eclipse configuration from svn Deleted: projects/plugins/maven/jaxws-tools/trunk/.classpath =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/.classpath 2010-09-17 18:21:20 UTC (rev 12991) +++ projects/plugins/maven/jaxws-tools/trunk/.classpath 2010-09-20 08:37:32 UTC (rev 12992) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/test/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> Deleted: projects/plugins/maven/jaxws-tools/trunk/.project =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/.project 2010-09-17 18:21:20 UTC (rev 12991) +++ projects/plugins/maven/jaxws-tools/trunk/.project 2010-09-20 08:37:32 UTC (rev 12992) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jaxws-tools-maven-plugin</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription>

13 years, 7 months

1
0
0 / 0

JBossWS SVN: r12991 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2010-09-17 14:21:20 -0400 (Fri, 17 Sep 2010) New Revision: 12991 Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java Log: [JBWS-3129] Prevent CXF tooling from depending on jbossws-common DOMUtils as that causes classloading issues in the maven-jaxws-plugin due to its static threadlocal member Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java 2010-09-17 17:56:02 UTC (rev 12990) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFProviderImpl.java 2010-09-17 18:21:20 UTC (rev 12991) @@ -21,6 +21,7 @@ */ package org.jboss.wsf.stack.cxf.tools; +import java.io.ByteArrayInputStream; import java.io.File; import java.io.PrintStream; import java.net.URL; @@ -28,9 +29,10 @@ import java.util.ArrayList; import java.util.List; +import javax.xml.parsers.DocumentBuilderFactory; + import org.apache.cxf.tools.java2ws.JavaToWS; import org.jboss.ws.tools.io.NullPrintStream; -import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.spi.tools.WSContractProvider; import org.w3c.dom.Element; @@ -253,7 +255,7 @@ + "</log4j:configuration>"; try { - Element element = DOMUtils.parse(xmlConfig); + Element element = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new ByteArrayInputStream(xmlConfig.getBytes("UTF-8"))).getDocumentElement(); org.apache.log4j.xml.DOMConfigurator.configure(element); } catch (Exception e)

13 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits September 2010