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:27:59 UTC
svn commit: r152924 - incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF
incubator/beehive/trunk/samples/wsm-blank
incubator/beehive/trunk/samples/wsm-blank/WEB-INF
Author: mmerz
Date: Tue Feb 8 11:27:57 2005
New Revision: 152924
URL: http://svn.apache.org/viewcvs?view=rev&rev=152924
Log:
More minor modifications to the blank sample.
Modified:
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-client-dist.xml
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-client-svn.xml
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-svn.xml
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client-svn.xml
incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-svn.xml
incubator/beehive/trunk/samples/wsm-blank/index.html
Modified: incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-client-dist.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-client-dist.xml?view=diff&r1=152923&r2=152924
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-client-dist.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-client-dist.xml Tue Feb 8 11:27:57 2005
@@ -23,7 +23,7 @@
<import file="../../../beehive-imports.xml" />
<property
- name="AddressBook.wsdl.url"
+ name="wsdl.url"
value="http://localhost:8080/AddressBookWS/web/Service.jws?wsdl" />
<property name="webapp.dir" value=".." />
<property name="web.inf.dir" value="${webapp.dir}/WEB-INF" />
@@ -75,7 +75,7 @@
<classpath refid="jars"/>
</taskdef>
<wsdl2java
- url="${AddressBook.wsdl.url}"
+ url="${wsdl.url}"
output="${gen.dir}"
testcase="yes">
</wsdl2java>
Modified: incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-client-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-client-svn.xml?view=diff&r1=152923&r2=152924
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-client-svn.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-client-svn.xml Tue Feb 8 11:27:57 2005
@@ -18,7 +18,7 @@
$Header:$
-->
-<project name="AddressBookClient" basedir="." default="test">
+<project name="Address Book Sample Client" basedir="." default="test">
<import file="../../../beehive-imports.xml" />
@@ -93,4 +93,4 @@
<mkdir dir="${log.dir}" />
</target>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-svn.xml?view=diff&r1=152923&r2=152924
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-svn.xml Tue Feb 8 11:27:57 2005
@@ -1,93 +1,105 @@
-<?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="AddressBookWS" default="build" basedir=".">
-
- <import file="../../../beehive-imports.xml" />
-
- <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="lib.dir" location="${web.inf.dir}/lib" />
- <property name="webservice.jar" location="${lib.dir}/AddressBookWS.jar" />
- <property name="webservice.war" location="AddressBookWS.war" />
-
- <condition property="isJDK15">
- <equals arg1="${ant.java.version}" arg2="1.5" />
- </condition>
-
- <path id="jars">
- <fileset dir="${lib.dir}" >
- <include name="**/*.jar" />
- </fileset>
- </path>
-
-
- <!-- ========================================= -->
- <!-- deploy.war - build deployable artifact -->
- <!-- ========================================= -->
-
- <target name="deploy.war">
- <jar jarfile="${to.dir}/AddressBookWS.war">
- <fileset dir="${webapp.dir}">
- <exclude name="${web.inf}/src/**" />
- <exclude name="${web.inf}/.tmpbeansrc/**" />
- </fileset>
- </jar>
- <antcall target="clean" />
- </target>
-
-
- <!-- ========================================= -->
- <!-- build - build all binaries -->
- <!-- ========================================= -->
-
- <target name="build" depends="dirs">
- <deploy-wsm webappDir="${webapp.dir}" />
- <build-webapp webappDir="${webapp.dir}" />
- <jar jarfile="${webservice.jar}">
- <fileset dir="${classes.dir}" />
- </jar>
- </target>
-
-
- <!-- ========================================= -->
- <!-- clean - remove binary files -->
- <!-- ========================================= -->
-
- <target name="clean">
- <delete dir="${attachments.dir}" />
- <delete dir="${lib.dir}" />
- <delete file="velocity.log" />
- <clean-webapp webappDir="${webapp.dir}" />
- </target>
-
-
- <!-- ========================================= -->
- <!-- dirs - create dirs required for compile -->
- <!-- ========================================= -->
-
- <target name="dirs">
- <mkdir dir="${attachments.dir}" />
- <mkdir dir="${classes.dir}" />
- </target>
-
-</project>
\ No newline at end of file
+<?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="Address Book Sample" default="build" basedir=".">
+
+ <import file="../../../beehive-imports.xml" />
+
+ <property name="service.name" value="AddressBook" />
+
+ <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" value="${web.inf.dir}/.tmpbeansrc" />
+ <property name="lib.dir" value="${web.inf.dir}/lib" />
+ <property name="src.dir" value="${web.inf.dir}/src" />
+ <property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
+ <property name="webservice.war" value="${service.name}WS.war" />
+
+ <condition property="isJDK15">
+ <equals arg1="${ant.java.version}" arg2="1.5" />
+ </condition>
+
+ <path id="jars">
+ <fileset dir="${lib.dir}" >
+ <include name="**/*.jar" />
+ </fileset>
+ </path>
+
+
+ <!-- ========================================= -->
+ <!-- deploy - build deployable artifact -->
+ <!-- ========================================= -->
+
+ <target name="deploy">
+ <antcall target="deploy.war" />
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- deploy.war - build deployable artifact -->
+ <!-- ========================================= -->
+
+ <target name="deploy.war">
+ <jar jarfile="${to.dir}/${webservice.war}">
+ <fileset dir="${webapp.dir}">
+ <exclude name="${src.dir}/**" />
+ <exclude name="${gen.dir}/**" />
+ </fileset>
+ </jar>
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- build - build all binaries -->
+ <!-- ========================================= -->
+
+ <target name="build" depends="dirs">
+ <deploy-wsm webappDir="${webapp.dir}" />
+ <build-webapp webappDir="${webapp.dir}" />
+ <jar jarfile="${webservice.jar}">
+ <fileset dir="${classes.dir}" />
+ </jar>
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- clean - remove binary files -->
+ <!-- ========================================= -->
+
+ <target name="clean">
+ <delete dir="${attachments.dir}" />
+ <delete dir="${lib.dir}" />
+ <delete file="velocity.log" />
+ <clean-webapp webappDir="${webapp.dir}" />
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- dirs - create dirs required for compile -->
+ <!-- ========================================= -->
+
+ <target name="dirs">
+ <mkdir dir="${attachments.dir}" />
+ <mkdir dir="${classes.dir}" />
+ </target>
+
+</project>
Modified: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client-svn.xml?view=diff&r1=152923&r2=152924
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client-svn.xml (original)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-client-svn.xml Tue Feb 8 11:27:57 2005
@@ -24,7 +24,7 @@
<property
name="wsdl.url"
- value="http://localhost:8080/wsm-blankWS/template/Blank.jws?wsdl" />
+ value="http://localhost:8080/blankWS/web/Blank.jws?wsdl" />
<property name="webapp.dir" value=".." />
<property name="web.inf.dir" value="${webapp.dir}/WEB-INF" />
<property name="lib.dir" value="${web.inf.dir}/lib" />
Modified: incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-svn.xml?view=diff&r1=152923&r2=152924
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/wsm-blank/WEB-INF/build-svn.xml Tue Feb 8 11:27:57 2005
@@ -22,15 +22,17 @@
<import file="../../../beehive-imports.xml" />
- <property name="service.name" value="wsm-blank" />
+ <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="lib.dir" location="${web.inf.dir}/lib" />
- <property name="webservice.jar" location="${lib.dir}/${service.name}WS.jar" />
- <property name="webservice.war" location="${service.name}WS.war" />
+ <property name="src.dir" location="${web.inf.dir}/src" />
+ <property name="gen.dir" location="${web.inf.dir}/gen" />
+ <property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
+ <property name="webservice.war" value="${service.name}WS.war" />
<condition property="isJDK15">
<equals arg1="${ant.java.version}" arg2="1.5" />
@@ -44,14 +46,23 @@
<!-- ========================================= -->
+ <!-- deploy - build deployable artifact -->
+ <!-- ========================================= -->
+
+ <target name="deploy">
+ <antcall target="deploy.war" />
+ </target>
+
+
+ <!-- ========================================= -->
<!-- deploy.war - build deployable artifact -->
<!-- ========================================= -->
<target name="deploy.war">
- <jar jarfile="${to.dir}/${service.name}WS.war">
+ <jar jarfile="${to.dir}/${webservice.war}">
<fileset dir="${webapp.dir}">
- <exclude name="${web.inf}/src/**" />
- <exclude name="${web.inf}/.tmpbeansrc/**" />
+ <exclude name="${src.dir}/**" />
+ <exclude name="${gen.dir}/**" />
</fileset>
</jar>
</target>
Modified: incubator/beehive/trunk/samples/wsm-blank/index.html
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-blank/index.html?view=diff&r1=152923&r2=152924
==============================================================================
--- incubator/beehive/trunk/samples/wsm-blank/index.html (original)
+++ incubator/beehive/trunk/samples/wsm-blank/index.html Tue Feb 8 11:27:57 2005
@@ -17,11 +17,11 @@
</li>
<li>
View Template Web Service's
- <a href="template/Blank.jws?wsdl">WSDL</a>
+ <a href="web/Blank.jws?wsdl">WSDL</a>
</li>
<li>
Invoke the Template Web Service's method
- <a href="template/Blank.jws?method=sayHelloWorld">sayHelloWorld()</a>
+ <a href="web/Blank.jws?method=sayHelloWorld">sayHelloWorld()</a>
</li>
</ul>
<h3>Validating the local configuration</h3>