Author: mmerz
Date: Wed Mar 9 12:47:35 2005
New Revision: 156685
URL: http://svn.apache.org/viewcvs?view=rev&rev=156685
Log:
Created "build.dir" for wsm-employee's client (BEEHIVE-362).
Cleaned up wsm-addressbook sample.
Modified:
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-svn.xml
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/org/apache/beehive/sample/AddressBookImpl.java
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/web/Service.jws
incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-client-svn.xml
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=156684&r2=156685
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-svn.xml
(original)
+++ incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/build-svn.xml Wed
Mar 9 12:47:35 2005
@@ -25,7 +25,7 @@
<property name="service.name" value="AddressBook" />
<property name="webapp.dir" location=".." />
- <property name="web.inf.dir" location="${webapp.dir}/web-inf" />
+ <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" />
Modified:
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/org/apache/beehive/sample/AddressBookImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/org/apache/beehive/sample/AddressBookImpl.java?view=diff&r1=156684&r2=156685
==============================================================================
---
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/org/apache/beehive/sample/AddressBookImpl.java
(original)
+++
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/org/apache/beehive/sample/AddressBookImpl.java
Wed Mar 9 12:47:35 2005
@@ -18,27 +18,34 @@
* $Header:$
*/
-
import java.util.Hashtable;
import java.util.Map;
-public class AddressBookImpl implements AddressBook
-{
+public class AddressBookImpl implements AddressBook {
+
private static Map<String, Address> addresses = new Hashtable<String,
Address>();
-
- public void addEntry(String name, Address address)
- {
- System.out.println("addEntry is called for: " + name );
- this.addresses.put(name, address);
+
+ public void addEntry(String name, Address address) {
+ System.out.println("addEntry() is called for: " + name );
+ if (null == name || null == address) {
+ System.out.println("cannot store address under name: address or
name is <null>");
+ return;
+ }
+ addresses.put(name, address);
}
- public Address getAddressFromName(String name)
- {
- System.out.println("getAddressFromName is called for: " + name);
- Address res = (Address) this.addresses.get(name);
- if( null == res) System.out.println("No address was found!");
- else System.out.println("Address: city: " + res.getCity() + " zipcode: "
+ res.getZip());
-
- return res;
+ public Address getAddressFromName(String name) {
+ System.out.println("getAddressFromName() is called for: " + name);
+ if (null != name) {
+ return null;
+ }
+ Address res = (Address) this.addresses.get(name);
+ if (null == res) {
+ System.out.println("No address was found!");
+ }
+ else {
+ System.out.println("Address: city: " + res.getCity() + " zipcode:
" + res.getZip());
+ }
+ return res;
}
-}
+}
\ No newline at end of file
Modified:
incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/web/Service.jws
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/web/Service.jws?view=diff&r1=156684&r2=156685
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/web/Service.jws
(original)
+++ incubator/beehive/trunk/samples/wsm-addressbook/WEB-INF/src/web/Service.jws
Wed Mar 9 12:47:35 2005
@@ -29,17 +29,13 @@
import org.apache.beehive.sample.AddressBookImpl;
[EMAIL PROTECTED](targetNamespace="http://beehive.apache.org/addressbook";,
serviceName="SimpleAddressBook")
[EMAIL PROTECTED](
+ targetNamespace="http://beehive.apache.org/addressbook";,
+ serviceName="SimpleAddressBook")
public class Service implements AddressBook {
- AddressBook addressBook;
+ private AddressBook addressBook = new AddressBookImpl();
- /**
- * Constructor.
- */
- public Service() {
- addressBook = new AddressBookImpl();
- }
/**
* Web method that adds an entry to the AddressBook.
@@ -51,6 +47,7 @@
addressBook.addEntry(name, address);
}
+
/**
* Web method that queries the AddressBook.
* @param name
@@ -60,7 +57,7 @@
public Address getAddressFromName(String name) {
return addressBook.getAddressFromName(name);
}
-
+
/**
* This method is not exposed by the Web Service and can only be used
@@ -70,6 +67,4 @@
public String notWebService() {
return "Not available through Web service";
}
-
-
-}
+}
\ No newline at end of file
Modified:
incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-client-svn.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-client-svn.xml?view=diff&r1=156684&r2=156685
==============================================================================
--- incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-client-svn.xml
(original)
+++ incubator/beehive/trunk/samples/wsm-employee/WEB-INF/build-client-svn.xml
Wed Mar 9 12:47:35 2005
@@ -28,9 +28,10 @@
<property name="webapp.dir" value=".." />
<property name="web.inf.dir" value="${webapp.dir}/WEB-INF" />
<property name="lib.dir" value="${web.inf.dir}/lib" />
+ <property name="build.dir" value="${web.inf.dir}/build-client" />
<property name="log.dir" value="${web.inf.dir}/logs" />
- <property name="gen.dir" value="gen" />
- <property name="classes.dir" value="classes" />
+ <property name="gen.dir" value="${build.dir}/gen" />
+ <property name="classes.dir" value="${build.dir}/classes" />
<path id="jars">
<fileset dir="${lib.dir}">
