You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2008/03/09 03:39:48 UTC
svn commit: r635142 - in
/webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin:
pom.xml src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
src/test/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojoTest.java
Author: dims
Date: Sat Mar 8 18:39:46 2008
New Revision: 635142
URL: http://svn.apache.org/viewvc?rev=635142&view=rev
Log:
enable the testes for this maven plugin
Modified:
webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/src/test/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojoTest.java
Modified: webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml?rev=635142&r1=635141&r2=635142&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml Sat Mar 8 18:39:46 2008
@@ -82,6 +82,17 @@
<artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<distributionManagement>
<repository>
<id>apache-repo</id>
Modified: webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java?rev=635142&r1=635141&r2=635142&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/src/main/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojo.java Sat Mar 8 18:39:46 2008
@@ -468,16 +468,18 @@
new String[]{targetResourcesFolderLocation}));
}
- Iterator iterator = options.entrySet().iterator();
- while (iterator.hasNext()) {
- Map.Entry entry = (Map.Entry) iterator.next();
- String key = CommandLineOptionConstants.WSDL2JavaConstants.EXTRA_OPTIONTYPE_PREFIX + entry.getKey();
- String value = (String) entry.getValue();
- optionMap.put(
- key,
- new CommandLineOption(
- key,
- new String[]{value}));
+ if(options != null) {
+ Iterator iterator = options.entrySet().iterator();
+ while (iterator.hasNext()) {
+ Map.Entry entry = (Map.Entry) iterator.next();
+ String key = CommandLineOptionConstants.WSDL2JavaConstants.EXTRA_OPTIONTYPE_PREFIX + entry.getKey();
+ String value = (String) entry.getValue();
+ optionMap.put(
+ key,
+ new CommandLineOption(
+ key,
+ new String[]{value}));
+ }
}
optionMap.put(
Modified: webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/src/test/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojoTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/src/test/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojoTest.java?rev=635142&r1=635141&r2=635142&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/src/test/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojoTest.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-wsdl2code-maven-plugin/src/test/java/org/apache/axis2/maven2/wsdl2code/WSDL2CodeMojoTest.java Sat Mar 8 18:39:46 2008
@@ -39,7 +39,6 @@
MavenProjectStub project = new MavenProjectStub();
project.setDependencyArtifacts(new HashSet());
setVariableValueToObject(mojo, "project", project);
- setVariableValueToObject(mojo, "pluginArtifacts", new ArrayList());
setVariableValueToObject(mojo, "wsdlFile",
new File(baseDir, "src/main/axis2/service.wsdl").getAbsolutePath());
setVariableValueToObject(mojo, "outputDirectory",
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org