You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by mm...@apache.org on 2006/10/25 13:52:34 UTC

svn commit: r467613 - in /incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca: common/ common/resources/ common/src/demo/servlet/ hello_world_soap_http/ hello_world_soap_http/etc/ hello_world_soap_http/etc/wsdl/ hello_world_soap_http/src...

Author: mmao
Date: Wed Oct 25 04:52:33 2006
New Revision: 467613

URL: http://svn.apache.org/viewvc?view=rev&rev=467613
Log:
Remove the duplicated part caused by the last patch

Modified:
    incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/common_j2ee.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/resources/cxf_doc.css
    incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/src/demo/servlet/DemoServletBase.java
    incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/README.txt
    incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/etc/cxfj2ee_1_5-ds.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/etc/jboss-web.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/etc/web.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/etc/wsdl/hello_world.wsdl
    incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/src/demo/servlet/HelloWorldServlet.java
    incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/src/hello_world.wsdl

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/README.txt?view=diff&rev=467613&r1=467612&r2=467613
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/README.txt Wed Oct 25 04:52:33 2006
@@ -2,7 +2,3 @@
 This directory does not contain an Celtix demo.  It contains code that
 is common to other jca demos and builds a jar that is incorporated
 into other jca demos. 
-
-This directory does not contain an Celtix demo.  It contains code that
-is common to other jca demos and builds a jar that is incorporated
-into other jca demos. 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/build.xml?view=diff&rev=467613&r1=467612&r2=467613
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/build.xml Wed Oct 25 04:52:33 2006
@@ -53,60 +53,4 @@
        <delete file="${basedir}/common.jar"/>
     </target>
 
- </project>
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you 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.
--->
-<project name="demo_common" default="build" basedir=".">
-
-  <property name="demos.current.dir" value="."/>
-  <property name="common.build.classes" value="${basedir}/build/classes"/> 
-  <property name="common.build.src" value="${basedir}/src"/> 
-    
-  <path id="build.classpath"> 
-    <path location="${common.build.classes}"/>
-    <path location="${basedir}/../../../../lib/servlet-api-2.4.jar"/>
-  </path> 
-
-  <target name="init">
-    <mkdir dir="${common.build.classes}"/> 
-  </target>
-
-  <target name="compile" depends="init"> 
-    <javac destdir="${common.build.classes}" >
-      <src path="${common.build.src}"/>
-      <include name="**/*.java"/>
-      <classpath>
-	<path refid="build.classpath"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <target name="build" depends="clean,compile"> 
-    <jar destfile="${basedir}/common.jar">
-      <fileset dir="${common.build.classes}"/> 
-    </jar>
-    </target>
-
-   <target name="clean">
-       <delete dir="${basedir}/build"/>
-       <delete file="${basedir}/common.jar"/>
-    </target>
-
- </project>
+ </project>
\ No newline at end of file

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/common_j2ee.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/common_j2ee.xml?view=diff&rev=467613&r1=467612&r2=467613
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/common_j2ee.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/common_j2ee.xml Wed Oct 25 04:52:33 2006
@@ -79,86 +79,4 @@
     </zipfileset>
     </jar>
 </target>
--->
-
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you 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.
--->
-
-<!--target name="j2ee.compile">
-    <antcall target="compile"> 
-    <param name="build.src.dir" value="${basedir}/src"/> 
-    <param name="extra.class.path" value="${basedir}/../common/common.jar"/> 
-    </antcall>
-</target-->
-
-<target name="j2ee.compile">
-    <javac debug="true">
-        <src path="${basedir}/src"/>
-        <!--src path="${basedir}/src"/-->
-        <classpath>
-            <path refid="cxf.classpath"/>
-            <pathelement path="${thirdparty.classpath}"/>
-	</classpath>
-    </javac>
-
-    <copy todir="">
-    </copy>
-</target>
-
-<target name="j2ee.build.war">
-
-    <!-- copy wsdl so that it can be included in the web application --> 
-    <copy file="${wsdl.location}" todir="${basedir}/src" />
-
-    <war destfile="j2ee-archives/${war.name}" webxml="${web.xml}">
-
-    <webinf dir="etc"> 
-	<include name="jboss-web.xml"/>
-	<include name="weblogic.xml"/>
-    </webinf>
-
-    <lib dir="../common/">
-	<include name="common.jar"/>
-    </lib>
-    
-    <classes dir="${basedir}/src">
-	<include name="**/*.class"/>
-	<include name="**/*.wsdl"/>
-    </classes>
-
-    <zipfileset dir="${j2ee.resources.dir}/images" prefix="images">
-	<include name="*.gif" />
-    </zipfileset>
-
-    <zipfileset dir="${j2ee.resources.dir}">
-	<include name="*.css" />
-    </zipfileset>
-    </war>
-</target> 
-
-<!--
-<target name="prepare.rar.to.deploy">
-    <copy file="${aspen.j2ee.lib.dir}/cxf.rar" todir="${build.archives}"/>
-    <jar destfile="${build.archives}/cxf.rar" update="true">
-    <zipfileset dir="${basedir}/../common/etc" prefix="META-INF">
-	<include name="weblogic-ra.xml"/>
-    </zipfileset>
-    </jar>
-</target>
 -->

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/resources/cxf_doc.css
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/resources/cxf_doc.css?view=diff&rev=467613&r1=467612&r2=467613
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/resources/cxf_doc.css (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/resources/cxf_doc.css Wed Oct 25 04:52:33 2006
@@ -51,58 +51,4 @@
 }
 #subnav A:hover {
 	FONT-WEIGHT: bold; FONT-SIZE: 13px; COLOR: #808080; FONT-FAMILY: arial,helvetica,sans-serif; TEXT-DECORATION: underline
-}
-BODY {
-	FONT-SIZE: 12px; MARGIN: 0px; FONT-FAMILY: arial,helvetica,sans-serif; BACKGROUND-COLOR: #D6E7A5
-}
-#blue {
-	VERTICAL-ALIGN: top; BACKGROUND-COLOR: #EFF7F7
-}
-#green {
-	VERTICAL-ALIGN: top; BACKGROUND-COLOR: #D6E7A5
-}
-#grey {
-	VERTICAL-ALIGN: top; BACKGROUND-COLOR:  #E7E7E7
-}
-#white {
-	VERTICAL-ALIGN: top; FONT-FAMILY: arial,helvetica,sans-serif; BACKGROUND-COLOR: #ffffff
-}
-H1 {
-	FONT-WEIGHT: bold; FONT-SIZE: 18px; VERTICAL-ALIGN: top; COLOR: #000000; FONT-FAMILY: arial,helvetica,sans-serif
-}
-H2 {
-	FONT-WEIGHT: bold; FONT-SIZE: 16px; VERTICAL-ALIGN: top; COLOR: #000000; FONT-FAMILY: arial,helvetica,sans-serif
-}
-H3 {
-	FONT-SIZE: 14px; VERTICAL-ALIGN: top; COLOR: #000000; FONT-FAMILY: arial,helvetica,sans-serif
-}
-H4 {
-	FONT-SIZE: 12px; VERTICAL-ALIGN: top; COLOR: #000000; FONT-FAMILY: arial,helvetica,sans-serif
-}
-#leftnav {
-	PADDING-LEFT: 20px; FONT-WEIGHT: bold; FONT-SIZE: 12px; VERTICAL-ALIGN: top; COLOR: #c6d7de; FONT-FAMILY: arial,helvetica,sans-serif
-}
-#leftnav A {
-	FONT-WEIGHT: bold; FONT-SIZE: 12px; COLOR: #ffffff; FONT-FAMILY: arial,helvetica,sans-serif; TEXT-DECORATION: none
-}
-#leftnav A:hover {
-	FONT-WEIGHT: bold; FONT-SIZE: 12px; COLOR: #d8e1e8; FONT-FAMILY: arial,helvetica,sans-serif; TEXT-DECORATION: underline
-}
-#mainnav {
-	FONT-WEIGHT: normal; FONT-SIZE: 12px; VERTICAL-ALIGN: top; COLOR: #000000; FONT-FAMILY: arial,helvetica,sans-serif
-}
-#mainnav A {
-	FONT-WEIGHT: bold; FONT-SIZE: 16px; COLOR: #94b2c2; FONT-FAMILY: arial,helvetica,sans-serif; TEXT-DECORATION: none
-}
-#mainnav A:hover {
-	FONT-WEIGHT: bold; FONT-SIZE: 16px; COLOR: #808080; FONT-FAMILY: arial,helvetica,sans-serif; TEXT-DECORATION: underline
-}
-#subnav {
-	FONT-WEIGHT: normal; FONT-SIZE: 12px; VERTICAL-ALIGN: top; COLOR: #000000; FONT-FAMILY: arial,helvetica,sans-serif
-}
-#subnav A {
-	FONT-WEIGHT: bold; FONT-SIZE: 13px; COLOR: #94b2c2; FONT-FAMILY: arial,helvetica,sans-serif; TEXT-DECORATION: none
-}
-#subnav A:hover {
-	FONT-WEIGHT: bold; FONT-SIZE: 13px; COLOR: #808080; FONT-FAMILY: arial,helvetica,sans-serif; TEXT-DECORATION: underline
-}
+}
\ No newline at end of file

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/src/demo/servlet/DemoServletBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/src/demo/servlet/DemoServletBase.java?view=diff&rev=467613&r1=467612&r2=467613
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/src/demo/servlet/DemoServletBase.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/common/src/demo/servlet/DemoServletBase.java Wed Oct 25 04:52:33 2006
@@ -135,140 +135,3 @@
     protected abstract void writeMainBody(PrintWriter writer); 
 
 }
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package demo.servlet;
-
-import java.io.PrintWriter;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-
-
-/** Abstract base class for demo servlets.  Provides a consistent
- *  look&feel for the servlet based demos. Subclasses are only
- *  required to display the portions of the page relevant to their
- *  demo, minimizing the amount of clutter in the demo code.
- *
- * The servlet is based on the template method pattern. Subclasses
- * are required to implement the <code>writeMainBody</code> method.
- * the basic structure of the page is already laid out when this
- * method is invoke so there is no need to for &lt;body&gt; or
- * &lt;head&gt; type tags.
- */ 
-public abstract class DemoServletBase extends HttpServlet {
-
-    final String pageTitle; 
-
-    public DemoServletBase(String pageTitle) {
-    
-        this.pageTitle = pageTitle; 
-    }
-  
-
-
-    public void  doGet(HttpServletRequest req, HttpServletResponse resp) { 
-
-        PrintWriter writer = null; 
-    
-        try { 
-
-            resp.setContentType("text/html");
-            writer = resp.getWriter();  
-            writer.println("<html>"); 
-
-            // write out the page header
-            
-            writeHeader(writer);
-
-            // write out the body including displaying 
-            
-            writeBody(writer); 
-
-      
-            writer.println("</html>"); 
-      
-            writer.close(); 
-
-        } catch (Exception ex) { 
-            ex.printStackTrace(); 
-
-        } finally { 
-            if (writer != null) { 
-                writer.close(); 
-            } 
-      
-        } 
-    
-    } 
-
-
-    protected void writeBody(PrintWriter writer) { 
-    
-        writer.println("<body  topmargin=\"0\" leftmargin=\"0\" rightmargin=\"0\" margins=\"0\">"); 
-        writePageHeader(writer); 
-    
-    
-        writer.println("<h2><br>&nbsp;&nbsp;" + pageTitle + "</h2>"); 
-        writeMainBody(writer); 
-    
-        writer.println("</td>"); 
-        writer.println("</tr>"); 
-        writer.println("</table>"); 
-        writer.println("</body>"); 
-        writer.println("</html>"); 
-        writer.close(); 
-    } 
-
-
-    protected void writePageHeader(PrintWriter writer) { 
-
-        writer.println(
-            "<table width=\"100%\"  height=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">"
-            + "<TR><td width=\"9%\" height=\"1%\"></td><td width=\"1%\">"
-            + "<img src=\"images/spacer.gif\" width=\"2\">"
-            + "</td><td width=\"90%\">"
-            + "<img src=\"images/cxf_banner.gif\" width=\"350\" height=\"57\"></td></tr>"); 
-
-        writer.println(
-            "<TR><td id=\"grey\"><img src=\"images/spacer.gif\" width=\"185\" height=\"1\">"
-            + "</td><td id=\"grey\"><img src=\"images/spacer.gif\" width=\"2\" height=\"2\">"
-            + "</td><td id=\"grey\"><img src=\"images/spacer.gif\" width=\"300\" height=\"2\"></td>");
-
-        writer.println(
-            "</tr><TR><td id=\"grey\"><img src=\"images/spacer.gif\" width=\"1\" height=\"1\">"
-            + "</td><td id=\"grey\"><img src=\"images/spacer.gif\" width=\"2\" height=\"1\">" 
-            + "</td><td id=\"blue\">"); 
-
-    } 
-
-
-    protected void writeHeader(PrintWriter writer) { 
-
-        writer.println("<head>"); 
-        writer.println("<link rel=\"stylesheet\" type=\"text/css\" href=\"./cxf_doc.css\"/>");
-        writer.println("<title>CXF J2EE  Demos</title>"); 
-        writer.println("</head>"); 
-    } 
-
-    protected abstract void writeMainBody(PrintWriter writer); 
-
-}

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/README.txt?view=diff&rev=467613&r1=467612&r2=467613
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/README.txt Wed Oct 25 04:52:33 2006
@@ -157,162 +157,3 @@
 
 
 
-HELLO WORLD (SOAP OVER HTTP) CXF J2EE DEMO
-============================================
-============================================
-
-This demo will show how to connect with a CXF Web service using a
-Servlet deployed in an application server.
-
-
-Running the Demo
-================
-
-There are a number of steps required to successfully run this demo
-application:
-
-    . Update jboss endorsed jars
-    . Launch the application server
-    . Deploy the CXF J2EE Connector 
-    . Build the demo
-    . Deploy the web application to the application server
-    . Launch the CXF Server
-    . Accessing the web application 
-
-Update Jboss endorsed jars
-==========================
- (Unix)  % cd $CXF_HOME/lib/
-         % cp activation-1.1.jar jaxb-api-2.0.jar jaxb-impl-2.0.3.jar
-              jaxb-xjc-2.0.3.jar jsr173_api-1.0.jar
-	      jsr181-api-2.0-JAXWS-2.0-EA3.jar
-              saaj-api-1.3.jar saaj-impl-1.3.jar 
-              <jboss-home>/lib/endorsed\
- (Windows) > cd %CXF_HOME%\lib\
-           > copy activation-1.1.jar jaxb-api-2.0.jar jaxb-impl-2.0.3.jar
-              jaxb-xjc-2.0.3.jar jsr173_api-1.0.jar
-	      jsr181-api-2.0-JAXWS-2.0-EA3.jar
-              saaj-api-1.3.jar saaj-impl-1.3.jar 
-              <jboss-home>\lib\endorsed\
-
-Launch the application server
-=============================
-
-    The demo requires an application server.  Make sure you have a
-    running instance of an application server. 
-
-    
-
-Deploy the CXF J2EE Connector
-===============================
-
-    The CXF J2EE Connector must be deployed to the application
-    server before running the demo.  A single resource adapter
-    deployment will be shared by all of the demos, so this step need
-    only be completed once.  
-
-
-    How to deploy the CXF J2EE Connector is dependent on your 
-    application server. Please consult your vendor documentation
-    on connector deployment. Here are basic instructions to deploy
-    the connector in JBoss application servers.
-
-
-JBoss
------
-Copy the connector RAR from its location in the CXF installation to
-the JBoss deployment directory.
-
-  (Unix)    % cd $CXF_HOME/lib/
-            % cp CXF.rar \ 
-              <jboss-home>/server/default/deploy
-
-  (Windows) > cd %CXF_HOME%\lib\
-            > copy cxf.rar 
-              <jboss-home>\server\default\deploy
-
-Copy the celtix_j2ee_1_5-ds.xml file to the JBoss deployment directory.
-
-  (Unix)    % cp ./etc/celtixj2ee_1_5-ds.xml <jboss-home>/server/default/deploy
-
-  (Windows) > copy .\etc\celtixj2ee_1_5-ds.xml 
-                <jboss-home>\server\default\deploy
-
-Building the Demo
-=================
-
-Building the demo requires that there is a JDK available and that the
-CXF environment is correctly set. 
-
-Before building this demo, build common dir first.
-  (Unix)    % cd common
-            % ant
-  (Windows) > cd common
-            > ant
-
-The demo may be built from the directory 
-hello_world_soap_http.
-
-Issue the command:
-
-  (Unix)    % ant
-  (Windows) > ant
-
-
-
-Launch the CXF Service
-========================
-
-Run the CXF service provided by the basic/hello_world_soap_http
-demo.
-
-To launch the service:
-
-1.  Move into the sample/hello_world/ 
-directory.
-2.  Start it_container and deploy a C++ Web service into it.
-    Issue the command: 
-  (Unix)    % ant server
-  (Windows) > ant server
-
-
-See hello_world/README.txt file for full details.
-
-
-Deploying the demo WAR archive
-==============================
-
-How to deploy a WAR archive is dependent on your 
-application server. Please consult your vendor documentation
-on application deployment. Here are basic instructions to deploy
-the demo application for JBoss, WebLogic and WebSphere application 
-servers.
-
-JBoss
------
-Copy the WAR archive ./build/lib/helloworld.war 
-to the JBoss deployment directory.
-  
-  (Unix)    % cp ./build/lib/helloworld.war \ 
-              <jboss-home>/server/default/deploy
-  (Windows) > copy .\build\lib\helloworld.war 
-              <jboss-home>\server\default\deploy
-
-
-
-Accessing the web application 
-=============================
-
-Using a web browser access the URI below corresponding to your
-application server. (These URI assume that the application
-server is running in the same machine as the web browser)
-
-JBoss
------
-http://localhost:8080/helloworld/*.do
-
-
-The web application provides a simple Web front-end to the Hello World
-Application. 
-
-
-

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/build.xml?view=diff&rev=467613&r1=467612&r2=467613
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/build.xml Wed Oct 25 04:52:33 2006
@@ -113,118 +113,3 @@
   </target>
     
 </project>
-<?xml version="1.0"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you 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.
--->
-
-<project name="HelloWorldSOAPHttpDemo" default="build" basedir=".">
-
- <!-- overload some properties to customize this build -->
-  <property name="wsdl.dir" value="${basedir}/etc/wsdl"/>
-  <property name="cxf.home" value="../../../.."/>
-  <property name="wsdl.location" value="${wsdl.dir}/hello_world.wsdl"/>
-  <property name="war.name" value="helloworld.war"/>
-  <property name="j2ee.resources.dir" location="${basedir}/../common/resources"/>
-  <property name="thirdparty.classpath" value="${basedir}/../common/common.jar"/>
-    
-  <path id="other.classpath">
-   	<pathelement location="${basedir}/../../../../lib/servlet-api-2.4.jar"/>
-        <pathelement location="${basedir}/../../../../lib/connector.jar"/>
-        <pathelement location="${basedir}/../common/common.jar"/>
-  </path>
-
-  <import file="../../../common_build.xml"/>
-  
-   <target name="init">
-    <mkdir dir="${build.classes.dir}"/>
-  </target>
-
-
-  <target name="compile-j2ee" depends="maybe.generate.code">
-        <javac destdir="${build.classes.dir}" debug="true">
-	    <src path="${build.src.dir}"/>
-            <src path="${basedir}/src"/>
-            <classpath>
-                <path refid="cxf.classpath"/>
-                <path refid="other.classpath"/>
-            </classpath>
-        </javac>
-
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${basedir}/src" includes="**/*.xml" />            
-            <fileset dir="${build.src.dir}" includes="**/*.xml" />
-            <fileset dir="${build.src.dir}" includes="**/*.wsdl" />
-        </copy>
-  </target>
- 
-  <target name="build" depends="compile-j2ee,build-war"/>
-
-  <target name="generate.code">
-    <echo level="info" message="Generating code using wsdl2java..."/>
-    <wsdl2java file="hello_world.wsdl"/>
-  </target>
-
-  <target name="server" description="run demo server" depends="build">
-    <property name="param" value=""/>
-    <cxfrun classname="demo.hw.server.Server"
-               param1="${wsdl.dir}/hello_world.wsdl"/>
-  </target>
-
-  <target name="build-war">
-    <copy file="${wsdl.location}" todir="${basedir}/src" />
-     
-    <mkdir dir="./build/lib"/>
-    <mkdir dir="./build/classes/wsdl"/>
-    <copy file="${wsdl.location}" todir="${basedir}/build/classes/wsdl"/>
-    <war destfile="build/lib/${war.name}" webxml="${basedir}/etc/web.xml">
-       <webinf dir="etc">
-          <include name="jboss-web.xml"/>
-          <include name="weblogic.xml"/>
-       </webinf>
-
-       <lib dir="../common/">
-          <include name="common.jar"/>
-       </lib>
-
-       <classes dir="${build.classes.dir}">
-          <include name="**/*.class"/>
-          <include name="**/*.wsdl"/>
-       </classes>
-
-
-       <zipfileset dir="${j2ee.resources.dir}/images" prefix="images">
-          <include name="*.gif" />
-       </zipfileset>
-
-       <zipfileset dir="${j2ee.resources.dir}">
-          <include name="*.css" />
-       </zipfileset>
-
-    </war>
-  </target>
-
-
-  <target name="clean">
-      <delete failonerror="no">
-	<fileset dir="./src" includes="**/*.class"/>
-	<fileset dir="." includes="**/*.war"/>
-      </delete>
-  </target>
-    
-</project>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/etc/cxfj2ee_1_5-ds.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/etc/cxfj2ee_1_5-ds.xml?view=diff&rev=467613&r1=467612&r2=467613
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/etc/cxfj2ee_1_5-ds.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/etc/cxfj2ee_1_5-ds.xml Wed Oct 25 04:52:33 2006
@@ -27,36 +27,4 @@
     <rar-name>cxf.rar</rar-name>
     <connection-definition>org.apache.cxf.connector.CXFConnectionFactory</connection-definition>
   </no-tx-connection-factory>
-</connection-factories>
-
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you 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.
--->
-
-<!DOCTYPE connection-factories
-    PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN"
-    "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd">
-<connection-factories>
-  <no-tx-connection-factory>
-    <jndi-name>CXFConnector</jndi-name>
-    <rar-name>cxf.rar</rar-name>
-    <connection-definition>org.apache.cxf.connector.CXFConnectionFactory</connection-definition>
-  </no-tx-connection-factory>
-</connection-factories>
-
+</connection-factories>
\ No newline at end of file

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/etc/jboss-web.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/etc/jboss-web.xml?view=diff&rev=467613&r1=467612&r2=467613
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/etc/jboss-web.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/etc/jboss-web.xml Wed Oct 25 04:52:33 2006
@@ -22,29 +22,4 @@
     <res-type>org.apache.cxf.connector.CXFConnectionFactory</res-type>
     <jndi-name>java:/CXFConnector</jndi-name>
   </resource-ref>
-</jboss-web>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you 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.
--->
-<jboss-web>
-  <resource-ref>
-    <res-ref-name>eis/CXFConnector</res-ref-name>
-    <res-type>org.apache.cxf.connector.CXFConnectionFactory</res-type>
-    <jndi-name>java:/CXFConnector</jndi-name>
-  </resource-ref>
-</jboss-web>
+</jboss-web>
\ No newline at end of file

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/etc/web.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/etc/web.xml?view=diff&rev=467613&r1=467612&r2=467613
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/etc/web.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/etc/web.xml Wed Oct 25 04:52:33 2006
@@ -37,44 +37,4 @@
     <res-auth>Container</res-auth>
   </resource-ref>
 
-</web-app>
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you 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.
--->
-
-<!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>
-
-  <servlet>
-    <servlet-name>HelloWorldServlet</servlet-name>
-    <servlet-class>demo.servlet.HelloWorldServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>HelloWorldServlet</servlet-name>
-    <url-pattern>*.do</url-pattern>
-  </servlet-mapping>
- 
-  <resource-ref>
-    <res-ref-name>eis/CXFConnector</res-ref-name>
-    <res-type>org.apache.cxf.connector.CXFConnectionFactory</res-type>
-    <res-auth>Container</res-auth>
-  </resource-ref>
-
-</web-app>
+</web-app>
\ No newline at end of file

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/etc/wsdl/hello_world.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/etc/wsdl/hello_world.wsdl?view=diff&rev=467613&r1=467612&r2=467613
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/etc/wsdl/hello_world.wsdl (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/etc/wsdl/hello_world.wsdl Wed Oct 25 04:52:33 2006
@@ -179,184 +179,3 @@
     </wsdl:service>
 </wsdl:definitions>
 
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you 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.
--->
-<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/hello_world_soap_http" 
-    xmlns="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:tns="http://apache.org/hello_world_soap_http"
-    xmlns:x1="http://apache.org/hello_world_soap_http/types"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <wsdl:types>
-        <schema targetNamespace="http://apache.org/hello_world_soap_http/types" 
-            xmlns="http://www.w3.org/2001/XMLSchema"
-	    xmlns:tns="http://apache.org/hello_world_soap_http/types"
-            elementFormDefault="qualified">
-	    <simpleType name="MyStringType">
-		<restriction base="string">
-		    <maxLength value="30" />
-		</restriction>
-	    </simpleType>
-
-            <element name="sayHi">
-                <complexType/>
-            </element>
-            <element name="sayHiResponse">
-                <complexType>
-                    <sequence>
-                        <element name="responseType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMe">
-                <complexType>
-                    <sequence>
-                        <element name="requestType" type="tns:MyStringType"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMeResponse">
-                <complexType>
-                    <sequence>
-                        <element name="responseType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMeOneWay">
-                <complexType>
-                    <sequence>
-                        <element name="requestType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="pingMe">
-                <complexType/>
-            </element>
-            <element name="pingMeResponse">
-                <complexType/>
-            </element>
-            <element name="faultDetail">
-                <complexType>
-                    <sequence>
-                        <element name="minor" type="short"/>
-                        <element name="major" type="short"/>
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-    </wsdl:types>
-    <wsdl:message name="sayHiRequest">
-        <wsdl:part element="x1:sayHi" name="in"/>
-    </wsdl:message>
-    <wsdl:message name="sayHiResponse">
-        <wsdl:part element="x1:sayHiResponse" name="out"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeRequest">
-        <wsdl:part element="x1:greetMe" name="in"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeResponse">
-        <wsdl:part element="x1:greetMeResponse" name="out"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeOneWayRequest">
-        <wsdl:part element="x1:greetMeOneWay" name="in"/>
-    </wsdl:message>
-    <wsdl:message name="pingMeRequest">
-        <wsdl:part name="in" element="x1:pingMe"/>
-    </wsdl:message>
-    <wsdl:message name="pingMeResponse">
-        <wsdl:part name="out" element="x1:pingMeResponse"/>
-    </wsdl:message>		
-    <wsdl:message name="pingMeFault">
-        <wsdl:part name="faultDetail" element="x1:faultDetail"/>
-    </wsdl:message>
-    
-    <wsdl:portType name="Greeter">
-        <wsdl:operation name="sayHi">
-            <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
-            <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
-        </wsdl:operation>
-        
-        <wsdl:operation name="greetMe">
-            <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
-            <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
-        </wsdl:operation>
-        
-        <wsdl:operation name="greetMeOneWay">
-            <wsdl:input message="tns:greetMeOneWayRequest" name="greetMeOneWayRequest"/>
-        </wsdl:operation>
-
-        <wsdl:operation name="pingMe">
-            <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
-            <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
-            <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
-        </wsdl:operation> 
-    </wsdl:portType>
-    <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        
-        <wsdl:operation name="sayHi">
-            <soap:operation soapAction="" style="document"/>
-            <wsdl:input name="sayHiRequest">
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="sayHiResponse">
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        
-        <wsdl:operation name="greetMe">
-            <soap:operation soapAction="" style="document"/>
-            <wsdl:input name="greetMeRequest">
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="greetMeResponse">
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        
-        <wsdl:operation name="greetMeOneWay">
-            <soap:operation soapAction="" style="document"/>
-            <wsdl:input name="greetMeOneWayRequest">
-                <soap:body use="literal"/>
-            </wsdl:input>
-        </wsdl:operation>
-
-        <wsdl:operation name="pingMe">
-            <soap:operation style="document"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-            <wsdl:fault name="pingMeFault">
-                <soap:fault name="pingMeFault" use="literal"/>
-            </wsdl:fault>
-        </wsdl:operation>
-        
-    </wsdl:binding>
-    <wsdl:service name="SOAPService">
-        <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">
-            <soap:address location="http://localhost:9000/SoapContext/SoapPort"/>
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>
-

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/src/demo/servlet/HelloWorldServlet.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/src/demo/servlet/HelloWorldServlet.java?view=diff&rev=467613&r1=467612&r2=467613
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/src/demo/servlet/HelloWorldServlet.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/src/demo/servlet/HelloWorldServlet.java Wed Oct 25 04:52:33 2006
@@ -28,154 +28,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.namespace.QName;
-import org.apache.hello_world_soap_http.Greeter;
 
 import org.apache.cxf.connector.CXFConnectionFactory;
 import org.apache.cxf.connector.Connection;
-
-public class HelloWorldServlet extends DemoServletBase {
-
-    private static final String EIS_JNDI_NAME = "java:comp/env/eis/CXFConnector";
-
-    private String operationName; 
-    private String userName; 
-
-    public HelloWorldServlet() {
-        super("J2EE Connector Hello World Demo");
-    }
-
-
-    public void doGet(HttpServletRequest req, HttpServletResponse resp) {
-        try { 
-            operationName = req.getParameter("Operation"); 
-            userName = req.getParameter("User"); 
-            super.doGet(req, resp);
-        } finally { 
-            operationName = null; 
-        } 
-    }
-
-
-
-    /** 
-     * get a connection to the SOAP service
-     */ 
-    protected Connection getServiceConnection() throws NamingException, ResourceException {
-
-        Context ctx = new InitialContext();
-
-        // retrieve the connection factory from JNDI 
-        //
-        CXFConnectionFactory factory = (CXFConnectionFactory)ctx.lookup(EIS_JNDI_NAME);
-            
-        URL wsdlLocation = getClass().getResource("/wsdl/hello_world.wsdl");
-
-        QName serviceName = 
-            new QName("http://apache.org/hello_world_soap_http", "SOAPService");
-        QName portName = new QName("http://apache.org/hello_world_soap_http", "SoapPort");
-
-
-        // create the connection 
-        //
-        return (Connection)factory.getConnection(Greeter.class, wsdlLocation, serviceName, portName);
-    }
-
-
-
-    protected void writeMainBody(PrintWriter writer) {
-        operationForm(writer);
-        writer.println("&nbsp;&nbsp;" + getResponseFromWebService());
-    }
-
-
-    protected void operationForm(PrintWriter writer) {
-
-        writer.println("<TABLE ALIGN=\"center\">");
-        writer.println("<FORM ACTION=\"./*.do\" METHOD=GET>");
-        writer.println("<TR><TD><b>Operation:</b><BR>");
-        writer.println("<TR><TD>");   
-        writer.println("<INPUT TYPE=RADIO NAME=\"Operation\" VALUE=\"sayHi\"" 
-            + ("sayHi".equals(operationName) ? " CHECKED " : "") +  "> sayHi<BR>");
-        writer.println("<TR><TD>");
-        writer.println("<INPUT TYPE=RADIO NAME=\"Operation\" VALUE=\"greetMe\""
-            + ("greetMe".equals(operationName) ? "  CHECKED " : "") + "> greetMe ");
-        writer.println("<INPUT TYPE=TEXT NAME=\"User\" VALUE=\""
-            + ("greetMe".equals(operationName) ? userName : "") + "\" SIZE=20><BR>");
-        writer.println("<TR><TD>");
-        writer.println("<INPUT TYPE=SUBMIT VALUE=\"Submit\"><BR></p>");
-        writer.println("</FORM>");
-        writer.println("</TABLE>");
-    }
-
-
-    String getResponseFromWebService() {
-
-        Greeter greeter = null;
-        String responseFromWebService = "No message sent";
-        
-        try {
-            greeter = (Greeter)getServiceConnection();
-            
-            if (operationName != null) {
-
-                if ("sayHi".equals(operationName)) {
-                    responseFromWebService = greeter.sayHi();
-                } else if ("greetMe".equals(operationName)) {
-                    responseFromWebService = greeter.greetMe(userName);
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            if (e.getCause() != null) { 
-                e.getCause().printStackTrace(); 
-            } 
-            responseFromWebService = e.toString();
-        } finally { 
-            try {
-                if (greeter != null) {
-                    ((Connection)greeter).close();
-                }
-            } catch (ResourceException e) {
-                // report error from close
-            }
-        } 
-        return responseFromWebService; 
-    }
-}
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package demo.servlet;
-
-import java.io.PrintWriter;
-import java.net.URL;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.resource.ResourceException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.namespace.QName;
 import org.apache.hello_world_soap_http.Greeter;
-
-import org.apache.cxf.connector.CXFConnectionFactory;
-import org.apache.cxf.connector.Connection;
 
 public class HelloWorldServlet extends DemoServletBase {
 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/src/hello_world.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/src/hello_world.wsdl?view=diff&rev=467613&r1=467612&r2=467613
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/src/hello_world.wsdl (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/j2ee/jca/hello_world_soap_http/src/hello_world.wsdl Wed Oct 25 04:52:33 2006
@@ -179,184 +179,3 @@
     </wsdl:service>
 </wsdl:definitions>
 
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you 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.
--->
-<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/hello_world_soap_http" 
-    xmlns="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:tns="http://apache.org/hello_world_soap_http"
-    xmlns:x1="http://apache.org/hello_world_soap_http/types"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <wsdl:types>
-        <schema targetNamespace="http://apache.org/hello_world_soap_http/types" 
-            xmlns="http://www.w3.org/2001/XMLSchema"
-	    xmlns:tns="http://apache.org/hello_world_soap_http/types"
-            elementFormDefault="qualified">
-	    <simpleType name="MyStringType">
-		<restriction base="string">
-		    <maxLength value="30" />
-		</restriction>
-	    </simpleType>
-
-            <element name="sayHi">
-                <complexType/>
-            </element>
-            <element name="sayHiResponse">
-                <complexType>
-                    <sequence>
-                        <element name="responseType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMe">
-                <complexType>
-                    <sequence>
-                        <element name="requestType" type="tns:MyStringType"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMeResponse">
-                <complexType>
-                    <sequence>
-                        <element name="responseType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMeOneWay">
-                <complexType>
-                    <sequence>
-                        <element name="requestType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="pingMe">
-                <complexType/>
-            </element>
-            <element name="pingMeResponse">
-                <complexType/>
-            </element>
-            <element name="faultDetail">
-                <complexType>
-                    <sequence>
-                        <element name="minor" type="short"/>
-                        <element name="major" type="short"/>
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-    </wsdl:types>
-    <wsdl:message name="sayHiRequest">
-        <wsdl:part element="x1:sayHi" name="in"/>
-    </wsdl:message>
-    <wsdl:message name="sayHiResponse">
-        <wsdl:part element="x1:sayHiResponse" name="out"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeRequest">
-        <wsdl:part element="x1:greetMe" name="in"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeResponse">
-        <wsdl:part element="x1:greetMeResponse" name="out"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeOneWayRequest">
-        <wsdl:part element="x1:greetMeOneWay" name="in"/>
-    </wsdl:message>
-    <wsdl:message name="pingMeRequest">
-        <wsdl:part name="in" element="x1:pingMe"/>
-    </wsdl:message>
-    <wsdl:message name="pingMeResponse">
-        <wsdl:part name="out" element="x1:pingMeResponse"/>
-    </wsdl:message>		
-    <wsdl:message name="pingMeFault">
-        <wsdl:part name="faultDetail" element="x1:faultDetail"/>
-    </wsdl:message>
-    
-    <wsdl:portType name="Greeter">
-        <wsdl:operation name="sayHi">
-            <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
-            <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
-        </wsdl:operation>
-        
-        <wsdl:operation name="greetMe">
-            <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
-            <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
-        </wsdl:operation>
-        
-        <wsdl:operation name="greetMeOneWay">
-            <wsdl:input message="tns:greetMeOneWayRequest" name="greetMeOneWayRequest"/>
-        </wsdl:operation>
-
-        <wsdl:operation name="pingMe">
-            <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
-            <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
-            <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
-        </wsdl:operation> 
-    </wsdl:portType>
-    <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        
-        <wsdl:operation name="sayHi">
-            <soap:operation soapAction="" style="document"/>
-            <wsdl:input name="sayHiRequest">
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="sayHiResponse">
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        
-        <wsdl:operation name="greetMe">
-            <soap:operation soapAction="" style="document"/>
-            <wsdl:input name="greetMeRequest">
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="greetMeResponse">
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        
-        <wsdl:operation name="greetMeOneWay">
-            <soap:operation soapAction="" style="document"/>
-            <wsdl:input name="greetMeOneWayRequest">
-                <soap:body use="literal"/>
-            </wsdl:input>
-        </wsdl:operation>
-
-        <wsdl:operation name="pingMe">
-            <soap:operation style="document"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-            <wsdl:fault name="pingMeFault">
-                <soap:fault name="pingMeFault" use="literal"/>
-            </wsdl:fault>
-        </wsdl:operation>
-        
-    </wsdl:binding>
-    <wsdl:service name="SOAPService">
-        <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">
-            <soap:address location="http://localhost:9000/SoapContext/SoapPort"/>
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>
-