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/01 22:08:38 UTC
svn commit: r179413 - in /incubator/beehive/trunk/wsm: build.xml
src/runtime/org/apache/beehive/wsm/jsr181/wsdl/ src/runtime/templates/
Author: ekoneil
Date: Wed Jun 1 13:08:36 2005
New Revision: 179413
URL: http://svn.apache.org/viewcvs?rev=179413&view=rev
Log:
Cleanup the WSM build.
- rework the build.xml file to be more linear and understandable. it can be re-modularized once we know what we need.
- remove a couple of unused directories.
BB: self
DRT: Beehive pass / build.dist pass
Removed:
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/jsr181/wsdl/
incubator/beehive/trunk/wsm/src/runtime/templates/
Modified:
incubator/beehive/trunk/wsm/build.xml
Modified: incubator/beehive/trunk/wsm/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/build.xml?rev=179413&r1=179412&r2=179413&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/build.xml (original)
+++ incubator/beehive/trunk/wsm/build.xml Wed Jun 1 13:08:36 2005
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
- Copyright 2004 The Apache Software Foundation
+ Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -23,24 +23,22 @@
<import file="../ant/${webservice.runtime}-import.xml"/>
<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" />
- <property name="api.dir" location="src/api" />
- <property name="api.classes" location="${classes.dir}/api" />
- <property name="runtime.dir" location="src/runtime" />
- <property name="runtime.classes" location="${classes.dir}/runtime" />
- <property name="lib.dir" location="lib" />
- <property name="ext.lib.dir" location="external" />
- <property name="wsm.jar" location="${jars.dir}/beehive-wsm.jar" />
- <property name="wsm-axis.jar" location="${jars.dir}/beehive-wsm-axis.jar" />
- <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="jsr181.jar" location="${lib.dir}/jsr181.jar" />
-
- <property name="wsdl.schema.dir" location="schemas" />
- <property name="temp.wsdl.classes.dir" location="${build.dir}/temp-wsdltypes" />
+ <property name="classes.dir" location="${build.dir}/classes"/>
+ <property name="jars.dir" location="${build.dir}/jars"/>
+ <property name="docs.dir" location="${build.dir}/docs"/>
+ <property name="api.dir" location="src/api"/>
+ <property name="api.classes" location="${classes.dir}/api"/>
+ <property name="runtime.dir" location="src/runtime"/>
+ <property name="runtime.classes" location="${classes.dir}/runtime"/>
+ <property name="lib.dir" location="lib"/>
+ <property name="ext.lib.dir" location="external"/>
+ <property name="wsm.jar" location="${jars.dir}/beehive-wsm.jar"/>
+ <property name="wsm-axis.jar" location="${jars.dir}/beehive-wsm-axis.jar"/>
+ <property name="xsd.schema.dir" location="src/runtime/schema"/>
+ <property name="xsd.classes.dir" location="${build.dir}/xsd-classes"/>
+ <property name="jsr181.jar" location="${build.dir}/jars/jsr181.jar"/>
+ <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"/>
@@ -52,66 +50,18 @@
<path refid="commons-codec.dependency.path"/>
<pathelement location="${api.classes}"/>
<pathelement location="${jars.dir}/beehive-wsdltypes.jar"/>
- <pathelement location="${lib.dir}/schematypes.jar"/>
<pathelement location="${jsr181.jar}"/>
<pathelement location="${ext.lib.dir}/jaxrpc.jar"/>
- <path refid="xbean.dependency.path"/>
</path>
<path id="axis.classpath">
<path refid="controls.dependency.path"/>
- <path refid="tools.dependency.path"/>
<path refid="runtime.classpath"/>
<path refid="webservice.classpath"/>
<pathelement location="${runtime.classes}"/>
<pathelement location="${xsd.classes.dir}"/>
</path>
-
- <!-- ==================================================================== -->
- <!-- usage - output usage -->
- <!-- ==================================================================== -->
- <target name="usage">
- <echo message=""/>
- <echo message=""/>
- <echo message="WSM Build file"/>
- <echo message="================================================================"/>
- <echo message="| Usage |"/>
- <echo message="================================================================"/>
- <echo message=""/>
- <echo message="----------------------------------------------------------------"/>
- <echo message="| Standard Targets |"/>
- <echo message="----------------------------------------------------------------"/>
- <echo message="build_core - build core WSM classes and jar files"/>
- <echo message="build_axis - build AXIS dependent classes and jar files"/>
- <echo message="build - build all classes and jar files"/>
- <echo message="clean - remove build files"/>
- <echo message="deploy - prepares an axis webapp suitable for deployment"/>
- <echo message=" to a servlet container"/>
- <echo message="docs - build the java docs"/>
- <echo message="drt - runs the DRT (developer regression test) on the"/>
- <echo message=" core WSM components"/>
- <echo message=""/>
- <echo message="----------------------------------------------------------------"/>
- <echo message="| Project-Specific Targets |"/>
- <echo message="----------------------------------------------------------------"/>
- <echo message="dirs - Creates the output directories of the build."/>
- <echo message="classes - Compiles the core source code of the project and"/>
- <echo message=" copies properties and templates into the build."/>
- <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=""/>
- </target>
-
- <!-- ==================================================================== -->
- <!-- build_all. build this project and all inter-project dependencies -->
- <!-- ==================================================================== -->
- <target name="build">
- <antcall target="build_core"/>
- <antcall target="build_axis"/>
- </target>
-
+
<!-- ==================================================================== -->
<!-- Creates the output directories of the build. -->
<!-- ==================================================================== -->
@@ -122,80 +72,30 @@
<mkdir dir="${jars.dir}"/>
<mkdir dir="${docs.dir}"/>
</target>
-
- <!-- ==================================================================== -->
- <!-- Compiles the source code of the project. -->
- <!-- ==================================================================== -->
- <target name="classes" depends="api, runtime">
- <!-- Copy template files into the build -->
- <copy todir="${runtime.classes}" overwrite="true">
- <fileset dir="${runtime.dir}" includes="**/*.template,**/*.vm,META-INF/**"/>
- </copy>
- <!-- Copy property files into the build -->
- <copy todir="${runtime.classes}" overwrite="true">
- <fileset dir="${runtime.dir}" includes="**/*.properties"/>
- </copy>
- </target>
-
-
- <target name="api" depends="dirs">
- <!-- Build the API classes -->
- <javac destdir="${api.classes}" debug="on">
- <src path="${api.dir}"/>
- </javac>
- </target>
-
-
-
- <target name="runtime" depends="api">
- <!-- Build the runtime classes -->
- <javac destdir="${runtime.classes}" classpathref="runtime.classpath" debug="on">
- <src path="${runtime.dir}"/>
- <exclude name="**/axis/**"/>
- </javac>
-
- <copy todir="${runtime.classes}" overwrite="true">
- <fileset dir="${runtime.dir}" includes="**/*.template,**/*.vm,META-INF/**"/>
- </copy>
- <!-- Copy property files into the build -->
- <copy todir="${runtime.classes}" overwrite="true">
- <fileset dir="${runtime.dir}" includes="**/*.properties"/>
- </copy>
- </target>
-
- <target name="axis" depends="xsd,runtime">
- <!-- Build the axis classes -->
- <echo message="AXIS build"/>
- <javac destdir="${runtime.classes}" classpathref="axis.classpath" debug="on">
- <src path="${runtime.dir}"/>
- <include name="**/axis/**"/>
- </javac>
- </target>
-
+
<!-- ==================================================================== -->
- <!-- Generate classes from xml schemas using XMLBeans. -->
+ <!-- clean -->
<!-- ==================================================================== -->
- <target name="xsd" description="Compile a set of XSDs using the XMLBean Ant task">
- <fileset id="xbean.sources" dir="${xsd.schema.dir}" includes="${xsd.includes}"/>
- <!-- checks whether classes have already been generated. -->
- <uptodate property="xbean.uptodate" targetfile="${xsd.classes.dir}/schema">
- <srcfiles refid="xbean.sources"/>
- </uptodate>
- <antcall target="xsd.generate"/>
- </target>
- <target name="xsd.generate" unless="xbean.uptodate">
- <echo message="generate"/>
- <build-xbean schemaDir="${xsd.schema.dir}" classgenDir="${xsd.classes.dir}"/>
+ <target name="clean">
+ <delete file="${lib.dir}/beehive-wsdltypes.jar" failOnError="false"/>
+ <delete dir="${build.dir}"/>
+ <delete dir="${temp.wsdl.classes.dir}"/>
+ <ant dir="drt" target="clean" inheritAll="false"/>
</target>
-
+
<!-- ==================================================================== -->
- <!-- Generate xml bean type for wsdl based on its schema -->
+ <!-- build_all. build this project and all inter-project dependencies -->
<!-- ==================================================================== -->
- <target name="wsdltypes" depends="dirs" description="Generate the xml bean types wsdl schema">
- <echo message="Generate WSDL types JAR"/>
+ <target name="build">
+ <antcall target="dirs"/>
+
+ <echo message="--------------------------------------------------"/>
+ <echo message="| WSM WSDL types build starting |"/>
+ <echo message="--------------------------------------------------"/>
+
<build-xbean schemaDir="${wsdl.schema.dir}" classgenDir="${temp.wsdl.classes.dir}"/>
<jar jarfile="${jars.dir}/beehive-wsdltypes.jar">
- <fileset dir="${temp.wsdl.classes.dir}" />
+ <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"/>
@@ -207,28 +107,55 @@
<attribute name="Beehive-Version" value="${beehive.version}"/>
</manifest>
</jar>
- </target>
-
- <!-- ==================================================================== -->
- <!-- Jars up the classes, libraries, and resources. -->
- <!-- ==================================================================== -->
- <target name="build_core" depends="wsdltypes,classes">
+
<echo message="--------------------------------------------------"/>
- <echo message="| WSM build starting |"/>
+ <echo message="| WSM WSDL types build ending |"/>
<echo message="--------------------------------------------------"/>
+
+ <echo message="--------------------------------------------------"/>
+ <echo message="| JSR 181 API build starting |"/>
+ <echo message="--------------------------------------------------"/>
+
+ <javac destdir="${api.classes}" debug="on">
+ <src path="${api.dir}"/>
+ </javac>
+
<jar jarfile="${jsr181.jar}">
- <fileset dir="${api.classes}"/>
- <manifest>
- <attribute name="Extension-Name" value="JSR 181 API Library"/>
- <attribute name="Specification-Title" value="Web Services Metadata for the Java Platform"/>
- <attribute name="Specification-Vendor" value="BEA Systems Inc."/>
- <attribute name="Specification-Version" value="pre 1.0"/>
- <attribute name="Implementation-Title" value="Beehive WSM"/>
- <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
- <attribute name="Implementation-Version" value="${beehive.version}"/>
- <attribute name="Beehive-Version" value="${beehive.version}"/>
- </manifest>
- </jar>
+ <fileset dir="${api.classes}"/>
+ <manifest>
+ <attribute name="Extension-Name" value="JSR 181 API Library"/>
+ <attribute name="Specification-Title" value="Web Services Metadata for the Java Platform"/>
+ <attribute name="Specification-Vendor" value="BEA Systems Inc."/>
+ <attribute name="Specification-Version" value="pre 1.0"/>
+ <attribute name="Implementation-Title" value="Beehive WSM"/>
+ <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
+ <attribute name="Implementation-Version" value="${beehive.version}"/>
+ <attribute name="Beehive-Version" value="${beehive.version}"/>
+ </manifest>
+ </jar>
+
+ <echo message="--------------------------------------------------"/>
+ <echo message="| JSR 181 API build ending |"/>
+ <echo message="--------------------------------------------------"/>
+
+ <echo message="--------------------------------------------------"/>
+ <echo message="| WSM Runtime build starting |"/>
+ <echo message="--------------------------------------------------"/>
+
+ <!-- Build the runtime classes -->
+ <javac destdir="${runtime.classes}" classpathref="runtime.classpath" debug="on">
+ <src path="${runtime.dir}"/>
+ <exclude name="**/axis/**"/>
+ </javac>
+
+ <copy todir="${runtime.classes}" overwrite="true">
+ <fileset dir="${runtime.dir}" includes="**/*.template,**/*.vm,META-INF/**"/>
+ </copy>
+
+ <!-- Copy property files into the build -->
+ <copy todir="${runtime.classes}" overwrite="true">
+ <fileset dir="${runtime.dir}" includes="**/*.properties"/>
+ </copy>
<jar jarfile="${wsm.jar}">
<fileset dir="${runtime.classes}">
@@ -246,15 +173,21 @@
</manifest>
</jar>
<echo message="--------------------------------------------------"/>
- <echo message="| WSM build ending |"/>
+ <echo message="| WSM Runtime build ending |"/>
<echo message="--------------------------------------------------"/>
- </target>
-
- <target name="build_axis" depends="axis">
<echo message="--------------------------------------------------"/>
- <echo message="| WSM-AXIS build starting |"/>
+ <echo message="| WSM AXIS build starting |"/>
<echo message="--------------------------------------------------"/>
+
+ <build-xbean schemaDir="${xsd.schema.dir}" classgenDir="${xsd.classes.dir}"/>
+
+ <!-- Build the axis classes -->
+ <javac destdir="${runtime.classes}" classpathref="axis.classpath" debug="on">
+ <src path="${runtime.dir}"/>
+ <include name="**/axis/**"/>
+ </javac>
+
<jar jarfile="${wsm-axis.jar}">
<fileset dir="${runtime.classes}">
<include name="**/axis/**"/>
@@ -275,30 +208,27 @@
</manifest>
</jar>
<echo message="--------------------------------------------------"/>
- <echo message="| WSM-AXIS build ending |"/>
+ <echo message="| WSM AXIS build ending |"/>
<echo message="--------------------------------------------------"/>
</target>
<!-- ==================================================================== -->
- <!-- clean -->
+ <!-- deploy -->
<!-- ==================================================================== -->
- <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 dir="${temp.wsdl.classes.dir}"/>
- <ant dir="drt" target="clean" inheritAll="false"/>
- </target>
-
+ <target name="deploy" depends="build"/>
+
<!-- ==================================================================== -->
<!-- deploy.webservice.runtime -->
<!-- ==================================================================== -->
- <target
- name="deploy.webservice.runtime"
+ <target name="deploy.webservice.runtime"
description="Deploy the web services runtime to a fully-quaflified webapp directory specified with the property 'webapp.dir'">
+
+ <!-- todo: this shouldn't depend on having a webapp present -->
<available property="webapp.dir.available" file="${webapp.dir}" type="dir"/>
<fail unless="webapp.dir.available" message="Can't find the webapp directory ${webapp.dir}"/>
- <echo message="Deploy WSM to webapp rooted at: ${webapp.dir}" />
+
+ <echo message="Deploy WSM to webapp rooted at: ${webapp.dir}"/>
+
<!-- copy the required libraries -->
<deploy-webservice-runtime appdir="${webapp.dir}/WEB-INF/lib"/>
<copy todir="${webapp.dir}/WEB-INF/lib/" failOnError="true">
@@ -311,27 +241,21 @@
<fileset refid="velocity.fileset"/>
</copy>
</target>
-
- <!-- ==================================================================== -->
- <!-- deploy -->
- <!-- ==================================================================== -->
- <target name="deploy">
- <echo message="--------------------------------------------------"/>
- <echo message="| WSM deploy starting |"/>
- <echo message="--------------------------------------------------"/>
-
- <antcall target="build"/>
-
- <echo message="--------------------------------------------------"/>
- <echo message="| WSM deploy ending |"/>
- <echo message="--------------------------------------------------"/>
- </target>
-
+
<!-- ==================================================================== -->
<!-- docs -->
<!-- ==================================================================== -->
<target name="docs">
- <javadoc destdir="${docs.dir}/apidocs/classref_wsm" maxmemory="256M" windowtitle="WSM Documentation" doctitle="Web Services Metadata" version="true" author="false" use="true" additionalparam="-breakiterator -noqualifier all -notimestamp " useexternalfile="true" classpathref="axis.classpath">
+ <javadoc destdir="${docs.dir}/apidocs/classref_wsm"
+ maxmemory="256M"
+ windowtitle="WSM Documentation"
+ doctitle="Web Services Metadata"
+ version="true"
+ author="false"
+ use="true"
+ additionalparam="-breakiterator -noqualifier all -notimestamp "
+ useexternalfile="true"
+ classpathref="axis.classpath">
<packageset dir="${runtime.dir}" defaultexcludes="yes"/>
</javadoc>
<fixcrlf srcDir="${docs.dir}/apidocs/classref_wsm" includes="**/*.html"/>
@@ -342,6 +266,21 @@
<!-- ==================================================================== -->
<target name="drt">
<ant dir="drt" target="drt" inheritAll="false"/>
+ </target>
+
+ <!-- ==================================================================== -->
+ <!-- usage - output usage -->
+ <!-- ==================================================================== -->
+ <target name="usage">
+ <echo message="WSM Build file"/>
+ <echo message=""/>
+ <echo message="build - build all classes and jar files"/>
+ <echo message="clean - remove build files"/>
+ <echo message="deploy - prepares an axis webapp suitable for deployment"/>
+ <echo message=" to a servlet container"/>
+ <echo message="docs - build the java docs"/>
+ <echo message="drt - runs the DRT (developer regression test) on the"/>
+ <echo message=" core WSM components"/>
</target>
</project>