Author: mmao
Date: Tue Aug 21 22:32:46 2007
New Revision: 568427
URL: http://svn.apache.org/viewvc?rev=568427&view=rev
Log:
CXF-928 wsdl2java should not overwrite existing files
* Add an argument -keep to keep the existing files
Added:
incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/AbstractGeneratorTest.java
incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/DummyGenerator.java
Modified:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/FileWriterUtil.java
incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java
incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AbstractJAXWSGenerator.java
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ClientGenerator.java
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml
Modified:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java?rev=568427&r1=568426&r2=568427&view=diff
==============================================================================
---
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
(original)
+++
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
Tue Aug 21 22:32:46 2007
@@ -90,6 +90,8 @@
public static final String CFG_GEN_OVERWRITE = "overwrite";
public static final String CFG_GEN_FAULT = "genFault";
+ public static final String CFG_GEN_KEEP = "keep";
+
// Java2WSDL Constants
public static final String CFG_CLASSPATH = "classpath";
Modified:
incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/FileWriterUtil.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/FileWriterUtil.java?rev=568427&r1=568426&r2=568427&view=diff
==============================================================================
---
incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/FileWriterUtil.java
(original)
+++
incubator/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/util/FileWriterUtil.java
Tue Aug 21 22:32:46 2007
@@ -72,7 +72,7 @@
return fileExist(dir, fileName);
}
- private File buildDir(String packageName) {
+ public File buildDir(String packageName) {
File dir;
if (packageName == null) {
dir = target;
Modified:
incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java?rev=568427&r1=568426&r2=568427&view=diff
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java
(original)
+++
incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java
Tue Aug 21 22:32:46 2007
@@ -22,6 +22,7 @@
import java.io.IOException;
import java.io.Writer;
import java.util.Calendar;
+import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.cxf.common.i18n.Message;
@@ -46,7 +47,9 @@
}
protected void doWrite(String templateName, Writer outputs) throws
ToolException {
- velocity.doWrite(templateName, outputs);
+ if (outputs != null) {
+ velocity.doWrite(templateName, outputs);
+ }
}
protected boolean isCollision(String packageName, String filename) throws
ToolException {
@@ -61,10 +64,20 @@
return fw.isCollision(packageName, filename + ext);
}
+ protected boolean wantToKeep() {
+ return env.optionSet(ToolConstants.CFG_GEN_KEEP);
+ }
+
protected Writer parseOutputName(String packageName, String filename,
String ext) throws ToolException {
FileWriterUtil fw = null;
Writer writer = null;
+ if (wantToKeep() && isCollision(packageName, filename, ext)) {
+ Message msg = new Message("SKIP_GEN", LOG, packageName + "." +
filename + ext);
+ LOG.log(Level.INFO, msg.toString());
+ return null;
+ }
+
fw = new FileWriterUtil((String)env.get(ToolConstants.CFG_OUTPUTDIR));
try {
writer = fw.getWriter(packageName, filename + ext);
@@ -76,29 +89,10 @@
return writer;
}
- protected Writer parseOutputName(String packageName, String filename)
throws ToolException {
- ClassCollector collector = env.get(ClassCollector.class);
-
- if (ToolConstants.SEI_GENERATOR.equals(name)) {
- collector.addSeiClassName(packageName , filename , packageName +
"." + filename);
- }
-
- if (ToolConstants.CLT_GENERATOR.equals(name)) {
- collector.addClientClassName(packageName , filename , packageName
+ "." + filename);
- }
-
- if (ToolConstants.FAULT_GENERATOR.equals(name)) {
- collector.addExceptionClassName(packageName , filename ,
packageName + "." + filename);
- }
- if (ToolConstants.SERVICE_GENERATOR.equals(name)) {
- collector.addServiceClassName(packageName , filename , packageName
+ "." + filename);
- }
- if (ToolConstants.SVR_GENERATOR.equals(name)) {
- collector.addServiceClassName(packageName , filename , packageName
+ "." + filename);
-
- }
-
+ public abstract void register(final ClassCollector collector, String
packageName, String fileName);
+ protected Writer parseOutputName(String packageName, String filename)
throws ToolException {
+ register(env.get(ClassCollector.class), packageName, filename);
return parseOutputName(packageName, filename, ".java");
}
Modified:
incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties?rev=568427&r1=568426&r2=568427&view=diff
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties
(original)
+++
incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/Messages.properties
Tue Aug 21 22:32:46 2007
@@ -48,3 +48,5 @@
REPLACED_DEFAULT_FRONTEND = Replaced default frontend {0}
CLZ_SHOULD_IMPLEMENT_INTERFACE = {0} should implement the ToolContainer
interface
+
+SKIP_GEN = Keep the existing file {0}
\ No newline at end of file
Added:
incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/AbstractGeneratorTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/AbstractGeneratorTest.java?rev=568427&view=auto
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/AbstractGeneratorTest.java
(added)
+++
incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/AbstractGeneratorTest.java
Tue Aug 21 22:32:46 2007
@@ -0,0 +1,68 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.tools.wsdlto.core;
+
+import java.io.Writer;
+
+import org.apache.cxf.tools.common.ProcessorTestBase;
+import org.apache.cxf.tools.common.ToolConstants;
+import org.apache.cxf.tools.common.ToolContext;
+import org.apache.cxf.tools.util.FileWriterUtil;
+import org.junit.Before;
+import org.junit.Test;
+
+public class AbstractGeneratorTest extends ProcessorTestBase {
+
+ DummyGenerator gen;
+ ToolContext context;
+ FileWriterUtil util;
+
+ String packageName = "org.apache";
+ String className = "Hello";
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+
+ gen = new DummyGenerator();
+ util = new FileWriterUtil(output.toString());
+
+ context = new ToolContext();
+ context.put(ToolConstants.CFG_OUTPUTDIR, output.toString());
+ gen.setEnvironment(context);
+
+ Writer writer = util.getWriter(packageName, className + ".java");
+ writer.write("hello world");
+ writer.flush();
+ writer.close();
+ }
+
+ @Test
+ public void testKeep() throws Exception {
+ context.put(ToolConstants.CFG_GEN_KEEP, "keep");
+ assertNull(gen.parseOutputName(packageName, className));
+ }
+
+ @Test
+ public void testOverwrite() throws Exception {
+ assertNotNull(gen.parseOutputName(packageName, className));
+ }
+}
+
Added:
incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/DummyGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/DummyGenerator.java?rev=568427&view=auto
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/DummyGenerator.java
(added)
+++
incubator/cxf/trunk/tools/wsdlto/core/src/test/java/org/apache/cxf/tools/wsdlto/core/DummyGenerator.java
Tue Aug 21 22:32:46 2007
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.tools.wsdlto.core;
+
+import org.apache.cxf.tools.common.ToolContext;
+import org.apache.cxf.tools.util.ClassCollector;
+
+public class DummyGenerator extends AbstractGenerator {
+ public DummyGenerator() {
+ super();
+ this.name = "dummy";
+ }
+ public void register(ClassCollector collector, String packageName, String
fileName) {
+ // empty
+ }
+ public void generate(ToolContext context) {
+ // empty
+ }
+}
Modified:
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AbstractJAXWSGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AbstractJAXWSGenerator.java?rev=568427&r1=568426&r2=568427&view=diff
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AbstractJAXWSGenerator.java
(original)
+++
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AbstractJAXWSGenerator.java
Tue Aug 21 22:32:46 2007
@@ -24,6 +24,7 @@
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.common.ToolException;
+import org.apache.cxf.tools.util.ClassCollector;
import org.apache.cxf.tools.wsdlto.core.AbstractGenerator;
public abstract class AbstractJAXWSGenerator extends AbstractGenerator {
@@ -33,4 +34,8 @@
public abstract boolean passthrough();
public abstract void generate(ToolContext penv) throws ToolException;
+
+ public void register(final ClassCollector collector, String packageName,
String fileName) {
+ // do nothing
+ }
}
Modified:
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ClientGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ClientGenerator.java?rev=568427&r1=568426&r2=568427&view=diff
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ClientGenerator.java
(original)
+++
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ClientGenerator.java
Tue Aug 21 22:32:46 2007
@@ -31,6 +31,7 @@
import org.apache.cxf.tools.common.model.JavaModel;
import org.apache.cxf.tools.common.model.JavaPort;
import org.apache.cxf.tools.common.model.JavaServiceClass;
+import org.apache.cxf.tools.util.ClassCollector;
import org.apache.cxf.tools.util.NameUtil;
public class ClientGenerator extends AbstractJAXWSGenerator {
@@ -101,5 +102,9 @@
doWrite(CLT_TEMPLATE, parseOutputName(intf.getPackageName(),
clientClassName));
}
}
+ }
+
+ public void register(final ClassCollector collector, String packageName,
String fileName) {
+ collector.addClientClassName(packageName , fileName , packageName +
"." + fileName);
}
}
Modified:
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java?rev=568427&r1=568426&r2=568427&view=diff
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
(original)
+++
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/FaultGenerator.java
Tue Aug 21 22:32:46 2007
@@ -30,6 +30,7 @@
import org.apache.cxf.tools.common.model.JavaExceptionClass;
import org.apache.cxf.tools.common.model.JavaField;
import org.apache.cxf.tools.common.model.JavaModel;
+import org.apache.cxf.tools.util.ClassCollector;
import
org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.ProcessorUtil;
public class FaultGenerator extends AbstractJAXWSGenerator {
@@ -89,5 +90,9 @@
private String getSUID() {
return new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
+ }
+
+ public void register(final ClassCollector collector, String packageName,
String fileName) {
+ collector.addExceptionClassName(packageName , fileName , packageName +
"." + fileName);
}
}
Modified:
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java?rev=568427&r1=568426&r2=568427&view=diff
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java
(original)
+++
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java
Tue Aug 21 22:32:46 2007
@@ -28,6 +28,7 @@
import org.apache.cxf.tools.common.ToolException;
import org.apache.cxf.tools.common.model.JavaInterface;
import org.apache.cxf.tools.common.model.JavaModel;
+import org.apache.cxf.tools.util.ClassCollector;
public class SEIGenerator extends AbstractJAXWSGenerator {
@@ -100,5 +101,9 @@
doWrite(SEI_TEMPLATE, parseOutputName(intf.getPackageName(),
intf.getName()));
}
+ }
+
+ public void register(final ClassCollector collector, String packageName,
String fileName) {
+ collector.addSeiClassName(packageName , fileName , packageName + "." +
fileName);
}
}
Modified:
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java?rev=568427&r1=568426&r2=568427&view=diff
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java
(original)
+++
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java
Tue Aug 21 22:32:46 2007
@@ -32,6 +32,7 @@
import org.apache.cxf.tools.common.model.JavaModel;
import org.apache.cxf.tools.common.model.JavaPort;
import org.apache.cxf.tools.common.model.JavaServiceClass;
+import org.apache.cxf.tools.util.ClassCollector;
import org.apache.cxf.tools.util.NameUtil;
public class ServerGenerator extends AbstractJAXWSGenerator {
@@ -106,5 +107,7 @@
}
}
}
-
+ public void register(final ClassCollector collector, String packageName,
String fileName) {
+ collector.addServerClassName(packageName , fileName , packageName +
"." + fileName);
+ }
}
Modified:
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java?rev=568427&r1=568426&r2=568427&view=diff
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
(original)
+++
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java
Tue Aug 21 22:32:46 2007
@@ -28,6 +28,7 @@
import org.apache.cxf.tools.common.ToolException;
import org.apache.cxf.tools.common.model.JavaModel;
import org.apache.cxf.tools.common.model.JavaServiceClass;
+import org.apache.cxf.tools.util.ClassCollector;
public class ServiceGenerator extends AbstractJAXWSGenerator {
//private static final Logger LOG =
LogUtils.getL7dLogger(AbstractGenerator.class);
@@ -106,5 +107,9 @@
doWrite(SERVICE_TEMPLATE, parseOutputName(js.getPackageName(),
js.getName()));
}
+ }
+
+ public void register(final ClassCollector collector, String packageName,
String fileName) {
+ collector.addServiceClassName(packageName , fileName , packageName +
"." + fileName);
}
}
Modified:
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml?rev=568427&r1=568426&r2=568427&view=diff
==============================================================================
---
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml
(original)
+++
incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml
Tue Aug 21 22:32:46 2007
@@ -235,6 +235,13 @@
<switch>validate</switch>
</option>
+ <option id="keep" maxOccurs="1">
+ <annotation>
+ To keep the existing files, NOTE: You have to solve the
compilation problems by yourself
+ </annotation>
+ <switch>keep</switch>
+ </option>
+
<option id="wsdlLocation" maxOccurs="1">
<annotation>
The wsdlLocation that is injected into code. This
location could be the location
