You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2006/01/02 00:32:52 UTC
svn commit: r360595 - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/wsdl/codegen/emitter/
codegen/src/org/apache/axis2/wsdl/codegen/extension/ security/
Author: dims
Date: Sun Jan 1 15:32:45 2006
New Revision: 360595
URL: http://svn.apache.org/viewcvs?rev=360595&view=rev
Log:
generate java files in the "src" directory
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
webservices/axis2/trunk/java/modules/security/maven.xml
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java?rev=360595&r1=360594&r2=360595&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/MultiLanguageClientEmitter.java Sun Jan 1 15:32:45 2006
@@ -57,6 +57,7 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.URIResolver;
import java.io.IOException;
+import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -400,7 +401,7 @@
wsdlInterface, axisBinding);
CallbackHandlerWriter callbackWriter =
new CallbackHandlerWriter(
- this.configuration.getOutputLocation(),
+ getOutputDirectoryForSourceFiles(this.configuration.getOutputLocation()),
this.configuration.getOutputLanguage());
writeClass(interfaceModel, callbackWriter);
}
@@ -416,7 +417,8 @@
if (configuration.isWriteTestCase()) {
Document classModel = createDOMDocumentForTestCase(binding);
TestClassWriter callbackWriter =
- new TestClassWriter(this.configuration.getOutputLocation(),
+ new TestClassWriter(
+ getOutputDirectoryForSourceFiles(this.configuration.getOutputLocation()),
this.configuration.getOutputLanguage());
writeClass(classModel, callbackWriter);
}
@@ -434,7 +436,8 @@
Document interfaceModel = createDOMDocumentForInterface(axisInterface, axisBinding);
InterfaceWriter interfaceWriter =
- new InterfaceWriter(this.configuration.getOutputLocation(),
+ new InterfaceWriter(
+ getOutputDirectoryForSourceFiles(this.configuration.getOutputLocation()),
this.configuration.getOutputLanguage());
writeClass(interfaceModel, interfaceWriter);
@@ -453,7 +456,7 @@
//Note - One can generate the skeleton using the interface XML
Document skeletonModel = createDOMDocumentForSkeleton(axisInteface, axisBinding);
ClassWriter skeletonWriter = new SkeletonWriter(
- this.configuration.getOutputLocation(),
+ getOutputDirectoryForSourceFiles(this.configuration.getOutputLocation()),
this.configuration.getOutputLanguage());
writeClass(skeletonModel, skeletonWriter);
@@ -514,7 +517,7 @@
axisBinding, service);
InterfaceImplementationWriter writer =
new InterfaceImplementationWriter(
- this.configuration.getOutputLocation(),
+ getOutputDirectoryForSourceFiles(this.configuration.getOutputLocation()),
this.configuration.getOutputLanguage());
writeClass(interfaceImplModel, writer);
}
@@ -525,7 +528,7 @@
binding);
MessageReceiverWriter writer =
new MessageReceiverWriter(
- this.configuration.getOutputLocation(),
+ getOutputDirectoryForSourceFiles(this.configuration.getOutputLocation()),
this.configuration.getOutputLanguage());
writeClass(classModel, writer);
}
@@ -1453,6 +1456,20 @@
out = "null";
}
return out;
+ }
+
+ /**
+ * Get the output directory for source files
+ *
+ * @param outputDir
+ * @return
+ */
+ protected File getOutputDirectoryForSourceFiles(File outputDir) {
+ outputDir = new File(outputDir, "src");
+ if (!outputDir.exists()) {
+ outputDir.mkdirs();
+ }
+ return outputDir;
}
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java?rev=360595&r1=360594&r2=360595&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/SimpleDBExtension.java Sun Jan 1 15:32:45 2006
@@ -36,6 +36,7 @@
import java.util.Map;
import java.util.Stack;
import java.util.Vector;
+import java.io.File;
/**
* This extension provides the
@@ -178,8 +179,12 @@
private void setDefaultOptions(CompilerOptions options) {
+ File outputDir = new File(configuration.getOutputLocation(), "src");
+ if(!outputDir.exists()) {
+ outputDir.mkdirs();
+ }
/// these options need to be taken from the command line
- options.setOutputLocation(configuration.getOutputLocation());
+ options.setOutputLocation(outputDir);
//default setting is to set the wrap status depending on whether it's
//the server side or the client side
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java?rev=360595&r1=360594&r2=360595&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/extension/XMLBeansExtension.java Sun Jan 1 15:32:45 2006
@@ -364,7 +364,11 @@
throws IOException {
typename =
typename.replace('.', File.separatorChar);
- File file = new File(configuration.getOutputLocation(),
+ File outputDir = new File(configuration.getOutputLocation(), "src");
+ if(!outputDir.exists()) {
+ outputDir.mkdirs();
+ }
+ File file = new File(outputDir,
typename + ".java");
file.getParentFile().mkdirs();
file.createNewFile();
Modified: webservices/axis2/trunk/java/modules/security/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/maven.xml?rev=360595&r1=360594&r2=360595&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/security/maven.xml Sun Jan 1 15:32:45 2006
@@ -76,20 +76,20 @@
<!-- copy the service impl -->
<copy file="interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java"
- tofile="${work.dir}/org/apache/axis2/oasis/ping/PingPortSkeleton.java" overwrite="yes"/>
+ tofile="${work.dir}/src/org/apache/axis2/oasis/ping/PingPortSkeleton.java" overwrite="yes"/>
<!-- Password callback class for the interop service -->
<copy file="test-resources/PWCallback.java"
- tofile="${work.dir}/org/apache/axis2/security/PWCallback.java" overwrite="yes"/>
+ tofile="${work.dir}/src/org/apache/axis2/security/PWCallback.java" overwrite="yes"/>
<!-- Interop client -->
<copy file="interop/org/apache/axis2/security/InteropScenarioClient.java"
- tofile="${work.dir}/org/apache/axis2/security/InteropScenarioClient.java" overwrite="yes"/>
+ tofile="${work.dir}/src/org/apache/axis2/security/InteropScenarioClient.java" overwrite="yes"/>
<ant:path id="classes.dir" location="${class.dir}"/>
<maven:addPath id="maven.dependency.classpath" refid="classes.dir"/>
- <ant:path id="src.dir" location="${work.dir}"/>
+ <ant:path id="src.dir" location="${work.dir}/src"/>
<maven:addPath id="maven.compile.src.set" refid="src.dir"/>
</j:if>
</preGoal>