Author: ffang
Date: Tue Apr 9 02:02:20 2013
New Revision: 1465859
URL: http://svn.apache.org/r1465859
Log:
Merged revisions 1465636 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1465636 | ffang | 2013-04-08 21:51:05 +0800 (δΈ€, 08 4 2013) | 1 line
[CXF-4951]cxf-codegen-plugin wsdlArtifact ignores classifier|add classifier
for cxf-java2ws-plugin used to publish wsdl
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
cxf/branches/2.7.x-fixes/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
cxf/branches/2.7.x-fixes/systests/wsdl_maven/codegen/pom.xml
cxf/branches/2.7.x-fixes/systests/wsdl_maven/java2ws/pom.xml
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1465636
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.7.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java?rev=1465859&r1=1465858&r2=1465859&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
(original)
+++
cxf/branches/2.7.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
Tue Apr 9 02:02:20 2013
@@ -802,9 +802,11 @@ public abstract class AbstractCodegenMoh
if (wsdlA == null) {
continue;
}
- Artifact wsdlArtifact =
artifactFactory.createBuildArtifact(wsdlA.getGroupId(),
+ Artifact wsdlArtifact =
artifactFactory.createArtifactWithClassifier(wsdlA.getGroupId(),
wsdlA.getArtifactId(),
-
wsdlA.getVersion(), wsdlA.getType());
+
wsdlA.getVersion(),
+
wsdlA.getType(),
+
wsdlA.getClassifier());
wsdlArtifact = resolveRemoteWsdlArtifact(wsdlArtifact);
if (wsdlArtifact != null) {
File supposedFile = wsdlArtifact.getFile();
Modified:
cxf/branches/2.7.x-fixes/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java?rev=1465859&r1=1465858&r2=1465859&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
(original)
+++
cxf/branches/2.7.x-fixes/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
Tue Apr 9 02:02:20 2013
@@ -92,6 +92,12 @@ public class Java2WSMojo extends Abstrac
* @parameter
*/
private String address;
+
+
+ /**
+ * @parameter
+ */
+ private String classifier;
/**
* @parameter expression="${project.compileClasspathElements}"
@@ -427,7 +433,12 @@ public class Java2WSMojo extends Abstrac
if (attachWsdl && outputFile != null) {
File wsdlFile = new File(outputFile);
if (wsdlFile.exists()) {
- projectHelper.attachArtifact(project, "wsdl", wsdlFile);
+ if (classifier != null) {
+ projectHelper.attachArtifact(project, "wsdl", classifier,
wsdlFile);
+ } else {
+ projectHelper.attachArtifact(project, "wsdl", wsdlFile);
+ }
+
}
}
}
Modified: cxf/branches/2.7.x-fixes/systests/wsdl_maven/codegen/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/wsdl_maven/codegen/pom.xml?rev=1465859&r1=1465858&r2=1465859&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/wsdl_maven/codegen/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/systests/wsdl_maven/codegen/pom.xml Tue Apr 9
02:02:20 2013
@@ -76,6 +76,31 @@
<fork>${cxf.codegenplugin.forkmode}</fork>
</configuration>
</execution>
+ <execution>
+ <id>process-sources</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>wsdl2java</goal>
+ </goals>
+ <configuration>
+ <wsdlOptions>
+ <wsdlOption>
+ <wsdlArtifact>
+
<groupId>org.apache.cxf.systests.wsdl_maven</groupId>
+
<artifactId>cxf-systests-java2ws</artifactId>
+ <version>${project.version}</version>
+ <classifier>test</classifier>
+ </wsdlArtifact>
+ </wsdlOption>
+ </wsdlOptions>
+ <fork>${cxf.codegenplugin.forkmode}</fork>
+ <defaultOptions>
+ <markGenerated>true</markGenerated>
+ <asyncMethods />
+ </defaultOptions>
+ </configuration>
+ </execution>
+
</executions>
</plugin>
<!--
@@ -115,6 +140,7 @@
<groupId>org.apache.cxf.systests.wsdl_maven</groupId>
<artifactId>cxf-systests-java2ws</artifactId>
<version>${project.version}</version>
+ <classifier>test</classifier>
<type>wsdl</type>
</dependency>
<dependency>
Modified: cxf/branches/2.7.x-fixes/systests/wsdl_maven/java2ws/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/wsdl_maven/java2ws/pom.xml?rev=1465859&r1=1465858&r2=1465859&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/wsdl_maven/java2ws/pom.xml (original)
+++ cxf/branches/2.7.x-fixes/systests/wsdl_maven/java2ws/pom.xml Tue Apr 9
02:02:20 2013
@@ -56,12 +56,14 @@
<className>org.apache.cxf.systests.java2ws.HelloWorld</className>
<genWsdl>true</genWsdl>
<verbose>true</verbose>
+
<classifier>test</classifier>
<attachWsdl>true</attachWsdl>
</configuration>
<goals>
<goal>java2ws</goal>
</goals>
</execution>
+
</executions>
</plugin>
</plugins>
