Author: dkulp
Date: Wed Aug 20 14:04:18 2008
New Revision: 687464
URL: http://svn.apache.org/viewvc?rev=687464&view=rev
Log:
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.1.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/CodegenUtils.java
cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/CodegenUtils.java
cxf/branches/2.1.x-fixes/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/CodegenUtils.java
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
cxf/branches/2.1.x-fixes/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 20 14:04:18 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096
+/cxf/trunk:686333-686363,686764,686820,687096,687387
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Aug 20 14:04:18 2008
@@ -1 +1 @@
-/cxf/trunk:1-686342,686344-686363,686764,686820,687096
+/cxf/trunk:1-686342,686344-686363,686764,686820,687096,687387
Modified:
cxf/branches/2.1.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java?rev=687464&r1=687463&r2=687464&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
(original)
+++
cxf/branches/2.1.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
Wed Aug 20 14:04:18 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.1.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.1.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java?rev=687464&r1=687463&r2=687464&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
(original)
+++
cxf/branches/2.1.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
Wed Aug 20 14:04:18 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,7 +299,7 @@
}
}
- boolean doWork = cgtimestamp > doneFile.lastModified();
+ boolean doWork = false;
if (!doneFile.exists()) {
doWork = true;
} else if (timestamp > doneFile.lastModified()) {
Modified:
cxf/branches/2.1.x-fixes/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java?rev=687464&r1=687463&r2=687464&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
(original)
+++
cxf/branches/2.1.x-fixes/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
Wed Aug 20 14:04:18 2008
@@ -115,12 +115,12 @@
}
}
- private void processWsdl(File file, long cgtimestamp) throws
MojoExecutionException {
+ private void processWsdl(File file) throws MojoExecutionException {
// If URL to WSDL, replace ? and & since they're invalid chars for
file names
File doneFile =
new File(markerDirectory, "." + file.getName().replace('?',
'_').replace('&', '_') + ".DONE");
- boolean doWork = cgtimestamp > doneFile.lastModified();
+ boolean doWork = false;
if (!doneFile.exists()) {
doWork = true;
} else if (file.lastModified() > doneFile.lastModified()) {
@@ -183,9 +183,8 @@
wsdls.addAll(getWsdlFiles(testWsdlRoot));
}
- long timestamp = CodegenUtils.getCodegenTimestamp();
for (File wsdl : wsdls) {
- processWsdl(wsdl, timestamp);
+ processWsdl(wsdl);
}
