You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2006/05/20 01:04:02 UTC
svn commit: r407928 - in /beehive/trunk/samples: petstoreWeb/
wsm-addressbook/ wsm-addressbook/src-ws/
wsm-addressbook/src/org/apache/beehive/sample/ wsm-addressbook/src/web/
wsm-samples/ wsm-samples/src-ws/ wsm-samples/src/web/complex/
wsm-samples/src...
Author: ekoneil
Date: Fri May 19 16:04:00 2006
New Revision: 407928
URL: http://svn.apache.org/viewvc?rev=407928&view=rev
Log:
Whole lotta WSM samples stuff -- am making these easier to use for testing.
BB: self
Test: none
Added:
beehive/trunk/samples/wsm-addressbook/src/web/
- copied from r406320, beehive/trunk/samples/wsm-addressbook/src-ws/web/
beehive/trunk/samples/wsm-addressbook/src/web/Service.java
- copied, changed from r407923, beehive/trunk/samples/wsm-addressbook/src-ws/web/Service.java
beehive/trunk/samples/wsm-samples/src/web/complex/
- copied from r406320, beehive/trunk/samples/wsm-samples/src-ws/web/complex/
beehive/trunk/samples/wsm-samples/src/web/complex/DocumentLiteralBareSample.java
- copied, changed from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/complex/DocumentLiteralBareSample.java
beehive/trunk/samples/wsm-samples/src/web/complex/DocumentLiteralWrappedSample.java
- copied unchanged from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/complex/DocumentLiteralWrappedSample.java
beehive/trunk/samples/wsm-samples/src/web/complex/RpcEncodedSample.java
- copied, changed from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/complex/RpcEncodedSample.java
beehive/trunk/samples/wsm-samples/src/web/complex/RpcLiteralSample.java
- copied, changed from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/complex/RpcLiteralSample.java
beehive/trunk/samples/wsm-samples/src/web/handlerchain/
- copied from r406320, beehive/trunk/samples/wsm-samples/src-ws/web/handlerchain/
beehive/trunk/samples/wsm-samples/src/web/handlerchain/HandlerChainSample.java
- copied unchanged from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/handlerchain/HandlerChainSample.java
beehive/trunk/samples/wsm-samples/src/web/handlerchain/HandlerConfig.xml
- copied unchanged from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/handlerchain/HandlerConfig.xml
beehive/trunk/samples/wsm-samples/src/web/header/StockQuoteImpl.java
- copied unchanged from r406320, beehive/trunk/samples/wsm-samples/src-ws/web/header/StockQuoteImpl.java
beehive/trunk/samples/wsm-samples/src/web/oneway/
- copied from r406320, beehive/trunk/samples/wsm-samples/src-ws/web/oneway/
beehive/trunk/samples/wsm-samples/src/web/oneway/OnewaySample.java
- copied unchanged from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/oneway/OnewaySample.java
beehive/trunk/samples/wsm-samples/src/web/soapmessagehandlers/
- copied from r406320, beehive/trunk/samples/wsm-samples/src-ws/web/soapmessagehandlers/
beehive/trunk/samples/wsm-samples/src/web/soapmessagehandlers/SOAPMessageHandlersSample.java
- copied, changed from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/soapmessagehandlers/SOAPMessageHandlersSample.java
beehive/trunk/samples/wsm-samples/src/web/webmethod/
- copied from r406320, beehive/trunk/samples/wsm-samples/src-ws/web/webmethod/
beehive/trunk/samples/wsm-samples/src/web/webmethod/WebMethodWithAnnotationSample.java
- copied unchanged from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/webmethod/WebMethodWithAnnotationSample.java
beehive/trunk/samples/wsm-samples/src/web/webmethod/WebMethodWithoutAnnotationSample.java
- copied unchanged from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/webmethod/WebMethodWithoutAnnotationSample.java
beehive/trunk/samples/wsm-samples/src/web/webparam/
- copied from r406320, beehive/trunk/samples/wsm-samples/src-ws/web/webparam/
beehive/trunk/samples/wsm-samples/src/web/webparam/WebParamDocumentLiteralSample.java
- copied unchanged from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/webparam/WebParamDocumentLiteralSample.java
beehive/trunk/samples/wsm-samples/src/web/webparam/WebParamRpcLiteralSample.java
- copied unchanged from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/webparam/WebParamRpcLiteralSample.java
beehive/trunk/samples/wsm-samples/src/web/webresult/
- copied from r406320, beehive/trunk/samples/wsm-samples/src-ws/web/webresult/
beehive/trunk/samples/wsm-samples/src/web/webresult/WebResultDocumentLiteralSample.java
- copied unchanged from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/webresult/WebResultDocumentLiteralSample.java
beehive/trunk/samples/wsm-samples/src/web/webresult/WebResultRpcLiteralSample.java
- copied unchanged from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/webresult/WebResultRpcLiteralSample.java
beehive/trunk/samples/wsm-samples/src/web/webservice/
- copied from r406320, beehive/trunk/samples/wsm-samples/src-ws/web/webservice/
beehive/trunk/samples/wsm-samples/src/web/webservice/WebServiceCustomSample.java
- copied unchanged from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/webservice/WebServiceCustomSample.java
beehive/trunk/samples/wsm-samples/src/web/webservice/WebServiceEndpointInterfaceSample.java
- copied unchanged from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/webservice/WebServiceEndpointInterfaceSample.java
beehive/trunk/samples/wsm-samples/src/web/webservice/WebServiceImplementationBeanSample.java
- copied unchanged from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/webservice/WebServiceImplementationBeanSample.java
beehive/trunk/samples/wsm-samples/src/web/webservice/WebServiceSample.java
- copied unchanged from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/webservice/WebServiceSample.java
beehive/trunk/samples/wsm-samples/src/web/webservice/WebServiceWsdlLocation.wsdl
- copied unchanged from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/webservice/WebServiceWsdlLocation.wsdl
beehive/trunk/samples/wsm-samples/src/web/webservice/WebServiceWsdlLocationSample.java
- copied unchanged from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/webservice/WebServiceWsdlLocationSample.java
beehive/trunk/samples/wsm-samples/src/web/xsdtypes/
- copied from r406320, beehive/trunk/samples/wsm-samples/src-ws/web/xsdtypes/
beehive/trunk/samples/wsm-samples/src/web/xsdtypes/XsdTypesSample.java
- copied, changed from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/xsdtypes/XsdTypesSample.java
Removed:
beehive/trunk/samples/wsm-addressbook/build-client.xml
beehive/trunk/samples/wsm-addressbook/src-ws/
beehive/trunk/samples/wsm-samples/src-ws/
Modified:
beehive/trunk/samples/petstoreWeb/build.xml
beehive/trunk/samples/wsm-addressbook/build.properties
beehive/trunk/samples/wsm-addressbook/build.xml
beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/Address.java
beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/AddressBook.java
beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/AddressBookImpl.java
beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/Phone.java
beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/StateType.java
beehive/trunk/samples/wsm-samples/build.properties
beehive/trunk/samples/wsm-samples/build.xml
Modified: beehive/trunk/samples/petstoreWeb/build.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/petstoreWeb/build.xml?rev=407928&r1=407927&r2=407928&view=diff
==============================================================================
--- beehive/trunk/samples/petstoreWeb/build.xml (original)
+++ beehive/trunk/samples/petstoreWeb/build.xml Fri May 19 16:04:00 2006
@@ -91,7 +91,6 @@
classpathref="webapp.classpath"
srcExtensions="*.java"
debug="true"
- processorOptions="web.content.root=${web.dir}"
nocompile="false"/>
</target>
@@ -99,7 +98,6 @@
description="When deploying an exploded webapp, this target copies changed JSPs into the deployed directory">
<copy todir="${build.dir}/">
<fileset dir="${web.dir}">
- <exclude name="**/*.java"/>
<exclude name="WEB-INF/**"/>
</fileset>
</copy>
Modified: beehive/trunk/samples/wsm-addressbook/build.properties
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/wsm-addressbook/build.properties?rev=407928&r1=407927&r2=407928&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-addressbook/build.properties (original)
+++ beehive/trunk/samples/wsm-addressbook/build.properties Fri May 19 16:04:00 2006
@@ -1,6 +1,6 @@
#
-# Edit this if you have moved the sample out of <beehive-home>/samples.
+#
#
beehive.home=../../
-service.name=wsm-addressbook
+context.path=wsm-addressbook
\ No newline at end of file
Modified: beehive/trunk/samples/wsm-addressbook/build.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/wsm-addressbook/build.xml?rev=407928&r1=407927&r2=407928&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-addressbook/build.xml (original)
+++ beehive/trunk/samples/wsm-addressbook/build.xml Fri May 19 16:04:00 2006
@@ -1,7 +1,6 @@
<?xml version="1.0" ?>
-
<!--
- Copyright 2004-2005 The Apache Software Foundation
+ Copyright 2004-2006 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.
@@ -26,62 +25,103 @@
<import file="${beehive.home}/ant/beehive-tools.xml"/>
<import file="${beehive.home}/wsm/ant/beehive-wsm-tools.xml"/>
- <property name="service.name" value="AddressBook" />
-
<property name="src.dir" location="src"/>
- <property name="ws-src.dir" location="src-ws"/>
<property name="web.dir" location="web"/>
<property name="build.dir" location="build"/>
- <property name="web.inf.dir" location="${build.dir}/WEB-INF"/>
- <property name="classes.dir" location="${web.inf.dir}/classes"/>
- <property name="gen.dir" location="${web.inf.dir}/gen"/>
+ <property name="tmp.sourcegen.dir" location="${build.dir}/WEB-INF/.tmpbeansrc"/>
- <property name="webservice.war.name" value="${service.name}WS.war"/>
+ <property name="wsdl.url" value="http://localhost:8080/${context.path}/web/Service.jws?wsdl" />
+ <property name="test.build.dir" location="build-test"/>
+ <property name="test.classes.dir" location="${test.build.dir}/classes"/>
+ <property name="test.log.dir" location="${test.build.dir}/logs"/>
+ <property name="test.sourcegen.dir" location="${test.build.dir}/sourcegen"/>
<path id="build.classpath">
- <pathelement location="${classes.dir}"/>
- <fileset dir="${web.inf.dir}/lib" includes="*.jar"/>
+ <pathelement location="${build.dir}/WEB-INF/classes"/>
+ <fileset dir="${build.dir}/WEB-INF/lib" includes="*.jar"/>
</path>
-
- <!-- ========================================= -->
- <!-- war - build deployable artifact -->
- <!-- ========================================= -->
- <target name="war">
- <jar jarfile="${service.name}.war">
- <fileset dir="${build.dir}">
- <exclude name="WEB-INF/gen/**"/>
- </fileset>
- </jar>
- </target>
-
- <!-- ========================================= -->
- <!-- build - build all binaries -->
- <!-- ========================================= -->
- <target name="build">
+
+ <path id="test.classpath">
+ <fileset dir="build/WEB-INF/lib" includes="**/*.jar"/>
+ </path>
+
+ <target name="build" description="Build the webapp">
<mkdir dir="${build.dir}"/>
- <mkdir dir="${classes.dir}"/>
+ <mkdir dir="${build.dir}/WEB-INF/classes"/>
<deploy-wsm webappDir="${build.dir}"/>
- <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
-
- <build-webservices srcdir="${ws-src.dir}"
- destdir="${classes.dir}"
- tempdir="${gen.dir}"
- classpathref="build.classpath"/>
-
- <copy file="${src.dir}/log4j.properties" todir="${classes.dir}"/>
-
- <copy todir="${build.dir}">
- <fileset dir="${web.dir}"/>
- </copy>
+ <taskdef name="apt"
+ classname="org.apache.beehive.controls.runtime.generator.AptTask"
+ classpathref="build.classpath"
+ onerror="fail"/>
+
+ <apt srcdir="${src.dir}"
+ destdir="${build.dir}/WEB-INF/classes"
+ gendir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
+ classpathref="build.classpath"
+ srcExtensions="*.java"
+ debug="true"
+ processorOptions="web.content.root=${web.dir}"
+ nocompile="false"/>
+
+ <copy file="${src.dir}/log4j.properties" todir="${build.dir}/WEB-INF/classes"/>
+
+ <copy todir="${build.dir}">
+ <fileset dir="${web.dir}"/>
+ </copy>
</target>
- <!-- ========================================= -->
- <!-- clean - remove binary files -->
- <!-- ========================================= -->
- <target name="clean">
+ <target name="clean" description="Clean the webapp">
<delete dir="${build.dir}"/>
+ <delete file="${context.path}.war"/>
+ </target>
+
+ <target name="war" description="Create a .war file for this webapp">
+ <war destfile="${context.path}.war" webxml="${build.dir}/WEB-INF/web.xml">
+ <fileset dir="${build.dir}">
+ <exclude name="WEB-INF/web.xml"/>
+ </fileset>
+ </war>
+ </target>
+
+ <target name="build.test" description="Build the tests">
+ <mkdir dir="${test.classes.dir}"/>
+ <mkdir dir="${test.sourcegen.dir}"/>
+
+ <taskdef name="wsdl2java"
+ classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask"
+ loaderref="axis"
+ classpathref="test.classpath"/>
+
+ <wsdl2java url="${wsdl.url}"
+ output="${test.sourcegen.dir}"
+ testcase="yes"/>
+
+ <javac srcdir="${test.sourcegen.dir}"
+ destdir="${test.classes.dir}"
+ classpathref="test.classpath"
+ failonerror="true"
+ source="1.4"/>
+ </target>
+
+ <target name="clean.test" description="Clean the tests">
+ <delete dir="${test.build.dir}"/>
+ </target>
+
+ <target name="test" description="Run the tests">
+ <mkdir dir="${test.log.dir}"/>
+ <junit printsummary="yes" haltonfailure="yes" showoutput="yes">
+ <classpath>
+ <pathelement location="${test.classes.dir}"/>
+ <pathelement location="${build.dir}/WEB-INF/classes"/>
+ <path refid="test.classpath"/>
+ </classpath>
+ <formatter type="plain"/>
+ <batchtest fork="yes" todir="${test.log.dir}">
+ <fileset dir="${test.classes.dir}" includes="**/*Test*.class"/>
+ </batchtest>
+ </junit>
</target>
</project>
Modified: beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/Address.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/Address.java?rev=407928&r1=407927&r2=407928&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/Address.java (original)
+++ beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/Address.java Fri May 19 16:04:00 2006
@@ -1,5 +1,3 @@
-package org.apache.beehive.sample;
-
/*
* Copyright 2004-2005 The Apache Software Foundation
*
@@ -17,22 +15,30 @@
*
* $Header:$
*/
+package org.apache.beehive.sample;
import java.io.Serializable;
-public class Address implements Serializable
-{
+public class Address
+ implements Serializable {
+
private static final long serialVersionUID = 1L;
+
private int streetNum;
- private java.lang.String streetName;
- private java.lang.String city;
+ private String streetName;
+ private String city;
private StateType state;
private int zip;
private Phone phoneNumber;
-
-
/**
+ *
+ */
+ public Address() {
+ super();
+ }
+
+ /**
* @param streetNum
* @param streetName
* @param city
@@ -40,8 +46,7 @@
* @param zip
* @param phoneNumber
*/
- public Address(int streetNum, java.lang.String streetName,
- java.lang.String city, StateType state, int zip, Phone phoneNumber) {
+ public Address(int streetNum, String streetName, String city, StateType state, int zip, Phone phoneNumber) {
super();
this.streetNum = streetNum;
this.streetName = streetName;
@@ -50,79 +55,84 @@
this.zip = zip;
this.phoneNumber = phoneNumber;
}
- /**
- *
- */
- public Address() {
- super();
- // TODO Auto-generated constructor stub
- }
+
/**
* @return Returns the city.
*/
- public java.lang.String getCity() {
+ public String getCity() {
return city;
}
+
/**
* @param city The city to set.
*/
- public void setCity(java.lang.String city) {
+ public void setCity(String city) {
this.city = city;
}
+
/**
* @return Returns the phoneNumber.
*/
public Phone getPhoneNumber() {
return phoneNumber;
}
+
/**
* @param phoneNumber The phoneNumber to set.
*/
public void setPhoneNumber(Phone phoneNumber) {
this.phoneNumber = phoneNumber;
}
+
/**
* @return Returns the state.
*/
public StateType getState() {
return state;
}
+
/**
* @param state The state to set.
*/
public void setState(StateType state) {
this.state = state;
}
+
/**
* @return Returns the streetName.
*/
- public java.lang.String getStreetName() {
+ public String getStreetName() {
return streetName;
}
+
/**
* @param streetName The streetName to set.
*/
- public void setStreetName(java.lang.String streetName) {
+ public void setStreetName(String streetName) {
this.streetName = streetName;
}
+
/**
* @return Returns the streetNum.
*/
public int getStreetNum() {
return streetNum;
}
+
/**
* @param streetNum The streetNum to set.
*/
public void setStreetNum(int streetNum) {
this.streetNum = streetNum;
}
+
/**
* @return Returns the zip.
*/
public int getZip() {
return zip;
}
+
/**
* @param zip The zip to set.
*/
Modified: beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/AddressBook.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/AddressBook.java?rev=407928&r1=407927&r2=407928&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/AddressBook.java (original)
+++ beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/AddressBook.java Fri May 19 16:04:00 2006
@@ -1,5 +1,3 @@
-package org.apache.beehive.sample;
-
/*
* Copyright 2004-2005 The Apache Software Foundation
*
@@ -18,9 +16,11 @@
* $Header:$
*/
-public interface AddressBook
-{
- void addEntry(java.lang.String name, Address address);
+package org.apache.beehive.sample;
+
+public interface AddressBook {
+
+ void addEntry(String name, Address address);
- Address getAddressFromName(java.lang.String name);
+ Address getAddressFromName(String name);
}
Modified: beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/AddressBookImpl.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/AddressBookImpl.java?rev=407928&r1=407927&r2=407928&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/AddressBookImpl.java (original)
+++ beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/AddressBookImpl.java Fri May 19 16:04:00 2006
@@ -1,5 +1,3 @@
-package org.apache.beehive.sample;
-
/*
* Copyright 2004-2005 The Apache Software Foundation
*
@@ -17,11 +15,13 @@
*
* $Header:$
*/
+package org.apache.beehive.sample;
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>();
@@ -31,7 +31,6 @@
Address testAddress = new Address(100, "my street name", "my city", testState, 11111, testPhone);
addresses.put("jack", testAddress);
}
-
public void addEntry(String name, Address address) {
System.out.println("addEntry() is called for: " + name );
@@ -40,21 +39,19 @@
return;
}
addresses.put(name, address);
-
}
public Address getAddressFromName(String name) {
System.out.println("getAddressFromName() is called for: " + name);
- if (null == name) {
+ if (null == name)
return null;
- }
+
Address res = (Address) this.addresses.get(name);
- if (null == res) {
+ if (null == res)
System.out.println("No address was found!");
- }
- else {
+ else
System.out.println("Address: city: " + res.getCity() + " zipcode: " + res.getZip());
- }
+
return res;
}
}
Modified: beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/Phone.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/Phone.java?rev=407928&r1=407927&r2=407928&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/Phone.java (original)
+++ beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/Phone.java Fri May 19 16:04:00 2006
@@ -1,5 +1,3 @@
-package org.apache.beehive.sample;
-
/*
* Copyright 2004-2005 The Apache Software Foundation
*
@@ -17,72 +15,77 @@
*
* $Header:$
*/
+package org.apache.beehive.sample;
import java.io.Serializable;
-public class Phone implements Serializable
-{
+public class Phone
+ implements Serializable {
+
private static final long serialVersionUID = 1L;
private int areaCode;
- private java.lang.String exchange;
- private java.lang.String number;
+ private String exchange;
+ private String number;
-
+ /**
+ *
+ */
+ public Phone() {
+ super();
+ }
/**
* @param areaCode
* @param exchange
* @param number
*/
- public Phone(int areaCode, java.lang.String exchange,
- java.lang.String number) {
- super();
+ public Phone(int areaCode, String exchange, String number) {
+ this();
this.areaCode = areaCode;
this.exchange = exchange;
this.number = number;
}
- /**
- *
- */
- public Phone() {
- super();
- // TODO Auto-generated constructor stub
- }
+
/**
* @return Returns the areaCode.
*/
public int getAreaCode() {
return areaCode;
}
+
/**
* @param areaCode The areaCode to set.
*/
public void setAreaCode(int areaCode) {
this.areaCode = areaCode;
}
+
/**
* @return Returns the exchange.
*/
- public java.lang.String getExchange() {
+ public String getExchange() {
return exchange;
}
+
/**
* @param exchange The exchange to set.
*/
- public void setExchange(java.lang.String exchange) {
+ public void setExchange(String exchange) {
this.exchange = exchange;
}
+
/**
* @return Returns the number.
*/
- public java.lang.String getNumber() {
+ public String getNumber() {
return number;
}
+
/**
* @param number The number to set.
*/
- public void setNumber(java.lang.String number) {
+ public void setNumber(String number) {
this.number = number;
}
}
Modified: beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/StateType.java
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/StateType.java?rev=407928&r1=407927&r2=407928&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/StateType.java (original)
+++ beehive/trunk/samples/wsm-addressbook/src/org/apache/beehive/sample/StateType.java Fri May 19 16:04:00 2006
@@ -1,5 +1,3 @@
-package org.apache.beehive.sample;
-
/*
* Copyright 2004-2005 The Apache Software Foundation
*
@@ -17,21 +15,24 @@
*
* $Header:$
*/
+package org.apache.beehive.sample;
import java.io.Serializable;
-public class StateType implements Serializable
-{
+public class StateType
+ implements Serializable {
+
private static final long serialVersionUID = 1L;
- String state;
+
+ private String state;
/**
*
*/
public StateType() {
super();
- // TODO Auto-generated constructor stub
}
+
/**
* @param state
*/
@@ -39,11 +40,11 @@
super();
this.state = state;
}
+
/**
* @return Returns the state.
*/
public String getState() {
return state;
}
-
}
Copied: beehive/trunk/samples/wsm-addressbook/src/web/Service.java (from r407923, beehive/trunk/samples/wsm-addressbook/src-ws/web/Service.java)
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/wsm-addressbook/src/web/Service.java?p2=beehive/trunk/samples/wsm-addressbook/src/web/Service.java&p1=beehive/trunk/samples/wsm-addressbook/src-ws/web/Service.java&r1=407923&r2=407928&rev=407928&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-addressbook/src-ws/web/Service.java (original)
+++ beehive/trunk/samples/wsm-addressbook/src/web/Service.java Fri May 19 16:04:00 2006
@@ -1,5 +1,3 @@
-package web;
-
/*
* Copyright 2004-2005 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$
*/
+package web;
import javax.jws.Oneway;
import javax.jws.WebMethod;
@@ -31,10 +30,9 @@
import org.apache.beehive.sample.StateType;
-@WebService(
- targetNamespace="http://beehive.apache.org/addressbook",
- serviceName="SimpleAddressBook")
-public class Service implements AddressBook {
+@WebService(targetNamespace="http://beehive.apache.org/addressbook", serviceName="SimpleAddressBook")
+public class Service
+ implements AddressBook {
private static String DEFAULT_NAME = "default";
Modified: beehive/trunk/samples/wsm-samples/build.properties
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/wsm-samples/build.properties?rev=407928&r1=407927&r2=407928&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-samples/build.properties (original)
+++ beehive/trunk/samples/wsm-samples/build.properties Fri May 19 16:04:00 2006
@@ -1,6 +1,6 @@
#
-# Edit this if you have moved the sample out of <beehive-home>/samples.
+#
#
beehive.home=../../
-service.name=wsm-samples
+context.path=wsm-samples
Modified: beehive/trunk/samples/wsm-samples/build.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/wsm-samples/build.xml?rev=407928&r1=407927&r2=407928&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-samples/build.xml (original)
+++ beehive/trunk/samples/wsm-samples/build.xml Fri May 19 16:04:00 2006
@@ -1,7 +1,6 @@
<?xml version="1.0" ?>
-
<!--
- Copyright 2004-2005 The Apache Software Foundation
+ Copyright 2004-2006 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.
@@ -17,74 +16,61 @@
$Header:$
-->
-<project name="Beehive/Samples/WSM/Samples" default="build" basedir=".">
-
+
+<project name="Beehive/WSM/Samples" default="build" basedir=".">
+
<property file="build.properties"/>
- <import file="${beehive.home}/beehive-imports.xml"/>
+ <import file="${beehive.home}/beehive-imports.xml" />
<import file="${beehive.home}/ant/beehive-tools.xml"/>
- <import file="${beehive.home}/wsm/ant/beehive-wsm-tools.xml"/>
-
- <property name="service.name" value="samples"/>
<property name="src.dir" location="src"/>
- <property name="ws-src.dir" location="src-ws"/>
<property name="web.dir" location="web"/>
<property name="build.dir" location="build"/>
- <property name="web.inf.dir" location="${build.dir}/WEB-INF"/>
- <property name="classes.dir" location="${web.inf.dir}/classes"/>
- <property name="gen.dir" location="${web.inf.dir}/gen"/>
-
- <property name="webservice.war.name" value="${service.name}WS.war"/>
+ <property name="tmp.sourcegen.dir" location="${build.dir}/WEB-INF/.tmpbeansrc"/>
<path id="build.classpath">
- <pathelement location="${classes.dir}"/>
- <fileset dir="${web.inf.dir}/lib" includes="*.jar"/>
+ <pathelement location="${build.dir}/WEB-INF/classes"/>
+ <fileset dir="${build.dir}/WEB-INF/lib" includes="*.jar"/>
</path>
- <!-- ========================================= -->
- <!-- war - build deployable artifact -->
- <!-- ========================================= -->
- <target name="war">
- <jar jarfile="${service.name}.war">
- <fileset dir="${build.dir}">
- <exclude name="WEB-INF/gen/**"/>
- </fileset>
- </jar>
- </target>
-
- <!-- ========================================= -->
- <!-- build - build all binaries -->
- <!-- ========================================= -->
- <target name="build">
+ <target name="build" description="Build the webapp">
<mkdir dir="${build.dir}"/>
- <mkdir dir="${classes.dir}"/>
+ <mkdir dir="${build.dir}/WEB-INF/classes"/>
<deploy-wsm webappDir="${build.dir}"/>
- <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
-
- <build-webservices srcdir="${ws-src.dir}"
- destdir="${classes.dir}"
- tempdir="${gen.dir}"
- classpathref="build.classpath"/>
-
- <copy file="${src.dir}/log4j.properties" todir="${classes.dir}"/>
-
- <copy todir="${classes.dir}">
- <fileset dir="${ws-src.dir}" includes="**/*.xml,**/*.wsdl"/>
- </copy>
-
- <copy todir="${build.dir}">
- <fileset dir="${web.dir}"/>
- </copy>
+ <taskdef name="apt"
+ classname="org.apache.beehive.controls.runtime.generator.AptTask"
+ classpathref="build.classpath"
+ onerror="fail"/>
+
+ <apt srcdir="${src.dir}"
+ destdir="${build.dir}/WEB-INF/classes"
+ gendir="${build.dir}/WEB-INF/${tmp.sourcegen.dir}"
+ classpathref="build.classpath"
+ srcExtensions="*.java"
+ debug="true"
+ nocompile="false"/>
+
+ <copy file="${src.dir}/log4j.properties" todir="${build.dir}/WEB-INF/classes"/>
+
+ <copy todir="${build.dir}">
+ <fileset dir="${web.dir}"/>
+ </copy>
</target>
-
- <!-- ========================================= -->
- <!-- clean - remove binary files -->
- <!-- ========================================= -->
- <target name="clean">
+
+ <target name="clean" description="Clean the webapp">
<delete dir="${build.dir}"/>
+ <delete file="${context.path}.war"/>
</target>
-
+
+ <target name="war" description="Create a .war file for this webapp">
+ <war destfile="${context.path}.war" webxml="${build.dir}/WEB-INF/web.xml">
+ <fileset dir="${build.dir}">
+ <exclude name="WEB-INF/web.xml"/>
+ </fileset>
+ </war>
+ </target>
+
</project>
Copied: beehive/trunk/samples/wsm-samples/src/web/complex/DocumentLiteralBareSample.java (from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/complex/DocumentLiteralBareSample.java)
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/wsm-samples/src/web/complex/DocumentLiteralBareSample.java?p2=beehive/trunk/samples/wsm-samples/src/web/complex/DocumentLiteralBareSample.java&p1=beehive/trunk/samples/wsm-samples/src-ws/web/complex/DocumentLiteralBareSample.java&r1=407923&r2=407928&rev=407928&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-samples/src-ws/web/complex/DocumentLiteralBareSample.java (original)
+++ beehive/trunk/samples/wsm-samples/src/web/complex/DocumentLiteralBareSample.java Fri May 19 16:04:00 2006
@@ -1,5 +1,3 @@
-package web.complex;
-
/*
* Copyright 2004, 2005 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$Factory
*/
+package web.complex;
import javax.jws.WebMethod;
import javax.jws.WebParam;
@@ -34,10 +33,7 @@
* This class illustrates the use of complex types with style/use "DOC/LITERAL" (bare).
*/
@WebService
-@SOAPBinding(
- style=SOAPBinding.Style.DOCUMENT,
- use=SOAPBinding.Use.LITERAL,
- parameterStyle=SOAPBinding.ParameterStyle.BARE
+@SOAPBinding(style=SOAPBinding.Style.DOCUMENT, use=SOAPBinding.Use.LITERAL, parameterStyle=SOAPBinding.ParameterStyle.BARE
)
public class DocumentLiteralBareSample {
@@ -70,7 +66,7 @@
*/
@WebMethod
@WebResult(name="ReturnCreateAddressInBodyResult")
- public int createAddressInBody(@WebParam(name="out_param_body", mode=WebParam.Mode.OUT) AddressHolder addressHolder) {
+ public int createAddressInBody(@WebParam(name="out_param_body", header=true, mode=WebParam.Mode.OUT) AddressHolder addressHolder) {
StateType state = new StateType("WA");
Phone phoneNumber = new Phone(425, "555", "1234");
Address address = new Address(10230, "NE Points Drive", "Kirkland", state, 98008, phoneNumber);
Copied: beehive/trunk/samples/wsm-samples/src/web/complex/RpcEncodedSample.java (from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/complex/RpcEncodedSample.java)
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/wsm-samples/src/web/complex/RpcEncodedSample.java?p2=beehive/trunk/samples/wsm-samples/src/web/complex/RpcEncodedSample.java&p1=beehive/trunk/samples/wsm-samples/src-ws/web/complex/RpcEncodedSample.java&r1=407923&r2=407928&rev=407928&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-samples/src-ws/web/complex/RpcEncodedSample.java (original)
+++ beehive/trunk/samples/wsm-samples/src/web/complex/RpcEncodedSample.java Fri May 19 16:04:00 2006
@@ -1,5 +1,3 @@
-package web.complex;
-
/*
* Copyright 2004, 2005 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$Factory
*/
+package web.complex;
import javax.jws.WebMethod;
import javax.jws.WebParam;
@@ -34,11 +33,7 @@
* This class illustrates the use of complex types with style/use "RPC/ENCODED".
*/
@WebService( targetNamespace="http://beehive.apache.org/web/webservice/rpc-enc-examples")
-
-@SOAPBinding(
- style=SOAPBinding.Style.RPC,
- use=SOAPBinding.Use.ENCODED
-)
+@SOAPBinding(style=SOAPBinding.Style.RPC, use=SOAPBinding.Use.ENCODED)
public class RpcEncodedSample {
/**
Copied: beehive/trunk/samples/wsm-samples/src/web/complex/RpcLiteralSample.java (from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/complex/RpcLiteralSample.java)
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/wsm-samples/src/web/complex/RpcLiteralSample.java?p2=beehive/trunk/samples/wsm-samples/src/web/complex/RpcLiteralSample.java&p1=beehive/trunk/samples/wsm-samples/src-ws/web/complex/RpcLiteralSample.java&r1=407923&r2=407928&rev=407928&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-samples/src-ws/web/complex/RpcLiteralSample.java (original)
+++ beehive/trunk/samples/wsm-samples/src/web/complex/RpcLiteralSample.java Fri May 19 16:04:00 2006
@@ -1,5 +1,3 @@
-package web.complex;
-
/*
* Copyright 2004, 2005 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$Factory
*/
+package web.complex;
import javax.jws.WebMethod;
import javax.jws.WebParam;
@@ -33,12 +32,8 @@
/**
* This class illustrates the use of complex types with style/use "RPC/LITERAL".
*/
-@WebService( targetNamespace="http://beehive.apache.org/web/webservice/rpc-examples")
-
-@SOAPBinding(
- style=SOAPBinding.Style.RPC,
- use=SOAPBinding.Use.LITERAL
-)
+@WebService(targetNamespace="http://beehive.apache.org/web/webservice/rpc-examples")
+@SOAPBinding(style=SOAPBinding.Style.RPC, use=SOAPBinding.Use.LITERAL)
public class RpcLiteralSample {
/**
Copied: beehive/trunk/samples/wsm-samples/src/web/soapmessagehandlers/SOAPMessageHandlersSample.java (from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/soapmessagehandlers/SOAPMessageHandlersSample.java)
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/wsm-samples/src/web/soapmessagehandlers/SOAPMessageHandlersSample.java?p2=beehive/trunk/samples/wsm-samples/src/web/soapmessagehandlers/SOAPMessageHandlersSample.java&p1=beehive/trunk/samples/wsm-samples/src-ws/web/soapmessagehandlers/SOAPMessageHandlersSample.java&r1=407923&r2=407928&rev=407928&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-samples/src-ws/web/soapmessagehandlers/SOAPMessageHandlersSample.java (original)
+++ beehive/trunk/samples/wsm-samples/src/web/soapmessagehandlers/SOAPMessageHandlersSample.java Fri May 19 16:04:00 2006
@@ -1,5 +1,3 @@
-package web.soapmessagehandlers;
-
/*
* Copyright 2004, 2005 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$Factory
*/
+package web.soapmessagehandlers;
import javax.jws.WebMethod;
import javax.jws.WebService;
Copied: beehive/trunk/samples/wsm-samples/src/web/xsdtypes/XsdTypesSample.java (from r407923, beehive/trunk/samples/wsm-samples/src-ws/web/xsdtypes/XsdTypesSample.java)
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/wsm-samples/src/web/xsdtypes/XsdTypesSample.java?p2=beehive/trunk/samples/wsm-samples/src/web/xsdtypes/XsdTypesSample.java&p1=beehive/trunk/samples/wsm-samples/src-ws/web/xsdtypes/XsdTypesSample.java&r1=407923&r2=407928&rev=407928&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-samples/src-ws/web/xsdtypes/XsdTypesSample.java (original)
+++ beehive/trunk/samples/wsm-samples/src/web/xsdtypes/XsdTypesSample.java Fri May 19 16:04:00 2006
@@ -1,5 +1,3 @@
-package web.xsdtypes;
-
/*
* Copyright 2004, 2005 The Apache Software Foundation
*
@@ -17,6 +15,7 @@
*
* $Header:$Factory
*/
+package web.xsdtypes;
import javax.xml.namespace.QName;
@@ -28,20 +27,6 @@
*/
@WebService
public class XsdTypesSample {
-
- /**
- * This method tests "char".
- * NOTE: A built-in mapping for the primitive type "char" is *not*
- * available; "char" doesn't have a representation in XML Schema).
- * A custom type mapping is required to use this type.
- */
-/*
- public char testChar(char c) {
- // todo: count up one...
- // todo: print it...
- return c;
- }
- */
/**
* This method tests "java.math.BigDecimal".