beehive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ekon...@apache.org
Subject svn commit: r227491 - /incubator/beehive/trunk/system-controls/samples/webservice/amazon/build.xml
Date Thu, 04 Aug 2005 21:16:23 GMT
Author: ekoneil
Date: Thu Aug  4 14:16:20 2005
New Revision: 227491

URL: http://svn.apache.org/viewcvs?rev=227491&view=rev
Log:
Fixup the Amazon WS control sample build.  This apparently hasn't worked in a while.  :)

It doesn't entirely work now, but it was good enough to generate a WS control for a sample
during Garrett's OSCON talk.

BB: self
DRT: none


Modified:
    incubator/beehive/trunk/system-controls/samples/webservice/amazon/build.xml

Modified: incubator/beehive/trunk/system-controls/samples/webservice/amazon/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/samples/webservice/amazon/build.xml?rev=227491&r1=227490&r2=227491&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/samples/webservice/amazon/build.xml (original)
+++ incubator/beehive/trunk/system-controls/samples/webservice/amazon/build.xml Thu Aug  4
14:16:20 2005
@@ -16,61 +16,44 @@
    $Header:$
  -->
 
-<project name="xmlbea _service_control_sample" default="run.test">
+<project name="Beehive/WebServiceControl/Samples/Amazon" default="run.test">
 
-    <property environment="env"/>
-    <property name="beehive.home" value="${env.BEEHIVE_HOME}"/>
-    <import file="${beehive.home}/beehive-imports.xml" />
-
-    <property name="build.dir" value="./build"/>
-    <property name="xbeangen.dir" value="${build.dir}/xbeangen"/>
-    <property name="extgen.dir" value="${build.dir}/extgen"/>
-    <property name="jcxgen.dir" value="${build.dir}/controlgen"/>
-
-
-    <property name="source.dir" value="./src"/>
-
-    <property name="junit.source.dir" value="./junit"/>
-    <property name="common.source.dir" value="../common/src"/>
-    <property name="test.logs" value="./logs"/>
-    <property name="servers.dir" value="./servers/local"/>  <!-- test servers -->
-    <property name="build.classes" value="${build.dir}/classes"/>
-    <property name="build.beansrc" value="${build.dir}/beansrc"/>
-    <property name="axisbeangen.dir" value="${build.dir}/axisbeangen"/>
-    <property name="servicecontrol.jar" value="../../servicecontrol/build/jars/webservice-control.jar"/>
-
-    <property name="beehive.common.lib.dir" value="${beehive.home}/lib/common"/>
-
-    <property name="controls.jar" value="${beehive.home}/lib/controls/beehive-controls.jar"/>
-    <property name="schema.dir" value="schemas"/>
-
-
-    <path id="beehive.class.path">
-        <fileset dir="${beehive.home}/lib/wsm" includes="*.jar"/>
-        <pathelement location="${beehive.home}/lib/controls/beehive-controls.jar"/>
-        <fileset dir="${beehive.common.lib.dir}">
-            <include name="**/*.jar"/>
-        </fileset>
-        <pathelement location="${lib.dir}/junit-3.8.1.jar"/>
-        <pathelement location="${basedir}/lib/servlet-api-2.4-20040521.jar"/>
-        <pathelement location="${basedir}/lib/jsp-api-2.0-20040521.jar"/>
-    </path>
+    <property environment="os"/>
+
+    <import file="../../../../beehive-imports.xml" />
+    <import file="../../../../ant/beehive-tools.xml" />
+
+    <property name="build.dir" location="build"/>
+    <property name="test.logs" location="${build.dir}/logs"/>
+    <property name="xbeangen.dir" location="${build.dir}/xbeangen"/>
+    <property name="extgen.dir" location="${build.dir}/extgen"/>
+    <property name="jcxgen.dir" location="${build.dir}/controlgen"/>
+    <property name="build.classes" location="${build.dir}/classes"/>
+    <property name="build.beansrc" location="${build.dir}/beansrc"/>
+    <property name="axisbeangen.dir" location="${build.dir}/axisbeangen"/>
+
+    <property name="source.dir" location="src"/>
+    <property name="junit.source.dir" location="junit"/>
+    <property name="common.source.dir" location="../common/src"/>
+    <property name="servers.dir" location="servers/local"/>
+    <property name="servicecontrol.jar" location="../../../build/jars/beehive-webservice-control.jar"/>
+    <property name="schema.dir" location="schemas"/>
 
     <path id="build.classpath">
-        <fileset dir="${beehive.home}/lib/wsm">
-            <include name="*.jar"/>
-        </fileset>
-        <pathelement location="${beehive.home}/lib/controls/beehive-webservice-control.jar"/>
-        <path refid="beehive.class.path"/>
+        <fileset dir="${beehive.home}/wsm/external" includes="*.jar"/>
+        <fileset dir="${beehive.home}/wsm/build/jars" includes="*.jar"/>
+        <path refid="xbean.dependency.path"/>
+        <path refid="servlet.dependency.path"/>
+        <path refid="junit.dependency.path"/>
+        <path refid="commons-logging.dependency.path"/>
+        <path refid="controls.dependency.path"/>
+        <pathelement location="${servicecontrol.jar}"/>
         <pathelement path="${servicecontrol.jar}"/>
     </path>
 
-    <taskdef name="apt" classname="org.apache.beehive.controls.runtime.generator.AptTask"
-        classpath="${controls.jar}" onerror="report"/>
-
     <path id="scgen.dependencies">
-        <path refid="build.classpath" />
-        <pathelement location="${build.classes}" />
+        <path refid="build.classpath"/>
+        <pathelement location="${build.classes}"/>
     </path>
 
     <taskdef name="scgen"
@@ -78,8 +61,7 @@
              classpathref="scgen.dependencies"/>
 
     <!-- XMLBean build -->
-    <taskdef name="xmlbeanbuild"
-        classname="org.apache.xmlbeans.impl.tool.XMLBean">
+    <taskdef name="xmlbeanbuild" classname="org.apache.xmlbeans.impl.tool.XMLBean">
         <classpath>
             <path refid="build.classpath"/>
         </classpath>
@@ -106,6 +88,7 @@
 
 
     <target name="gen_jcx" depends="gen_xmlbeans">
+
         <scgen srcDir="${schema.dir}" destDir="${jcxgen.dir}" destPackageName="amazonWS"
wsdlPathAnnotation="."/>
 
         <!-- have the wsdls, next to the jcx files -->
@@ -114,19 +97,12 @@
                 <include name="**/*.wsdl"/>
             </fileset>
         </copy>
-
     </target>
 
     <target name="build_jcx" depends="gen_jcx">
         <echo message="jcxgen: ${jcxgen.dir}   extgen: ${extgen.dir}"/>
 
-        <apt srcdir="${jcxgen.dir}"
-            destdir="${build.classes}"
-            gendir="${extgen.dir}"
-            classpathref="build.classpath"
-            compileByExtension="true"
-            srcExtensions="*.jcx,*.java"
-            debug="true"/>
+        <build-controls srcdir="${jcxgen.dir}" destdir="${build.classes}" tempdir="${extgen.dir}"
classpathref="build.classpath"/>
 
         <!-- copy wsdls to the classes -->
         <copy todir="${build.classes}">
@@ -138,7 +114,6 @@
 
     </target>
 
-
     <target name="checkxbean">
         <uptodate property="noxbeanrebuild" targetfile="${xbeangen.dir}">
             <srcfiles dir="${schema.dir}" includes="*.wsdl,*.xsd"/>
@@ -146,7 +121,8 @@
     </target>
 
     <target name="gen_xmlbeans" depends="checkxbean, dirs" unless="noxbeanrebuild">
-        <xmlbeanbuild
+        <build-schemas srcdir="${schema.dir}" destdir="${build.classes}"/>
+<!--
             schema="${schema.dir}"
             srcgendir="${xbeangen.dir}"
             classgendir="${build.classes}"
@@ -155,37 +131,21 @@
                 <path refid="build.classpath"/>
             </classpath>
         </xmlbeanbuild>
+-->
     </target>
 
-
     <target name="build_junit" depends="build_jcx">
 
-        <apt srcdir="${common.source.dir}" destdir="${build.classes}" gendir="${build.beansrc}"
-            debug="on"
-            compileByExtension="true"
-            srcExtensions="*.jcx,*.java">
-            <classpath>
-                <path refid="build.classpath"/>
-            </classpath>
-        </apt>
-
-        <apt srcdir="${junit.source.dir}" destdir="${build.classes}" gendir="${build.beansrc}"
-            debug="on"
-            compileByExtension="true"
-            srcExtensions="*.jcx,*.java">
-            <classpath>
-                <path refid="build.classpath"/>
-            </classpath>
-        </apt>
+        <build-controls srcdir="${common.source.dir}" destdir="${build.classes}" tempdir="${build.beansrc}"
classpathref="build.classpath"/>
+        <build-controls srcdir="${junit.source.dir}" destdir="${build.classes}" tempdir="${build.beansrc}"
classpathref="build.classpath"/>
 
-        <!-- update properties (e.g. log4j.properties) -->
         <copy todir="${build.classes}">
             <fileset dir="${junit.source.dir}">
-                <include name="**/*properties"/>
+                <include name="**/*.properties"/>
             </fileset>
         </copy>
-
     </target>
+
     <target name="run.test" depends="build">
         <junit failureproperty="testfailed" printsummary="on" tempdir="${build.dir}" fork="yes">
             <classpath>



Mime
View raw message