[jbossws-commits] JBossWS SVN: r13005 - in projects/plugins/maven/jaxws-tools/trunk: src/main/java/org/jboss/ws/plugins/tools and 2 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Sep 22 10:10:36 EDT 2010
Author: alessio.soldano at jboss.com
Date: 2010-09-22 10:10:35 -0400 (Wed, 22 Sep 2010)
New Revision: 13005
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/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/test/java/org/jboss/test/ws/plugins/tools/ArgumentTest.java
projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/wsconsume-plugin-config.xml
Log:
[JBWS-3132] Adding additionalHeaders support
Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/pom.xml 2010-09-22 12:32:30 UTC (rev 13004)
+++ projects/plugins/maven/jaxws-tools/trunk/pom.xml 2010-09-22 14:10:35 UTC (rev 13005)
@@ -25,7 +25,7 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>1.3.0.GA</jbossws.spi.version>
+ <jbossws.spi.version>1.4.0.Beta2</jbossws.spi.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/AbstractWsConsumeMojo.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2010-09-22 12:32:30 UTC (rev 13004)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2010-09-22 14:10:35 UTC (rev 13005)
@@ -59,8 +59,16 @@
* @parameter
*/
private File catalog;
-
+
/**
+ * Enables or disables processing of implicit SOAP headers (i.e. SOAP headers
+ * defined in the wsdl:binding but not wsdl:portType section.) Default is false.
+ *
+ * @parameter default-value="false"
+ */
+ protected Boolean additionalHeaders;
+
+ /**
* Sets the source directory. This directory will contain any generated Java source.
* If the directory does not exist, it will be created.
*
@@ -120,6 +128,7 @@
params.setAdditionalCompilerClassPath(new LinkedList<String>(getClasspathElements()));
params.setBindingFiles(bindingFiles);
params.setCatalog(catalog);
+ params.setAdditionalHeaders(additionalHeaders);
params.setExtension(extension);
params.setGenerateSource(generateSource);
params.setLoader(loader);
@@ -190,4 +199,9 @@
{
return target;
}
+
+ public Boolean isAdditionalHeaders()
+ {
+ return additionalHeaders;
+ }
}
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-22 12:32:30 UTC (rev 13004)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java 2010-09-22 14:10:35 UTC (rev 13005)
@@ -31,6 +31,7 @@
private List<String> additionalCompilerClassPath;
private List<String> bindingFiles;
private File catalog;
+ private boolean additionalHeaders;
private boolean extension;
private boolean generateSource;
private boolean noCompile;
@@ -41,6 +42,14 @@
private String wsdlLocation;
private String argLine;
+ public boolean isAdditionalHeaders()
+ {
+ return additionalHeaders;
+ }
+ public void setAdditionalHeaders(boolean additionalHeaders)
+ {
+ this.additionalHeaders = additionalHeaders;
+ }
public String getArgLine()
{
return argLine;
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-22 12:32:30 UTC (rev 13004)
+++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java 2010-09-22 14:10:35 UTC (rev 13005)
@@ -209,6 +209,10 @@
{
commandList.add("-n");
}
+ if (params.isAdditionalHeaders())
+ {
+ commandList.add("-a");
+ }
commandList.add(wsdl);
StringBuilder command = new StringBuilder();
for (String s : commandList)
@@ -277,6 +281,7 @@
{
callMethod(consumerClass, consumer, "setCatalog", params.getCatalog());
}
+ callMethod(consumerClass, consumer, "setAdditionalHeaders", params.isAdditionalHeaders());
callMethod(consumerClass, consumer, "setExtension", params.isExtension());
callMethod(consumerClass, consumer, "setGenerateSource", params.isGenerateSource());
callMethod(consumerClass, consumer, "setNoCompile", params.isNoCompile());
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/ArgumentTest.java
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/ArgumentTest.java 2010-09-22 12:32:30 UTC (rev 13004)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/ArgumentTest.java 2010-09-22 14:10:35 UTC (rev 13005)
@@ -62,6 +62,7 @@
assertEquals("wl", mojo.getWsdlLocation());
assertEquals("source", mojo.getSourceDirectory().getName());
assertTrue(mojo.isVerbose());
+ assertTrue(mojo.isAdditionalHeaders());
assertThat(mojo.getBindingFiles(), hasItems(new String[] { "b1" }));
assertThat(mojo.getClasspathElements(), hasItems(new String[] { "cp1", "cp2" }));
assertThat(mojo.getWsdls(), hasItems(new String[] { "w1", "w2" }));
Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/wsconsume-plugin-config.xml
===================================================================
--- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/wsconsume-plugin-config.xml 2010-09-22 12:32:30 UTC (rev 13004)
+++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/wsconsume-plugin-config.xml 2010-09-22 14:10:35 UTC (rev 13005)
@@ -17,6 +17,7 @@
<bindingFiles>
<bindingFile>b1</bindingFile>
</bindingFiles>
+ <additionalHeaders>true</additionalHeaders>
<catalog>catalog</catalog>
<sourceDirectory>source</sourceDirectory>
<targetPackage>tp</targetPackage>
More information about the jbossws-commits
mailing list