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/05/13 16:14:29 UTC
svn commit: r170022 - in /incubator/beehive/trunk: ./
samples/controls-webservices-blank/ system-controls/ system-controls/ant/
test/dist-test/ant/ user/
Author: ekoneil
Date: Fri May 13 07:14:29 2005
New Revision: 170022
URL: http://svn.apache.org/viewcvs?rev=170022&view=rev
Log:
Build fixes to get Cruisecontrol running again.
Also:
- remove duplicated commons-codec.dependency.path
- remove commons-cli-*.jar from the files copied by NetUI at runtime to a webapp in the distribution
BB: self
DRT: Beehive pass / build.dist pass
Modified:
incubator/beehive/trunk/beehive-imports.xml
incubator/beehive/trunk/distribution.xml
incubator/beehive/trunk/samples/controls-webservices-blank/build-svn.xml
incubator/beehive/trunk/samples/controls-webservices-blank/build.xml
incubator/beehive/trunk/system-controls/ant/systemcontrols.properties
incubator/beehive/trunk/system-controls/build.xml
incubator/beehive/trunk/system-controls/systemcontrols-imports.xml
incubator/beehive/trunk/test/dist-test/ant/build.xml
incubator/beehive/trunk/user/beehive-runtime.xml
Modified: incubator/beehive/trunk/beehive-imports.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/beehive-imports.xml?rev=170022&r1=170021&r2=170022&view=diff
==============================================================================
--- incubator/beehive/trunk/beehive-imports.xml (original)
+++ incubator/beehive/trunk/beehive-imports.xml Fri May 13 07:14:29 2005
@@ -51,12 +51,6 @@
<fileset id="commons-cli.fileset"
file="${beehive.home}/system-controls/external/commons/commons-cli-1.0.jar"/>
-
-
-
- <fileset id="commons-codec.fileset"
- file="${beehive.home}/external/commons/commons-codec-1.3.jar"/>
-
<fileset id="commons-codec.fileset"
file="${beehive.home}/external/commons/commons-codec-1.3.jar"/>
Modified: incubator/beehive/trunk/distribution.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?rev=170022&r1=170021&r2=170022&view=diff
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Fri May 13 07:14:29 2005
@@ -82,11 +82,6 @@
<copy todir="${samples.verify.dir}">
<fileset dir="${dist.dir}"/>
</copy>
-
- <echo>---------------------------------------------------------</echo>
- <echo>Building distribution samples</echo>
- <echo>---------------------------------------------------------</echo>
-
<ant antfile="${samples.verify.dir}/samples/petstoreWeb/build.xml" target="deploy-beehive" inheritAll="false">
<property name="derby.jar" location="${beehive.home}/external/derby/derby_46005.jar"/>
</ant>
@@ -98,6 +93,7 @@
<ant antfile="${samples.verify.dir}/samples/wsm-blank/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
<ant antfile="${samples.verify.dir}/samples/wsm-samples/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
<ant antfile="${samples.verify.dir}/samples/controls-webservices-blank/build.xml" target="build" inheritAll="false"/>
+
<!--
<ant antfile="${samples.verify.dir}/controls-spring/integration/build.xml" target="build" inheritAll="false"/>
<ant antfile="${samples.verify.dir}/controls-spring/web/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
Modified: incubator/beehive/trunk/samples/controls-webservices-blank/build-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-webservices-blank/build-svn.xml?rev=170022&r1=170021&r2=170022&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/controls-webservices-blank/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/controls-webservices-blank/build-svn.xml Fri May 13 07:14:29 2005
@@ -20,38 +20,45 @@
<project name="controls-webservices-blank" basedir="." default="usage">
<property environment="os" />
-
- <property name="beehive.home" value="../.." />
-
- <property name="sc.home" value="${beehive.home}/system-controls"/>
- <property name="external.dir" value="${sc.home}/external" />
+ <import file="../../beehive-imports.xml"/>
+ <import file="../../ant/beehive-tools.xml"/>
- <import file="${basedir}/systemcontrols-imports.xml" />
-
- <property name="junit.source.dir" value="${basedir}/junit" />
- <property name="build.dir" value="${basedir}/build" />
- <property name="build.classes" value="${build.dir}/classes" />
- <property name="build.beansrc" value="${build.dir}/beansrc" />
+ <property name="junit.source.dir" location="${basedir}/junit" />
+ <property name="build.dir" location="${basedir}/build" />
+ <property name="build.classes" location="${build.dir}/classes" />
+ <property name="build.beansrc" location="${build.dir}/beansrc" />
<!-- Service control specific properties -->
- <property name="gen.source.dir" value="${build.dir}/jcxsrc" />
+ <property name="gen.source.dir" location="${build.dir}/jcxsrc" />
<property name="my.service.control.package" value="mypackage" />
- <property name="schema.dir" value="${basedir}/schemas" />
- <property name="xmlbean.type.gen.dir" value="${build.dir}/xmlbeantypes" />
+ <property name="schema.dir" location="${basedir}/schemas" />
+ <property name="xmlbean.type.gen.dir" location="${build.dir}/xmlbeantypes" />
<property name="build.jar" value="myservicecontrols.jar" />
- <property name="test.logs" value="${basedir}/logs" />
- <property name="junit.build.dir" value="${build.dir}/junitclasses" />
- <property name="junit.build.beansrc" value="${build.dir}/junitbeansrc" />
+ <property name="test.logs" location="${basedir}/logs" />
+ <property name="junit.build.dir" location="${build.dir}/junitclasses" />
+ <property name="junit.build.beansrc" location="${build.dir}/junitbeansrc" />
+
+ <path id="webservices.dependency.path">
+ <fileset file="${beehive.home}/wsm/build/jars/beehive-wsm.jar"/>
+ <fileset file="${beehive.home}/wsm/build/jars/beehive-wsm-axis.jar"/>
+ <fileset file="${beehive.home}/wsm/lib/beehive-wsdltypes.jar"/>
+ <fileset file="${beehive.home}/wsm/lib/jsr181.jar"/>
+ <fileset file="${beehive.home}/wsm/external/axis.jar"/>
+ <fileset file="${beehive.home}/wsm/external/jaxrpc.jar"/>
+ <fileset file="${beehive.home}/wsm/external/wsdl4j.jar"/>
+ <fileset file="${beehive.home}/system-controls/external/commons/commons-cli-1.0.jar"/>
+ <path refid="servlet.dependency.path"/>
+ </path>
<path id="beehive.classpath">
- <path refid="webservices.dependency.path" />
- <path refid="controls.dependency.path" />
- <path refid="servlet.dependency.path" />
- <path refid="junit.dependency.path" />
+ <path refid="webservices.dependency.path" />
+ <path refid="controls.dependency.path" />
+ <path refid="servlet.dependency.path" />
+ <path refid="junit.dependency.path" />
</path>
<path id="service.control.dependencies">
- <pathelement path="${beehive-webservice-control.jar}" />
+ <pathelement path="${beehive.home}/system-controls/build/jars/beehive-webservice-control.jar"/>
<path refid="beehive.classpath" />
<path refid="xbean.dependency.path" />
<path refid="log4j.dependency.path" />
@@ -73,8 +80,6 @@
<pathelement path="${junit.build.dir}" />
</path>
-
-
<taskdef name="control-jar" classname="org.apache.beehive.controls.runtime.packaging.ControlJarTask" onerror="report">
<classpath>
<path refid="controls.dependency.path" />
@@ -97,7 +102,6 @@
</target>
-
<target name="build" depends="gen-svc-ctrl" description="Build control sources">
<build-controls srcdir="${gen.source.dir}" destdir="${build.classes}" tempdir="${build.beansrc}" classpathref="build.classpath" />
<!-- have the wsdls, in the same dir as the jcx files -->
@@ -109,10 +113,11 @@
<control-jar destfile="${build.dir}/${build.jar}" basedir="${build.classes}" />
</target>
-
<!-- Generate the service control, should run after types have been generated. -->
<target name="gen-svc-ctrl" depends="gen-types">
- <java classname="org.apache.beehive.controls.system.webservice.generator.ExtensionMaker">
+ <property name="cp" refid="build.classpath"/><echo>cp: ${cp}</echo>
+
+ <java classname="org.apache.beehive.controls.system.webservice.generator.ExtensionMaker" failOnError="true">
<classpath>
<path refid="build.classpath" />
<pathelement location="${build.classes}" />
@@ -131,8 +136,6 @@
</copy>
</target>
-
-
<!-- Generate types for the WSDL and Scheams -->
<!--
***********************************************************************************
@@ -186,9 +189,6 @@
</uptodate>
</target>
-
-
-
<!-- Build the junit tests -->
<target name="build.junit" depends="build">
<build-controls srcdir="${junit.source.dir}"
@@ -206,7 +206,6 @@
</copy>
</target>
-
<target name="run.junit" depends="build.junit">
<echo message="** junit logfiles written to ${test.logs} **" />
@@ -227,7 +226,6 @@
See the http://incubator.apache.org/beehive/wsm/sample_AddressBook.html for instruction
on running the sample." />
</target>
-
<target name="usage" description="Print the usage for this build.xml">
<echo message="" />
Modified: incubator/beehive/trunk/samples/controls-webservices-blank/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/controls-webservices-blank/build.xml?rev=170022&r1=170021&r2=170022&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/controls-webservices-blank/build.xml (original)
+++ incubator/beehive/trunk/samples/controls-webservices-blank/build.xml Fri May 13 07:14:29 2005
@@ -18,28 +18,28 @@
$Header:$
-->
<project name="controls-webservices-blank" basedir="." default="usage">
+
<property environment="os" />
<property file="build.properties" />
<import file="${beehive.home}/beehive-imports.xml" />
<import file="${beehive.home}/ant/beehive-tools.xml" />
- <property name="junit.source.dir" value="./junit" />
- <property name="build.dir" value="./build" />
- <property name="build.classes" value="${build.dir}/classes" />
- <property name="build.beansrc" value="${build.dir}/beansrc" />
+ <property name="junit.source.dir" location="junit" />
+ <property name="build.dir" location="build" />
+ <property name="build.classes" location="${build.dir}/classes" />
+ <property name="build.beansrc" location="${build.dir}/beansrc" />
<property name="lib.dir" location="./lib" />
<!-- Service control specific properties -->
- <property name="gen.source.dir" value="${build.dir}/jcxsrc" />
+ <property name="gen.source.dir" location="${build.dir}/jcxsrc" />
<property name="my.service.control.package" value="mypackage" />
- <property name="schema.dir" value="schemas" />
- <property name="xmlbean.type.gen.dir" value="${build.dir}/xmlbeantypes" />
+ <property name="schema.dir" location="schemas" />
+ <property name="xmlbean.type.gen.dir" location="${build.dir}/xmlbeantypes" />
<property name="build.jar" value="myservicecontrols.jar" />
- <property name="test.logs" value="./logs" />
- <property name="junit.build.dir" value="${build.dir}/junitclasses" />
- <property name="junit.build.beansrc" value="${build.dir}/junitbeansrc" />
-
+ <property name="test.logs" location="logs" />
+ <property name="junit.build.dir" location="${build.dir}/junitclasses" />
+ <property name="junit.build.beansrc" location="${build.dir}/junitbeansrc" />
<path id="lib.path">
<fileset dir="${lib.dir}">
@@ -96,10 +96,6 @@
</copy>
</target>
-
-
-
-
<target name="build" depends="gen-svc-ctrl" description="Build control sources">
<build-controls srcdir="${gen.source.dir}" destdir="${build.classes}" tempdir="${build.beansrc}" classpathref="build.classpath" />
<!-- have the wsdls, in the same dir as the jcx files -->
@@ -122,7 +118,7 @@
<arg line="-gen_root ${gen.source.dir}
-wsdl ${schema.dir}
-pkg ${my.service.control.package}
- -wsdl_path_annotation ." />
+ -wsdl_path_annotation ${basedir}" />
</java>
<!-- have the wsdls, in the same dir as the jcx files -->
Modified: incubator/beehive/trunk/system-controls/ant/systemcontrols.properties
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/ant/systemcontrols.properties?rev=170022&r1=170021&r2=170022&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/ant/systemcontrols.properties (original)
+++ incubator/beehive/trunk/system-controls/ant/systemcontrols.properties Fri May 13 07:14:29 2005
@@ -9,7 +9,6 @@
build.dir=${sc.home}/build
docs.dir=${sc.home}/docs
src.dir=${sc.home}/src
-external.dir=${sc.home}/external
classes.dir=${build.dir}/classes
gen.src.dir=${build.dir}/gensrc
Modified: incubator/beehive/trunk/system-controls/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/build.xml?rev=170022&r1=170021&r2=170022&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/build.xml (original)
+++ incubator/beehive/trunk/system-controls/build.xml Fri May 13 07:14:29 2005
@@ -8,7 +8,7 @@
<import file="systemcontrols-imports.xml"/>
<target name="clean" description="Cleans all system controls build products.">
- <delete dir="./build/"/>
+ <delete dir="build"/>
</target>
<target name="build" depends="prepare" description="Compiles and builds all of the system controls.">
Modified: incubator/beehive/trunk/system-controls/systemcontrols-imports.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/systemcontrols-imports.xml?rev=170022&r1=170021&r2=170022&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/systemcontrols-imports.xml (original)
+++ incubator/beehive/trunk/system-controls/systemcontrols-imports.xml Fri May 13 07:14:29 2005
@@ -5,12 +5,13 @@
<!-- Common System controls build dependencies -->
<!-- -->
<!-- ======================================================================== -->
-<project name="module-import">
+<project name="Beehive/SystemControlsBuild">
<import file="../beehive-imports.xml"/>
<import file="../ant/beehive-tools.xml"/>
- <property file="${beehive.home}/system-controls/ant/systemcontrols.properties"/>
+ <property name="external.dir" location="${beehive.home}/system-controls/external"/>
+ <property file="${beehive.home}/system-controls/ant/systemcontrols.properties"/>
<path id="webservices.dependency.path">
<fileset file="${beehive.home}/wsm/build/jars/beehive-wsm.jar"/>
Modified: incubator/beehive/trunk/test/dist-test/ant/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/test/dist-test/ant/build.xml?rev=170022&r1=170021&r2=170022&view=diff
==============================================================================
--- incubator/beehive/trunk/test/dist-test/ant/build.xml (original)
+++ incubator/beehive/trunk/test/dist-test/ant/build.xml Fri May 13 07:14:29 2005
@@ -40,9 +40,7 @@
<echo message="waiting for the server to shutdown completely."/>
<sleep minutes="2"/>
-
<antcall target="controls.tests"/>
- <antcall target="wsm.tests"/>
</target>
<target name="netui.tests" description="Run netui tests">
Modified: incubator/beehive/trunk/user/beehive-runtime.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/user/beehive-runtime.xml?rev=170022&r1=170021&r2=170022&view=diff
==============================================================================
--- incubator/beehive/trunk/user/beehive-runtime.xml (original)
+++ incubator/beehive/trunk/user/beehive-runtime.xml Fri May 13 07:14:29 2005
@@ -32,6 +32,7 @@
</fileset>
<fileset dir="../lib/common">
<include name="*.jar"/>
+ <exclude name="commons-cli*.jar"/>
</fileset>
<fileset dir="../lib/controls">
<include name="*.jar"/>
@@ -57,6 +58,7 @@
<copy todir="${webapp.dir}/WEB-INF/lib">
<fileset dir="../lib/common">
<include name="*.jar"/>
+ <exclude name="commons-cli*.jar"/>
</fileset>
<fileset dir="../lib/controls">
<include name="*.jar"/>