You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2008/08/20 23:07:42 UTC
svn commit: r687466 - in /cxf/branches/2.0.x-fixes: ./
common/xsd/src/main/java/org/apache/cxf/maven_plugin/
maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/
Author: dkulp
Date: Wed Aug 20 14:07:41 2008
New Revision: 687466
URL: http://svn.apache.org/viewvc?rev=687466&view=rev
Log:
Merged revisions 687464 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................
r687464 | dkulp | 2008-08-20 17:04:18 -0400 (Wed, 20 Aug 2008) | 9 lines
Merged revisions 687387 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r687387 | dkulp | 2008-08-20 12:57:17 -0400 (Wed, 20 Aug 2008) | 2 lines
[CXF-1753] Remove the attempts at checking the timestamp on the code. It isn't needed for "release" builds, and doesn't really work as it only checks one or two classes, not all the classes that go into the code generators.
........
................
Removed:
cxf/branches/2.0.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/CodegenUtils.java
cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/CodegenUtils.java
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 20 14:07:41 2008
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387
/incubator/cxf/trunk:434594-651668
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Aug 20 14:07:41 2008
@@ -1 +1 @@
-/cxf/branches/2.1.x-fixes:1-686313,686315-686332,686334-686346,686348-686828,687097
+/cxf/branches/2.1.x-fixes:1-686313,686315-686332,686334-686346,686348-686828,687097,687464
Modified: cxf/branches/2.0.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java?rev=687466&r1=687465&r2=687466&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java (original)
+++ cxf/branches/2.0.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java Wed Aug 20 14:07:41 2008
@@ -74,7 +74,6 @@
outputDirFile.mkdirs();
markerDirectory.mkdirs();
- long timestamp = CodegenUtils.getCodegenTimestamp();
boolean result = true;
if (xsdOptions == null) {
@@ -117,7 +116,7 @@
}
}
- boolean doWork = timestamp > doneFile.lastModified();
+ boolean doWork = false;
if (!doneFile.exists()) {
doWork = true;
} else if (srctimestamp > doneFile.lastModified()) {
Modified: cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java?rev=687466&r1=687465&r2=687466&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java (original)
+++ cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java Wed Aug 20 14:07:41 2008
@@ -218,14 +218,13 @@
Map<Object, Object> origProps = new HashMap<Object, Object>(System.getProperties());
String cp = System.getProperty("java.class.path");
- long timestamp = CodegenUtils.getCodegenTimestamp();
boolean result = true;
try {
Thread.currentThread().setContextClassLoader(loader);
System.setProperty("java.class.path", newCp);
for (WsdlOption o : wsdlOptions) {
- processWsdl(o, timestamp);
+ processWsdl(o);
File dirs[] = o.getDeleteDirs();
if (dirs != null) {
@@ -261,8 +260,7 @@
System.gc();
}
- private void processWsdl(WsdlOption wsdlOption,
- long cgtimestamp) throws MojoExecutionException {
+ private void processWsdl(WsdlOption wsdlOption) throws MojoExecutionException {
File outputDirFile = wsdlOption.getOutputDir();
outputDirFile.mkdirs();
@@ -301,8 +299,7 @@
}
}
-
- boolean doWork = cgtimestamp > doneFile.lastModified();
+ boolean doWork = false;
if (!doneFile.exists()) {
doWork = true;
} else if (timestamp > doneFile.lastModified()) {