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 Tom Jordahl <to...@macromedia.com> on 2004/02/26 21:31:10 UTC
RE: cvs commit: ws-axis/java/tools/org/apache/axis/tools/ant/wsdl
Wsdl2javaAntTask.java
Nice job Jim on these changes. They look very nice and I especially
appreciate the test cases!
This change, however, looks like a mistake. Why is the build.xml file
generation commented out?
--- ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaBuildFileWriter.java
2004/02/10 04:23:35 1.1
+++ ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaBuildFileWriter.java
2004/02/24 23:22:08 1.2
@@ -171,9 +171,9 @@
* @see org.apache.axis.wsdl.gen.Generator#generate()
*/
public void generate() throws IOException {
- if(emitter.isBuildFileWanted()){
- super.generate();
- }
+// if(emitter.isBuildFileWanted()){
+// super.generate();
+// }
}
Also, this commented out code in Wsdl2javaAntTask.java makes me nervous too:
+// if (factorySpec != null) {
+// emitter.setFactorySpec(factorySpec);
+// }
+// else
if (factory != null) {
emitter.setFactory(factory);
}
Please advise.
--
Tom Jordahl
Macromedia Server Development
-----Original Message-----
From: dims@apache.org [mailto:dims@apache.org]
Sent: Tuesday, February 24, 2004 6:22 PM
To: ws-axis-cvs@apache.org
Subject: cvs commit: ws-axis/java/tools/org/apache/axis/tools/ant/wsdl
Wsdl2javaAntTask.java
dims 2004/02/24 15:22:10
Modified: java/docs reference.html
java/docs/ant axis-wsdl2java.html
java/src/org/apache/axis/i18n resource.properties
java/src/org/apache/axis/wsdl WSDL2Java.java
java/src/org/apache/axis/wsdl/toJava Emitter.java
JavaBuildFileWriter.java JavaGeneratorFactory.java
java/test/wsdl/filegen FileGenTestCase.java
java/tools/org/apache/axis/tools/ant/wsdl
Wsdl2javaAntTask.java
Added: java/src/org/apache/axis/wsdl/toJava FactoryProperty.java
NamespaceSelector.java
java/test/wsdl/selectivefilegen AllNamespacesTestCase.java
Bean1.java Bean2.java CmdLineExcludeTestCase.java
CmdLineIncludeTestCase.java
ExcludeBeanTestCase.java
ExcludeServiceTestCase.java
IncludeBeanTestCase.java
IncludeServiceTestCase.java build.xml
selectiveFileGen.wsdl
Log:
Fix for Bug 27186 - Enhance wsdl2java generation to selectively generate
classes
from jcstaff@apl.jhu.edu (jim)
Revision Changes Path
1.34 +848 -725 ws-axis/java/docs/reference.html
http://cvs.apache.org/viewcvs/ws-axis/java/docs/reference.html.diff?r1=1.33&
r2=1.34
1.6 +424 -400 ws-axis/java/docs/ant/axis-wsdl2java.html
http://cvs.apache.org/viewcvs/ws-axis/java/docs/ant/axis-wsdl2java.html.diff
?r1=1.5&r2=1.6
1.80 +2 -0
ws-axis/java/src/org/apache/axis/i18n/resource.properties
http://cvs.apache.org/viewcvs/ws-axis/java/src/org/apache/axis/i18n/resource
.properties.diff?r1=1.79&r2=1.80
1.45 +31 -3 ws-axis/java/src/org/apache/axis/wsdl/WSDL2Java.java
http://cvs.apache.org/viewcvs/ws-axis/java/src/org/apache/axis/wsdl/WSDL2Jav
a.java.diff?r1=1.44&r2=1.45
1.64 +62 -0
ws-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java
http://cvs.apache.org/viewcvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/E
mitter.java.diff?r1=1.63&r2=1.64
1.2 +3 -3
ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaBuildFileWriter.java
http://cvs.apache.org/viewcvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/J
avaBuildFileWriter.java.diff?r1=1.1&r2=1.2
1.46 +98 -39
ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
http://cvs.apache.org/viewcvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/J
avaGeneratorFactory.java.diff?r1=1.45&r2=1.46
1.1
ws-axis/java/src/org/apache/axis/wsdl/toJava/FactoryProperty.java
http://cvs.apache.org/viewcvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/F
actoryProperty.java?rev=1.1
1.1
ws-axis/java/src/org/apache/axis/wsdl/toJava/NamespaceSelector.java
http://cvs.apache.org/viewcvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/N
amespaceSelector.java?rev=1.1
1.8 +39 -3 ws-axis/java/test/wsdl/filegen/FileGenTestCase.java
http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/filegen/FileGenTestCase
.java.diff?r1=1.7&r2=1.8
1.1
ws-axis/java/test/wsdl/selectivefilegen/AllNamespacesTestCase.java
http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/AllNam
espacesTestCase.java?rev=1.1
1.1 ws-axis/java/test/wsdl/selectivefilegen/Bean1.java
http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/Bean1.
java?rev=1.1
1.1 ws-axis/java/test/wsdl/selectivefilegen/Bean2.java
http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/Bean2.
java?rev=1.1
1.1
ws-axis/java/test/wsdl/selectivefilegen/CmdLineExcludeTestCase.java
http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/CmdLin
eExcludeTestCase.java?rev=1.1
1.1
ws-axis/java/test/wsdl/selectivefilegen/CmdLineIncludeTestCase.java
http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/CmdLin
eIncludeTestCase.java?rev=1.1
1.1
ws-axis/java/test/wsdl/selectivefilegen/ExcludeBeanTestCase.java
http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/Exclud
eBeanTestCase.java?rev=1.1
1.1
ws-axis/java/test/wsdl/selectivefilegen/ExcludeServiceTestCase.java
http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/Exclud
eServiceTestCase.java?rev=1.1
1.1
ws-axis/java/test/wsdl/selectivefilegen/IncludeBeanTestCase.java
http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/Includ
eBeanTestCase.java?rev=1.1
1.1
ws-axis/java/test/wsdl/selectivefilegen/IncludeServiceTestCase.java
http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/Includ
eServiceTestCase.java?rev=1.1
1.1 ws-axis/java/test/wsdl/selectivefilegen/build.xml
http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/build.
xml?rev=1.1
1.1
ws-axis/java/test/wsdl/selectivefilegen/selectiveFileGen.wsdl
http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/select
iveFileGen.wsdl?rev=1.1
1.14 +58 -1
ws-axis/java/tools/org/apache/axis/tools/ant/wsdl/Wsdl2javaAntTask.java
http://cvs.apache.org/viewcvs/ws-axis/java/tools/org/apache/axis/tools/ant/w
sdl/Wsdl2javaAntTask.java.diff?r1=1.13&r2=1.14
Re: cvs commit: ws-axis/java/tools/org/apache/axis/tools/ant/wsdl
Wsdl2javaAntTask.java
Posted by Jim Stafford <jc...@apl.jhu.edu>.
Tom,
JavaBuildFileWriter.java: In one of the download versions I was using.
that line did not compile. For some reason, that is no longer the case.
The inclusion of this change in the patch is a mistake. The code should
_NOT_ be commented out and any changes to this file should be ignored.
Wsdl2javaAntTask.java: These commented lines were part of a design
involving an extra class that I ended up folding into the
JavaGeneratorFactory class. The code was commented out while I was
incrementally migrating and testing the code. The commented code
can/should be deleted.
Sorry for the mistakes. Hopefully your careful eye caught all of them.
jim
Tom Jordahl wrote:
>Nice job Jim on these changes. They look very nice and I especially
>appreciate the test cases!
>
>This change, however, looks like a mistake. Why is the build.xml file
>generation commented out?
>
>
>
>--- ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaBuildFileWriter.java
>2004/02/10 04:23:35 1.1
>+++ ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaBuildFileWriter.java
>2004/02/24 23:22:08 1.2
>@@ -171,9 +171,9 @@
> * @see org.apache.axis.wsdl.gen.Generator#generate()
> */
> public void generate() throws IOException {
>- if(emitter.isBuildFileWanted()){
>- super.generate();
>- }
>+// if(emitter.isBuildFileWanted()){
>+// super.generate();
>+// }
> }
>
>
>
>Also, this commented out code in Wsdl2javaAntTask.java makes me nervous too:
>
>+// if (factorySpec != null) {
>+// emitter.setFactorySpec(factorySpec);
>+// }
>+// else
> if (factory != null) {
> emitter.setFactory(factory);
> }
>
>
>Please advise.
>
>--
>Tom Jordahl
>Macromedia Server Development
>
>-----Original Message-----
>From: dims@apache.org [mailto:dims@apache.org]
>Sent: Tuesday, February 24, 2004 6:22 PM
>To: ws-axis-cvs@apache.org
>Subject: cvs commit: ws-axis/java/tools/org/apache/axis/tools/ant/wsdl
>Wsdl2javaAntTask.java
>
>dims 2004/02/24 15:22:10
>
> Modified: java/docs reference.html
> java/docs/ant axis-wsdl2java.html
> java/src/org/apache/axis/i18n resource.properties
> java/src/org/apache/axis/wsdl WSDL2Java.java
> java/src/org/apache/axis/wsdl/toJava Emitter.java
> JavaBuildFileWriter.java JavaGeneratorFactory.java
> java/test/wsdl/filegen FileGenTestCase.java
> java/tools/org/apache/axis/tools/ant/wsdl
> Wsdl2javaAntTask.java
> Added: java/src/org/apache/axis/wsdl/toJava FactoryProperty.java
> NamespaceSelector.java
> java/test/wsdl/selectivefilegen AllNamespacesTestCase.java
> Bean1.java Bean2.java CmdLineExcludeTestCase.java
> CmdLineIncludeTestCase.java
> ExcludeBeanTestCase.java
> ExcludeServiceTestCase.java
> IncludeBeanTestCase.java
> IncludeServiceTestCase.java build.xml
> selectiveFileGen.wsdl
> Log:
> Fix for Bug 27186 - Enhance wsdl2java generation to selectively generate
>classes
> from jcstaff@apl.jhu.edu (jim)
>
> Revision Changes Path
> 1.34 +848 -725 ws-axis/java/docs/reference.html
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/docs/reference.html.diff?r1=1.33&
>r2=1.34
>
>
> 1.6 +424 -400 ws-axis/java/docs/ant/axis-wsdl2java.html
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/docs/ant/axis-wsdl2java.html.diff
>?r1=1.5&r2=1.6
>
>
> 1.80 +2 -0
>ws-axis/java/src/org/apache/axis/i18n/resource.properties
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/src/org/apache/axis/i18n/resource
>.properties.diff?r1=1.79&r2=1.80
>
>
> 1.45 +31 -3 ws-axis/java/src/org/apache/axis/wsdl/WSDL2Java.java
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/src/org/apache/axis/wsdl/WSDL2Jav
>a.java.diff?r1=1.44&r2=1.45
>
>
> 1.64 +62 -0
>ws-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/E
>mitter.java.diff?r1=1.63&r2=1.64
>
>
> 1.2 +3 -3
>ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaBuildFileWriter.java
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/J
>avaBuildFileWriter.java.diff?r1=1.1&r2=1.2
>
>
> 1.46 +98 -39
>ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/J
>avaGeneratorFactory.java.diff?r1=1.45&r2=1.46
>
>
> 1.1
>ws-axis/java/src/org/apache/axis/wsdl/toJava/FactoryProperty.java
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/F
>actoryProperty.java?rev=1.1
>
>
> 1.1
>ws-axis/java/src/org/apache/axis/wsdl/toJava/NamespaceSelector.java
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/N
>amespaceSelector.java?rev=1.1
>
>
> 1.8 +39 -3 ws-axis/java/test/wsdl/filegen/FileGenTestCase.java
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/filegen/FileGenTestCase
>.java.diff?r1=1.7&r2=1.8
>
>
> 1.1
>ws-axis/java/test/wsdl/selectivefilegen/AllNamespacesTestCase.java
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/AllNam
>espacesTestCase.java?rev=1.1
>
>
> 1.1 ws-axis/java/test/wsdl/selectivefilegen/Bean1.java
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/Bean1.
>java?rev=1.1
>
>
> 1.1 ws-axis/java/test/wsdl/selectivefilegen/Bean2.java
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/Bean2.
>java?rev=1.1
>
>
> 1.1
>ws-axis/java/test/wsdl/selectivefilegen/CmdLineExcludeTestCase.java
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/CmdLin
>eExcludeTestCase.java?rev=1.1
>
>
> 1.1
>ws-axis/java/test/wsdl/selectivefilegen/CmdLineIncludeTestCase.java
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/CmdLin
>eIncludeTestCase.java?rev=1.1
>
>
> 1.1
>ws-axis/java/test/wsdl/selectivefilegen/ExcludeBeanTestCase.java
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/Exclud
>eBeanTestCase.java?rev=1.1
>
>
> 1.1
>ws-axis/java/test/wsdl/selectivefilegen/ExcludeServiceTestCase.java
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/Exclud
>eServiceTestCase.java?rev=1.1
>
>
> 1.1
>ws-axis/java/test/wsdl/selectivefilegen/IncludeBeanTestCase.java
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/Includ
>eBeanTestCase.java?rev=1.1
>
>
> 1.1
>ws-axis/java/test/wsdl/selectivefilegen/IncludeServiceTestCase.java
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/Includ
>eServiceTestCase.java?rev=1.1
>
>
> 1.1 ws-axis/java/test/wsdl/selectivefilegen/build.xml
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/build.
>xml?rev=1.1
>
>
> 1.1
>ws-axis/java/test/wsdl/selectivefilegen/selectiveFileGen.wsdl
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/test/wsdl/selectivefilegen/select
>iveFileGen.wsdl?rev=1.1
>
>
> 1.14 +58 -1
>ws-axis/java/tools/org/apache/axis/tools/ant/wsdl/Wsdl2javaAntTask.java
>
>
>http://cvs.apache.org/viewcvs/ws-axis/java/tools/org/apache/axis/tools/ant/w
>sdl/Wsdl2javaAntTask.java.diff?r1=1.13&r2=1.14
>
>
>
>
>