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/15 23:31:02 UTC
svn commit: r170268 - in /incubator/beehive/trunk: distribution.xml
samples/controls-webservices-blank/build-svn.xml
samples/petstoreWeb/build-dist.xml
system-controls/systemcontrols-imports.xml wsm/build.xml wsm/drt/build.xml
Author: ekoneil
Date: Sun May 15 14:31:00 2005
New Revision: 170268
URL: http://svn.apache.org/viewcvs?rev=170268&view=rev
Log:
Fix for JIRA 316. Turned out that the beehive-wsdltypes.jar needs to be generated every build, so it now lives in wsm/build/jars and is referenced as such throughout the WSM / service control builds.
Also changes the dependence of the petstoreWeb build on having deploy-beehive called; this is now a dependency of the "build" target.
BB: self
DRT: Beehive pass / build.dist pass
Modified:
incubator/beehive/trunk/distribution.xml
incubator/beehive/trunk/samples/controls-webservices-blank/build-svn.xml
incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml
incubator/beehive/trunk/system-controls/systemcontrols-imports.xml
incubator/beehive/trunk/wsm/build.xml
incubator/beehive/trunk/wsm/drt/build.xml
Modified: incubator/beehive/trunk/distribution.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?rev=170268&r1=170267&r2=170268&view=diff
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Sun May 15 14:31:00 2005
@@ -85,10 +85,9 @@
<ant antfile="${samples.verify.dir}/samples/netui-blank/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
<ant antfile="${samples.verify.dir}/samples/controls-blank/build.xml" target="build" inheritAll="false"/>
- <ant antfile="${samples.verify.dir}/samples/petstoreWeb/build.xml" target="deploy-beehive" inheritAll="false">
+ <ant antfile="${samples.verify.dir}/samples/petstoreWeb/build.xml" target="build" inheritAll="false">
<property name="derby.jar" location="${beehive.home}/external/derby/derby_46005.jar"/>
</ant>
- <ant antfile="${samples.verify.dir}/samples/petstoreWeb/build.xml" target="build" inheritAll="false"/>
<ant antfile="${samples.verify.dir}/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
<ant antfile="${samples.verify.dir}/samples/netui-samples/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=170268&r1=170267&r2=170268&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/controls-webservices-blank/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/controls-webservices-blank/build-svn.xml Sun May 15 14:31:00 2005
@@ -41,7 +41,7 @@
<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/build/jars/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"/>
Modified: incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml?rev=170268&r1=170267&r2=170268&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/build-dist.xml Sun May 15 14:31:00 2005
@@ -73,7 +73,7 @@
<!-- build - build the webapp -->
<!-- ========================================= -->
- <target name="build" description="Build the webapp">
+ <target name="build" depends="deploy-beehive" description="Build the webapp">
<copy todir="${build.dir}/">
<fileset dir="${web.dir}">
<exclude name="**/*.java"/>
Modified: incubator/beehive/trunk/system-controls/systemcontrols-imports.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/systemcontrols-imports.xml?rev=170268&r1=170267&r2=170268&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/systemcontrols-imports.xml (original)
+++ incubator/beehive/trunk/system-controls/systemcontrols-imports.xml Sun May 15 14:31:00 2005
@@ -16,7 +16,7 @@
<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/build/jars/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"/>
Modified: incubator/beehive/trunk/wsm/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/build.xml?rev=170268&r1=170267&r2=170268&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/build.xml (original)
+++ incubator/beehive/trunk/wsm/build.xml Sun May 15 14:31:00 2005
@@ -17,13 +17,12 @@
$Header:$
-->
-
- <project name="Beehive - Metadata for Web Services" default="usage" basedir=".">
+<project name="Beehive/Metadata for Web Services" default="usage" basedir=".">
<import file="../beehive-imports.xml"/>
<import file="../ant/${webservice.runtime}-import.xml"/>
- <property name="build.dir" location="build" />
+ <property name="build.dir" location="build"/>
<property name="classes.dir" location="${build.dir}/classes" />
<property name="jars.dir" location="${build.dir}/jars" />
<property name="docs.dir" location="${build.dir}/docs" />
@@ -38,9 +37,9 @@
<property name="xsd.schema.dir" location="src/runtime/schema" />
<property name="xsd.classes.dir" location="${build.dir}/xsd-classes" />
<property name="xsd.includes" value="*.xsd" />
-
- <property name="wsdl.schema.dir" location="schemas" />
- <property name="temp.wsdl.classes.dir" location="${build.dir}/temp-wsdltypes" />
+
+ <property name="wsdl.schema.dir" location="schemas" />
+ <property name="temp.wsdl.classes.dir" location="${build.dir}/temp-wsdltypes" />
<path id="runtime.classpath">
<path refid="velocity.dependency.path"/>
@@ -51,7 +50,7 @@
<path refid="ant-jar.dependency.path"/>
<path refid="commons-codec.dependency.path"/>
<pathelement location="${api.classes}"/>
- <pathelement location="${lib.dir}/beehive-wsdltypes.jar"/>
+ <pathelement location="${jars.dir}/beehive-wsdltypes.jar"/>
<pathelement location="${lib.dir}/schematypes.jar"/>
<pathelement location="${lib.dir}/jsr181.jar"/>
<pathelement location="${ext.lib.dir}/jaxrpc.jar"/>
@@ -66,7 +65,6 @@
<pathelement location="${runtime.classes}"/>
<pathelement location="${xsd.classes.dir}"/>
</path>
-
<!-- ==================================================================== -->
<!-- usage - output usage -->
@@ -102,20 +100,15 @@
<echo message="api - Compiles the api source code of the project."/>
<echo message="runtime - Compiles the runtime source code of the project."/>
<echo message="axis - Compiles the axis dependent source code of the project."/>
- <echo message="================================================================"/>
- <echo message="| NOTE: THE WSM PROJECT ONLY BUILDS ON JDK5 AND LATER |"/>
- <echo message="================================================================"/>
<echo message=""/>
<echo message=""/>
</target>
-
<!-- ==================================================================== -->
<!-- build_all. build this project and all inter-project dependencies -->
<!-- ==================================================================== -->
<target name="build_all" depends="build, build_axis"/>
-
<!-- ==================================================================== -->
<!-- Creates the output directories of the build. -->
<!-- ==================================================================== -->
@@ -127,7 +120,6 @@
<mkdir dir="${docs.dir}"/>
</target>
-
<!-- ==================================================================== -->
<!-- Compiles the source code of the project. -->
<!-- ==================================================================== -->
@@ -142,8 +134,6 @@
</copy>
</target>
-
-
<target name="runtime" depends="dirs">
<!-- Build the runtime classes -->
<javac destdir="${runtime.classes}" classpathref="runtime.classpath" debug="on">
@@ -160,7 +150,6 @@
</copy>
</target>
-
<target name="axis" depends="xsd,runtime">
<!-- Build the axis classes -->
<echo message="AXIS build"/>
@@ -170,7 +159,6 @@
</javac>
</target>
-
<!-- ==================================================================== -->
<!-- Generate classes from xml schemas using XMLBeans. -->
<!-- ==================================================================== -->
@@ -187,35 +175,31 @@
<build-xbean schemaDir="${xsd.schema.dir}" classgenDir="${xsd.classes.dir}"/>
</target>
-
-
-
-
<!-- ==================================================================== -->
- <!-- Generate xml bean type for wsdl based on its schema -->
- <!-- ==================================================================== -->
- <target name="wsdltypes" description="Generate the xml bean types wsdl schema">
- <fileset id="xwsdl.schema.source" dir="${wsdl.schema.dir}" includes="${xsd.includes}"/>
- <!-- checks whether classes have already been generated. -->
- <uptodate property="wsdltypes.uptodate" targetfile="${lib.dir}/beehive-wsdltypes.jar">
- <srcfiles refid="xwsdl.schema.source"/>
- </uptodate>
- <antcall target="wsdltypes.generate"/>
- </target>
- <target name="wsdltypes.generate" unless="wsdltypes.uptodate">
- <echo message="generate wsdl types"/>
- <delete dir="${temp.wsdl.classes.dir}" />
- <build-xbean schemaDir="${wsdl.schema.dir}" classgenDir="${temp.wsdl.classes.dir}"/>
- <jar jarfile="${lib.dir}/beehive-wsdltypes.jar">
- <fileset dir="${temp.wsdl.classes.dir}" />
- </jar>
- </target>
-
+ <!-- Generate xml bean type for wsdl based on its schema -->
+ <!-- ==================================================================== -->
+ <target name="wsdltypes" depends="dirs" description="Generate the xml bean types wsdl schema">
+ <echo message="Generate WSDL types JAR"/>
+ <build-xbean schemaDir="${wsdl.schema.dir}" classgenDir="${temp.wsdl.classes.dir}"/>
+ <jar jarfile="${jars.dir}/beehive-wsdltypes.jar">
+ <fileset dir="${temp.wsdl.classes.dir}" />
+ <manifest>
+ <attribute name="Extension-Name" value="Beehive WSM WSDL Types"/>
+ <attribute name="Specification-Title" value="Beehive WSM WSDL Types"/>
+ <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
+ <attribute name="Specification-Version" value="${beehive.version}"/>
+ <attribute name="Implementation-Title" value="Beehive WSM WSDL Types"/>
+ <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
+ <attribute name="Implementation-Version" value="${beehive.version}"/>
+ <attribute name="Beehive-Version" value="${beehive.version}"/>
+ </manifest>
+ </jar>
+ </target>
<!-- ==================================================================== -->
<!-- Jars up the classes, libraries, and resources. -->
<!-- ==================================================================== -->
- <target name="build" depends="wsdltypes, classes">
+ <target name="build" depends="wsdltypes,classes">
<echo message="--------------------------------------------------"/>
<echo message="| WSM build starting |"/>
<echo message="--------------------------------------------------"/>
@@ -234,7 +218,6 @@
<attribute name="Implementation-Version" value="${beehive.version}"/>
<attribute name="Beehive-Version" value="${beehive.version}"/>
</manifest>
-
</jar>
<echo message="--------------------------------------------------"/>
<echo message="| WSM build ending |"/>
@@ -270,17 +253,17 @@
<echo message="--------------------------------------------------"/>
</target>
-
<!-- ==================================================================== -->
<!-- clean -->
<!-- ==================================================================== -->
<target name="clean">
+ <delete file="${lib.dir}/beehive-wsdltypes.jar" failOnError="false"/>
+ <delete file="${lib.dir}/wsdltypes.jar" failOnError="false"/>
<delete dir="${build.dir}"/>
- <delete file="${lib.dir}/beehive-wsdltypes.jar" />
+ <delete dir="${temp.wsdl.classes.dir}"/>
<ant dir="drt" target="clean" inheritAll="false"/>
</target>
-
<!-- ==================================================================== -->
<!-- clean_all -->
<!-- ==================================================================== -->
@@ -288,7 +271,6 @@
<antcall target="clean"/>
</target>
-
<!-- ==================================================================== -->
<!-- redeploy -->
<!-- ==================================================================== -->
@@ -298,7 +280,6 @@
<antcall target="deploy"/>
</target>
-
<!-- ==================================================================== -->
<!-- redeploy_all -->
<!-- ==================================================================== -->
@@ -308,7 +289,6 @@
<antcall target="deploy_all"/>
</target>
-
<!-- ==================================================================== -->
<!-- deploy.webservice.runtime -->
<!-- ==================================================================== -->
@@ -332,7 +312,6 @@
</copy>
</target>
-
<!-- ==================================================================== -->
<!-- deploy -->
<!-- ==================================================================== -->
@@ -346,7 +325,6 @@
<echo message="--------------------------------------------------"/>
</target>
-
<!-- ==================================================================== -->
<!-- deploy_all -->
<!-- ==================================================================== -->
@@ -354,7 +332,6 @@
<antcall target="deploy"/>
</target>
-
<!-- ==================================================================== -->
<!-- minprod -->
<!-- ==================================================================== -->
@@ -368,7 +345,6 @@
<echo message="--------------------------------------------------"/>
</target>
-
<!-- ==================================================================== -->
<!-- docs -->
<!-- ==================================================================== -->
@@ -378,7 +354,6 @@
</javadoc>
<fixcrlf srcDir="${docs.dir}/apidocs/classref_wsm" includes="**/*.html"/>
</target>
-
<!-- ==================================================================== -->
<!-- drt -->
Modified: incubator/beehive/trunk/wsm/drt/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/drt/build.xml?rev=170268&r1=170267&r2=170268&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/drt/build.xml (original)
+++ incubator/beehive/trunk/wsm/drt/build.xml Sun May 15 14:31:00 2005
@@ -19,14 +19,6 @@
<property name="ext.lib.dir" value="../external"/>
<property name="drt.wsdl.file" location="${drt.src}/org/apache/beehive/wsm/jsr181/wsdl/web/wsdl2javatest.wsdl"/>
-
- <condition property="drt.os" value="windows">
- <os family="windows"/>
- </condition>
- <condition property="drt.os" value="unix">
- <os family="unix"/>
- </condition>
-
<fileset id="axis.jars" dir="${ext.lib.dir}">
<include name="wsdl4j.jar"/>
<include name="saaj.jar"/>
@@ -49,10 +41,9 @@
<path refid="commons-discovery.dependency.path"/>
<path refid="commons-logging.dependency.path"/>
<path refid="controls.dependency.path"/>
-
- <pathelement location="${lib.dir}/beehive-wsdltypes.jar"/>
<pathelement location="${lib.dir}/jsr181.jar"/>
<pathelement location="${lib.dir}/schematypes.jar"/>
+ <pathelement location="../build/jars/beehive-wsdltypes.jar"/>
<pathelement location="../build/jars/beehive-wsm.jar"/>
<pathelement location="../build/jars/beehive-wsm-axis.jar"/>
<fileset refid="axis.jars"/>