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 st...@apache.org on 2002/09/05 23:06:10 UTC
cvs commit: xml-axis/java/tools/org/apache/axis/tools/ant/wsdl Java2WsdlAntTask.java Wsdl2javaAntTask.java
stevel 2002/09/05 14:06:10
Modified: java/tools build.xml
java/tools/org/apache/axis/tools/ant/axis
AdminClientTask.java
RunAxisFunctionalTestsTask.java
java/tools/org/apache/axis/tools/ant/wsdl
Java2WsdlAntTask.java Wsdl2javaAntTask.java
Log:
to try and autogenerate HTML docs from the javadocs via xdoclet, using jakarta-ant\proposal\xdocs; Not actually working, as xdoclet is failing on my system today.
Revision Changes Path
1.7 +28 -0 xml-axis/java/tools/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis/java/tools/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 5 Sep 2002 06:21:32 -0000 1.6
+++ build.xml 5 Sep 2002 21:06:10 -0000 1.7
@@ -105,4 +105,32 @@
<ant antfile="${tools.dir}/test.xml" />
</target>
+<property name="xdocs.dir" location="${env.ANT_HOME}/proposal/xdocs" />
+<path id="xdoclet.extra.classpath">
+ <pathelement location="${build.lib}/axis.jar"/>
+</path>
+<property name="xdoclet.extra.classpath.asprop"
+ refid="xdoclet.extra.classpath"/>
+
+<!-- probe for xdocs, which is only in CVS, not redist packages -->
+<target name="probe-xdocs" >
+ <available property="xdocs.found" file="${xdocs.dir}/build.xml"/>
+</target>
+
+
+
+<target name="xdocs" depends="probe-xdocs"
+ description="Run xdoclet over the ant tasks to create doc pages">
+ <echo>
+ running xdocs with classpath=${xdoclet.extra.classpath.asprop}
+ </echo>
+ <ant dir="${xdocs.dir}">
+ <property name="src.dir" location="org/apache/axis/tools/ant"/>
+ <property name="src.root" location="."/>
+ <property name="xdoclet.extra.classpath"
+ value="${xdoclet.extra.classpath.asprop}"/>
+ </ant>
+</target>
+
+
</project>
1.2 +2 -1 xml-axis/java/tools/org/apache/axis/tools/ant/axis/AdminClientTask.java
Index: AdminClientTask.java
===================================================================
RCS file: /home/cvs/xml-axis/java/tools/org/apache/axis/tools/ant/axis/AdminClientTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AdminClientTask.java 5 Sep 2002 06:23:49 -0000 1.1
+++ AdminClientTask.java 5 Sep 2002 21:06:10 -0000 1.2
@@ -62,7 +62,8 @@
import java.io.File;
/**
- * Task to offer axis to the Axis AdminClient
+ * Task to administer a local or remote Axis server. Remember, for remote admin,
+ * the server has to be accept remote management calls.
* @ant.task category="axis"
*/
public class AdminClientTask extends Task {
1.2 +24 -24 xml-axis/java/tools/org/apache/axis/tools/ant/axis/RunAxisFunctionalTestsTask.java
Index: RunAxisFunctionalTestsTask.java
===================================================================
RCS file: /home/cvs/xml-axis/java/tools/org/apache/axis/tools/ant/axis/RunAxisFunctionalTestsTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RunAxisFunctionalTestsTask.java 27 Aug 2002 16:04:55 -0000 1.1
+++ RunAxisFunctionalTestsTask.java 5 Sep 2002 21:06:10 -0000 1.2
@@ -78,7 +78,7 @@
private String testTarget;
private String stopTarget;
private URL url;
-
+
/**
* Executes the task.
*/
@@ -93,7 +93,7 @@
callStop();
}
}
-
+
/**
* Call the start server task
*/
@@ -115,10 +115,10 @@
// loop & try again
}
}
-
+
// NOTREACHED since the while loop returns if it successfully pings
}
-
+
/**
* Call the run tests target
*/
@@ -126,7 +126,7 @@
{
antcall(testTarget);
}
-
+
/**
* Call the stop server task
*/
@@ -135,7 +135,7 @@
try {
// first, stop the tcp server
sendOnSocket("quit\r\n");
-
+
// second, and more involvedly, stop the http server
// Try connecting in case the server is already stopped.
URL url = new URL("http://localhost:8080/");
@@ -149,17 +149,17 @@
System.out.println("Error from HTTP read: " + e);
return;
}
-
+
// Call the target that stops the server
antcall(stopTarget);
-
+
// Wait a few ms more (just to make sure)
try {
Thread.sleep(500);
} catch (InterruptedException e) {
throw new BuildException("Interruption during sleep", e);
}
-
+
/*
// Continuously try calling the test URL until it fails
while (true) {
@@ -172,15 +172,15 @@
} catch (IOException e) {
break;
}
-
+
try {
Thread.sleep(500);
} catch (InterruptedException ee) {
throw new BuildException("Interruption during sleep", ee);
}
-
+
}
-
+
// Wait a few ms more (just to be sure !)
try {
Thread.sleep(500);
@@ -193,8 +193,8 @@
// ignore; if socket not there, presume dead already
}
}
-
-
+
+
/**
* Call the selected ant task.
*/
@@ -208,7 +208,7 @@
callee.setTarget(taskName);
callee.execute();
}
-
+
/**
* Make a socket to the url, and send the given string
*/
@@ -231,8 +231,8 @@
}
}*/
}
-
-
+
+
/**
* Read all the contents that are to be read
*/
@@ -254,7 +254,7 @@
{
startTarget1 = theStartTarget;
}
-
+
/**
* Sets the target to call to start server 2.
*
@@ -264,17 +264,17 @@
{
startTarget2 = theStartTarget;
}
-
+
/**
* Sets the target to call to run the tests.
*
- * @param theTerstTarget the Ant target to call
+ * @param theTestTarget the Ant target to call
*/
public void setTestTarget(String theTestTarget)
{
testTarget = theTestTarget;
}
-
+
/**
* Sets the stop target. This is the target which does
* a HTTP admin shutdown on the simple server.
@@ -283,7 +283,7 @@
{
stopTarget = theStopTarget;
}
-
+
/**
* Sets the target URL (just http://host:port)
*/
@@ -294,8 +294,8 @@
System.err.println("Can't make URL from "+theUrl);
}
}
-
-
+
+
/**
* Helper class to execute a task in a thread.
*/
1.2 +2 -1 xml-axis/java/tools/org/apache/axis/tools/ant/wsdl/Java2WsdlAntTask.java
Index: Java2WsdlAntTask.java
===================================================================
RCS file: /home/cvs/xml-axis/java/tools/org/apache/axis/tools/ant/wsdl/Java2WsdlAntTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Java2WsdlAntTask.java 27 Aug 2002 16:04:55 -0000 1.1
+++ Java2WsdlAntTask.java 5 Sep 2002 21:06:10 -0000 1.2
@@ -66,9 +66,10 @@
import java.io.PrintWriter;
/**
- * Simple Ant task for running Java2Wsdl utility.
+ * Generates a WSDL description from a Java class.
*
* @author Rich Scheuerle (scheu@us.ibm.com)
+ * @ant.task category="axis"
*/
public class Java2WsdlAntTask extends Task
{
1.2 +4 -4 xml-axis/java/tools/org/apache/axis/tools/ant/wsdl/Wsdl2javaAntTask.java
Index: Wsdl2javaAntTask.java
===================================================================
RCS file: /home/cvs/xml-axis/java/tools/org/apache/axis/tools/ant/wsdl/Wsdl2javaAntTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Wsdl2javaAntTask.java 27 Aug 2002 16:04:55 -0000 1.1
+++ Wsdl2javaAntTask.java 5 Sep 2002 21:06:10 -0000 1.2
@@ -74,7 +74,7 @@
* As well as the nested parameters, this task uses the file
* <tt>NStoPkg.properties</tt> in the project base directory
* for namespace mapping
- * @ant.task category="xml"
+ * @ant.task category="axis"
* @author steve loughran
* @author Davanum Srinivas (dims@yahoo.com)
*/
@@ -299,8 +299,8 @@
}
/**
- * url to fetch and generate WSDL for. Can be remote or a local file.
- * required.
+ * URL to fetch and generate WSDL for.
+ * Can be remote or a local file.
*/
public void setURL(String parameter) {
this.url = parameter;
@@ -315,7 +315,7 @@
}
/**
- * set the type mapping version. default is "1.2"
+ * Set the type mapping version; default is "1.2"
*/
public void setTypeMappingVersion(String parameter) {
this.tm = parameter;