You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by cs...@apache.org on 2006/07/24 04:13:51 UTC
svn commit: r424880 - in /beehive/trunk/system-controls/samples/webservice:
ant/beehive-wsc-tools.xml axis-client/build.xml
axis-client/client/index.jsp interop-client/build.xml
Author: cschoett
Date: Sun Jul 23 19:13:50 2006
New Revision: 424880
URL: http://svn.apache.org/viewvc?rev=424880&view=rev
Log:
A bit of cleanup to get the new wsc samples to build correctly.
Modified:
beehive/trunk/system-controls/samples/webservice/ant/beehive-wsc-tools.xml
beehive/trunk/system-controls/samples/webservice/axis-client/build.xml
beehive/trunk/system-controls/samples/webservice/axis-client/client/index.jsp
beehive/trunk/system-controls/samples/webservice/interop-client/build.xml
Modified: beehive/trunk/system-controls/samples/webservice/ant/beehive-wsc-tools.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/system-controls/samples/webservice/ant/beehive-wsc-tools.xml?rev=424880&r1=424879&r2=424880&view=diff
==============================================================================
--- beehive/trunk/system-controls/samples/webservice/ant/beehive-wsc-tools.xml (original)
+++ beehive/trunk/system-controls/samples/webservice/ant/beehive-wsc-tools.xml Sun Jul 23 19:13:50 2006
@@ -38,13 +38,17 @@
<attribute name="classpathref" description="The classpath reference for building the controls. Required."/>
<sequential>
+ <!--
<fail unless="os.AXIS_HOME"
message="AXIS_HOME must be set in you environment"/>
+ -->
+ <fail unless="axis.home"
+ message="axis.home must be set to your Apache Axis installation directory"/>
<path id="_wscgen.classpath">
<path refid="@{classpathref}"/>
<path refid="wsc.dependency.path"/>
- <fileset dir="${os.AXIS_HOME}/lib">
+ <fileset dir="${axis.home}/lib">
<include name="*.jar"/>
</fileset>
<path refid="velocity.dependency.path"/>
@@ -88,7 +92,7 @@
<path id="_wscbuild.classpath">
<path refid="${_cpref}"/>
<path refid="wsc.dependency.path"/>
- <fileset dir="${os.AXIS_HOME}/lib">
+ <fileset dir="${axis.home}/lib">
<include name="*.jar"/>
</fileset>
</path>
Modified: beehive/trunk/system-controls/samples/webservice/axis-client/build.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/system-controls/samples/webservice/axis-client/build.xml?rev=424880&r1=424879&r2=424880&view=diff
==============================================================================
--- beehive/trunk/system-controls/samples/webservice/axis-client/build.xml (original)
+++ beehive/trunk/system-controls/samples/webservice/axis-client/build.xml Sun Jul 23 19:13:50 2006
@@ -38,7 +38,8 @@
<path id="build.classpath">
<path refid="controls.dependency.path"/>
- <path refid="wsc.dependency.path"/>
+ <!-- TODO: for final form <path refid="wsc.dependency.path"/> -->
+ <pathelement location="../../../build/jars/beehive-webservice-control.jar"/>
</path>
<target name="clean" description="Delete all generated files">
@@ -65,14 +66,18 @@
<include name="beehive-controls.jar"/>
<include name="beehive-webservice-control.jar"/>
</fileset>
+ <!-- TODO: Remove for final version -->
+ <fileset dir="../../../build/jars">
+ <include name="beehive-webservice-control.jar"/>
+ </fileset>
<fileset dir="${build.dir}">
<include name="**/${build.jar}"/>
</fileset>
- <fileset dir="${axis.home}">
- <include name="**/*.jar"/>
+ <fileset dir="${axis.home}/lib">
+ <include name="*.jar"/>
</fileset>
<fileset dir="${beehive.home}/lib/common">
- <include name="**/*.jar"/>
+ <include name="*.jar"/>
</fileset>
</copy>
@@ -87,11 +92,11 @@
</copy>
<copy todir="${build.dir}/${context.path}/WEB-INF/lib">
- <fileset dir="${axis.home}">
- <include name="**/*.jar"/>
+ <fileset dir="${axis.home}/lib">
+ <include name="*.jar"/>
</fileset>
<fileset dir="${beehive.home}/lib/common">
- <include name="**/*.jar"/>
+ <include name="*.jar"/>
</fileset>
</copy>
Modified: beehive/trunk/system-controls/samples/webservice/axis-client/client/index.jsp
URL: http://svn.apache.org/viewvc/beehive/trunk/system-controls/samples/webservice/axis-client/client/index.jsp?rev=424880&r1=424879&r2=424880&view=diff
==============================================================================
--- beehive/trunk/system-controls/samples/webservice/axis-client/client/index.jsp (original)
+++ beehive/trunk/system-controls/samples/webservice/axis-client/client/index.jsp Sun Jul 23 19:13:50 2006
@@ -18,7 +18,8 @@
<%@ page language="java" contentType="text/html;charset=UTF-8" session="true"
import="org.apache.beehive.controls.api.bean.Controls,
org.apache.beehive.controls.api.context.ControlThreadContext,
- javax.servlet.jsp.JspWriter" %>
+ javax.servlet.jsp.JspWriter,
+ wsc.axis.sample.CalculatorServiceBean" %>
<% response.setHeader("Cache-Control", "no-cache"); %>
Modified: beehive/trunk/system-controls/samples/webservice/interop-client/build.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/system-controls/samples/webservice/interop-client/build.xml?rev=424880&r1=424879&r2=424880&view=diff
==============================================================================
--- beehive/trunk/system-controls/samples/webservice/interop-client/build.xml (original)
+++ beehive/trunk/system-controls/samples/webservice/interop-client/build.xml Sun Jul 23 19:13:50 2006
@@ -40,7 +40,9 @@
<path id="build.classpath">
<pathelement path="${build.classes}"/>
<path refid="controls.dependency.path"/>
- <path refid="wsc.dependency.path"/>
+ <!-- TODO: for final form <path refid="wsc.dependency.path"/> -->
+ <pathelement location="../../../build/jars/beehive-webservice-control.jar"/>
+
</path>
<target name="clean" description="Delete all generated files">