You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/06/08 23:16:43 UTC
svn commit: r545628 - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/wsdl/codegen/emitter/
codegen/src/org/apache/axis2/wsdl/codegen/writer/
tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/core/
tool/axis2-...
Author: dims
Date: Fri Jun 8 14:16:42 2007
New Revision: 545628
URL: http://svn.apache.org/viewvc?view=rev&rev=545628
Log:
My friends it's *NOT* a ClassWriter it writes files of all kinds :) am making this change as i don't want it frozen after 1.3 and it's used everywhere...
Added:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/FileWriter.java (contents, props changed)
- copied, changed from r545592, webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ClassWriter.java
Removed:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ClassWriter.java
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/AntBuildWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CServiceXMLWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CStubHeaderWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CStubSourceWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CSvcSkeletonWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CallbackHandlerWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ExceptionWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceImplementationWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/MessageReceiverWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PolicyFileWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonInterfaceWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonWriter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/TestClassWriter.java
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/core/ServiceFileCreator.java
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ServiceFileCreator.java
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?view=diff&rev=545628&r1=545627&r2=545628
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Fri Jun 8 14:16:42 2007
@@ -26,7 +26,7 @@
import org.apache.axis2.wsdl.codegen.CodeGenerationException;
import org.apache.axis2.wsdl.codegen.writer.AntBuildWriter;
import org.apache.axis2.wsdl.codegen.writer.CallbackHandlerWriter;
-import org.apache.axis2.wsdl.codegen.writer.ClassWriter;
+import org.apache.axis2.wsdl.codegen.writer.FileWriter;
import org.apache.axis2.wsdl.codegen.writer.ExceptionWriter;
import org.apache.axis2.wsdl.codegen.writer.InterfaceImplementationWriter;
import org.apache.axis2.wsdl.codegen.writer.InterfaceWriter;
@@ -531,7 +531,7 @@
codeGenConfiguration.getOutputLanguage());
antBuildWriter.setDatabindingFramework(codeGenConfiguration.getDatabindingType());
- writeClass(skeletonModel, antBuildWriter);
+ writeFile(skeletonModel, antBuildWriter);
}
/** Creates the DOM tree for the Ant build. Uses the interface. */
@@ -573,7 +573,7 @@
TEST_SRC_DIR_NAME),
codeGenConfiguration.getOutputLanguage());
- writeClass(classModel, callbackWriter);
+ writeFile(classModel, callbackWriter);
}
}
@@ -668,7 +668,7 @@
codeGenConfiguration.getOutputLanguage());
- writeClass(interfaceImplModel, writer);
+ writeFile(interfaceImplModel, writer);
}
@@ -1019,7 +1019,7 @@
codeGenConfiguration.getOutputLanguage());
doc.appendChild(faultElement);
- writeClass(doc, exceptionWriter);
+ writeFile(doc, exceptionWriter);
}
}
@@ -1055,7 +1055,7 @@
codeGenConfiguration.getSourceLocation()),
codeGenConfiguration.getOutputLanguage());
- writeClass(interfaceModel, callbackWriter);
+ writeFile(interfaceModel, callbackWriter);
}
}
@@ -1098,7 +1098,7 @@
codeGenConfiguration.getSourceLocation()),
this.codeGenConfiguration.getOutputLanguage());
- writeClass(interfaceModel, interfaceWriter);
+ writeFile(interfaceModel, interfaceWriter);
}
/** Creates the DOM tree for the interface creation. Uses the interface. */
@@ -1406,7 +1406,7 @@
codeGenConfiguration.getSourceLocation()),
codeGenConfiguration.getOutputLanguage());
- writeClass(classModel, writer);
+ writeFile(classModel, writer);
}
}
}
@@ -1788,7 +1788,7 @@
// Write the service xml in a folder with the
Document serviceXMLModel = createDOMDocumentForServiceXML();
debugLogDocument("Document for service XML:", serviceXMLModel);
- ClassWriter serviceXmlWriter =
+ FileWriter serviceXmlWriter =
new ServiceXMLWriter(
codeGenConfiguration.isFlattenFiles() ?
getOutputDirectory(codeGenConfiguration.getOutputLocation(), null) :
@@ -1796,7 +1796,7 @@
codeGenConfiguration.getResourceLocation()),
this.codeGenConfiguration.getOutputLanguage());
- writeClass(serviceXMLModel, serviceXmlWriter);
+ writeFile(serviceXMLModel, serviceXmlWriter);
}
@@ -1870,14 +1870,14 @@
Document skeletonModel =
createDOMDocumentForSkeleton(codeGenConfiguration.isServerSideInterface());
debugLogDocument("Document for skeleton:", skeletonModel);
- ClassWriter skeletonWriter = new SkeletonWriter(
+ FileWriter skeletonWriter = new SkeletonWriter(
codeGenConfiguration.isFlattenFiles() ?
getOutputDirectory(codeGenConfiguration.getOutputLocation(), null) :
getOutputDirectory(codeGenConfiguration.getOutputLocation(),
codeGenConfiguration.getSourceLocation())
, this.codeGenConfiguration.getOutputLanguage());
- writeClass(skeletonModel, skeletonWriter);
+ writeFile(skeletonModel, skeletonWriter);
}
/**
@@ -1888,14 +1888,14 @@
protected void writeSkeletonInterface() throws Exception {
Document skeletonModel = createDOMDocumentForSkeletonInterface();
debugLogDocument("Document for skeleton Interface:", skeletonModel);
- ClassWriter skeletonInterfaceWriter = new SkeletonInterfaceWriter(
+ FileWriter skeletonInterfaceWriter = new SkeletonInterfaceWriter(
codeGenConfiguration.isFlattenFiles() ?
getOutputDirectory(codeGenConfiguration.getOutputLocation(), null) :
getOutputDirectory(codeGenConfiguration.getOutputLocation(),
codeGenConfiguration.getSourceLocation())
, this.codeGenConfiguration.getOutputLanguage());
- writeClass(skeletonModel, skeletonInterfaceWriter);
+ writeFile(skeletonModel, skeletonInterfaceWriter);
}
/**
@@ -2381,7 +2381,7 @@
* @throws java.io.IOException
* @throws Exception
*/
- protected void writeClass(Document model, ClassWriter writer) throws IOException, Exception {
+ protected void writeFile(Document model, FileWriter writer) throws IOException, Exception {
writer.loadTemplate();
String packageName = model.getDocumentElement().getAttribute("package");
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java?view=diff&rev=545628&r1=545627&r2=545628
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java Fri Jun 8 14:16:42 2007
@@ -29,7 +29,7 @@
import org.apache.axis2.wsdl.codegen.writer.CStubHeaderWriter;
import org.apache.axis2.wsdl.codegen.writer.CStubSourceWriter;
import org.apache.axis2.wsdl.codegen.writer.CSvcSkeletonWriter;
-import org.apache.axis2.wsdl.codegen.writer.ClassWriter;
+import org.apache.axis2.wsdl.codegen.writer.FileWriter;
import org.apache.axis2.wsdl.databinding.CUtils;
import org.apache.neethi.Policy;
import org.w3c.dom.Document;
@@ -108,7 +108,7 @@
codeGenConfiguration.getSourceLocation()),
codeGenConfiguration.getOutputLanguage());
- writeClass(interfaceImplModel, writerHStub);
+ writeFile(interfaceImplModel, writerHStub);
CStubSourceWriter writerCStub =
@@ -116,7 +116,7 @@
codeGenConfiguration.getSourceLocation()),
codeGenConfiguration.getOutputLanguage());
- writeClass(interfaceImplModel, writerCStub);
+ writeFile(interfaceImplModel, writerCStub);
}
@@ -136,14 +136,14 @@
codeGenConfiguration.getSourceLocation()),
this.codeGenConfiguration.getOutputLanguage());
- writeClass(skeletonModel, skeletonWriter);
+ writeFile(skeletonModel, skeletonWriter);
CSkelSourceWriter skeletonWriterStub = new CSkelSourceWriter(
getOutputDirectory(this.codeGenConfiguration.getOutputLocation(),
codeGenConfiguration.getSourceLocation()),
this.codeGenConfiguration.getOutputLanguage());
- writeClass(skeletonModel, skeletonWriterStub);
+ writeFile(skeletonModel, skeletonWriterStub);
}
/** @throws Exception */
@@ -155,7 +155,7 @@
codeGenConfiguration.getSourceLocation()),
codeGenConfiguration.getOutputLanguage());
- writeClass(skeletonModel, writer);
+ writeFile(skeletonModel, writer);
}
@@ -169,13 +169,13 @@
// Write the service xml in a folder with the
Document serviceXMLModel = createDOMDocumentForServiceXML();
- ClassWriter serviceXmlWriter =
+ FileWriter serviceXmlWriter =
new CServiceXMLWriter(
getOutputDirectory(this.codeGenConfiguration.getOutputLocation(),
codeGenConfiguration.getResourceLocation()),
this.codeGenConfiguration.getOutputLanguage());
- writeClass(serviceXMLModel, serviceXmlWriter);
+ writeFile(serviceXMLModel, serviceXmlWriter);
}
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/AntBuildWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/AntBuildWriter.java?view=diff&rev=545628&r1=545627&r2=545628
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/AntBuildWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/AntBuildWriter.java Fri Jun 8 14:16:42 2007
@@ -1,6 +1,5 @@
package org.apache.axis2.wsdl.codegen.writer;
-import org.apache.axis2.util.FileWriter;
import org.apache.axis2.util.XSLTTemplateProcessor;
import org.apache.axis2.wsdl.util.ConfigPropertyFileLoader;
import org.w3c.dom.Document;
@@ -26,7 +25,7 @@
* limitations under the License.
*/
-public class AntBuildWriter extends ClassWriter {
+public class AntBuildWriter extends FileWriter {
private String databindingFramework = ConfigPropertyFileLoader.getDefaultDBFrameworkName();
@@ -44,7 +43,7 @@
}
public void createOutFile(String packageName, String fileName) throws Exception {
- File outputFile = FileWriter.createClassFile(outputFileLocation,
+ File outputFile = org.apache.axis2.util.FileWriter.createClassFile(outputFileLocation,
"",
"build",
".xml");
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CServiceXMLWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CServiceXMLWriter.java?view=diff&rev=545628&r1=545627&r2=545628
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CServiceXMLWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CServiceXMLWriter.java Fri Jun 8 14:16:42 2007
@@ -15,12 +15,10 @@
*/
package org.apache.axis2.wsdl.codegen.writer;
-import org.apache.axis2.util.FileWriter;
-
import java.io.File;
import java.io.FileOutputStream;
-public class CServiceXMLWriter extends ClassWriter {
+public class CServiceXMLWriter extends FileWriter {
public CServiceXMLWriter(String outputFileLocation) {
@@ -34,7 +32,7 @@
public void createOutFile(String packageName, String fileName) throws Exception {
- outputFile = FileWriter.createClassFile(outputFileLocation,
+ outputFile = org.apache.axis2.util.FileWriter.createClassFile(outputFileLocation,
"",
"services",
".xml");
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CStubHeaderWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CStubHeaderWriter.java?view=diff&rev=545628&r1=545627&r2=545628
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CStubHeaderWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CStubHeaderWriter.java Fri Jun 8 14:16:42 2007
@@ -16,7 +16,6 @@
package org.apache.axis2.wsdl.codegen.writer;
-import org.apache.axis2.util.FileWriter;
import org.apache.axis2.util.XSLTTemplateProcessor;
import org.w3c.dom.Document;
@@ -24,7 +23,7 @@
import java.io.File;
import java.io.FileOutputStream;
-public class CStubHeaderWriter extends ClassWriter {
+public class CStubHeaderWriter extends FileWriter {
public CStubHeaderWriter(String outputFileLocation) {
this.outputFileLocation = new File(outputFileLocation);
@@ -36,7 +35,7 @@
}
public void createOutFile(String packageName, String fileName) throws Exception {
- outputFile = FileWriter.createClassFile(outputFileLocation,
+ outputFile = org.apache.axis2.util.FileWriter.createClassFile(outputFileLocation,
"",
fileName,
".h");
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CStubSourceWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CStubSourceWriter.java?view=diff&rev=545628&r1=545627&r2=545628
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CStubSourceWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CStubSourceWriter.java Fri Jun 8 14:16:42 2007
@@ -16,7 +16,6 @@
package org.apache.axis2.wsdl.codegen.writer;
-import org.apache.axis2.util.FileWriter;
import org.apache.axis2.util.XSLTTemplateProcessor;
import org.w3c.dom.Document;
@@ -24,7 +23,7 @@
import java.io.File;
import java.io.FileOutputStream;
-public class CStubSourceWriter extends ClassWriter {
+public class CStubSourceWriter extends FileWriter {
public CStubSourceWriter(String outputFileLocation) {
this.outputFileLocation = new File(outputFileLocation);
@@ -36,7 +35,7 @@
}
public void createOutFile(String packageName, String fileName) throws Exception {
- outputFile = FileWriter.createClassFile(outputFileLocation,
+ outputFile = org.apache.axis2.util.FileWriter.createClassFile(outputFileLocation,
"",
fileName,
getFileExtensionForLanguage(language));
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CSvcSkeletonWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CSvcSkeletonWriter.java?view=diff&rev=545628&r1=545627&r2=545628
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CSvcSkeletonWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CSvcSkeletonWriter.java Fri Jun 8 14:16:42 2007
@@ -16,7 +16,6 @@
package org.apache.axis2.wsdl.codegen.writer;
-import org.apache.axis2.util.FileWriter;
import org.apache.axis2.util.XSLTTemplateProcessor;
import org.w3c.dom.Document;
@@ -24,7 +23,7 @@
import java.io.File;
import java.io.FileOutputStream;
-public class CSvcSkeletonWriter extends ClassWriter {
+public class CSvcSkeletonWriter extends FileWriter {
public CSvcSkeletonWriter(String outputFileLocation) {
this.outputFileLocation = new File(outputFileLocation);
@@ -36,7 +35,7 @@
}
public void createOutFile(String packageName, String fileName) throws Exception {
- outputFile = FileWriter.createClassFile(outputFileLocation,
+ outputFile = org.apache.axis2.util.FileWriter.createClassFile(outputFileLocation,
"",
fileName,
getFileExtensionForLanguage(language));
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CallbackHandlerWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CallbackHandlerWriter.java?view=diff&rev=545628&r1=545627&r2=545628
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CallbackHandlerWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/CallbackHandlerWriter.java Fri Jun 8 14:16:42 2007
@@ -18,7 +18,7 @@
import java.io.File;
-public class CallbackHandlerWriter extends ClassWriter {
+public class CallbackHandlerWriter extends FileWriter {
public CallbackHandlerWriter(String outputFileLocation) {
this.outputFileLocation = new File(outputFileLocation);
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ExceptionWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ExceptionWriter.java?view=diff&rev=545628&r1=545627&r2=545628
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ExceptionWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ExceptionWriter.java Fri Jun 8 14:16:42 2007
@@ -18,7 +18,7 @@
import java.io.File;
-public class ExceptionWriter extends ClassWriter {
+public class ExceptionWriter extends FileWriter {
public ExceptionWriter(String outputFileLocation) {
this.outputFileLocation = new File(outputFileLocation);
Copied: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/FileWriter.java (from r545592, webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ClassWriter.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/FileWriter.java?view=diff&rev=545628&p1=webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ClassWriter.java&r1=545592&p2=webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/FileWriter.java&r2=545628
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ClassWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/FileWriter.java Fri Jun 8 14:16:42 2007
@@ -17,7 +17,6 @@
package org.apache.axis2.wsdl.codegen.writer;
import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.util.FileWriter;
import org.apache.axis2.util.XSLTTemplateProcessor;
import org.apache.axis2.wsdl.codegen.CodeGenerationException;
import org.apache.axis2.wsdl.i18n.CodegenMessages;
@@ -33,9 +32,9 @@
import java.util.Iterator;
import java.util.Map;
-public abstract class ClassWriter {
+public abstract class FileWriter {
- private static final Log log = LogFactory.getLog(ClassWriter.class);
+ private static final Log log = LogFactory.getLog(FileWriter.class);
protected File outputFileLocation = null;
protected File outputFile = null;
@@ -118,7 +117,7 @@
* @throws Exception
*/
public void createOutFile(String packageName, String fileName) throws Exception {
- outputFile = FileWriter.createClassFile(outputFileLocation,
+ outputFile = org.apache.axis2.util.FileWriter.createClassFile(outputFileLocation,
packageName,
fileName,
getFileExtensionForLanguage(language));
Propchange: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/FileWriter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceImplementationWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceImplementationWriter.java?view=diff&rev=545628&r1=545627&r2=545628
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceImplementationWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceImplementationWriter.java Fri Jun 8 14:16:42 2007
@@ -18,7 +18,7 @@
import java.io.File;
-public class InterfaceImplementationWriter extends ClassWriter {
+public class InterfaceImplementationWriter extends FileWriter {
public InterfaceImplementationWriter(String outputFileLocation) {
this.outputFileLocation = new File(outputFileLocation);
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceWriter.java?view=diff&rev=545628&r1=545627&r2=545628
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/InterfaceWriter.java Fri Jun 8 14:16:42 2007
@@ -18,7 +18,7 @@
import java.io.File;
-public class InterfaceWriter extends ClassWriter {
+public class InterfaceWriter extends FileWriter {
public InterfaceWriter(String outputFileLocation) {
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/MessageReceiverWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/MessageReceiverWriter.java?view=diff&rev=545628&r1=545627&r2=545628
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/MessageReceiverWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/MessageReceiverWriter.java Fri Jun 8 14:16:42 2007
@@ -18,7 +18,7 @@
import java.io.File;
-public class MessageReceiverWriter extends ClassWriter {
+public class MessageReceiverWriter extends FileWriter {
public MessageReceiverWriter(String outputFileLocation) {
this.outputFileLocation = new File(outputFileLocation);
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PolicyFileWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PolicyFileWriter.java?view=diff&rev=545628&r1=545627&r2=545628
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PolicyFileWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/PolicyFileWriter.java Fri Jun 8 14:16:42 2007
@@ -1,7 +1,5 @@
package org.apache.axis2.wsdl.codegen.writer;
-import org.apache.axis2.util.FileWriter;
-
import java.io.File;
import java.io.FileOutputStream;
/*
@@ -20,7 +18,7 @@
* limitations under the License.
*/
-public class PolicyFileWriter extends ClassWriter {
+public class PolicyFileWriter extends FileWriter {
public PolicyFileWriter(File outputFileLocation) {
this.outputFileLocation = outputFileLocation;
@@ -28,7 +26,7 @@
public void createOutFile(String packageName, String fileName) throws Exception {
- File outputFile = FileWriter.createClassFile(outputFileLocation,
+ File outputFile = org.apache.axis2.util.FileWriter.createClassFile(outputFileLocation,
packageName,
fileName,
".xml");
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java?view=diff&rev=545628&r1=545627&r2=545628
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/ServiceXMLWriter.java Fri Jun 8 14:16:42 2007
@@ -16,12 +16,10 @@
package org.apache.axis2.wsdl.codegen.writer;
-import org.apache.axis2.util.FileWriter;
-
import java.io.File;
import java.io.FileOutputStream;
-public class ServiceXMLWriter extends ClassWriter {
+public class ServiceXMLWriter extends FileWriter {
public ServiceXMLWriter(String outputFileLocation) {
@@ -35,7 +33,7 @@
public void createOutFile(String packageName, String fileName) throws Exception {
- File outputFile = FileWriter.createClassFile(outputFileLocation,
+ File outputFile = org.apache.axis2.util.FileWriter.createClassFile(outputFileLocation,
packageName,
"services",
".xml");
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonInterfaceWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonInterfaceWriter.java?view=diff&rev=545628&r1=545627&r2=545628
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonInterfaceWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonInterfaceWriter.java Fri Jun 8 14:16:42 2007
@@ -17,7 +17,7 @@
* limitations under the License.
*/
-public class SkeletonInterfaceWriter extends ClassWriter {
+public class SkeletonInterfaceWriter extends FileWriter {
public SkeletonInterfaceWriter(String outputFileLocation) {
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonWriter.java?view=diff&rev=545628&r1=545627&r2=545628
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/SkeletonWriter.java Fri Jun 8 14:16:42 2007
@@ -18,7 +18,7 @@
import java.io.File;
-public class SkeletonWriter extends ClassWriter {
+public class SkeletonWriter extends FileWriter {
public SkeletonWriter(String outputFileLocation) {
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/TestClassWriter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/TestClassWriter.java?view=diff&rev=545628&r1=545627&r2=545628
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/TestClassWriter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/writer/TestClassWriter.java Fri Jun 8 14:16:42 2007
@@ -18,7 +18,7 @@
import java.io.File;
-public class TestClassWriter extends ClassWriter {
+public class TestClassWriter extends FileWriter {
public TestClassWriter(String outputFileLocation) {
this.outputFileLocation = new File(outputFileLocation);
Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/core/ServiceFileCreator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/core/ServiceFileCreator.java?view=diff&rev=545628&r1=545627&r2=545628
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/core/ServiceFileCreator.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/core/ServiceFileCreator.java Fri Jun 8 14:16:42 2007
@@ -1,6 +1,6 @@
package org.apache.axis2.tool.core;
-import org.apache.axis2.wsdl.codegen.writer.ClassWriter;
+import org.apache.axis2.wsdl.codegen.writer.FileWriter;
import org.apache.axis2.wsdl.codegen.writer.ServiceXMLWriter;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -42,8 +42,8 @@
String currentUserDir = System.getProperty("user.dir");
String fileName = "services.xml";
- ClassWriter serviceXmlWriter = new ServiceXMLWriter(currentUserDir);
- writeClass(getServiceModel(serviceName,implementationClassName,methodList),serviceXmlWriter,fileName);
+ FileWriter serviceXmlWriter = new ServiceXMLWriter(currentUserDir);
+ writeFile(getServiceModel(serviceName,implementationClassName,methodList),serviceXmlWriter,fileName);
return new File(currentUserDir + File.separator + fileName);
@@ -84,7 +84,7 @@
* @throws IOException
* @throws Exception
*/
- private void writeClass(Document model, ClassWriter writer,String fileName) throws IOException,Exception {
+ private void writeFile(Document model, FileWriter writer,String fileName) throws IOException,Exception {
Source source = new DOMSource(model);
ByteArrayOutputStream memoryStream = new ByteArrayOutputStream();
Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ServiceFileCreator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ServiceFileCreator.java?view=diff&rev=545628&r1=545627&r2=545628
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ServiceFileCreator.java (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ServiceFileCreator.java Fri Jun 8 14:16:42 2007
@@ -1,6 +1,6 @@
package org.apache.axis2.tool.core;
-import org.apache.axis2.wsdl.codegen.writer.ClassWriter;
+import org.apache.axis2.wsdl.codegen.writer.FileWriter;
import org.apache.axis2.wsdl.codegen.writer.ServiceXMLWriter;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -42,8 +42,8 @@
String currentUserDir = System.getProperty("user.dir");
String fileName = "services.xml";
- ClassWriter serviceXmlWriter = new ServiceXMLWriter(currentUserDir);
- writeClass(getServiceModel(serviceName,implementationClassName,methodList),serviceXmlWriter,fileName);
+ FileWriter serviceXmlWriter = new ServiceXMLWriter(currentUserDir);
+ writeFile(getServiceModel(serviceName,implementationClassName,methodList),serviceXmlWriter,fileName);
return new File(currentUserDir + File.separator + fileName);
@@ -84,7 +84,7 @@
* @throws IOException
* @throws Exception
*/
- private void writeClass(Document model, ClassWriter writer,String fileName) throws IOException,Exception {
+ private void writeFile(Document model, FileWriter writer,String fileName) throws IOException,Exception {
Source source = new DOMSource(model);
ByteArrayOutputStream memoryStream = new ByteArrayOutputStream();
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org