You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/06/11 00:19:36 UTC
svn commit: r190025 - in
/incubator/beehive/trunk/system-controls/test/src/webservice: build.xml
jcxgen-tests/build.xml
Author: ekoneil
Date: Fri Jun 10 15:19:34 2005
New Revision: 190025
URL: http://svn.apache.org/viewcvs?rev=190025&view=rev
Log:
Fix some build files so that all of the logs go into a single directory.
BB: self
DRT: service control pass
Modified:
incubator/beehive/trunk/system-controls/test/src/webservice/build.xml
incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/build.xml
Modified: incubator/beehive/trunk/system-controls/test/src/webservice/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/webservice/build.xml?rev=190025&r1=190024&r2=190025&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/webservice/build.xml (original)
+++ incubator/beehive/trunk/system-controls/test/src/webservice/build.xml Fri Jun 10 15:19:34 2005
@@ -25,20 +25,17 @@
<!-- client properties -->
<property name="junit-source.dir" location="tests"/>
<property name="controls-source.dir" location="webservice-controls"/>
-
<property name="build.root.dir" location="build"/>
<property name="client.build" location="${build.root.dir}/client"/>
<property name="client.beansrc" location="${client.build}/beansrc"/>
<property name="client.xmlbeangen" location="${client.build}/xmlbeangen"/>
<property name="client.classes" location="${client.build}/classes"/>
<property name="wsdls.dir" location="schemas"/>
-
<property name="client.jcxgensrc" location="${client.build}/jcxsrc"/>
<property name="client.jcxgen.packageName" value="test"/>
<!-- webapp properties -->
<property name="webapp.template.dir" location="servers/webapp"/>
-
<property name="webapp.build.dir" location="${build.root.dir}/webapp"/>
<property name="webapp.lib" location="${webapp.build.dir}/WEB-INF/lib"/>
<property name="webapp.src" location="${webapp.build.dir}/WEB-INF/src"/>
@@ -56,16 +53,12 @@
<property name="beehive-webservice-control.jar"
location="${beehive.home}/system-controls/build/jars/beehive-webservice-control.jar"/>
- <path id="beehive.classpath">
- <path refid="webservices.dependency.path"/>
- <path refid="controls.dependency.path"/>
- <path refid="junit.dependency.path"/>
- </path>
-
<path id="client.classpath">
<pathelement path="${client.classes}"/>
<pathelement path="${beehive-webservice-control.jar}"/>
- <path refid="beehive.classpath"/>
+ <path refid="webservices.dependency.path"/>
+ <path refid="controls.dependency.path"/>
+ <path refid="junit.dependency.path"/>
<path refid="xbean.dependency.path"/>
<path refid="log4j.dependency.path"/>
<path refid="velocity.dependency.path"/>
@@ -76,7 +69,11 @@
<!-- =================================================================== -->
<!-- drt - run the webservice control DRTs -->
<!-- =================================================================== -->
- <target name="drt" depends="clean, build-client, build-webapp" description="Run the web service control drts.">
+ <target name="drt" description="Run the web service control drts.">
+
+ <antcall target="clean"/>
+ <antcall target="build-client"/>
+ <antcall target="build-webapp"/>
<ant dir="jcxgen-tests" target="drt" inheritAll="false"/>
@@ -85,11 +82,8 @@
<echo message="--------------------------------------------------"/>
<parallel>
-
- <antcall target="start-tomcat"/>
-
+ <start-server shmem="false" javaOptions=""/>
<sequential>
-
<echo message="Wait for server to start at URL: ${waitfor.url}"/>
<waitfor maxwait="${waitfor.timeout}"
maxwaitunit="second"
@@ -116,11 +110,8 @@
</fileset>
</batchtest>
</junit>
-
<antcall target="undeploy-webapps"/>
-
<stop-server/>
-
</sequential>
</parallel>
@@ -135,15 +126,15 @@
<!-- =================================================================== -->
<!-- build - build the junit tests and webservice controls -->
<!-- =================================================================== -->
- <target name="build-client" depends="dirs, generate_jcxs" description="Build the tests and controls for the drts.">
+ <target name="build-client" description="Build the tests and controls for the drts.">
+
+ <antcall target="dirs"/>
+ <antcall target="generate_jcxs"/>
<echo message="--------------------------------------------------"/>
<echo message="| Web service control client build starting |"/>
<echo message="--------------------------------------------------"/>
- <property name="cp" refid="client.classpath"/>
- <echo>cp: ${cp}</echo>
-
<!-- build webservice controls generated from wsdl files -->
<build-controls srcdir="${client.jcxgensrc}"
destdir="${client.classes}"
@@ -182,7 +173,9 @@
<!-- =================================================================== -->
<!-- build - build the webapp and wsm services for the drts -->
<!-- =================================================================== -->
- <target name="build-webapp" depends="dirs" description="Build the webapp for the drts.">
+ <target name="build-webapp" description="Build the webapp for the drts.">
+
+ <antcall target="dirs"/>
<echo message="----------------------------------------------------"/>
<echo message="| Web service control drt webapp build starting |"/>
@@ -221,7 +214,9 @@
<!-- =================================================================== -->
<!-- generate_jcxs - Generate webservice controls from wsdls -->
<!-- =================================================================== -->
- <target name="generate_jcxs" depends="gen_xmlbeans">
+ <target name="generate_jcxs">
+
+ <build-schemas srcdir="${wsdls.dir}" destdir="${client.classes}"/>
<java classname="org.apache.beehive.controls.system.webservice.generator.ExtensionMaker"
dir="${basedir}" fork="true" failOnError="true">
@@ -240,17 +235,6 @@
</copy>
</target>
- <target name="gen_xmlbeans" depends="checkxbean" unless="noxbeanrebuild">
- <build-schemas srcdir="${wsdls.dir}" destdir="${client.classes}"/>
- </target>
-
- <target name="checkxbean">
- <uptodate property="noxbeanrebuild" targetfile="${xbeangen.dir}">
- <srcfiles dir="${wsdls.dir}" includes="*.wsdl,*.xsd"/>
- </uptodate>
- </target>
-
-
<!-- =================================================================== -->
<!-- clean -->
<!-- =================================================================== -->
@@ -273,16 +257,11 @@
<mkdir dir="${log.dir}"/>
</target>
-
<!-- ================================================================ -->
<!-- -->
<!-- Targets for running the web service control drts on tomcat -->
<!-- -->
<!-- ================================================================ -->
- <target name="start-tomcat">
- <start-server shmem="false" javaOptions=""/>
- </target>
-
<target name="deploy-webapps">
<antcall target="ensure.deployed"/>
</target>
Modified: incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/build.xml?rev=190025&r1=190024&r2=190025&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/build.xml (original)
+++ incubator/beehive/trunk/system-controls/test/src/webservice/jcxgen-tests/build.xml Fri Jun 10 15:19:34 2005
@@ -12,7 +12,7 @@
<property name="jcxgen.classes" location="${jcxgen.build.dir}/classes"/>
<property name="jcxgen.gensrc" location="${jcxgen.build.dir}/jcxsrc"/>
<property name="jcxgen.package.name" value="jcxgentest"/>
- <property name="log.dir" location="../logs/jcxgen"/>
+ <property name="log.dir" location="${basedir}/../build/logs/jcxgen"/>
<property name="beehive-webservice-control.jar"
location="${beehive.home}/system-controls/build/jars/beehive-webservice-control.jar"/>
@@ -83,7 +83,6 @@
</fileset>
</copy>
-
<!-- build the client junit tests, use apt since they may access controls -->
<build-controls srcdir="${junit-source.dir}"
destdir="${jcxgen.classes}"
@@ -123,7 +122,6 @@
<srcfiles dir="${wsdls.dir}" includes="*.wsdl,*.xsd"/>
</uptodate>
</target>
-
<!-- =================================================================== -->
<!-- clean -->