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/06/25 21:51:26 UTC

svn commit: r417046 [1/2] - in /beehive/wsm/trunk: ./ samples/wsm-blank/ samples/wsm-samples/ samples/wsm-samples/src/ samples/wsm-samples/src/org/apache/beehive/sample/ samples/wsm-samples/src/org/apache/beehive/sample/wsm/wsmsamples/ samples/wsm-samp...

Author: ekoneil
Date: Sun Jun 25 12:51:21 2006
New Revision: 417046

URL: http://svn.apache.org/viewvc?rev=417046&view=rev
Log:
Add a distribution build for WSM:

  - distribution created in build/dist
  - wsm-samples builds now (fixed several non-compliant web services)
  - JARs copied to build/dist
  - added appropriate LICENSE / NOTICE / README files

Test: WSM pass


Added:
    beehive/wsm/trunk/BUILDING.txt
      - copied unchanged from r413523, beehive/wsm/trunk/README.txt
    beehive/wsm/trunk/LICENSE.txt
      - copied unchanged from r413523, beehive/trunk/LICENSE.txt
    beehive/wsm/trunk/NOTICE.txt
      - copied, changed from r413523, beehive/trunk/NOTICE.txt
    beehive/wsm/trunk/README-dist.txt
    beehive/wsm/trunk/samples/wsm-samples/src/log4j.xml
Removed:
    beehive/wsm/trunk/README.txt
    beehive/wsm/trunk/samples/wsm-samples/src/log4j.properties
    beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/wsm/wsmsamples/
Modified:
    beehive/wsm/trunk/build.xml
    beehive/wsm/trunk/samples/wsm-blank/build.xml
    beehive/wsm/trunk/samples/wsm-samples/build.properties
    beehive/wsm/trunk/samples/wsm-samples/build.xml
    beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/Address.java
    beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/AddressException.java
    beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/AddressHolder.java
    beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/MessageHandler.java
    beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/Phone.java
    beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/StateType.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/complex/DocumentLiteralBareSample.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/complex/DocumentLiteralWrappedSample.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/complex/RpcEncodedSample.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/handlerchain/HandlerChainSample.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/handlerchain/HandlerConfig.xml
    beehive/wsm/trunk/samples/wsm-samples/src/web/header/ServiceSignHandler.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/header/SignException.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/header/SignHandler.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/header/SignatureTool.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/header/SignatureToolImpl.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/header/StockQuote.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/header/StockQuoteImpl.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/oneway/OnewaySample.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/webmethod/WebMethodWithAnnotationSample.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/webmethod/WebMethodWithoutAnnotationSample.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/webparam/WebParamDocumentLiteralSample.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/webparam/WebParamRpcLiteralSample.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/webresult/WebResultDocumentLiteralSample.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/webresult/WebResultRpcLiteralSample.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceCustomSample.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceEndpointInterfaceSample.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceImplementationBeanSample.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceSample.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceWsdlLocationSample.java
    beehive/wsm/trunk/samples/wsm-samples/src/web/xsdtypes/XsdTypesSample.java
    beehive/wsm/trunk/samples/wsm-samples/web/WEB-INF/server-config.wsdd
    beehive/wsm/trunk/samples/wsm-samples/web/WEB-INF/web.xml
    beehive/wsm/trunk/samples/wsm-samples/web/handlerchain.html
    beehive/wsm/trunk/samples/wsm-samples/web/happyaxis.jsp
    beehive/wsm/trunk/samples/wsm-samples/web/index.html
    beehive/wsm/trunk/samples/wsm-samples/web/oneway.html
    beehive/wsm/trunk/samples/wsm-samples/web/soapbinding.html
    beehive/wsm/trunk/samples/wsm-samples/web/soapmessagehandlers.html
    beehive/wsm/trunk/samples/wsm-samples/web/webmethod.html
    beehive/wsm/trunk/samples/wsm-samples/web/webparam.html
    beehive/wsm/trunk/samples/wsm-samples/web/webresult.html
    beehive/wsm/trunk/samples/wsm-samples/web/webservice.html

Copied: beehive/wsm/trunk/NOTICE.txt (from r413523, beehive/trunk/NOTICE.txt)
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/NOTICE.txt?p2=beehive/wsm/trunk/NOTICE.txt&p1=beehive/trunk/NOTICE.txt&r1=413523&r2=417046&rev=417046&view=diff
==============================================================================
--- beehive/trunk/NOTICE.txt (original)
+++ beehive/wsm/trunk/NOTICE.txt Sun Jun 25 12:51:21 2006
@@ -3,22 +3,13 @@
 ==  Version 2.0, in this case for the Apache Beehive distribution.     ==
 =========================================================================
 
-This product includes software developed by 
-The Apache Software Foundation (http://www.apache.org/).
+This product includes software developed by The Apache Software Foundation (http://www.apache.org/).
 
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
-and are licensed to the Apache Software Foundation under the 
-"Software Grant and Corporate Contribution License Agreement"
-
-Aside from contributions to the Apache Beehive project, this 
-software also includes:
+Aside from contributions to the Apache Beehive project, this software also includes:
 
   - one or more JARs from various Apache projects:
     - Ant, Axis, Jakarta Commons, Log4J, Struts, Tomcat, and Velocity.
-  Copyright (c) 1999-2005 Apache Software Foundation
+  Copyright (c) 1999-2006 Apache Software Foundation
 
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
+See the LICENSE.txt file for information on all licenses associated with this software.
 

Added: beehive/wsm/trunk/README-dist.txt
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/README-dist.txt?rev=417046&view=auto
==============================================================================
--- beehive/wsm/trunk/README-dist.txt (added)
+++ beehive/wsm/trunk/README-dist.txt Sun Jun 25 12:51:21 2006
@@ -0,0 +1,27 @@
+
+Beehive WSM
+===========
+
+WSM (Web Service Metadata) is an implementation of thre JSR-181 specification 
+which defines a metadata grammar for authoring web services.
+
+This distribution consists of two parts:
+
+  - framework JARs needed for authoring WSM-enabled web services
+  - sample webapps that demonstrate WSM functionality
+
+WSM is dependent on several additional software packages that must be downloaded
+separately:
+
+  - Axis 1.3+
+
+To add support for Beehive Controls, download:
+
+  - Commons Discovery 0.2
+  - Velocity 1.4 (with Dependencies)
+  - Beehive Controls 1.0.1
+
+To add XMLBean support, download:
+
+  - XMLBeans 2.x
+  - JSR 173 API
\ No newline at end of file

Modified: beehive/wsm/trunk/build.xml
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/build.xml?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/build.xml (original)
+++ beehive/wsm/trunk/build.xml Sun Jun 25 12:51:21 2006
@@ -1,7 +1,7 @@
 <?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.
@@ -220,6 +220,29 @@
     <target name="install" description="Install the JARs in a local Maven repository">
         <antcall target="m2.stage"/>
         <antcall target="m2.install"/>
+    </target>
+
+    <target name="build.dist" description="Build a WSM distribution">
+        <mkdir dir="build/dist"/>
+        <mkdir dir="build/dist/lib"/>
+
+        <copy todir="build/dist" file="NOTICE.txt"/>
+        <copy todir="build/dist" file="LICENSE.txt"/>
+        <copy tofile="build/dist/README.txt" file="README-dist.txt"/>
+
+        <copy todir="build/dist/lib">
+            <fileset dir="build/jars" includes="*.jar"/>
+        </copy>
+
+        <ant dir="samples/wsm-samples" target="clean" inheritAll="false"/>     
+        <ant dir="samples/wsm-blank" target="clean" inheritAll="false"/> 
+
+        <copy todir="build/dist/samples">
+            <fileset dir="samples">
+                <include name="wsm-samples/**"/>
+                <include name="wsm-blank/**"/>
+            </fileset>
+        </copy>
     </target>
 
     <target name="m2.stage">

Modified: beehive/wsm/trunk/samples/wsm-blank/build.xml
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-blank/build.xml?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-blank/build.xml (original)
+++ beehive/wsm/trunk/samples/wsm-blank/build.xml Sun Jun 25 12:51:21 2006
@@ -1,7 +1,7 @@
 <?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.
@@ -18,68 +18,74 @@
    $Header:$
  -->
 
-<project name="Beehive/Samples/WSM/Blank" default="build" basedir=".">
+<project name="WSM/Samples/Blank" default="build" basedir=".">
   
     <property file="build.properties"/>
-
-    <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="blank"/>
+    <import file="../../wsm-imports.xml"/>
 
     <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"/>
-
-    <path id="build.classpath">
-        <pathelement location="${classes.dir}"/>
-        <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>
+    <property name="tmp.sourcegen.dir" location="${build.dir}/WEB-INF/.tmpbeansrc"/>
+    
+    <target name="build" description="Build the webapp">
+        <mkdir dir="${build.dir}/WEB-INF/classes"/>
+        <mkdir dir="${build.dir}/WEB-INF/lib"/>
 
-    <!-- ========================================= -->
-    <!-- build - build all binaries                -->
-    <!-- ========================================= -->
-    <target name="build">
-        <mkdir dir="${build.dir}"/>
-        <mkdir dir="${classes.dir}"/>
-
-        <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 todir="${build.dir}">
+        <copy todir="${build.dir}">
             <fileset dir="${web.dir}"/>
         </copy>
+
+        <copy todir="${build.dir}/WEB-INF/lib">
+            <fileset refid="controls.fileset"/>
+            <fileset refid="velocity.fileset"/>
+            <fileset refid="commons-logging.fileset"/>
+            <fileset refid="commons-discovery.fileset"/>
+
+            <fileset refid="xbean.fileset"/>
+            <fileset refid="jsr173.fileset"/>
+
+            <fileset refid="axis.fileset"/>
+            <fileset refid="axis-jaxrpc.fileset"/>
+            <fileset refid="axis-saaj.fileset"/>
+            <fileset refid="axis-wsdl4j.fileset"/>
+
+            <fileset refid="wsm-core.fileset"/>
+            <fileset refid="wsm-axis.fileset"/>
+            <fileset refid="wsm-wsdltypes.fileset"/>
+            <fileset refid="wsm-jsr181.fileset"/>
+        </copy>
+
+        <path id="build.classpath">
+            <pathelement location="${build.dir}/WEB-INF/classes"/>
+            <fileset dir="${build.dir}/WEB-INF/lib" includes="*.jar"/>
+        </path>
+
+        <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"/>
     </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">
+        <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>

Modified: beehive/wsm/trunk/samples/wsm-samples/build.properties
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/build.properties?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/build.properties (original)
+++ beehive/wsm/trunk/samples/wsm-samples/build.properties Sun Jun 25 12:51:21 2006
@@ -1,6 +1,4 @@
 #
 # 
 #
-beehive.home=../../
-
 context.path=wsm-samples

Modified: beehive/wsm/trunk/samples/wsm-samples/build.xml
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/build.xml?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/build.xml (original)
+++ beehive/wsm/trunk/samples/wsm-samples/build.xml Sun Jun 25 12:51:21 2006
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+
 <!--
    Copyright 2004-2006 The Apache Software Foundation 
  
@@ -17,28 +18,49 @@
    $Header:$
  -->
 
-<project name="Beehive/WSM/Samples" default="build" basedir=".">
+<project name="WSM/Samples" default="build" basedir=".">
 
     <property file="build.properties"/>
 
-    <import file="${beehive.home}/beehive-imports.xml" />
-    <import file="${beehive.home}/ant/beehive-tools.xml"/>
+    <import file="../../wsm-imports.xml"/>
 
     <property name="src.dir" location="src"/>
     <property name="web.dir" location="web"/>
     <property name="build.dir" location="build"/>
     <property name="tmp.sourcegen.dir" location="${build.dir}/WEB-INF/.tmpbeansrc"/>
-
-    <path id="build.classpath">
-        <pathelement location="${build.dir}/WEB-INF/classes"/>
-        <fileset dir="${build.dir}/WEB-INF/lib" includes="*.jar"/>
-    </path>
     
     <target name="build" description="Build the webapp">
-        <mkdir dir="${build.dir}"/>
         <mkdir dir="${build.dir}/WEB-INF/classes"/>
+        <mkdir dir="${build.dir}/WEB-INF/lib"/>
 
-        <deploy-wsm webappDir="${build.dir}"/>
+        <copy todir="${build.dir}">
+            <fileset dir="${web.dir}"/>
+        </copy>
+
+        <copy todir="${build.dir}/WEB-INF/lib">
+            <fileset refid="controls.fileset"/>
+            <fileset refid="velocity.fileset"/>
+            <fileset refid="commons-logging.fileset"/>
+            <fileset refid="commons-discovery.fileset"/>
+
+            <fileset refid="xbean.fileset"/>
+            <fileset refid="jsr173.fileset"/>
+
+            <fileset refid="axis.fileset"/>
+            <fileset refid="axis-jaxrpc.fileset"/>
+            <fileset refid="axis-saaj.fileset"/>
+            <fileset refid="axis-wsdl4j.fileset"/>
+
+            <fileset refid="wsm-core.fileset"/>
+            <fileset refid="wsm-axis.fileset"/>
+            <fileset refid="wsm-wsdltypes.fileset"/>
+            <fileset refid="wsm-jsr181.fileset"/>
+        </copy>
+
+        <path id="build.classpath">
+            <pathelement location="${build.dir}/WEB-INF/classes"/>
+            <fileset dir="${build.dir}/WEB-INF/lib" includes="*.jar"/>
+        </path>
 
         <taskdef name="apt" 
                  classname="org.apache.beehive.controls.runtime.generator.AptTask" 
@@ -52,12 +74,6 @@
              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>
   
     <target name="clean" description="Clean the webapp">
@@ -65,7 +81,7 @@
         <delete file="${context.path}.war"/>
     </target>
 
-    <target name="war" description="Create a .war file for this webapp">
+    <target name="war" description="Create a war file">
         <war destfile="${context.path}.war" webxml="${build.dir}/WEB-INF/web.xml">
             <fileset dir="${build.dir}">
                 <exclude name="WEB-INF/web.xml"/>

Added: beehive/wsm/trunk/samples/wsm-samples/src/log4j.xml
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/log4j.xml?rev=417046&view=auto
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/log4j.xml (added)
+++ beehive/wsm/trunk/samples/wsm-samples/src/log4j.xml Sun Jun 25 12:51:21 2006
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+  <appender name="WEBAPPLOGFILE" class="org.apache.log4j.ConsoleAppender">
+    <param name="Append" value="true"/>
+    <param name="MaxFileSize" value="500000KB"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d{DATE} %-5p %-15c{1} [%x]: %m%n"/>
+    </layout>
+  </appender>
+
+  <category name="org.apache.beehive.wsm">
+    <priority value="error"/>
+    <appender-ref ref="WEBAPPLOGFILE"/>
+  </category>
+
+  <category name="org.apache.axis">
+    <priority value="error"/>
+    <appender-ref ref="WEBAPPLOGFILE"/>
+  </category>
+
+</log4j:configuration>

Modified: beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/Address.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/Address.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/Address.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/Address.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package org.apache.beehive.sample;
-
 /*
  * Copyright 2004-2005 The Apache Software Foundation
  *
@@ -17,45 +15,46 @@
  *
  * $Header:$
  */
+package org.apache.beehive.sample;
 
 public class Address implements java.io.Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private int streetNum;
-    private String streetName;
-    private String city;
-    private StateType state;
-    private int zip;
-    private Phone phoneNumber;
+    private int _streetNum;
+    private String _streetName;
+    private String _city;
+    private StateType _state;
+    private int _zip;
+    private Phone _phoneNumber;
 
     public Address() { }
 
     public Address(int streetNum, String streetName, String city, StateType state, int zip, Phone phoneNumber) {
 
-        this.streetNum = streetNum;
-        this.streetName = streetName;
-        this.city = city;
-        this.state = state;
-        this.zip = zip;
-        this.phoneNumber = phoneNumber;
+        _streetNum = streetNum;
+        _streetName = streetName;
+        _city = city;
+        _state = state;
+        _zip = zip;
+        _phoneNumber = phoneNumber;
     }
 
-    public String getCity() { return city; }
-    public void setCity(String city) { this.city = city; }
+    public String getCity() { return _city; }
+    public void setCity(String city) { _city = city; }
 
-    public Phone getPhoneNumber() { return phoneNumber; }
-    public void setPhoneNumber(Phone phoneNumber) { this.phoneNumber = phoneNumber; }
+    public Phone getPhoneNumber() { return _phoneNumber; }
+    public void setPhoneNumber(Phone phoneNumber) { _phoneNumber = phoneNumber; }
 
-    public StateType getState() { return state; }
-    public void setState(StateType state) { this.state = state; }
+    public StateType getState() { return _state; }
+    public void setState(StateType state) { _state = state; }
 
-    public String getStreetName() { return streetName; }
-    public void setStreetName(String streetName) { this.streetName = streetName; }
+    public String getStreetName() { return _streetName; }
+    public void setStreetName(String streetName) { _streetName = streetName; }
 
-    public int getStreetNum() { return streetNum; }
-    public void setStreetNum(int streetNum) { this.streetNum = streetNum; }
+    public int getStreetNum() { return _streetNum; }
+    public void setStreetNum(int streetNum) { _streetNum = streetNum; }
 
-    public int getZip() { return zip; }
-    public void setZip(int zip) { this.zip = zip; }
+    public int getZip() { return _zip; }
+    public void setZip(int zip) { _zip = zip; }
 }

Modified: beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/AddressException.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/AddressException.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/AddressException.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/AddressException.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package org.apache.beehive.sample;
-
 /*
  * Copyright 2004-2005 The Apache Software Foundation
  *
@@ -17,11 +15,18 @@
  *
  * $Header:$
  */
+package org.apache.beehive.sample;
 
-public class AddressException extends Exception implements java.io.Serializable {
+public class AddressException
+    extends Exception
+    implements java.io.Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    public AddressException() { }
-    public AddressException(String msg) { super(msg); }
+    public AddressException() {
+    }
+
+    public AddressException(String msg) {
+        super(msg);
+    }
 }

Modified: beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/AddressHolder.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/AddressHolder.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/AddressHolder.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/AddressHolder.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package org.apache.beehive.sample;
-
 /*
  * Copyright 2004-2005 The Apache Software Foundation
  *
@@ -17,8 +15,10 @@
  *
  * $Header:$
  */
+package org.apache.beehive.sample;
 
-public class AddressHolder implements javax.xml.rpc.holders.Holder, java.io.Serializable {
+public class AddressHolder
+    implements javax.xml.rpc.holders.Holder, java.io.Serializable {
 
     private static final long serialVersionUID = 1L;
 

Modified: beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/MessageHandler.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/MessageHandler.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/MessageHandler.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/MessageHandler.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package org.apache.beehive.sample;
-
 /*
  * Copyright 2004, 2005 The Apache Software Foundation
  *
@@ -17,14 +15,13 @@
  *
  * $Header:$Factory
  */
+package org.apache.beehive.sample;
 
 import javax.xml.namespace.QName;
-
 import javax.xml.rpc.handler.Handler;
 import javax.xml.rpc.handler.HandlerInfo;
 import javax.xml.rpc.handler.MessageContext;
 import javax.xml.rpc.handler.soap.SOAPMessageContext;
-
 import javax.xml.soap.SOAPMessage;
 
 public class MessageHandler implements Handler {

Modified: beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/Phone.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/Phone.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/Phone.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/Phone.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package org.apache.beehive.sample;
-
 /*
  * Copyright 2004-2005 The Apache Software Foundation
  *
@@ -17,30 +15,33 @@
  *
  * $Header:$
  */
+package org.apache.beehive.sample;
 
-public class Phone implements java.io.Serializable {
+public class Phone
+    implements java.io.Serializable {
 
     private static final long serialVersionUID = 1L;
     
-    private int areaCode;
-    private String exchange;
-    private String number;
+    private int _areaCode;
+    private String _exchange;
+    private String _number;
 
-    public Phone() { super(); }
+    public Phone() {
+        super();
+    }
 
     public Phone(int areaCode, String exchange, String number) {
-
-        this.areaCode = areaCode;
-        this.exchange = exchange;
-        this.number = number;
+        _areaCode = areaCode;
+        _exchange = exchange;
+        _number = number;
     }
 
-    public int getAreaCode() { return areaCode; }
-    public void setAreaCode(int areaCode) { this.areaCode = areaCode; }
+    public int getAreaCode() { return _areaCode; }
+    public void setAreaCode(int areaCode) { _areaCode = areaCode; }
 
-    public String getExchange() { return exchange; }
-    public void setExchange(String exchange) { this.exchange = exchange; }
+    public String getExchange() { return _exchange; }
+    public void setExchange(String exchange) { _exchange = exchange; }
 
-    public String getNumber() { return number; }
-    public void setNumber(String number) { this.number = number; }
+    public String getNumber() { return _number; }
+    public void setNumber(String number) { _number = number; }
 }

Modified: beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/StateType.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/StateType.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/StateType.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/org/apache/beehive/sample/StateType.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package org.apache.beehive.sample;
-
 /*
  * Copyright 2004-2005 The Apache Software Foundation
  *
@@ -17,17 +15,22 @@
  *
  * $Header:$
  */
+package org.apache.beehive.sample;
 
-public class StateType implements java.io.Serializable {
+public class StateType
+    implements java.io.Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private String state;
+    private String _state;
    
-    public StateType() { }
+    public StateType() {
+    }
 
-    public StateType(String state) { this.state = state; }
+    public StateType(String state) {
+        _state = state;
+    }
 
-    public String getState() { return state; }
-    public void setState(String state) { this.state = state; }
+    public String getState() { return _state; }
+    public void setState(String state) { _state = state; }
 }

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/complex/DocumentLiteralBareSample.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/complex/DocumentLiteralBareSample.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/complex/DocumentLiteralBareSample.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/complex/DocumentLiteralBareSample.java Sun Jun 25 12:51:21 2006
@@ -33,87 +33,59 @@
  * 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 {
 
-    /**
-     * Returns a complex (address) object that was passed in as IN parameter in the message body.
-     * @param address The complex object to be returned.
-     * @return The complex object that was passed in as an IN parameter.
-     */
-    @WebMethod
-    @WebResult(name="ReturnAddressFromBodyResult")
-    public Address returnAddressFromBody(@WebParam(name="in_param_body", mode=WebParam.Mode.IN) Address address) {
-        return address;
-    }
+    // ---------------------------------- Document operations ----------------------------------
 
     /**
-     * Returns a complex (address) object that was passed in as IN parameter in the message header.
-     * @param object The complex object to be modified.
-     * @return The complex object that was passed in as an IN parameter.
-     */
-    @WebMethod
-    @WebResult(name="ReturnAddressFromHeaderResult")
-    public Address returnAddressFromHeader(@WebParam(name="in_param_header", header=true, mode=WebParam.Mode.IN) Address address) {
-        return address;
-    }
-
-    /**
-     * Creates a new complex (address) object and returns that object as an OUT parameter that is encoded in the message body.
-     * @param addressHolder The holder of the complex object to be returned.
+     * Creates a new complex (address) object and returns that document.
      * @return An operational result (always 0).
      */
+/*
     @WebMethod
-    @WebResult(name="ReturnCreateAddressInBodyResult")
-    public int createAddressInBody(@WebParam(name="out_param_body", header=true, mode=WebParam.Mode.OUT) AddressHolder addressHolder) {
+    @WebResult(name="CreateAddressInBodyResult")
+    public Address createAddressInBody() {
+
         StateType state = new StateType("WA");
         Phone phoneNumber = new Phone(425, "555", "1234");
-        Address address = new Address(10230, "NE Points Drive", "Kirkland", state, 98008, phoneNumber);
-        addressHolder.value = address;
-        return 0;
+        return new Address(10230, "NE Points Drive", "Kirkland", state, 98008, phoneNumber);
     }
+*/
 
     /**
-     * Creates a new complex (address) object and returns that object as an OUT parameter that is encoded in the message header.
-     * @param addressHolder The holder of the complex object to be returned.
-     * @return An operational result (always 0).
+     * Returns a complex (address) object that was passed in as IN parameter in the message body.
+     * @param address The complex object to be returned.
+     * @return The complex object that was passed in as an IN parameter.
      */
     @WebMethod
-    @WebResult(name="ReturnCreateAddressInHeaderResult")
-    public int createAddressInHeader(@WebParam(name="out_param_header", 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);
-        addressHolder.value = address;
-        return 0;
+    @WebResult(name="ReturnAddressFromBodyResult")
+    public Address returnAddressFromBody(@WebParam(name="in_param_body", mode=WebParam.Mode.IN) Address address) {
+        return address;
     }
 
     /**
      * Modifies a complex (address) INOUT parameter that is encoded in the message body.
-     * @param addressHolder The object to be modified.
+     * @param address The object to be modified.
      * @return An operational result (always 0).
      */
     @WebMethod
     @WebResult(name="ChangeAddressInBodyResult")
-    public int changeAddressInBody(@WebParam(name="inout_param_body", mode=WebParam.Mode.INOUT) AddressHolder addressHolder) {
-        Address address = addressHolder.value;
+    public Address changeAddressInBody(Address address) {
         address.setZip(address.getZip() + 1);
-        return 0;
+        return address;
     }
 
-    /**
-     * Modifies a complex (address) INOUT parameter that is encoded in the message header.
-     * @param addressHolder The object to be modified.
-     * @return An operational result (always 0).
+    // ---------------------------------- Document + Header operations ----------------------------------
+
+    /*
+    Note, Document/Bare web services must have a single, non-header parameter; as such, it is illegal for any operation to
+    accept zero parameters.  Operations must have a return value or must be marked as @Oneway.
      */
-    @WebMethod
-    @WebResult(name="ChangeAddressInHeaderResult")
-    public int changeAddressInHeader(@WebParam(name="inout_param_header", header=true, mode=WebParam.Mode.INOUT) AddressHolder addressHolder) {
-        Address address = addressHolder.value;
-        address.setZip(address.getZip() + 1);
-        return 0;
-    }
+
+    // ---------------------------------- Exception operations ----------------------------------
 
     /**
      * Throws an AddressException.
@@ -123,7 +95,8 @@
      */
     @WebMethod
     @WebResult(name="ThrowAddressExceptionResult")
-    public int throwAddressException(@WebParam(name="in_param") int value) throws AddressException {
+    public int throwAddressException(
+        @WebParam(name="in_param") int value) throws AddressException {
         throw new AddressException("This is a sample message for:\n\tAddressException; input value=\"" + value + "\"");
     }
 }

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/complex/DocumentLiteralWrappedSample.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/complex/DocumentLiteralWrappedSample.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/complex/DocumentLiteralWrappedSample.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/complex/DocumentLiteralWrappedSample.java Sun Jun 25 12:51:21 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;
@@ -41,6 +40,8 @@
 )        
 public class DocumentLiteralWrappedSample {
 
+    // ---------------------------------- Document operations ----------------------------------
+
     /**
      * Returns a complex (address) object that was passed in as IN parameter in the message body.
      * @param address The complex object to be returned.
@@ -53,38 +54,38 @@
     }
 
     /**
-     * Returns a complex (address) object that was passed in as IN parameter in the message header.
-     * @param object The complex object to be modified.
-     * @return The complex object that was passed in as an IN parameter.
+     * Modifies a complex (address) INOUT parameter that is encoded in the message body.
+     * @param address The object to be modified.
+     * @return An operational result (always 0).
      */
     @WebMethod
-    @WebResult(name="ReturnAddressFromHeaderResult")
-    public Address returnAddressFromHeader(@WebParam(name="in_param_header", header=true, mode=WebParam.Mode.IN) Address address) {
+    @WebResult(name="ChangeAddressInBodyResult")
+    public Address changeAddressInBody(Address address) {
+        address.setZip(address.getZip() + 1);
         return address;
     }
 
     /**
      * Creates a new complex (address) object and returns that object as an OUT parameter that is encoded in the message body.
-     * @param addressHolder The holder of the complex object to be returned.
      * @return An operational result (always 0).
      */
     @WebMethod
-    @WebResult(name="ReturnCreateAddressInBodyResult")
-    public int createAddressInBody(@WebParam(name="out_param_body", mode=WebParam.Mode.OUT) AddressHolder addressHolder) {
+    @WebResult(name="CreateAddressInBodyResult")
+    public Address createAddressInBody() {
         StateType state = new StateType("WA");
         Phone phoneNumber = new Phone(425, "555", "1234");
-        Address address = new Address(10230, "NE Points Drive", "Kirkland", state, 98008, phoneNumber);
-        addressHolder.value = address;
-        return 0;
+        return new Address(10230, "NE Points Drive", "Kirkland", state, 98008, phoneNumber);
     }
 
+    // ---------------------------------- Document + Header Operations ----------------------------------
+
     /**
      * Creates a new complex (address) object and returns that object as an OUT parameter that is encoded in the message header.
      * @param addressHolder The holder of the complex object to be returned.
      * @return An operational result (always 0).
      */
     @WebMethod
-    @WebResult(name="ReturnCreateAddressInHeaderResult")
+    @WebResult(name="CreateAddressInHeaderResult")
     public int createAddressInHeader(@WebParam(name="out_param_header", header=true, mode=WebParam.Mode.OUT) AddressHolder addressHolder) {
         StateType state = new StateType("WA");
         Phone phoneNumber = new Phone(425, "555", "1234");
@@ -94,30 +95,30 @@
     }
 
     /**
-     * Modifies a complex (address) INOUT parameter that is encoded in the message body.
+     * Modifies a complex (address) INOUT parameter that is encoded in the message header.
      * @param addressHolder The object to be modified.
      * @return An operational result (always 0).
      */
     @WebMethod
-    @WebResult(name="ChangeAddressInBodyResult")
-    public int changeAddressInBody(@WebParam(name="inout_param_body", mode=WebParam.Mode.INOUT) AddressHolder addressHolder) {
+    @WebResult(name="ChangeAddressInHeaderResult")
+    public int changeAddressInHeader(@WebParam(name="inout_param_header", header=true, mode=WebParam.Mode.INOUT) AddressHolder addressHolder) {
         Address address = addressHolder.value;
         address.setZip(address.getZip() + 1);
         return 0;
     }
 
     /**
-     * Modifies a complex (address) INOUT parameter that is encoded in the message header.
-     * @param addressHolder The object to be modified.
-     * @return An operational result (always 0).
+     * Returns a complex (address) object that was passed in as IN parameter in the message header.
+     * @param address The complex object to be modified.
+     * @return The complex object that was passed in as an IN parameter.
      */
     @WebMethod
-    @WebResult(name="ChangeAddressInHeaderResult")
-    public int changeAddressInHeader(@WebParam(name="inout_param_header", header=true, mode=WebParam.Mode.INOUT) AddressHolder addressHolder) {
-        Address address = addressHolder.value;
-        address.setZip(address.getZip() + 1);
-        return 0;
+    @WebResult(name="ReturnAddressFromHeaderResult")
+    public Address returnAddressFromHeader(@WebParam(name="in_param_header", header=true, mode=WebParam.Mode.IN) Address address) {
+        return address;
     }
+
+    // ---------------------------------- Exception Operations ----------------------------------
 
     /**
      * Throws an AddressException.

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/complex/RpcEncodedSample.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/complex/RpcEncodedSample.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/complex/RpcEncodedSample.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/complex/RpcEncodedSample.java Sun Jun 25 12:51:21 2006
@@ -49,7 +49,7 @@
 
     /**
      * Returns a complex (address) object that was passed in as IN parameter in the message header.
-     * @param object The complex object to be modified.
+     * @param address The complex object to be modified.
      * @return The complex object that was passed in as an IN parameter.
      */
     @WebMethod

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/handlerchain/HandlerChainSample.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/handlerchain/HandlerChainSample.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/handlerchain/HandlerChainSample.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/handlerchain/HandlerChainSample.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package web.handlerchain;
-
 /*
  * Copyright 2004, 2005 The Apache Software Foundation
  *
@@ -17,6 +15,8 @@
  *
  * $Header:$Factory
  */
+package web.handlerchain;
+
 
 import javax.jws.HandlerChain;
 import javax.jws.WebMethod;

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/handlerchain/HandlerConfig.xml
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/handlerchain/HandlerConfig.xml?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/handlerchain/HandlerConfig.xml (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/handlerchain/HandlerConfig.xml Sun Jun 25 12:51:21 2006
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--
+   Copyright 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.
+   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:$
+-->
+    
 <handler-config xmlns="http://www.bea.com/xml/ns/jws" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee">
   <handler-chain>
     <handler-chain-name>HandlerChain</handler-chain-name>

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/header/ServiceSignHandler.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/header/ServiceSignHandler.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/header/ServiceSignHandler.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/header/ServiceSignHandler.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package web.header;
-
 /*
  * Copyright 2004, 2005 The Apache Software Foundation
  *
@@ -17,11 +15,7 @@
  *
  * $Header:$Factory
  */
-
-/*  
- * Note:  This sample was developed based on the example in the article:
- * http://www-128.ibm.com/developerworks/webservices/library/ws-tip-extend/
- */
+package web.header;
 
 import javax.xml.rpc.handler.MessageContext;
 import javax.xml.rpc.handler.soap.SOAPMessageContext;
@@ -29,8 +23,12 @@
 /**
  * Service-side SignHandler. Verify signature on incoming request messages, sign
  * outgoing response messages,
+ *
+ * Note:  This sample was developed based on the example in the article:
+ * http://www-128.ibm.com/developerworks/webservices/library/ws-tip-extend/
  */
 public class ServiceSignHandler extends SignHandler {
+
     /**
      * Check incoming request message.
      */

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/header/SignException.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/header/SignException.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/header/SignException.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/header/SignException.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package web.header;
-
 /*
  * Copyright 2004, 2005 The Apache Software Foundation
  *
@@ -17,11 +15,8 @@
  *
  * $Header:$Factory
  */
+package web.header;
 
-/*  
- * Note:  This sample was developed based on the example in the article:
- * http://www-128.ibm.com/developerworks/webservices/library/ws-tip-extend/
- */
 /**
  * SignException for general faults associated with signing.
  */

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/header/SignHandler.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/header/SignHandler.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/header/SignHandler.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/header/SignHandler.java Sun Jun 25 12:51:21 2006
@@ -1,4 +1,3 @@
-package web.header;
 /*
  * Copyright 2004, 2005 The Apache Software Foundation
  *
@@ -16,14 +15,10 @@
  *
  * $Header:$Factory
  */
+package web.header;
 
-/*  
- * Note:  This sample was developed based on the example in the article:
- * http://www-128.ibm.com/developerworks/webservices/library/ws-tip-extend/
- */
 import java.util.Iterator;
 import java.util.Map;
-
 import javax.xml.namespace.QName;
 import javax.xml.rpc.handler.Handler;
 import javax.xml.rpc.handler.HandlerInfo;

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/header/SignatureTool.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/header/SignatureTool.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/header/SignatureTool.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/header/SignatureTool.java Sun Jun 25 12:51:21 2006
@@ -1,4 +1,3 @@
-package web.header;
 /*
  * Copyright 2004, 2005 The Apache Software Foundation
  *
@@ -16,14 +15,10 @@
  *
  * $Header:$Factory
  */
+package web.header;
 
-/*  
- * Note:  This sample was developed based on the example in the article:
- * http://www-128.ibm.com/developerworks/webservices/library/ws-tip-extend/
- */
 import javax.xml.soap.SOAPElement;
 import javax.xml.soap.SOAPException;
-
 
 interface SignatureTool {
     /**

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/header/SignatureToolImpl.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/header/SignatureToolImpl.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/header/SignatureToolImpl.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/header/SignatureToolImpl.java Sun Jun 25 12:51:21 2006
@@ -1,4 +1,3 @@
-package web.header;
 /*
  * Copyright 2004, 2005 The Apache Software Foundation
  *
@@ -16,11 +15,8 @@
  *
  * $Header:$Factory
  */
+package web.header;
 
-/*  
- * Note:  This sample was developed based on the example in the article:
- * http://www-128.ibm.com/developerworks/webservices/library/ws-tip-extend/
- */
 import java.util.Iterator;
 
 import javax.xml.soap.Name;

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/header/StockQuote.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/header/StockQuote.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/header/StockQuote.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/header/StockQuote.java Sun Jun 25 12:51:21 2006
@@ -20,8 +20,6 @@
  * Note:  This sample was developed based on the example in the article:
  * http://www-128.ibm.com/developerworks/webservices/library/ws-tip-extend/
  */
-
-
 package web.header;
 
 public interface StockQuote  {

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/header/StockQuoteImpl.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/header/StockQuoteImpl.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/header/StockQuoteImpl.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/header/StockQuoteImpl.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package web.header;
-
 /*
  * Copyright 2004, 2005 The Apache Software Foundation
  *
@@ -17,18 +15,13 @@
  *
  * $Header:$Factory
  */
-
-/*  
- * Note:  This sample was developed based on the example in the article:
- * http://www-128.ibm.com/developerworks/webservices/library/ws-tip-extend/
- */
+package web.header;
 
 import javax.jws.WebMethod;
 import javax.jws.WebService;
 import javax.jws.soap.InitParam;
 import javax.jws.soap.SOAPMessageHandler;
 import javax.jws.soap.SOAPMessageHandlers;
-
 
 /**
  * Serve up stock quotes.

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/oneway/OnewaySample.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/oneway/OnewaySample.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/oneway/OnewaySample.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/oneway/OnewaySample.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package web.oneway;
-
 /*
  * Copyright 2004, 2005 The Apache Software Foundation
  *
@@ -17,6 +15,7 @@
  *
  * $Header:$Factory
  */
+package web.oneway;
 
 import javax.jws.Oneway;
 import javax.jws.WebMethod;

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/webmethod/WebMethodWithAnnotationSample.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/webmethod/WebMethodWithAnnotationSample.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/webmethod/WebMethodWithAnnotationSample.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/webmethod/WebMethodWithAnnotationSample.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package web.webmethod;
-
 /*
  * Copyright 2004, 2005 The Apache Software Foundation
  *
@@ -17,6 +15,7 @@
  *
  * $Header:$Factory
  */
+package web.webmethod;
 
 import javax.jws.WebMethod;
 import javax.jws.WebService;

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/webmethod/WebMethodWithoutAnnotationSample.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/webmethod/WebMethodWithoutAnnotationSample.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/webmethod/WebMethodWithoutAnnotationSample.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/webmethod/WebMethodWithoutAnnotationSample.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package web.webmethod;
-
 /*
  * Copyright 2004, 2005 The Apache Software Foundation
  *
@@ -17,6 +15,7 @@
  *
  * $Header:$Factory
  */
+package web.webmethod;
 
 import javax.jws.WebMethod;
 import javax.jws.WebService;

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/webparam/WebParamDocumentLiteralSample.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/webparam/WebParamDocumentLiteralSample.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/webparam/WebParamDocumentLiteralSample.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/webparam/WebParamDocumentLiteralSample.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package web.webparam;
-
 /*
  * Copyright 2004-2005 The Apache Software Foundation
  *
@@ -17,6 +15,7 @@
  *
  * $Header:$
  */
+package web.webparam;
 
 import javax.jws.WebMethod;
 import javax.jws.WebParam;

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/webparam/WebParamRpcLiteralSample.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/webparam/WebParamRpcLiteralSample.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/webparam/WebParamRpcLiteralSample.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/webparam/WebParamRpcLiteralSample.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package web.webparam;
-
 /*
  * Copyright 2004, 2005 The Apache Software Foundation
  *
@@ -17,6 +15,7 @@
  *
  * $Header:$
  */
+package web.webparam;
 
 import javax.jws.WebMethod;
 import javax.jws.WebParam;

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/webresult/WebResultDocumentLiteralSample.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/webresult/WebResultDocumentLiteralSample.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/webresult/WebResultDocumentLiteralSample.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/webresult/WebResultDocumentLiteralSample.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package web.webresult;
-
 /*
  * Copyright 2004-2005 The Apache Software Foundation
  *
@@ -17,6 +15,7 @@
  *
  * $Header:$
  */
+package web.webresult;
 
 import javax.jws.WebMethod;
 import javax.jws.WebResult;

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/webresult/WebResultRpcLiteralSample.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/webresult/WebResultRpcLiteralSample.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/webresult/WebResultRpcLiteralSample.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/webresult/WebResultRpcLiteralSample.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package web.webresult;
-
 /*
  * Copyright 2004-2005 The Apache Software Foundation
  *
@@ -17,6 +15,7 @@
  *
  * $Header:$
  */
+package web.webresult;
 
 import javax.jws.WebMethod;
 import javax.jws.WebResult;

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceCustomSample.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceCustomSample.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceCustomSample.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceCustomSample.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package web.webservice;
-
 /*
  * Copyright 2004, 2005 The Apache Software Foundation
  *
@@ -17,6 +15,7 @@
  *
  * $Header:$Factory
  */
+package web.webservice;
 
 import javax.jws.WebMethod;
 import javax.jws.WebService;
@@ -25,7 +24,9 @@
  * This web service customizes the service's configuration by using 
  * @WebService.name, @WebService.serviceName and @WebService.targetNamespace.
  */
-@WebService(name="WebServiceCustomSampleName", serviceName="WebServiceCustomSampleServiceName", targetNamespace="http://beehive.apache.org/web/webservice/custom")
+@WebService(name="WebServiceCustomSampleName",
+    serviceName="WebServiceCustomSampleServiceName", 
+    targetNamespace="http://beehive.apache.org/web/webservice/custom")
 public class WebServiceCustomSample {
 
     @WebMethod

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceEndpointInterfaceSample.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceEndpointInterfaceSample.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceEndpointInterfaceSample.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceEndpointInterfaceSample.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package web.webservice;
-
 /*
  * Copyright 2004, 2005 The Apache Software Foundation
  *
@@ -17,6 +15,7 @@
  *
  * $Header:$Factory
  */
+package web.webservice;
 
 import javax.jws.WebMethod;
 import javax.jws.WebService;

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceImplementationBeanSample.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceImplementationBeanSample.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceImplementationBeanSample.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceImplementationBeanSample.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package web.webservice;
-
 /*
  * Copyright 2004, 2005 The Apache Software Foundation
  *
@@ -17,6 +15,7 @@
  *
  * $Header:$Factory
  */
+package web.webservice;
 
 import javax.jws.WebMethod;
 import javax.jws.WebService;

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceSample.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceSample.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceSample.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceSample.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package web.webservice;
-
 /*
  * Copyright 2004, 2005 The Apache Software Foundation
  *
@@ -17,6 +15,7 @@
  *
  * $Header:$Factory
  */
+package web.webservice;
 
 import javax.jws.WebMethod;
 import javax.jws.WebService;

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceWsdlLocationSample.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceWsdlLocationSample.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceWsdlLocationSample.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/webservice/WebServiceWsdlLocationSample.java Sun Jun 25 12:51:21 2006
@@ -1,5 +1,3 @@
-package web.webservice;
-
 /*
  * Copyright 2004, 2005 The Apache Software Foundation
  *
@@ -17,6 +15,7 @@
  *
  * $Header:$Factory
  */
+package web.webservice;
 
 import javax.jws.WebMethod;
 import javax.jws.WebService;

Modified: beehive/wsm/trunk/samples/wsm-samples/src/web/xsdtypes/XsdTypesSample.java
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/src/web/xsdtypes/XsdTypesSample.java?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/src/web/xsdtypes/XsdTypesSample.java (original)
+++ beehive/wsm/trunk/samples/wsm-samples/src/web/xsdtypes/XsdTypesSample.java Sun Jun 25 12:51:21 2006
@@ -17,9 +17,8 @@
  */
 package web.xsdtypes;
 
-import javax.xml.namespace.QName;
-
 import javax.jws.WebService;
+import javax.xml.namespace.QName;
 
 /**
  * This web service defines several web methods with various types for formal

Modified: beehive/wsm/trunk/samples/wsm-samples/web/WEB-INF/server-config.wsdd
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/web/WEB-INF/server-config.wsdd?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/web/WEB-INF/server-config.wsdd (original)
+++ beehive/wsm/trunk/samples/wsm-samples/web/WEB-INF/server-config.wsdd Sun Jun 25 12:51:21 2006
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
- <globalConfiguration>
-  <parameter name="adminPassword" value="admin"/>
-  <parameter name="disablePrettyXML" value="true"/>
-  <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/>
-  <parameter name="sendXsiTypes" value="true"/>
-  <parameter name="sendXMLDeclaration" value="true"/>
-  <requestFlow>
-   <handler type="java:org.apache.beehive.wsm.axis.handlers.AnnotatedWebServiceDeploymentHandler">
-    <parameter name="scope" value="session"/>
-   </handler>
-   <handler type="java:org.apache.axis.handlers.JWSHandler">
-    <parameter name="scope" value="session"/>
-   </handler>
-  </requestFlow>
- </globalConfiguration>
- <handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/>
- <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/>
- <handler name="Authenticate" type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/>
- <service name="AdminService" provider="java:MSG">
-  <parameter name="allowedMethods" value="AdminService"/>
-  <parameter name="enableRemoteAdmin" value="false"/>
-  <parameter name="className" value="org.apache.axis.utils.Admin"/>
-  <namespace>http://xml.apache.org/axis/wsdd/</namespace>
- </service>
- <service name="Version" provider="java:RPC">
-  <parameter name="allowedMethods" value="getVersion"/>
-  <parameter name="className" value="org.apache.axis.Version"/>
- </service>
- <transport name="http">
-  <requestFlow>
-   <handler type="URLMapper"/>
-   <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
-  </requestFlow>
-  <parameter name="qs:list" value="org.apache.axis.transport.http.QSListHandler"/>
-  <parameter name="qs:wsdl" value="org.apache.axis.transport.http.QSWSDLHandler"/>
-  <parameter name="qs:method" value="org.apache.axis.transport.http.QSMethodHandler"/>
- </transport>
- <transport name="local">
-  <responseFlow>
-   <handler type="LocalResponder"/>
-  </responseFlow>
- </transport>
+    <globalConfiguration>
+        <parameter name="adminPassword" value="admin"/>
+        <parameter name="disablePrettyXML" value="true"/>
+        <parameter name="attachments.implementation" value="org.apache.axis.attachments.AttachmentsImpl"/>
+        <parameter name="sendXsiTypes" value="true"/>
+        <parameter name="sendXMLDeclaration" value="true"/>
+        <requestFlow>
+            <handler type="java:org.apache.beehive.wsm.axis.handlers.AnnotatedWebServiceDeploymentHandler">
+                <parameter name="scope" value="session"/>
+            </handler>
+            <handler type="java:org.apache.axis.handlers.JWSHandler">
+                <parameter name="scope" value="session"/>
+            </handler>
+        </requestFlow>
+    </globalConfiguration>
+    <handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/>
+    <handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/>
+    <handler name="Authenticate" type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/>
+    <service name="AdminService" provider="java:MSG">
+        <parameter name="allowedMethods" value="AdminService"/>
+        <parameter name="enableRemoteAdmin" value="false"/>
+        <parameter name="className" value="org.apache.axis.utils.Admin"/>
+        <namespace>http://xml.apache.org/axis/wsdd/</namespace>
+    </service>
+    <service name="Version" provider="java:RPC">
+        <parameter name="allowedMethods" value="getVersion"/>
+        <parameter name="className" value="org.apache.axis.Version"/>
+    </service>
+    <transport name="http">
+        <requestFlow>
+            <handler type="URLMapper"/>
+            <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
+        </requestFlow>
+        <parameter name="qs:list" value="org.apache.axis.transport.http.QSListHandler"/>
+        <parameter name="qs:wsdl" value="org.apache.axis.transport.http.QSWSDLHandler"/>
+        <parameter name="qs:method" value="org.apache.axis.transport.http.QSMethodHandler"/>
+    </transport>
+    <transport name="local">
+        <responseFlow>
+            <handler type="LocalResponder"/>
+        </responseFlow>
+    </transport>
 </deployment>
 

Modified: beehive/wsm/trunk/samples/wsm-samples/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/web/WEB-INF/web.xml?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/web/WEB-INF/web.xml (original)
+++ beehive/wsm/trunk/samples/wsm-samples/web/WEB-INF/web.xml Sun Jun 25 12:51:21 2006
@@ -1,57 +1,54 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!DOCTYPE web-app PUBLIC
+    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd">
 
 <web-app>
 
-  <display-name>Beehive Web Services - Samples for JSR-181 Annotations</display-name>
-    
-  <filter>
-    <filter-name>ControlFilter</filter-name>
-    <filter-class>org.apache.beehive.controls.runtime.servlet.ControlFilter</filter-class>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>ControlFilter</filter-name>
-    <url-pattern>*.jws</url-pattern>
-  </filter-mapping>
-
-  <listener>
-    <listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>
-  </listener>
-
-  <servlet>
-    <servlet-name>AxisServlet</servlet-name>
-    <display-name>Apache-Axis Servlet</display-name>
-    <servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>AxisServlet</servlet-name>
-    <url-pattern>*.jws</url-pattern>
-  </servlet-mapping>
-
-  <session-config>
-    <!-- Default to 5 minute session timeouts -->
-    <session-timeout>5</session-timeout>
-  </session-config>
-
-  <!-- currently the W3C havent settled on a media type for WSDL;
-    http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
-    for now we go with the basic 'it's XML' response -->
-  <mime-mapping>
-    <extension>wsdl</extension>
-    <mime-type>text/xml</mime-type>
-  </mime-mapping>
-
-  <mime-mapping>
-    <extension>xsd</extension>
-    <mime-type>text/xml</mime-type>
-  </mime-mapping>
-
-  <welcome-file-list id="WelcomeFileList">
-    <welcome-file>index.html</welcome-file>
-    <welcome-file>index.jsp</welcome-file>
-  </welcome-file-list>
+    <display-name>Beehive Web Services - Samples for JSR-181 Annotations</display-name>
 
+    <filter>
+        <filter-name>ControlFilter</filter-name>
+        <filter-class>org.apache.beehive.controls.runtime.servlet.ControlFilter</filter-class>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>ControlFilter</filter-name>
+        <url-pattern>*.jws</url-pattern>
+    </filter-mapping>
+
+    <listener>
+        <listener-class>org.apache.axis.transport.http.AxisHTTPSessionListener</listener-class>
+    </listener>
+
+    <servlet>
+        <servlet-name>AxisServlet</servlet-name>
+        <display-name>Apache-Axis Servlet</display-name>
+        <servlet-class>org.apache.axis.transport.http.AxisServlet</servlet-class>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>AxisServlet</servlet-name>
+        <url-pattern>*.jws</url-pattern>
+    </servlet-mapping>
+
+    <session-config>
+        <!-- Default to 5 minute session timeouts -->
+        <session-timeout>5</session-timeout>
+    </session-config>
+
+    <mime-mapping>
+        <extension>wsdl</extension>
+        <mime-type>text/xml</mime-type>
+    </mime-mapping>
+
+    <mime-mapping>
+        <extension>xsd</extension>
+        <mime-type>text/xml</mime-type>
+    </mime-mapping>
+
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
 </web-app>

Modified: beehive/wsm/trunk/samples/wsm-samples/web/handlerchain.html
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/samples/wsm-samples/web/handlerchain.html?rev=417046&r1=417045&r2=417046&view=diff
==============================================================================
--- beehive/wsm/trunk/samples/wsm-samples/web/handlerchain.html (original)
+++ beehive/wsm/trunk/samples/wsm-samples/web/handlerchain.html Sun Jun 25 12:51:21 2006
@@ -1,9 +1,26 @@
+<!--
+   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.
+   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:$
+-->
 <html>
 
 <head>
 
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Beehive Web Services - Samples - @javax.jws.HandlerChain</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>Beehive Web Services - Samples - @javax.jws.HandlerChain</title>
 
 </head>
 
@@ -12,22 +29,24 @@
 
 <h1>Samples for Beehive web services: @javax.jws.HandlerChain</h1>
 <hr>
+
 <p>
-View the WSDL files for the web services:
-<ul>
-    <li>
-        <a href="web/handlerchain/HandlerChainSample.jws?wsdl">HandlerChainSample</a>
-    </li>
-</ul>
+    View the WSDL files for the web services:
+    <ul>
+        <li>
+            <a href="web/handlerchain/HandlerChainSample.jws?wsdl">HandlerChainSample</a>
+        </li>
+    </ul>
 </p>
 <hr>
+
 <p>
-Invoke methods on sample web services:
-<ul>
-    <li>
-        <a href="web/handlerchain/HandlerChainSample.jws?method=sayHello&name=test">HandlerChain.sayHello("test")</a>
-    </li>
-</ul>
+    Invoke methods on sample web services:
+    <ul>
+        <li>
+            <a href="web/handlerchain/HandlerChainSample.jws?method=sayHello&name=test">HandlerChain.sayHello("test")</a>
+        </li>
+    </ul>
 </p>
 <hr>