You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by mm...@apache.org on 2005/02/08 20:20:03 UTC
svn commit: r152922 - in incubator/beehive/trunk/samples/wsm-blank/WEB-INF:
build-client-dist.xml build-dist.xml src/template/ src/web/ src/web/Blank.jws
Author: mmerz
Date: Tue Feb 8 11:20:02 2005
New Revision: 152922
URL: http://svn.apache.org/viewcvs?view=rev&rev=152922
Log:
Fixed the blank sample (WS template) for distro and SVN.
Added:
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client-dist.xml
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-dist.xml
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/web/
- copied from r151731, incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/template/
Removed:
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/template/
Modified:
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/web/Blank.jws
Added: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client-dist.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client-dist.xml?view=auto&rev=152922
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client-dist.xml (added)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client-dist.xml Tue Feb 8 11:20:02 2005
@@ -0,0 +1,107 @@
+<?xml version="1.0" ?>
+
+<!--
+ Copyright 2004 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.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+ -->
+
+<project name="Blank Sample Client" default="test" basedir=".">
+
+ <import file="../../../beehive-imports.xml" />
+
+ <property
+ name="wsdl.url"
+ value="http://localhost:8080/blankWS/web/Service.jws?wsdl" />
+ <property name="webapp.dir" value=".." />
+ <property name="web.inf.dir" value="${webapp.dir}/WEB-INF" />
+ <property name="build.dir" value="${web.inf.dir}/build-client" />
+ <property name="lib.dir" value="${web.inf.dir}/lib" />
+ <property name="gen.dir" value="${build.dir}/gen" />
+ <property name="classes.dir" value="${build.dir}/classes" />
+ <property name="log.dir" value="${web.inf.dir}/logs" />
+
+ <path id="jars">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+
+ <target name="test" depends="dirs,compile">
+ <junit
+ printsummary="yes"
+ haltonfailure="yes"
+ showoutput="yes">
+ <classpath>
+ <pathelement location= "${classes.dir}"/>
+ <path refid="jars"/>
+ </classpath>
+ <formatter type="plain"/>
+ <batchtest fork="yes" todir="${log.dir}">
+ <fileset dir="${classes.dir}">
+ <include name="**/*Test*.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="compile" depends="generate.client">
+ <javac
+ srcdir="${gen.dir}"
+ destdir="${classes.dir}"
+ classpathref="jars"
+ failonerror="true"
+ source="1.4" />
+ </target>
+
+ <target name="generate.client" depends="dirs">
+ <antcall target="deploy.beehive.webservice.runtime" />
+ <taskdef
+ name="wsdl2java"
+ classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask"
+ loaderref="axis">
+ <classpath refid="jars"/>
+ </taskdef>
+ <wsdl2java
+ url="${wsdl.url}"
+ output="${gen.dir}"
+ testcase="yes">
+ </wsdl2java>
+ </target>
+
+ <target name="clean">
+ <delete dir="${build.dir}" />
+ <delete dir="${log.dir}" />
+ <delete dir="${lib.dir}" />
+ </target>
+
+ <target name="dirs">
+ <mkdir dir="${build.dir}" />
+ <mkdir dir="${gen.dir}" />
+ <mkdir dir="${classes.dir}" />
+ <mkdir dir="${log.dir}" />
+ </target>
+
+
+ <!-- copy all dependencies -->
+ <target name="deploy.beehive.webservice.runtime" depends="dirs">
+ <copy todir="${lib.dir}">
+ <fileset file="${beehive.home}/lib/common/*.jar" />
+ <fileset file="${beehive.home}/lib/controls/controls.jar" />
+ <fileset file="${beehive.home}/lib/wsm/*.jar" />
+ </copy>
+ </target>
+
+</project>
Added: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-dist.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-dist.xml?view=auto&rev=152922
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-dist.xml (added)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-dist.xml Tue Feb 8 11:20:02 2005
@@ -0,0 +1,126 @@
+<?xml version="1.0" ?>
+
+<!--
+ Copyright 2004 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.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Header:$
+ -->
+
+<project name="Blank Sample" default="build" basedir=".">
+
+ <import file="../../../beehive-imports.xml" />
+
+ <property name="service.name" value="blank" />
+
+ <property name="webapp.dir" location=".." />
+ <property name="web.inf.dir" location="${webapp.dir}/web-inf" />
+ <property name="attachments.dir" location="${web.inf.dir}/attachments" />
+ <property name="classes.dir" location="${web.inf.dir}/classes" />
+ <property name="gen.dir" location="${web.inf.dir}/gen" />
+ <property name="lib.dir" location="${web.inf.dir}/lib" />
+ <property name="src.dir" location="${web.inf.dir}/src" />
+ <property name="webservice.jar" value="${lib.dir}/{service.name}WS.jar" />
+ <property name="webservice.war" value="${service.name}WS.war" />
+
+ <path id="lib.path">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar" />
+ </fileset>
+ </path>
+
+ <path id="build.classpath">
+ <path refid="lib.path"/>
+ <pathelement location="${classes.dir}"/>
+ </path>
+
+
+ <!-- ========================================= -->
+ <!-- deploy.war - build deployable artifact -->
+ <!-- ========================================= -->
+
+ <target name="deploy.war">
+ <jar jarfile="${to.dir}/${webservice.war}">
+ <fileset dir="..">
+ <exclude name="${src.dir}/**" />
+ <exclude name="${gen.dir}/**" />
+ </fileset>
+ </jar>
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- build - build all binaries -->
+ <!-- ========================================= -->
+
+ <target name="build" depends="dirs">
+ <antcall target="deploy.beehive.webservice.runtime" />
+ <antcall target="build.beehive.webservice" />
+ <jar jarfile="${webservice.jar}">
+ <fileset dir="${classes.dir}" />
+ </jar>
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- clean - remove binary files -->
+ <!-- ========================================= -->
+
+ <target name="clean">
+ <delete dir="${attachments.dir}" />
+ <delete dir="${classes.dir}" />
+ <delete dir="${gen.dir}" />
+ <delete dir="${lib.dir}" />
+ <delete file="velocity.log" />
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- dirs - create dirs required for compile -->
+ <!-- ========================================= -->
+
+ <target name="dirs">
+ <mkdir dir="${attachments.dir}" />
+ <mkdir dir="${classes.dir}" />
+ <mkdir dir="${gen.dir}" />
+ <mkdir dir="${lib.dir}" />
+ </target>
+
+ <!-- copy all dependencies -->
+ <target name="deploy.beehive.webservice.runtime" depends="dirs">
+ <copy todir="${lib.dir}">
+ <fileset file="${beehive.home}/lib/common/*.jar" />
+ <fileset file="${beehive.home}/lib/controls/controls.jar" />
+ <fileset file="${beehive.home}/lib/wsm/*.jar" />
+ </copy>
+ </target>
+
+
+ <!-- build all beehive webservice binaries -->
+ <target name="build.beehive.webservice">
+ <taskdef name="apt"
+ classname="org.apache.beehive.controls.runtime.generator.AptTask"
+ classpathref="lib.path"
+ onerror="report" />
+ <apt
+ srcdir="${src.dir}"
+ destdir="${classes.dir}"
+ gendir="${gen.dir}"
+ classpathref="build.classpath"
+ compileByExtension="true"
+ srcExtensions="*.java,*.jws"
+ debug="true" />
+ </target>
+
+</project>
Modified: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/web/Blank.jws
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/web/Blank.jws?view=diff&r1=151731&r2=152922
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/web/Blank.jws (original)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/src/web/Blank.jws Tue Feb 8 11:20:02 2005
@@ -1,4 +1,4 @@
-package template;
+package web;
/*
* Copyright 2001-2004 The Apache Software Foundation.