You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by pe...@apache.org on 2006/11/08 19:12:37 UTC
svn commit: r472570 - in
/incubator/cxf/trunk/distribution/src/main/release/samples: ./
dispatch_provider/ handlers/ hello_world/ hello_world_RPCLit/
hello_world_async/ hello_world_xml_bare/ hello_world_xml_wrapped/
jms_pubsub/ jms_queue/ js_provider/ ...
Author: peterjones
Date: Wed Nov 8 10:12:35 2006
New Revision: 472570
URL: http://svn.apache.org/viewvc?view=rev&rev=472570
Log:
[CXF-120] added mtosi demo
- Fixed couple of readme typos
- Minor fix to common_build.xml so demos can be built in src tree
Added:
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/README.TXT (with props)
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/build.xml (with props)
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/client/
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/client/AsyncAlarmHandler.java
- copied, changed from r443019, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/test/java/org/objectweb/celtix/fault/http/AsyncAlarmHandler.java
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/client/Client.java
- copied, changed from r443019, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/test/java/org/objectweb/celtix/fault/http/AlarmRetrievalClientTest.java
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/server/
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/server/AlarmRetrievalImpl.java
- copied, changed from r443019, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/test/java/org/objectweb/celtix/fault/http/AlarmRetrievalImpl.java
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/server/Server.java
- copied, changed from r443019, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/test/java/org/objectweb/celtix/fault/http/AlarmRetrievalServer.java
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/code_gen/
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/code_gen/build.xml (with props)
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/code_gen/src/
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/wsdl/
- copied from r443019, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/main/resources/wsdl/
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/wsdl/async_binding.xml.tmpl
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/
- copied from r472558, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/main/resources/wsdl/binding/
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/wsdl/common/
- copied from r472558, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/main/resources/wsdl/common/
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/wsdl/transport/
- copied from r472558, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/main/resources/wsdl/transport/
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/xsd/
- copied from r443019, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/main/resources/xsd/
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/xsd/common/
- copied from r472558, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/main/resources/xsd/common/
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/xsd/interfaces/
- copied from r472558, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/main/resources/xsd/interfaces/
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/xsd/networkResources/
- copied from r472558, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/main/resources/xsd/networkResources/
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/handlers/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_async/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_bare/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_wrapped/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/js_provider/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/mtom/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/wsdl/common/FaultService.wsdl
incubator/cxf/trunk/distribution/src/main/release/samples/restful/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/soap12/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/src/demo/soap_header/client/Client.java
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml?view=diff&rev=472570&r1=472569&r2=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml Wed Nov 8 10:12:35 2006
@@ -30,11 +30,7 @@
<!-- Setup for building in a source build -->
- <condition property="srcbuild_paths.file" value="./srcbuild_paths.xml">
- <available file="../../lib/cxf-incubator.jar"/>
- </condition>
- <!-- default setting -->
- <property name="srcbuild_paths.file" value="../../../target/srcbuild_paths.xml"/>
+ <property name="srcbuild_paths.file" value="../../../../target/srcbuild_paths.xml"/>
<import file="${srcbuild_paths.file}" optional="true"/>
<property name="srcbuild.classpath" value=""/>
@@ -66,6 +62,12 @@
-->
<condition property="cxf.home" value="${env.CXF_HOME}">
<isset property="env.CXF_HOME"/>
+ </condition>
+ <condition property="cxf.home" value="../..">
+ <available file="../../etc" type="dir" property=""/>
+ </condition>
+ <condition property="cxf.home" value="../../..">
+ <available file="../../../etc" type="dir" property=""/>
</condition>
<property name="cxf.home" location="../.."/>
<property name="cxf.etc.dir" location="${cxf.home}/etc"/>
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/README.txt?view=diff&rev=472570&r1=472569&r2=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/README.txt Wed Nov 8 10:12:35 2006
@@ -46,8 +46,8 @@
-Buildng the demo using wsdl2java and javac
-------------------------------------------
+Building the demo using wsdl2java and javac
+-------------------------------------------
From the samples/dispatch_provider directory, first create the target
directory build/classes and then generate code from the WSDL file.
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/handlers/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/handlers/README.txt?view=diff&rev=472570&r1=472569&r2=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/handlers/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/handlers/README.txt Wed Nov 8 10:12:35 2006
@@ -68,8 +68,8 @@
ant clean
-Buildng the demo using wsdl2java and javac
-------------------------------------------
+Building the demo using wsdl2java and javac
+-------------------------------------------
From the samples/handlers directory, first create the target directory
build/classes and then generate code from the WSDL file.
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/README.txt?view=diff&rev=472570&r1=472569&r2=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/README.txt Wed Nov 8 10:12:35 2006
@@ -39,8 +39,8 @@
-Buildng the demo using wsdl2java and javac
-------------------------------------------
+Building the demo using wsdl2java and javac
+-------------------------------------------
From the samples/hello_world directory, first create the target
directory build/classes and then generate code from the WSDL file.
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/README.txt?view=diff&rev=472570&r1=472569&r2=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/README.txt Wed Nov 8 10:12:35 2006
@@ -42,8 +42,8 @@
-Buildng the demo using wsdl2java and javac
-------------------------------------------
+Building the demo using wsdl2java and javac
+-------------------------------------------
From the samples/hello_world_RPCLit directory, first create the target
directory build/classes and then generate code from the WSDL file.
@@ -148,4 +148,4 @@
demo.hwRPCLit.client.Client http://localhost:#/helloworldrpclit/cxf/hello_world_rpclit
Where # is the TCP/IP port used by the servlet container,
-e.g., 8080.
\ No newline at end of file
+e.g., 8080.
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_async/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_async/README.txt?view=diff&rev=472570&r1=472569&r2=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_async/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_async/README.txt Wed Nov 8 10:12:35 2006
@@ -71,8 +71,8 @@
-Buildng the demo using wsdl2java and javac
-------------------------------------------
+Building the demo using wsdl2java and javac
+-------------------------------------------
From the samples/hello_world_async directory, first create the target
directory build/classes and then generate code from the WSDL file.
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_bare/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_bare/README.txt?view=diff&rev=472570&r1=472569&r2=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_bare/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_bare/README.txt Wed Nov 8 10:12:35 2006
@@ -42,8 +42,8 @@
-Buildng the demo using wsdl2java and javac
-------------------------------------------
+Building the demo using wsdl2java and javac
+-------------------------------------------
From the samples/hello_world_xml_bare directory, first create the target
directory build/classes and then generate code from the WSDL file.
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_wrapped/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_wrapped/README.txt?view=diff&rev=472570&r1=472569&r2=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_wrapped/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_wrapped/README.txt Wed Nov 8 10:12:35 2006
@@ -42,8 +42,8 @@
-Buildng the demo using wsdl2java and javac
-------------------------------------------
+Building the demo using wsdl2java and javac
+-------------------------------------------
From the samples/hello_world_xml_wrapped directory, first create the target
directory build/classes and then generate code from the WSDL file.
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/README.txt?view=diff&rev=472570&r1=472569&r2=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/README.txt Wed Nov 8 10:12:35 2006
@@ -64,8 +64,8 @@
-Buildng the demo using wsdl2java and javac
-------------------------------------------
+Building the demo using wsdl2java and javac
+-------------------------------------------
From the samples/jms_pubsub directory, first create the target
directory build/classes and then generate code from the WSDL file.
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt?view=diff&rev=472570&r1=472569&r2=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt Wed Nov 8 10:12:35 2006
@@ -63,8 +63,8 @@
-Buildng the demo using wsdl2java and javac
-------------------------------------------
+Building the demo using wsdl2java and javac
+-------------------------------------------
From the samples/jms_queue directory, first create the target
directory build/classes and then generate code from the WSDL file.
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/js_provider/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/js_provider/README.txt?view=diff&rev=472570&r1=472569&r2=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/js_provider/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/js_provider/README.txt Wed Nov 8 10:12:35 2006
@@ -53,8 +53,8 @@
-Buildng the demo using wsdl2java and javac
-------------------------------------------
+Building the demo using wsdl2java and javac
+-------------------------------------------
From the samples/dispatch_provider directory, first create the target
directory build/classes and then generate code from the WSDL file.
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/mtom/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/mtom/README.txt?view=diff&rev=472570&r1=472569&r2=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/mtom/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/mtom/README.txt Wed Nov 8 10:12:35 2006
@@ -42,8 +42,8 @@
-Buildng the demo using wsdl2java and javac
-------------------------------------------
+Building the demo using wsdl2java and javac
+-------------------------------------------
From the samples/mtom directory, first create the target
directory build/classes and then generate code from the WSDL file.
Added: incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/README.TXT
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/README.TXT?view=auto&rev=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/README.TXT (added)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/README.TXT Wed Nov 8 10:12:35 2006
@@ -0,0 +1,82 @@
+MTOSI FAULT DEMO (SOAP OVER HTTP)
+=================================
+=================================
+
+This code example demonstrates a simple cxf
+based client/server Web service implementing
+the MTOSI alarm retrieval service.
+
+
+Prerequisite
+------------
+
+If your environment already includes cxf-incubator.jar on the
+CLASSPATH, and the JDK and ant bin directories on the PATH
+it is not necessary to run the environment script described in
+the samples directory README. If your environment is not
+properly configured, or if you are planning on using wsdl2java,
+javac, and java to build and run the demos, you must set the
+environment by running the script.
+
+
+Building and running the demo using ant
+---------------------------------------
+
+From the samples/mtosi_1.1/alarm_retrieval directory, the ant
+build script can be used to build and run the demo.
+
+Using either UNIX or Windows:
+
+ ant build
+ ant server
+ ant client
+
+
+To remove the code generated from the WSDL file and the .class
+files, run:
+
+ ant clean
+
+
+What Happens When the Demo Runs
+===============================
+
+When the server process starts, it opens an
+HTTP connection on the TCP/IP port specified
+by the location attribute within the port
+specification.
+
+The client application has access to the
+same WSDL file, from which it obtains the
+connection information. The client makes
+asynchronous SOAP over HTTP requests against
+the Web service hosted by this server process.
+
+In the "fault" demo, the client invokes the
+getActiveAlarmsCount and the getActiveAlarms
+operations on the AlarmRetrieval interface.
+
+The client extracts data from the Alarm information
+resulting from the call to getActiveAlarms, and
+displays it in a formatted way:
+
+ Alarm #0:
+ - Notification ID: 0001239
+ - Object type: OT_EQUIPMENT
+ - OS time: 20060101123000.0Z
+ - NE time: 20060101122900.0Z
+ - Layer/Rate: LR_DS0_64K
+ - Probable cause type: AIS
+ - Perceived severity: PS_MAJOR
+ - Service affecting: SA_UNKNOWN
+ - Root Cause Alarm Indication: NO
+ (...)
+
+See the following source for details on
+how the types conveyed by the messages
+are created and populated:
+
+ - src/demo/fault/client/Client.java (client side)
+ - src/demo/fault/server/AlarmRetrievalImpl.java (server side)
+
+
Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/README.TXT
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/README.TXT
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/build.xml?view=auto&rev=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/build.xml (added)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/build.xml Wed Nov 8 10:12:35 2006
@@ -0,0 +1,55 @@
+<?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="MTOSI 1.1 fault demo" default="build" basedir=".">
+
+ <property name="wsdl.dir" location="${basedir}/../wsdl"/>
+ <import file="../../common_build.xml"/>
+
+ <target name="client" description="run demo client" depends="build">
+ <property name="op" value="all"/>
+ <property name="param" value=""/>
+ <cxfrun classname="org.apache.cxf.alarm_retrieval.client.Client"
+ param1="${basedir}/../wsdl/transport/http/FaultServiceSOAP_HTTP.wsdl"
+ param2="${op}" param3="${param}"/>
+ </target>
+
+ <target name="server" description="run demo server" depends="build">
+ <cxfrun classname="org.apache.cxf.alarm_retrieval.server.Server"
+ param1="${basedir}/../wsdl/transport/http/FaultServiceSOAP_HTTP.wsdl"/>
+ </target>
+
+ <target name="generate.code">
+ <copy file="${basedir}/../wsdl/async_binding.xml.tmpl"
+ tofile="${basedir}/build/async_binding.xml"
+ overwrite="yes">
+ <filterset>
+ <filter token="WSDL_LOCATION" value="${wsdl.dir}/transport/http/FaultServiceSOAP_HTTP.wsdl"/>
+ </filterset>
+ </copy>
+ <echo level="info" message="Generating code using wsdl2java..."/>
+ <wsdl2java
+ file="FaultServiceSOAP_HTTP.wsdl"
+ dir="${basedir}/../wsdl/transport/http"
+ package="ws.v1.tmf854.fault.http -p tmf854.v1=v1.tmf854.fault"
+ bindingfile="${basedir}/build/async_binding.xml"/>
+ </target>
+</project>
+
Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/build.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/build.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/client/AsyncAlarmHandler.java (from r443019, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/test/java/org/objectweb/celtix/fault/http/AsyncAlarmHandler.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/client/AsyncAlarmHandler.java?view=diff&rev=472570&p1=incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/test/java/org/objectweb/celtix/fault/http/AsyncAlarmHandler.java&r1=443019&p2=incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/client/AsyncAlarmHandler.java&r2=472570
==============================================================================
--- incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/test/java/org/objectweb/celtix/fault/http/AsyncAlarmHandler.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/client/AsyncAlarmHandler.java Wed Nov 8 10:12:35 2006
@@ -1,4 +1,23 @@
-package org.objectweb.celtix.fault.http;
+/**
+ * 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 org.apache.cxf.alarm_retrieval.client;
import javax.xml.ws.AsyncHandler;
import javax.xml.ws.Response;
@@ -16,14 +35,18 @@
reply = response.get();
} catch (InterruptedException ex) {
- System.out.println("InteruptedException while awaiting response.");
+ System.err.println("InterruptedException while awaiting response."
+ + ex);
} catch (java.util.concurrent.ExecutionException ex) {
- System.out.println("Operation received ExecutionException.");
+ System.err.println("Operation received ExecutionException." + ex);
}
}
public ActiveAlarmList getResponse() {
- return reply.getActiveAlarmList();
+ if (reply != null) {
+ return reply.getActiveAlarmList();
+ }
+ return null;
}
}
Copied: incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/client/Client.java (from r443019, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/test/java/org/objectweb/celtix/fault/http/AlarmRetrievalClientTest.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/client/Client.java?view=diff&rev=472570&p1=incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/test/java/org/objectweb/celtix/fault/http/AlarmRetrievalClientTest.java&r1=443019&p2=incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/client/Client.java&r2=472570
==============================================================================
--- incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/test/java/org/objectweb/celtix/fault/http/AlarmRetrievalClientTest.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/client/Client.java Wed Nov 8 10:12:35 2006
@@ -1,6 +1,25 @@
-package org.objectweb.celtix.fault.http;
+/**
+ * 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 org.apache.cxf.alarm_retrieval.client;
-import java.net.URL;
+import java.io.File;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -10,12 +29,6 @@
import javax.xml.ws.Holder;
import javax.xml.ws.Response;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.objectweb.celtix.testutil.common.AbstractClientServerSetupBase;
-
import v1.tmf854.fault.ActiveAlarmFilterT;
import v1.tmf854.fault.AlarmT;
import v1.tmf854.fault.CommunicationPatternT;
@@ -31,37 +44,47 @@
import ws.v1.tmf854.fault.http.AlarmRetrieval_Service;
/**
- * org.objectweb.celtix.fault.http.AlarmRetrievalClientTest
+ * org.apache.cxf.alarm_retrieval.client.Client
*/
-public final class AlarmRetrievalClientTest extends TestCase {
+public final class Client {
private static final QName SERVICE_NAME = new QName("tmf854.v1.ws", "AlarmRetrieval");
- private static AlarmRetrieval port;
- public static Test suite() throws Exception {
- TestSuite suite = new TestSuite(AlarmRetrievalClientTest.class);
- return new AbstractClientServerSetupBase(suite) {
- public void startServers() throws Exception {
- boolean ok = launchServer(AlarmRetrievalServer.class);
- if (!ok) {
- fail("Failed to launch alarm retrieval server.");
- }
- }
- };
+ private Client() {
}
- public void setUp() throws Exception {
- super.setUp();
+ public static void main(String args[]) throws Exception {
+ if (args.length < 2) {
+ printUsage();
+ System.exit(1);
+ }
+
+ File wsdl = new File(args[0]);
+
+ AlarmRetrieval_Service ss = new AlarmRetrieval_Service(wsdl.toURL(), SERVICE_NAME);
+ AlarmRetrieval port = ss.getAlarmRetrieval();
- URL wsdlUrl = getClass().getResource("/wsdl/transport/http/FaultServiceSOAP_HTTP.wsdl");
- assertNotNull("Could not get FaultServiceSOAP_HTTP.wsdl resource.", wsdlUrl);
-
- AlarmRetrieval_Service ss = new AlarmRetrieval_Service(wsdlUrl, SERVICE_NAME);
- assertNotNull("Failed to create AlarmRetrieval_Service", ss);
- port = ss.getAlarmRetrieval();
+ boolean foundOp = false;
+
+ if ("all".equals(args[1])) {
+ foundOp = true;
+ getActiveAlarmsCount(port);
+ getActiveAlarms(port);
+ } else if ("getActiveAlarmsCount".equals(args[1])) {
+ foundOp = true;
+ getActiveAlarmsCount(port);
+ } else if ("getActiveAlarms".equals(args[1])) {
+ foundOp = true;
+ getActiveAlarms(port);
+ } else {
+ printUsage();
+ System.exit(1);
+ }
+
+ System.exit(0);
}
- public void testGetActiveAlarmsCountAsync() throws Exception {
+ private static void getActiveAlarmsCount(AlarmRetrieval port) {
HeaderT header = new HeaderT();
header.setActivityName("getActiveAlarmsCountAsync");
@@ -82,23 +105,33 @@
System.out.println("Invoking getActiveAlarmsCountAsync using polling.");
Response<GetActiveAlarmsCountResponseT> response =
- port.getActiveAlarmsCountAsync(mtosiBody, mtosiHeader);
+ port.getActiveAlarmsCountAsync(mtosiHeader, mtosiBody);
- while (!response.isDone()) {
- System.out.println("waiting for operation response...");
- Thread.sleep(100);
+ try {
+ while (!response.isDone()) {
+ System.out.println("waiting for operation response...");
+ Thread.sleep(100);
+ }
+ } catch (InterruptedException ex) {
+ System.out.println("InterruptedException while sleeping.");
}
try {
- System.out.println("Active Alarms Count: " + response.get().getActiveAlarmCount());
+ if (response.get() != null) {
+ System.out.println("Active Alarms Count: " + response.get().getActiveAlarmCount());
+ } else {
+ System.err.println("Error - null response.");
+ }
} catch (InterruptedException ex) {
- System.out.println("InteruptedException while awaiting response.");
+ System.out.println("InterruptedException getting asynchronous response.");
} catch (java.util.concurrent.ExecutionException ex) {
System.out.println("Operation received ExecutionException.");
}
+
+ System.out.println();
}
- public void testGetActiveAlarmsAsync() throws Exception {
+ private static void getActiveAlarms(AlarmRetrieval port) {
HeaderT header = new HeaderT();
header.setActivityName("getActiveAlarmsAsync");
@@ -108,6 +141,7 @@
header.setDestinationURI("http://mtosi.iona.com/fault/destination");
header.setCommunicationPattern(CommunicationPatternT.SIMPLE_RESPONSE);
header.setCommunicationStyle(CommunicationStyleT.MSG);
+ header.setRequestedBatchSize(new Long(2));
SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss.SSSZ");
header.setTimestamp(formatter.format(new Date()));
Holder<HeaderT> mtosiHeader = new Holder<HeaderT>(header);
@@ -119,12 +153,22 @@
System.out.println("Invoking getActiveAlarmsAsync using callback.");
AsyncAlarmHandler handler = new AsyncAlarmHandler();
- Future<?> response = port.getActiveAlarmsAsync(mtosiBody, mtosiHeader, handler);
+ Future<?> response = port.getActiveAlarmsAsync(mtosiHeader, mtosiBody, handler);
- while (!response.isDone()) {
- Thread.sleep(100);
+ try {
+ while (!response.isDone()) {
+ System.out.println("waiting for handler to receive response...");
+ Thread.sleep(100);
+ }
+ System.out.println("getActiveAlarmsAsync operation completed.");
+ } catch (InterruptedException ex) {
+ System.out.println("InterruptedException while sleeping.");
+ }
+
+ if (handler.getResponse() == null) {
+ System.err.println("Error - null response.");
+ return;
}
- System.out.println("getActiveAlarmsAsync operation completed.");
List<AlarmT> alarms = handler.getResponse().getActiveAlarm();
int alarmCount = alarms.size();
@@ -150,18 +194,18 @@
String layerRate = alarm.getLayerRate();
if (layerRate != null) {
- System.out.print("- Layer/Rate: " + layerRate);
+ System.out.println("- Layer/Rate: " + layerRate);
}
ProbableCauseT probableCause = alarm.getProbableCause();
String type = probableCause.getType();
if (type != null) {
- System.out.print("- Probable cause type: " + type);
+ System.out.println("- Probable cause type: " + type);
}
String perceivedSeverity = alarm.getPerceivedSeverity();
if (perceivedSeverity != null) {
- System.out.print("- Perceived severity: " + perceivedSeverity);
+ System.out.println("- Perceived severity: " + perceivedSeverity);
}
System.out.println("- Service affecting: " + alarm.getServiceAffecting().value());
@@ -171,7 +215,10 @@
}
}
- public static void main(String args[]) {
- junit.textui.TestRunner.run(AlarmRetrievalClientTest.class);
+ public static void printUsage() {
+ System.out.println("Syntax is: Client <wsdl> <operation>");
+ System.out.println(" operation is one of: ");
+ System.out.println(" getActiveAlarmsCount");
+ System.out.println(" getActiveAlarms");
}
}
Copied: incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/server/AlarmRetrievalImpl.java (from r443019, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/test/java/org/objectweb/celtix/fault/http/AlarmRetrievalImpl.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/server/AlarmRetrievalImpl.java?view=diff&rev=472570&p1=incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/test/java/org/objectweb/celtix/fault/http/AlarmRetrievalImpl.java&r1=443019&p2=incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/server/AlarmRetrievalImpl.java&r2=472570
==============================================================================
--- incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/test/java/org/objectweb/celtix/fault/http/AlarmRetrievalImpl.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/server/AlarmRetrievalImpl.java Wed Nov 8 10:12:35 2006
@@ -1,4 +1,23 @@
-package org.objectweb.celtix.fault.http;
+/**
+ * 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 org.apache.cxf.alarm_retrieval.server;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -27,9 +46,12 @@
import ws.v1.tmf854.fault.http.AlarmRetrieval;
import ws.v1.tmf854.fault.http.ProcessingFailureException;
-@WebService(serviceName = "AlarmRetrieval", portName = "AlarmRetrieval",
- endpointInterface = "ws.v1.tmf854.fault.http.AlarmRetrieval",
- targetNamespace = "tmf854.v1.ws")
+@WebService(
+ serviceName = "AlarmRetrieval",
+ portName = "AlarmRetrieval",
+ targetNamespace = "tmf854.v1.ws",
+ endpointInterface = "ws.v1.tmf854.fault.http.AlarmRetrieval"
+ )
public class AlarmRetrievalImpl implements AlarmRetrieval {
private static final Logger LOG =
@@ -45,7 +67,7 @@
ProbableCauseT probableCause = new ProbableCauseT();
SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss.SSSZ");
- switch (alarmID) {
+ switch (alarmID % 2) {
case 1:
eventInfo.setNotificationId("0001239");
eventInfo.setObjectType(ObjectTypeT.OT_EQUIPMENT);
@@ -53,42 +75,40 @@
eventInfo.setOsTime(formatter.format(new Date()));
eventInfo.setNeTime(formatter.format(new Date()));
eventInfo.setEdgePointRelated(Boolean.FALSE);
- probableCause.setType("PROP_one_probable_cause_type");
+ probableCause.setType("PROP_odd_probable_cause_type");
alarm.setEventInfo(eventInfo);
alarm.setIsClearable(false);
- alarm.setLayerRate("PROP_layer_rate_one");
+ alarm.setLayerRate("PROP_layer_rate_odd");
alarm.setProbableCause(probableCause);
- alarm.setPerceivedSeverity("PROP_one_perceived_severity");
+ alarm.setPerceivedSeverity("PROP_odd_perceived_severity");
alarm.setServiceAffecting(ServiceAffectingT.SA_UNKNOWN);
alarm.setRcaiIndicator(false);
break;
- case 2:
+ default:
eventInfo.setNotificationId("9876543");
eventInfo.setObjectType(ObjectTypeT.OT_OS);
eventInfo.setObjectName(new NamingAttributesT());
eventInfo.setOsTime(formatter.format(new Date()));
eventInfo.setEdgePointRelated(Boolean.FALSE);
- probableCause.setType("PROP_two_probable_cause_type");
+ probableCause.setType("PROP_even_probable_cause_type");
alarm.setEventInfo(eventInfo);
alarm.setIsClearable(true);
- alarm.setLayerRate("PROP_layer_rate_two");
+ alarm.setLayerRate("PROP_layer_rate_even");
alarm.setProbableCause(probableCause);
- alarm.setPerceivedSeverity("PROP_two_perceived_severity");
+ alarm.setPerceivedSeverity("PROP_even_perceived_severity");
alarm.setServiceAffecting(ServiceAffectingT.SA_SERVICE_AFFECTING);
alarm.setRcaiIndicator(false);
break;
- default:
- return;
}
alarms.add(alarm);
}
public Future<?> getActiveAlarmsCountAsync(
- GetActiveAlarmsCountT mtosiBody,
Holder<HeaderT> mtosiHeader,
+ GetActiveAlarmsCountT mtosiBody,
AsyncHandler<GetActiveAlarmsCountResponseT> asyncHandler) {
LOG.info("Executing operation Future<?> getActiveAlarmsCountAsync");
System.out.println("Executing operation Future<?> getActiveAlarmsCountAsync");
@@ -96,16 +116,16 @@
}
public Response<GetActiveAlarmsCountResponseT> getActiveAlarmsCountAsync(
- GetActiveAlarmsCountT mtosiBody,
- Holder<HeaderT> mtosiHeader) {
+ Holder<HeaderT> mtosiHeader,
+ GetActiveAlarmsCountT mtosiBody) {
LOG.info("Executing operation Response<?> getActiveAlarmsCountAsync");
System.out.println("Executing operation Response<?> getActiveAlarmsCountAsync");
return null;
}
public GetActiveAlarmsCountResponseT getActiveAlarmsCount(
- GetActiveAlarmsCountT mtosiBody,
- Holder<HeaderT> mtosiHeader) throws ProcessingFailureException {
+ Holder<HeaderT> mtosiHeader,
+ GetActiveAlarmsCountT mtosiBody) throws ProcessingFailureException {
LOG.info("Executing operation getActiveAlarmsCount");
System.out.println("getActiveAlarmsCount() called.");
@@ -121,8 +141,8 @@
}
public Future<?> getActiveAlarmsAsync(
- GetActiveAlarmsT mtosiBody,
Holder<HeaderT> mtosiHeader,
+ GetActiveAlarmsT mtosiBody,
AsyncHandler<GetActiveAlarmsResponseT> asyncHandler) {
LOG.info("Executing operation Future<?> getActiveAlarmsAsync");
System.out.println("Executing operation Future<?> getActiveAlarmsAsync");
@@ -130,16 +150,16 @@
}
public Response<GetActiveAlarmsResponseT> getActiveAlarmsAsync(
- GetActiveAlarmsT mtosiBody,
- Holder<HeaderT> mtosiHeader) {
+ Holder<HeaderT> mtosiHeader,
+ GetActiveAlarmsT mtosiBody) {
LOG.info("Executing operation Response<?> getActiveAlarmsAsync");
System.out.println("Executing operation Response<?> getActiveAlarmsAsync");
return null;
}
public GetActiveAlarmsResponseT getActiveAlarms(
- GetActiveAlarmsT mtosiBody,
- Holder<HeaderT> mtosiHeader) throws ProcessingFailureException {
+ Holder<HeaderT> mtosiHeader,
+ GetActiveAlarmsT mtosiBody) throws ProcessingFailureException {
LOG.info("Executing operation getActiveAlarms");
System.out.println("getActiveAlarms() called.");
@@ -147,9 +167,23 @@
mtosiHeader.value.setMsgType(MsgTypeT.RESPONSE);
SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmmss.SSSZ");
mtosiHeader.value.setTimestamp(formatter.format(new Date()));
+ mtosiHeader.value.setBatchSequenceEndOfReply(Boolean.TRUE);
GetActiveAlarmsResponseT.ActiveAlarmList alarmList = new GetActiveAlarmsResponseT.ActiveAlarmList();
- alarmList.getActiveAlarm().addAll(alarms);
+
+ Long requestedCount = mtosiHeader.value.getRequestedBatchSize();
+ if (requestedCount != null) {
+ for (int i = 0; i < requestedCount && alarms.size() > 0; i++) {
+ AlarmT alarm = alarms.remove(0);
+ alarmList.getActiveAlarm().add(alarm);
+ }
+ // Indicate to the caller if there are more alarms remaining.
+ if (alarms.size() > 0) {
+ mtosiHeader.value.setBatchSequenceEndOfReply(Boolean.FALSE);
+ }
+ } else {
+ alarmList.getActiveAlarm().addAll(alarms);
+ }
GetActiveAlarmsResponseT response = new GetActiveAlarmsResponseT();
response.setActiveAlarmList(alarmList);
Copied: incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/server/Server.java (from r443019, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/test/java/org/objectweb/celtix/fault/http/AlarmRetrievalServer.java)
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/server/Server.java?view=diff&rev=472570&p1=incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/test/java/org/objectweb/celtix/fault/http/AlarmRetrievalServer.java&r1=443019&p2=incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/server/Server.java&r2=472570
==============================================================================
--- incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/test/java/org/objectweb/celtix/fault/http/AlarmRetrievalServer.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/server/Server.java Wed Nov 8 10:12:35 2006
@@ -1,30 +1,47 @@
-package org.objectweb.celtix.fault.http;
+/**
+ * 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.
+ */
-import javax.xml.ws.Endpoint;
+package org.apache.cxf.alarm_retrieval.server;
-import org.objectweb.celtix.testutil.common.AbstractTestServerBase;
+import javax.xml.ws.Endpoint;
-public class AlarmRetrievalServer extends AbstractTestServerBase {
+public class Server {
- protected void run() {
+ protected Server() throws Exception {
+ System.out.println("Starting Server");
+
AlarmRetrievalImpl implementor = new AlarmRetrievalImpl();
implementor.addAlarm(1);
implementor.addAlarm(2);
+ implementor.addAlarm(3);
String address = "http://localhost:9090/mtosi/v1/AlarmRetrieval";
Endpoint.publish(address, implementor);
}
- public static void main(String args[]) {
- try {
- AlarmRetrievalServer s = new AlarmRetrievalServer();
- s.start();
- } catch (Exception ex) {
- ex.printStackTrace();
- System.exit(-1);
- } finally {
- System.out.println("Server done!");
- }
+ public static void main(String args[]) throws Exception {
+ new Server();
+ System.out.println("Server ready...");
+
+ Thread.sleep(5 * 60 * 1000);
+ System.out.println("Server exiting... finished running for 5 minutes.");
+ System.exit(0);
}
}
Added: incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/code_gen/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/code_gen/build.xml?view=auto&rev=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/code_gen/build.xml (added)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/code_gen/build.xml Wed Nov 8 10:12:35 2006
@@ -0,0 +1,66 @@
+<?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="MTOSI 1.1 wsdl code generation" default="build" basedir=".">
+
+ <property name="wsdl.dir" location="${basedir}/../wsdl"/>
+ <import file="../../common_build.xml"/>
+
+ <target name="generate.code">
+ <echo level="info" message="Generating code using wsdl2java..."/>
+ <wsdl2java
+ file="DiscoveryServiceSOAP_HTTP.wsdl"
+ dir="${basedir}/../wsdl/transport/http"
+ package="ws.v1.tmf854.fault.http -p tmf854.v1=v1.tmf854.fault"/>
+ <wsdl2java
+ file="EquipmentInventoryMgrSOAP_HTTP.wsdl"
+ dir="${basedir}/../wsdl/transport/http"
+ package="ws.v1.tmf854.fault.http -p tmf854.v1=v1.tmf854.fault"/>
+ <wsdl2java
+ file="InventoryRetrievalSOAP_HTTP.wsdl"
+ dir="${basedir}/../wsdl/transport/http"
+ package="ws.v1.tmf854.fault.http -p tmf854.v1=v1.tmf854.fault"/>
+ <wsdl2java
+ file="ManagedElementMgrSOAP_HTTP.wsdl"
+ dir="${basedir}/../wsdl/transport/http"
+ package="ws.v1.tmf854.fault.http -p tmf854.v1=v1.tmf854.fault"/>
+ <wsdl2java
+ file="MultiLayerSubnetworkMgrSOAP_HTTP.wsdl"
+ dir="${basedir}/../wsdl/transport/http"
+ package="ws.v1.tmf854.fault.http -p tmf854.v1=v1.tmf854.fault"/>
+ <wsdl2java
+ file="NotificationServiceSOAP_HTTP.wsdl"
+ dir="${basedir}/../wsdl/transport/http"
+ package="ws.v1.tmf854.fault.http -p tmf854.v1=v1.tmf854.fault"/>
+ <wsdl2java
+ file="OperationsSystemMgrSOAP_HTTP.wsdl"
+ dir="${basedir}/../wsdl/transport/http"
+ package="ws.v1.tmf854.fault.http -p tmf854.v1=v1.tmf854.fault"/>
+ <wsdl2java
+ file="ProtectionMgrSOAP_HTTP.wsdl"
+ dir="${basedir}/../wsdl/transport/http"
+ package="ws.v1.tmf854.fault.http -p tmf854.v1=v1.tmf854.fault"/>
+ <wsdl2java
+ file="TransmissionDescriptorMgrSOAP_HTTP.wsdl"
+ dir="${basedir}/../wsdl/transport/http"
+ package="ws.v1.tmf854.fault.http -p tmf854.v1=v1.tmf854.fault"/>
+ </target>
+</project>
+
Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/code_gen/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/code_gen/build.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/code_gen/build.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/wsdl/async_binding.xml.tmpl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/wsdl/async_binding.xml.tmpl?view=auto&rev=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/wsdl/async_binding.xml.tmpl (added)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/wsdl/async_binding.xml.tmpl Wed Nov 8 10:12:35 2006
@@ -0,0 +1,28 @@
+<!--
+ 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.
+-->
+
+<bindings
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ wsdlLocation="@WSDL_LOCATION@"
+ xmlns="http://java.sun.com/xml/ns/jaxws">
+ <bindings node="wsdl:definitions">
+ <enableAsyncMapping>true</enableAsyncMapping>
+ </bindings>
+</bindings>
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/wsdl/common/FaultService.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/wsdl/common/FaultService.wsdl?view=diff&rev=472570&r1=472558&r2=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/wsdl/common/FaultService.wsdl (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/wsdl/common/FaultService.wsdl Wed Nov 8 10:12:35 2006
@@ -45,7 +45,13 @@
<wsdl:documentation>
The MTOSI AlarmRetrievalServer porttype
</wsdl:documentation>
+ <!--
+ N.B. The parameterOrder attribute has been added here as a work
+ around for CXF-161. When CXF-161 is resolved, this can be
+ removed.
<wsdl:operation name="getActiveAlarmsCount">
+ -->
+ <wsdl:operation name="getActiveAlarmsCount" parameterOrder="mtosiHeader">
<wsdl:documentation>
This is the getActiveAlarmsCount request/response operation
</wsdl:documentation>
@@ -53,7 +59,13 @@
<wsdl:output message="tmf854WS:getActiveAlarmsCountResponse"/>
<wsdl:fault name="ProcessingFailureException" message="tmf854WS:ProcessingFailureException"/>
</wsdl:operation>
+ <!--
+ N.B. The parameterOrder attribute has been added here as a work
+ around for CXF-161. When CXF-161 is resolved, this can be
+ removed.
<wsdl:operation name="getActiveAlarms">
+ -->
+ <wsdl:operation name="getActiveAlarms" parameterOrder="mtosiHeader">
<wsdl:documentation>
This is the getActiveAlarms request/response operation
</wsdl:documentation>
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/restful/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/restful/README.txt?view=diff&rev=472570&r1=472569&r2=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/restful/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/restful/README.txt Wed Nov 8 10:12:35 2006
@@ -84,8 +84,8 @@
-Buildng the demo using wsdl2java and javac
-------------------------------------------
+Building the demo using wsdl2java and javac
+-------------------------------------------
From the samples/restful directory, first create the target
directory build/classes and then generate code from the WSDL file.
@@ -147,4 +147,4 @@
To remove the code generated from the WSDL file and the .class
files, either delete the build directory and its contents or run:
- ant clean
\ No newline at end of file
+ ant clean
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/soap12/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/soap12/README.txt?view=diff&rev=472570&r1=472569&r2=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/soap12/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/soap12/README.txt Wed Nov 8 10:12:35 2006
@@ -41,8 +41,8 @@
-Buildng the demo using wsdl2java and javac
-------------------------------------------
+Building the demo using wsdl2java and javac
+-------------------------------------------
From the samples/hello_world directory, first create the target
directory build/classes and then generate code from the WSDL file.
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/README.txt?view=diff&rev=472570&r1=472569&r2=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/README.txt Wed Nov 8 10:12:35 2006
@@ -51,7 +51,7 @@
-Buildng the demo using wsdl2java and javac
+Building the demo using wsdl2java and javac
------------------------------------------
From the samples/soap_header directory, first create the target
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/src/demo/soap_header/client/Client.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/src/demo/soap_header/client/Client.java?view=diff&rev=472570&r1=472569&r2=472570
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/src/demo/soap_header/client/Client.java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/src/demo/soap_header/client/Client.java Wed Nov 8 10:12:35 2006
@@ -96,13 +96,13 @@
}
private static void invokeInOutHeader(HeaderTester proxy) {
- System.out.println("Inovking inoutHeader operation");
+ System.out.println("Invoking inoutHeader operation");
InoutHeader me = new InoutHeader();
me.setRequestType("CXF user");
Holder<SOAPHeaderData> headerInfo = new Holder<SOAPHeaderData>();
SOAPHeaderData shd = new SOAPHeaderData();
shd.setOriginator("CXF client");
- shd.setMessage("Inovking inoutHeader operation");
+ shd.setMessage("Invoking inoutHeader operation");
headerInfo.value = shd;
InoutHeaderResponse response = proxy.inoutHeader(me, headerInfo);
System.out.println("\tinoutHeader invocation returned: ");
Re: license MTOSI wsdl and schemas
Posted by Peter Jones <pe...@iona.com>.
Hi Bo,
On Thu, Nov 09, 2006 at 11:10:59AM +0800, Bozhong Lin wrote:
> Hi Peter,
>
> I saw this commit added a bunch of TMF wsdl and schemas, can you send me
> a copy of their license text so we could include it in distribution? I
> have a hard time to find its license text in public internet. Note these
> wsdl and schemas should NOT have Apache license headers.
Sorry for the delay in responding to you. The mtosi wsdl is covered under
the same license as the mtosi ri, the bsd license:
http://www.opensource.org/licenses/bsd-license.php
Cheers,
Peter
> Cheers,
> Bo
>
> peterjones@apache.org wrote:
> > Author: peterjones
> > Date: Wed Nov 8 10:12:35 2006
> > New Revision: 472570
> >
> > URL: http://svn.apache.org/viewvc?view=rev&rev=472570
> > Log:
> > [CXF-120] added mtosi demo
> > - Fixed couple of readme typos
> > - Minor fix to common_build.xml so demos can be built in src tree
> [...]
--
Peter Jones
IONA Technologies Inc.
E-Mail: mailto:peter.jones@iona.com
Tel: (w) 709-738-3725 x22 | Fax: 709-738-3745
84-86 Elizabeth Ave. St. John's, NL A1A 1W7 Canada
license MTOSI wsdl and schemas
Posted by Bozhong Lin <bl...@iona.com>.
Hi Peter,
I saw this commit added a bunch of TMF wsdl and schemas, can you send me
a copy of their license text so we could include it in distribution? I
have a hard time to find its license text in public internet. Note these
wsdl and schemas should NOT have Apache license headers.
Cheers,
Bo
peterjones@apache.org wrote:
> Author: peterjones
> Date: Wed Nov 8 10:12:35 2006
> New Revision: 472570
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=472570
> Log:
> [CXF-120] added mtosi demo
> - Fixed couple of readme typos
> - Minor fix to common_build.xml so demos can be built in src tree
>
> Added:
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/README.TXT (with props)
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/build.xml (with props)
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/client/
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/client/AsyncAlarmHandler.java
> - copied, changed from r443019, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/test/java/org/objectweb/celtix/fault/http/AsyncAlarmHandler.java
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/client/Client.java
> - copied, changed from r443019, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/test/java/org/objectweb/celtix/fault/http/AlarmRetrievalClientTest.java
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/server/
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/server/AlarmRetrievalImpl.java
> - copied, changed from r443019, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/test/java/org/objectweb/celtix/fault/http/AlarmRetrievalImpl.java
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/alarm_retrieval/src/demo/server/Server.java
> - copied, changed from r443019, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/test/java/org/objectweb/celtix/fault/http/AlarmRetrievalServer.java
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/code_gen/
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/code_gen/build.xml (with props)
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/code_gen/src/
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/wsdl/
> - copied from r443019, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/main/resources/wsdl/
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/wsdl/async_binding.xml.tmpl
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/wsdl/binding/
> - copied from r472558, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/main/resources/wsdl/binding/
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/wsdl/common/
> - copied from r472558, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/main/resources/wsdl/common/
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/wsdl/transport/
> - copied from r472558, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/main/resources/wsdl/transport/
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/xsd/
> - copied from r443019, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/main/resources/xsd/
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/xsd/common/
> - copied from r472558, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/main/resources/xsd/common/
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/xsd/interfaces/
> - copied from r472558, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/main/resources/xsd/interfaces/
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/xsd/networkResources/
> - copied from r472558, incubator/cxf/branches/post_apache_integration/toolkits/MTOSI/1.1/src/main/resources/xsd/networkResources/
> Modified:
> incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
> incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/README.txt
> incubator/cxf/trunk/distribution/src/main/release/samples/handlers/README.txt
> incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/README.txt
> incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/README.txt
> incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_async/README.txt
> incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_bare/README.txt
> incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_wrapped/README.txt
> incubator/cxf/trunk/distribution/src/main/release/samples/jms_pubsub/README.txt
> incubator/cxf/trunk/distribution/src/main/release/samples/jms_queue/README.txt
> incubator/cxf/trunk/distribution/src/main/release/samples/js_provider/README.txt
> incubator/cxf/trunk/distribution/src/main/release/samples/mtom/README.txt
> incubator/cxf/trunk/distribution/src/main/release/samples/mtosi_1.1/wsdl/common/FaultService.wsdl
> incubator/cxf/trunk/distribution/src/main/release/samples/restful/README.txt
> incubator/cxf/trunk/distribution/src/main/release/samples/soap12/README.txt
> incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/README.txt
> incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/src/demo/soap_header/client/Client.java
>