You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bi...@apache.org on 2011/12/15 03:37:12 UTC
svn commit: r1214604 - in
/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin:
AbstractCodegenMoho.java wsdl2java/WSDL2JavaMojo.java
wsdl2js/WSDL2JavaScriptMojo.java
Author: bimargulies
Date: Thu Dec 15 02:37:12 2011
New Revision: 1214604
URL: http://svn.apache.org/viewvc?rev=1214604&view=rev
Log:
[CXF-3972] sort our marker suffixes.
Modified:
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
Modified: cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java?rev=1214604&r1=1214603&r2=1214604&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java (original)
+++ cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java Thu Dec 15 02:37:12 2011
@@ -316,6 +316,8 @@ public abstract class AbstractCodegenMoh
return true;
}
+ protected abstract String getMarkerSuffix();
+
protected void forkOnce(Set<URI> classPath, List<GenericWsdlOption> effectiveWsdlOptions)
throws MojoExecutionException {
List<GenericWsdlOption> toDo = new LinkedList<GenericWsdlOption>();
@@ -325,7 +327,7 @@ public abstract class AbstractCodegenMoh
outputDirFile.mkdirs();
URI basedir = project.getBasedir().toURI();
URI wsdlURI = getWsdlURI(wsdlOption, basedir);
- File doneFile = getDoneFile(basedir, wsdlURI, "js");
+ File doneFile = getDoneFile(basedir, wsdlURI, getMarkerSuffix());
if (!shouldRun(wsdlOption, doneFile, wsdlURI)) {
continue;
Modified: cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java?rev=1214604&r1=1214603&r2=1214604&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java (original)
+++ cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java Thu Dec 15 02:37:12 2011
@@ -288,4 +288,9 @@ public class WSDL2JavaMojo extends Abstr
super.execute();
}
+ @Override
+ protected String getMarkerSuffix() {
+ return "java";
+ }
+
}
Modified: cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java?rev=1214604&r1=1214603&r2=1214604&view=diff
==============================================================================
--- cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java (original)
+++ cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java Thu Dec 15 02:37:12 2011
@@ -280,4 +280,9 @@ public class WSDL2JavaScriptMojo extends
return ForkOnceWSDL2Javascript.class;
}
+ @Override
+ protected String getMarkerSuffix() {
+ return "js";
+ }
+
}