2:02 a.m.
Author: alessio.soldano(a)jboss.com
Date: 2011-12-19 03:02:00 -0500 (Mon, 19 Dec 2011)
New Revision: 15425
Modified:
projects/plugins/maven/jaxws-tools/trunk/pom.xml
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/AbstractWsProvideMojo.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
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractProviderParams.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
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom-cxf.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml
Log:
[JBWS-3400] Cleaning up a bunch of stuff by moving to latest snapshots to jbws 4
Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/pom.xml 2011-12-19 06:25:15 UTC (rev 15424)
+++ projects/plugins/maven/jaxws-tools/trunk/pom.xml 2011-12-19 08:02:00 UTC (rev 15425)
@@ -44,16 +44,6 @@
<version>${jbossws.common.tools.version}</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>gnu-getopt</groupId>
- <artifactId>getopt</artifactId>
- <version>${getopt.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>${maven.project.version}</version>
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 2011-12-19
06:25:15 UTC (rev 15424)
+++
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2011-12-19
08:02:00 UTC (rev 15425)
@@ -140,10 +140,6 @@
params.setWsdlLocation(wsdlLocation);
params.setArgLine(argLine);
params.setFork(fork);
- if (fork)
- {
- params.setAdditionalPluginDependencies(getRequiredPluginDependencyPaths());
- }
WSContractDelegate delegate = new WSContractDelegate(getLog());
for (String wsdl : wsdls)
Modified:
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java
===================================================================
---
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java 2011-12-19
06:25:15 UTC (rev 15424)
+++
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsProvideMojo.java 2011-12-19
08:02:00 UTC (rev 15425)
@@ -101,10 +101,6 @@
params.setSourceDirectory(sourceDirectory);
params.setFork(fork);
params.setArgLine(argLine);
- if (fork)
- {
- params.setAdditionalPluginDependencies(getRequiredPluginDependencyPaths());
- }
WSContractDelegate delegate = new WSContractDelegate(getLog());
delegate.runProvider(params);
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 2011-12-19
06:25:15 UTC (rev 15424)
+++
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java 2011-12-19
08:02:00 UTC (rev 15425)
@@ -42,16 +42,7 @@
private String targetPackage;
private String wsdlLocation;
private String argLine;
- private List<String> additionalPluginDependencies;
- public List<String> getAdditionalPluginDependencies()
- {
- return additionalPluginDependencies;
- }
- public void setAdditionalPluginDependencies(List<String>
additionalPluginDependencies)
- {
- this.additionalPluginDependencies = additionalPluginDependencies;
- }
public boolean isAdditionalHeaders()
{
return additionalHeaders;
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 2011-12-19
06:25:15 UTC (rev 15424)
+++
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java 2011-12-19
08:02:00 UTC (rev 15425)
@@ -74,7 +74,6 @@
{
classpath.add(url.getFile());
}
- classpath.addAll(params.getAdditionalPluginDependencies());
List<String> commandList = initCommandList(params.getArgLine(), classpath,
"org.jboss.ws.tools.cmd.WSProvide");
String commandLine = getProviderCommandLine(commandList, params);
@@ -123,7 +122,6 @@
{
classpath.add(url.getFile());
}
- classpath.addAll(params.getAdditionalPluginDependencies());
List<String> commandList = initCommandList(params.getArgLine(), classpath,
"org.jboss.ws.tools.cmd.WSConsume");
String commandLine = getConsumerCommandLine(commandList, params, wsdl);
Modified:
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractProviderParams.java
===================================================================
---
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractProviderParams.java 2011-12-19
06:25:15 UTC (rev 15424)
+++
projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractProviderParams.java 2011-12-19
08:02:00 UTC (rev 15425)
@@ -37,16 +37,7 @@
private File resourceDirectory;
private File sourceDirectory;
private String argLine;
- private List<String> additionalPluginDependencies;
- public List<String> getAdditionalPluginDependencies()
- {
- return additionalPluginDependencies;
- }
- public void setAdditionalPluginDependencies(List<String>
additionalPluginDependencies)
- {
- this.additionalPluginDependencies = additionalPluginDependencies;
- }
public boolean isFork()
{
return fork;
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 2011-12-19
06:25:15 UTC (rev 15424)
+++
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml 2011-12-19
08:02:00 UTC (rev 15425)
@@ -120,18 +120,12 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
- <version>4.0.0.CR1</version>
- <exclusions> <!-- TODO remove this exclusion when moving to 4.0.0.CR2 (as that
prevents junit from leaking into the dependency tree -->
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-factories</artifactId>
- <version>4.0.0.CR1</version>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.xml.ws</groupId>
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 2011-12-19
06:25:15 UTC (rev 15424)
+++
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml 2011-12-19
08:02:00 UTC (rev 15425)
@@ -115,7 +115,7 @@
<dependency>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-client</artifactId>
- <version>4.0.0.CR2</version>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.xml.ws</groupId>
Modified:
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom-cxf.xml
===================================================================
---
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom-cxf.xml 2011-12-19
06:25:15 UTC (rev 15424)
+++
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom-cxf.xml 2011-12-19
08:02:00 UTC (rev 15425)
@@ -88,22 +88,10 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
- <version>4.0.0.CR1</version>
+ <version>4.0.0-SNAPSHOT</version>
<scope>provided</scope>
- <exclusions> <!-- TODO remove this exclusion when moving to 4.0.0.CR2 (as that
prevents junit from leaking into the dependency tree -->
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-factories</artifactId>
- <version>4.0.0.CR1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.xml.ws</groupId>
<artifactId>jboss-jaxws-api_2.2_spec</artifactId>
<version>2.0.0.Final</version>
Modified:
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom.xml
===================================================================
---
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom.xml 2011-12-19
06:25:15 UTC (rev 15424)
+++
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom.xml 2011-12-19
08:02:00 UTC (rev 15425)
@@ -89,7 +89,7 @@
<dependency>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-client</artifactId>
- <version>4.0.0.CR2</version>
+ <version>4.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified:
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml
===================================================================
---
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml 2011-12-19
06:25:15 UTC (rev 15424)
+++
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml 2011-12-19
08:02:00 UTC (rev 15425)
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
- <version>4.0.0.CR1</version>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified:
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml
===================================================================
---
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml 2011-12-19
06:25:15 UTC (rev 15424)
+++
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml 2011-12-19
08:02:00 UTC (rev 15425)
@@ -96,7 +96,7 @@
<dependency>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-client</artifactId>
- <version>4.0.0.CR2</version>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
Modified:
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml
===================================================================
---
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2011-12-19
06:25:15 UTC (rev 15424)
+++
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2011-12-19
08:02:00 UTC (rev 15425)
@@ -71,13 +71,7 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
- <version>4.0.0.CR1</version>
- <exclusions> <!-- TODO remove this exclusion when moving to 4.0.0.CR2 (as that
prevents junit from leaking into the dependency tree -->
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified:
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml
===================================================================
---
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml 2011-12-19
06:25:15 UTC (rev 15424)
+++
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml 2011-12-19
08:02:00 UTC (rev 15425)
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-client</artifactId>
- <version>4.0.0.CR2</version>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>