You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-dev@ws.apache.org by wi...@apache.org on 2005/08/12 15:40:59 UTC
svn commit: r232286 [1/2] - in
/webservices/muse/trunk/src/examples/ieeedemo/client: ./
src/org/apache/interop/client/ src/org/apache/interop/common/
src/org/apache/interop/common/ui/ src/org/apache/interop/common/ui/jgraph/
src/org/apache/interop/smgr...
Author: wire
Date: Fri Aug 12 06:40:31 2005
New Revision: 232286
URL: http://svn.apache.org/viewcvs?rev=232286&view=rev
Log:
Refactored all classes under one tree to simplify structure. Moved all simulators and unit tests out of main src tree.
Added:
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/FaultException.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/FaultException.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/ResourceStub.java
- copied, changed from r231096, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/ResourceStub.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/ServiceStub.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/ServiceStub.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/SpecificServiceStub.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/SpecificServiceStub.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/WcmMessage.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/WcmMessage.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/MessagesJPanel.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/MessagesJPanel.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/StatusJPanel.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/StatusJPanel.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/TemperatureJPanel.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/TemperatureJPanel.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/WcJFrame.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/WcJFrame.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/CustomCellViewFactory.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/CustomCellViewFactory.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/WcGraphCell.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/WcGraphCell.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/WcView.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/WcView.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/WsGraphCell.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/WsGraphCell.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/WsView.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/WsView.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/WcImpl.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WcImpl.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/WcmImpl.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WcmImpl.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/WsImpl.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WsImpl.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/WsImplTest.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WsImplTest.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/IWc.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/model/IWc.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/IWcm.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/model/IWcm.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/IWs.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/model/IWs.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/WcmFactory.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/model/WcmFactory.java
webservices/muse/trunk/src/examples/ieeedemo/client/test/org/
webservices/muse/trunk/src/examples/ieeedemo/client/test/org/apache/
webservices/muse/trunk/src/examples/ieeedemo/client/test/org/apache/interop/
webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/
webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/InteropSimulator.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/InteropSimulator.java
webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/InteropSimulatorTest.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/InteropSimulatorTest.java
webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/MessageSimulator.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/MessageSimulator.java
webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/StatusSimulator.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/StatusSimulator.java
webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/TemperatureSimulator.java
- copied, changed from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/TemperatureSimulator.java
Removed:
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WcImpl.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WcmImpl.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WsImpl.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WsImplTest.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/MessagesJPanel.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/StatusJPanel.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/TemperatureJPanel.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/WcJFrame.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/CustomCellViewFactory.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/WcGraphCell.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/WcView.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/WsGraphCell.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/WsView.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/model/IWc.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/model/IWcm.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/model/IWs.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/model/WcmFactory.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/InteropSimulator.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/InteropSimulatorTest.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/MessageSimulator.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/StatusSimulator.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/TemperatureSimulator.java
Modified:
webservices/muse/trunk/src/examples/ieeedemo/client/.classpath
webservices/muse/trunk/src/examples/ieeedemo/client/interop.prefs
webservices/muse/trunk/src/examples/ieeedemo/client/project.properties
webservices/muse/trunk/src/examples/ieeedemo/client/project.xml
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/LocationJPanel.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/BlackBerryApp.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/BlackBerryApp2.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/MessageListener.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/MessageWorker.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/TestSubscribe.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcdisplay/DisplayAppConnection.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcdisplay/WcDisplayApp.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/WcMgrApp.java
webservices/muse/trunk/src/examples/ieeedemo/client/test/WeatherStationNotifTest.java
webservices/muse/trunk/src/examples/ieeedemo/client/test/tests/WsCompatabilityTest.java
webservices/muse/trunk/src/examples/ieeedemo/client/velocity.log
Modified: webservices/muse/trunk/src/examples/ieeedemo/client/.classpath
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/.classpath?rev=232286&r1=232285&r2=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/.classpath (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/.classpath Fri Aug 12 06:40:31 2005
@@ -1,49 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="test"/>
- <classpathentry kind="var" path="MAVEN_REPO/addressing/jars/addressing-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/ant/jars/ant-1.6.2.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/apollo/jars/apollo-incubating-1.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/apollo/jars/apollo-jndi-config-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/apollo/jars/commonj-twm-api-1.1.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/apollo/jars/wsa-xbeans-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/apollo/jars/wsrf-xbeans-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/axis/jars/axis-1.2.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/axis/jars/axis-jaxrpc-1.2.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/axis/jars/axis-saaj-1.2.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/commons-cli/jars/commons-cli-1.0.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/commons-digester/jars/commons-digester-1.6.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/commons-discovery/jars/commons-discovery-0.2.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/commons-httpclient/jars/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/commons-io/jars/commons-io-1.0.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-2.0.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/concurrent/jars/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/directory-naming/jars/naming-core-0.8.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/directory-naming/jars/naming-factory-0.8.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/directory-naming/jars/naming-java-0.8.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/hermes/jars/hermes-incubating-1.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/hermes/jars/wsn-xbeans-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/jaxen/jars/jaxen-1.1-beta-3.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/muse"/>
<classpathentry kind="var" path="MAVEN_REPO/jfreechart/jars/gnujaxp-snapshot.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/jfreechart/jars/jcommon-1.0.0-pre2.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/jfreechart/jars/jfreechart-1.0.0-pre2.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/jgraph/jars/jgraph-5.5.1.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/muse/jars/advertiser-xbeans-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/muse/jars/muse-incubating-1.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/velocity/jars/velocity-1.4.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/wsdl4j/jars/wsdl4j-1.5-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/xalan/jars/xalan-2.4.1.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/xmlbeans/jars/xbean-2.0.0-beta1.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/xmlbeans/jars/xmlbeans-jsr173-api-2.0-dev.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/weather-station/jars/weather-client-config-xbeans-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/weather-station/jars/weather-station-dir-xbeans-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/weather-station/jars/weather-station-xbeans-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/muse/jars/wsdm-xbeans-SNAPSHOT.jar"/>
- <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="lib" path="C:/cygwin/home/wire/workspaces/wsdm_interop_workspace/ieeedemo/out/.xmlbeans/lib/weather-station-xbeans.jar"/>
+ <classpathentry kind="lib" path="C:/cygwin/home/wire/workspaces/wsdm_interop_workspace/ieeedemo/out/.xmlbeans/lib/weather-client-config-xbeans.jar"/>
+ <classpathentry kind="lib" path="C:/cygwin/home/wire/workspaces/wsdm_interop_workspace/ieeedemo/out/.xmlbeans/lib/weather-station-dir-xbeans.jar"/>
+ <classpathentry kind="var" path="MAVEN_REPO/jfreechart/jars/jcommon-1.0.0-pre2.jar"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
Modified: webservices/muse/trunk/src/examples/ieeedemo/client/interop.prefs
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/interop.prefs?rev=232286&r1=232285&r2=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/interop.prefs (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/interop.prefs Fri Aug 12 06:40:31 2005
@@ -1,8 +1,11 @@
#Prefs for interop
-#Thu Jun 23 14:52:11 EDT 2005
-WsDisplay.URL=http\://12.35.246.160\:8080/muse/epr
-WsMgr.listenPort=8000
+#Thu Aug 11 16:11:22 EDT 2005
+WsMgr.listenPort=8089
+WsMgr.URL=http\://localhost\:8080/muse/epr/
+SMgr.URL=http\://localhost\:8080/muse/epr
+WsMgr.listenerUrl=http\://localhost\:8089/endpoint
+SMgr.listenerUrl=http\://12.35.246.160\:8001/endpoint
+SMgr.listenPort=8000
WsDisplay.listenerUrl=http\://localhost\:8001/endpoint
-WsMgr.listenerUrl=http\://12.35.246.160\:8001/endpoint
WsDisplay.listenPort=8001
-WsMgr.URL=http\://12.35.246.160\:8080/muse/epr/
+WsDisplay.URL=http\://wsdm.no-ip.org\:8080/muse/epr
Modified: webservices/muse/trunk/src/examples/ieeedemo/client/project.properties
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/project.properties?rev=232286&r1=232285&r2=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/project.properties (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/project.properties Fri Aug 12 06:40:31 2005
@@ -7,7 +7,7 @@
# MAVEN CORE
##############
# comma-spearated list of remote JAR repository URLs
-maven.repo.remote = http://www.apache.org/dist/java-repository/, http://cvs.apache.org/repository/, http://mirrors.sunsite.dk/maven/, http://kolvir.esr.hp.com/maven/
+maven.repo.remote = http://kolvir.esr.hp.com/maven/, http://www.apache.org/dist/java-repository/, http://cvs.apache.org/repository/, http://mirrors.sunsite.dk/maven/
#todo remove Ian's Maven Repo from this list
# JAVA PLUGIN
Modified: webservices/muse/trunk/src/examples/ieeedemo/client/project.xml
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/project.xml?rev=232286&r1=232285&r2=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/project.xml (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/project.xml Fri Aug 12 06:40:31 2005
@@ -538,16 +538,16 @@
<url>http://www.apache.org</url>
</dependency>
<dependency>
- <groupId>jfreechart</groupId>
- <artifactId>jfreechart</artifactId>
- <version>1.0.0-pre2</version>
+ <groupId>jgraph</groupId>
+ <artifactId>jgraph</artifactId>
+ <version>5.5.1</version>
<type>jar</type>
<url>http://www.jfree.org/jfreechart</url>
</dependency>
<dependency>
- <groupId>jgraph</groupId>
- <artifactId>jgraph</artifactId>
- <version>5.5.1</version>
+ <groupId>jfreechart</groupId>
+ <artifactId>jfreechart</artifactId>
+ <version>1.0.0-pre2</version>
<type>jar</type>
<url>http://www.jfree.org/jfreechart</url>
</dependency>
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/FaultException.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/FaultException.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/FaultException.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/FaultException.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/FaultException.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/FaultException.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/FaultException.java Fri Aug 12 06:40:31 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*=============================================================================*/
-package org.apache.ws.muws.interop.client;
+package org.apache.interop.client;
/**
* TODO
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/ResourceStub.java (from r231096, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/ResourceStub.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/ResourceStub.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/ResourceStub.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/ResourceStub.java&r1=231096&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/ResourceStub.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/ResourceStub.java Fri Aug 12 06:40:31 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*=============================================================================*/
-package org.apache.ws.muws.interop.client;
+package org.apache.interop.client;
import org.apache.ws.addressing.EndpointReference;
import org.apache.ws.addressing.XmlBeansEndpointReference;
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/ServiceStub.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/ServiceStub.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/ServiceStub.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/ServiceStub.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/ServiceStub.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/ServiceStub.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/ServiceStub.java Fri Aug 12 06:40:31 2005
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*=============================================================================*/
-package org.apache.ws.muws.interop.client;
+package org.apache.interop.client;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.soap.SoapClient;
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/SpecificServiceStub.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/SpecificServiceStub.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/SpecificServiceStub.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/SpecificServiceStub.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/SpecificServiceStub.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/SpecificServiceStub.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/SpecificServiceStub.java Fri Aug 12 06:40:31 2005
@@ -4,7 +4,7 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/
-package org.apache.ws.muws.interop.client;
+package org.apache.interop.client;
import java.net.MalformedURLException;
import java.net.URL;
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/WcmMessage.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/WcmMessage.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/WcmMessage.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/WcmMessage.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/WcmMessage.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/WcmMessage.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/client/WcmMessage.java Fri Aug 12 06:40:31 2005
@@ -2,7 +2,7 @@
* Created on May 23, 2005
*
*/
-package org.apache.ws.muws.interop.client;
+package org.apache.interop.client;
import java.text.DateFormat;
import java.util.Date;
Modified: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/LocationJPanel.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/LocationJPanel.java?rev=232286&r1=232285&r2=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/LocationJPanel.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/LocationJPanel.java Fri Aug 12 06:40:31 2005
@@ -24,10 +24,10 @@
import javax.swing.JPanel;
+import org.apache.interop.common.ui.MessagesJPanel;
import org.apache.interop.smgr.ConnectionListener;
import org.apache.ws.addressing.EndpointReference;
import org.apache.ws.addressing.XmlBeansEndpointReference;
-import org.apache.wsdm.interop.wcm.impl.ui.MessagesJPanel;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
import org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceDocument;
@@ -299,8 +299,9 @@
//JFrame parent=(JFrame)getParent().getParent().getParent().getParent();
String urlText=jTextFieldUrl.getText();
props.setProperty(appName+".URL",urlText);
- props.setProperty(appName+".listenerUrl",listenerEndpointURL);
- props.setProperty(appName+".listenPort",""+listenerPort);
+ if(listenerEndpointURL!=null)
+ props.setProperty(appName+".listenerUrl",listenerEndpointURL);
+ props.setProperty(appName+".listenPort",""+listenerPort);
FileOutputStream is=new FileOutputStream(confFile);
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/MessagesJPanel.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/MessagesJPanel.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/MessagesJPanel.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/MessagesJPanel.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/MessagesJPanel.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/MessagesJPanel.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/MessagesJPanel.java Fri Aug 12 06:40:31 2005
@@ -1,4 +1,4 @@
-package org.apache.wsdm.interop.wcm.impl.ui;
+package org.apache.interop.common.ui;
import java.awt.BorderLayout;
import java.awt.GridBagConstraints;
@@ -24,7 +24,7 @@
import javax.swing.event.ListSelectionEvent;
import javax.swing.JCheckBox;
-import org.apache.ws.muws.interop.client.WcmMessage;
+import org.apache.interop.client.WcmMessage;
/**
* This code was generated using CloudGarden's Jigloo
* SWT/Swing GUI Builder, which is free for non-commercial
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/StatusJPanel.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/StatusJPanel.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/StatusJPanel.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/StatusJPanel.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/StatusJPanel.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/StatusJPanel.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/StatusJPanel.java Fri Aug 12 06:40:31 2005
@@ -1,4 +1,4 @@
-package org.apache.wsdm.interop.wcm.impl.ui;
+package org.apache.interop.common.ui;
import java.awt.BorderLayout;
import java.awt.Color;
@@ -21,11 +21,11 @@
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
+import org.apache.interop.common.ui.jgraph.CustomCellViewFactory;
+import org.apache.interop.common.ui.jgraph.WcGraphCell;
+import org.apache.interop.common.ui.jgraph.WsGraphCell;
import org.apache.interop.wcmgr.CommandListener;
-import org.apache.wsdm.interop.wcm.impl.ui.jgraph.CustomCellViewFactory;
-import org.apache.wsdm.interop.wcm.impl.ui.jgraph.WcGraphCell;
-import org.apache.wsdm.interop.wcm.impl.ui.jgraph.WsGraphCell;
-import org.apache.wsdm.interop.wcm.model.IWs;
+import org.apache.interop.wcmgr.model.IWs;
import org.jgraph.JGraph;
import org.jgraph.graph.AttributeMap;
import org.jgraph.graph.ConnectionSet;
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/TemperatureJPanel.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/TemperatureJPanel.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/TemperatureJPanel.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/TemperatureJPanel.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/TemperatureJPanel.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/TemperatureJPanel.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/TemperatureJPanel.java Fri Aug 12 06:40:31 2005
@@ -1,4 +1,4 @@
-package org.apache.wsdm.interop.wcm.impl.ui;
+package org.apache.interop.common.ui;
import javax.swing.JPanel;
import javax.swing.JFrame;
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/WcJFrame.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/WcJFrame.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/WcJFrame.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/WcJFrame.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/WcJFrame.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/WcJFrame.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/WcJFrame.java Fri Aug 12 06:40:31 2005
@@ -1,12 +1,12 @@
-package org.apache.wsdm.interop.wcm.impl.ui;
+package org.apache.interop.common.ui;
import javax.swing.WindowConstants;
import javax.swing.JSplitPane;
-import org.apache.wsdm.interop.wcm.model.IWcm;
-import org.apache.wsdm.interop.wcm.model.IWs;
+import org.apache.interop.wcmgr.model.IWcm;
+import org.apache.interop.wcmgr.model.IWs;
import java.awt.BorderLayout;
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/CustomCellViewFactory.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/CustomCellViewFactory.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/CustomCellViewFactory.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/CustomCellViewFactory.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/CustomCellViewFactory.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/CustomCellViewFactory.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/CustomCellViewFactory.java Fri Aug 12 06:40:31 2005
@@ -4,7 +4,7 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/
-package org.apache.wsdm.interop.wcm.impl.ui.jgraph;
+package org.apache.interop.common.ui.jgraph;
import org.jgraph.graph.DefaultCellViewFactory;
import org.jgraph.graph.VertexView;
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/WcGraphCell.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/WcGraphCell.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/WcGraphCell.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/WcGraphCell.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/WcGraphCell.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/WcGraphCell.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/WcGraphCell.java Fri Aug 12 06:40:31 2005
@@ -4,7 +4,7 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/
-package org.apache.wsdm.interop.wcm.impl.ui.jgraph;
+package org.apache.interop.common.ui.jgraph;
import javax.swing.tree.MutableTreeNode;
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/WcView.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/WcView.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/WcView.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/WcView.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/WcView.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/WcView.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/WcView.java Fri Aug 12 06:40:31 2005
@@ -4,7 +4,7 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/
-package org.apache.wsdm.interop.wcm.impl.ui.jgraph;
+package org.apache.interop.common.ui.jgraph;
import java.awt.Color;
import java.awt.GradientPaint;
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/WsGraphCell.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/WsGraphCell.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/WsGraphCell.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/WsGraphCell.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/WsGraphCell.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/WsGraphCell.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/WsGraphCell.java Fri Aug 12 06:40:31 2005
@@ -4,7 +4,7 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/
-package org.apache.wsdm.interop.wcm.impl.ui.jgraph;
+package org.apache.interop.common.ui.jgraph;
import javax.swing.tree.MutableTreeNode;
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/WsView.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/WsView.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/WsView.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/WsView.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/WsView.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/ui/jgraph/WsView.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/common/ui/jgraph/WsView.java Fri Aug 12 06:40:31 2005
@@ -4,7 +4,7 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/
-package org.apache.wsdm.interop.wcm.impl.ui.jgraph;
+package org.apache.interop.common.ui.jgraph;
import java.awt.Color;
import java.awt.GradientPaint;
Modified: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/BlackBerryApp.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/BlackBerryApp.java?rev=232286&r1=232285&r2=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/BlackBerryApp.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/BlackBerryApp.java Fri Aug 12 06:40:31 2005
@@ -9,9 +9,6 @@
import org.apache.ws.addressing.EndpointReference;
import org.apache.ws.addressing.XmlBeansEndpointReference;
import org.apache.ws.addressing.v2004_08_10.AddressingConstants;
-import org.apache.ws.muws.interop.client.FaultException;
-import org.apache.ws.muws.interop.client.ResourceStub;
-import org.apache.ws.muws.interop.client.ServiceStub;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.soap.Envelope;
import org.apache.xmlbeans.XmlException;
@@ -35,6 +32,10 @@
import javax.swing.JSplitPane;
import javax.xml.namespace.QName;
+
+import org.apache.interop.client.FaultException;
+import org.apache.interop.client.ResourceStub;
+import org.apache.interop.client.ServiceStub;
import org.apache.interop.common.LocationJPanel;
/**
* This code was generated using CloudGarden's Jigloo
@@ -151,8 +152,8 @@
}
public void startListener() throws IOException{
- m_messageWorker=new MessageWorker(this,m_buffer);
m_listener=new NotificationListener(subsciberInfoJPanel.getListenerPort(),0,m_buffer);
+ m_messageWorker=new MessageWorker(this,m_buffer,m_listener);
m_listener.setCloseSocketAfterNotification(false);
m_messageWorker.start();
m_listener.start();
@@ -161,7 +162,7 @@
/* (non-Javadoc)
* @see org.apache.interop.smgr.MessageListener#onMessage(java.lang.String)
*/
- public void onMessage(String messageText) {
+ public void onMessage(String messageText,String requestUri) {
// TODO Auto-generated method stub
System.err.println(messageText);
final String colorName=getColorFromMessage(messageText);
Modified: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/BlackBerryApp2.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/BlackBerryApp2.java?rev=232286&r1=232285&r2=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/BlackBerryApp2.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/BlackBerryApp2.java Fri Aug 12 06:40:31 2005
@@ -4,14 +4,14 @@
import javax.swing.WindowConstants;
+import org.apache.interop.client.FaultException;
+import org.apache.interop.client.ResourceStub;
+import org.apache.interop.client.ServiceStub;
import org.apache.interop.smgr.SubsciberInfoJPanel;
import org.apache.interop.smgr.BackberryJPanel;
import org.apache.ws.addressing.EndpointReference;
import org.apache.ws.addressing.XmlBeansEndpointReference;
import org.apache.ws.addressing.v2004_08_10.AddressingConstants;
-import org.apache.ws.muws.interop.client.FaultException;
-import org.apache.ws.muws.interop.client.ResourceStub;
-import org.apache.ws.muws.interop.client.ServiceStub;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.soap.Envelope;
import org.apache.xmlbeans.XmlException;
@@ -151,8 +151,8 @@
}
public void startListener() throws IOException{
- m_messageWorker=new MessageWorker(this,m_buffer);
m_listener=new NotificationListener(8000,0,m_buffer);
+ m_messageWorker=new MessageWorker(this,m_buffer,m_listener);
m_listener.setCloseSocketAfterNotification(false);
m_messageWorker.start();
m_listener.start();
@@ -161,7 +161,7 @@
/* (non-Javadoc)
* @see org.apache.interop.smgr.MessageListener#onMessage(java.lang.String)
*/
- public void onMessage(String messageText) {
+ public void onMessage(String messageText,String requestUri) {
// TODO Auto-generated method stub
System.err.println(messageText);
final String colorName=getColorFromMessage(messageText);
Modified: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/MessageListener.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/MessageListener.java?rev=232286&r1=232285&r2=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/MessageListener.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/MessageListener.java Fri Aug 12 06:40:31 2005
@@ -13,5 +13,5 @@
* Window - Preferences - Java - Code Style - Code Templates
*/
public interface MessageListener {
- public void onMessage(String messageText);
+ public void onMessage(String messageText,String requestUri);
}
Modified: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/MessageWorker.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/MessageWorker.java?rev=232286&r1=232285&r2=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/MessageWorker.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/MessageWorker.java Fri Aug 12 06:40:31 2005
@@ -19,13 +19,16 @@
private MessageListener listener;
private StringBuffer messageBuffer;
private Thread worker;
+ private NotificationListener m_notficationListner;
/**
+ * @param m_listener
*
*/
- public MessageWorker(MessageListener listener,StringBuffer messageBuffer) {
+ public MessageWorker(MessageListener listener,StringBuffer messageBuffer, NotificationListener notificationListener) {
super();
this.listener=listener;
this.messageBuffer=messageBuffer;
+ this.m_notficationListner=notificationListener;
}
public void stop(){
@@ -55,7 +58,7 @@
synchronized(messageBuffer){
messageBuffer.wait();
System.out.println("Sending on message.");
- listener.onMessage(messageBuffer.toString());
+ listener.onMessage(messageBuffer.toString(),m_notficationListner.getRequestUri());
messageBuffer.notify();
}
// I am now full
Modified: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/TestSubscribe.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/TestSubscribe.java?rev=232286&r1=232285&r2=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/TestSubscribe.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/smgr/TestSubscribe.java Fri Aug 12 06:40:31 2005
@@ -8,13 +8,13 @@
import javax.xml.namespace.QName;
+import org.apache.interop.client.AbstractWsdmInteropTestCase;
+import org.apache.interop.client.FaultException;
+import org.apache.interop.client.ResourceStub;
+import org.apache.interop.client.ServiceStub;
import org.apache.ws.addressing.EndpointReference;
import org.apache.ws.addressing.XmlBeansEndpointReference;
import org.apache.ws.addressing.v2004_08_10.AddressingConstants;
-import org.apache.ws.muws.interop.client.AbstractWsdmInteropTestCase;
-import org.apache.ws.muws.interop.client.FaultException;
-import org.apache.ws.muws.interop.client.ResourceStub;
-import org.apache.ws.muws.interop.client.ServiceStub;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
Modified: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcdisplay/DisplayAppConnection.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcdisplay/DisplayAppConnection.java?rev=232286&r1=232285&r2=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcdisplay/DisplayAppConnection.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcdisplay/DisplayAppConnection.java Fri Aug 12 06:40:31 2005
@@ -10,11 +10,11 @@
import javax.xml.namespace.QName;
+import org.apache.interop.client.FaultException;
+import org.apache.interop.client.ResourceStub;
import org.apache.ws.addressing.EndpointReference;
import org.apache.ws.addressing.XmlBeansEndpointReference;
import org.apache.ws.addressing.v2004_08_10.AddressingConstants;
-import org.apache.ws.muws.interop.client.FaultException;
-import org.apache.ws.muws.interop.client.ResourceStub;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.impl.values.XmlIntImpl;
Modified: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcdisplay/WcDisplayApp.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcdisplay/WcDisplayApp.java?rev=232286&r1=232285&r2=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcdisplay/WcDisplayApp.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcdisplay/WcDisplayApp.java Fri Aug 12 06:40:31 2005
@@ -19,12 +19,13 @@
import javax.swing.border.BevelBorder;
import org.apache.interop.smgr.ConnectionListener;
-import org.apache.ws.muws.interop.client.FaultException;
-import org.apache.wsdm.interop.wcm.impl.ui.MessagesJPanel;
-import org.apache.wsdm.interop.wcm.impl.ui.TemperatureJPanel;
import org.apache.xmlbeans.XmlException;
+import org.apache.interop.client.FaultException;
import org.apache.interop.common.LocationJPanel;
+import org.apache.interop.common.ui.MessagesJPanel;
+import org.apache.interop.common.ui.TemperatureJPanel;
+
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
/**
@@ -42,6 +43,10 @@
* *************************************
*/
public class WcDisplayApp extends javax.swing.JFrame implements ConnectionListener {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 6640653864228922288L;
private JSplitPane jSplitPaneGraphMessage;
private TemperatureJPanel temperatureJPanel1;
private LocationJPanel jPanelLocation;
@@ -50,8 +55,8 @@
private ActionListener m_taskPerformer;
private Timer m_timer;
private DisplayAppConnection m_connection;
- private ImageIcon stillIcon=new ImageIcon(getClass().getClassLoader().getResource("org/apache/interop/wcdisplay/hp-still.gif"));
- private ImageIcon aniIcon=new ImageIcon(getClass().getClassLoader().getResource("org/apache/interop/wcdisplay/hp-ani.gif"));
+ //private ImageIcon stillIcon=new ImageIcon(getClass().getClassLoader().getResource("org/apache/interop/wcdisplay/hp-still.gif"));
+ //private ImageIcon aniIcon=new ImageIcon(getClass().getClassLoader().getResource("org/apache/interop/wcdisplay/hp-ani.gif"));
/**
* Auto-generated main method to display this JFrame
*/
Modified: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/WcMgrApp.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/WcMgrApp.java?rev=232286&r1=232285&r2=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/WcMgrApp.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/WcMgrApp.java Fri Aug 12 06:40:31 2005
@@ -1,24 +1,24 @@
package org.apache.interop.wcmgr;
+import org.apache.interop.client.FaultException;
+import org.apache.interop.client.ResourceStub;
+import org.apache.interop.client.WcmMessage;
import org.apache.interop.common.LocationJPanel;
+import org.apache.interop.common.ui.MessagesJPanel;
+import org.apache.interop.common.ui.StatusJPanel;
+import org.apache.interop.common.ui.jgraph.WsGraphCell;
import org.apache.interop.smgr.ConnectionListener;
import org.apache.interop.smgr.MessageListener;
import org.apache.interop.smgr.MessageWorker;
import org.apache.interop.smgr.NotificationListener;
+import org.apache.interop.wcmgr.impl.WcImpl;
+import org.apache.interop.wcmgr.impl.WsImpl;
+import org.apache.interop.wcmgr.model.IWc;
+import org.apache.interop.wcmgr.model.IWs;
import org.apache.ws.addressing.EndpointReference;
import org.apache.ws.addressing.XmlBeansEndpointReference;
import org.apache.ws.addressing.v2004_08_10.AddressingConstants;
-import org.apache.ws.muws.interop.client.FaultException;
-import org.apache.ws.muws.interop.client.ResourceStub;
-import org.apache.ws.muws.interop.client.WcmMessage;
import org.apache.ws.util.XmlBeanUtils;
-import org.apache.wsdm.interop.wcm.impl.WcImpl;
-import org.apache.wsdm.interop.wcm.impl.WsImpl;
-import org.apache.wsdm.interop.wcm.impl.ui.MessagesJPanel;
-import org.apache.wsdm.interop.wcm.impl.ui.StatusJPanel;
-import org.apache.wsdm.interop.wcm.impl.ui.jgraph.WsGraphCell;
-import org.apache.wsdm.interop.wcm.model.IWc;
-import org.apache.wsdm.interop.wcm.model.IWs;
import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
@@ -70,7 +70,6 @@
private Vector model;
private String notificationListenerUrl="http://localhost:8001/bogas";
private int LISTENER_PORT = 8000;
- private static final String WcConfigEprURL="";
private JButton jButton;
private JPanel jPanel1;
private String m_activeWeatherStation;
@@ -87,12 +86,6 @@
initGUI();
statusJPanel.setPopupListener(this);
locationJPanel.setConnectionListener(this);
-
-// locationJPanel.setResourceUrl("http://12.35.246.160:8080/muse/services/WeatherStationDir");
-// locationJPanel.setTopicNamespace("");
-// locationJPanel.getTopicName("");
- //locationJPanel.setNotificationLister("http://12.35.246.160:8001/bogas");
-// locationJPanel.setNotificationLister("http://192.168.0.20:8001/bogas");
}
private void initGUI() {
@@ -213,8 +206,8 @@
notificationListenerUrl=locationJPanel.getListenerEndpointURL();
LISTENER_PORT=locationJPanel.getListenerPort();
// Start TCP Listener and A worker that will deliver received notifications
- m_messageWorker = new MessageWorker(this,m_buffer);
m_listener = new NotificationListener(LISTENER_PORT,0,m_buffer);
+ m_messageWorker = new MessageWorker(this,m_buffer, m_listener);
try {
m_messageWorker.start();
m_listener.start();
@@ -301,9 +294,9 @@
RelationshipTypeImpl relationshipSample = (RelationshipTypeImpl) relationArry[0];
- for (int i = 0; i < relationArry.length; i++) {
- RelationshipTypeImpl relationship = (RelationshipTypeImpl) relationArry[i];
- IWs ws1=new WsImpl(relationship,notificationListenerUrl,messagesJPanel1);
+ for (int id = 0; id < relationArry.length; id++) {
+ RelationshipTypeImpl relationship = (RelationshipTypeImpl) relationArry[id];
+ IWs ws1=new WsImpl(relationship,notificationListenerUrl,messagesJPanel1,""+id);
model.add(ws1);
}
@@ -336,7 +329,7 @@
/* (non-Javadoc)
* @see org.apache.interop.smgr.MessageListener#onMessage(java.lang.String)
*/
- public void onMessage(String messageText) {
+ public void onMessage(String messageText,String requestUri) {
// Create a new Message in the messages window
System.out.println("Message Starts.");
System.out.println(messageText);
@@ -348,9 +341,18 @@
ManagementEventTypeImpl manEvt = parseManagementEvent(noteMess);
String optStatus = parseCurrentOperationalStatus(manEvt);
EndpointReferenceType epr = parseSourceEpr(noteMess) ;
- //if(epr)
- System.out.println(""+epr.getAddress()+" Reports "+optStatus);
- updateStatusOfWs(epr,optStatus);
+
+ // Extract the notification id from the uri ex. http://blabla/stuff/3 = 3
+ String[] parts = requestUri.split("/");
+ if(parts.length==0){
+ // Discard message
+ System.out.println("Discarding message from "+epr.getAddress()+" because its URI did not have an identifier at the end");
+ return;
+ }
+ String id= parts[parts.length-1];
+
+ System.out.println(""+epr.getAddress()+" at id="+id+" Reports "+optStatus);
+ updateStatusOfWs(epr,optStatus,id);
} catch (XmlException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -375,39 +377,39 @@
* @param epr
* @param optStatus
*/
- private void updateStatusOfWs(EndpointReferenceType epr, String optStatus) {
+ private void updateStatusOfWs(EndpointReferenceType epr, String optStatus,String id) {
String epr1=epr.getAddress().getStringValue();
for (Iterator iter = model.iterator(); iter.hasNext();) {
WsImpl ws = (WsImpl) iter.next();
if(!(ws instanceof IWc)){
EndpointReference eprTest = ws.getEpr();
- // Is this an IBM Endpoint?
- if(epr.getAddress().getStringValue().endsWith("anonymous")){
- if(eprTest.getAddress().endsWith("WeatherStationSOAP")){
- Color color=colorFromStatus(optStatus);
- statusJPanel.setColor(ws.getName(),color);
- }
- }
- else {
- if(eprTest.getAddress().equals(epr.getAddress().getStringValue())){
- Object[] refProps = eprTest.getReferenceProperties();
- XmlObject xmlRefProp = (XmlObject)epr.getReferenceProperties();
-
- if(refProps!=null&&refProps.length>0){
- XmlObject xmlOb = (XmlObject)refProps[0];
- String resourceId=xmlOb.newCursor().getTextValue();
- String resIdOfEpr=xmlRefProp.newCursor().getTextValue();
- if(resourceId.equals(resIdOfEpr)){
- Color color=colorFromStatus(optStatus);
- statusJPanel.setColor(ws.getName(),color);
- }
- } else {
+// // Is this an IBM Endpoint?
+// if(epr.getAddress().getStringValue().endsWith("anonymous")){
+// if(eprTest.getAddress().endsWith("WeatherStationSOAP")){
+// Color color=colorFromStatus(optStatus);
+// statusJPanel.setColor(ws.getName(),color);
+// }
+// }
+// else {
+ if(ws.getId().equals(id)){ //eprTest.getAddress().equals(epr.getAddress().getStringValue())){
+ Object[] refProps = eprTest.getReferenceProperties();
+ XmlObject xmlRefProp = (XmlObject)epr.getReferenceProperties();
+
+// if(refProps!=null&&refProps.length>0){
+// XmlObject xmlOb = (XmlObject)refProps[0];
+// String resourceId=xmlOb.newCursor().getTextValue();
+// String resIdOfEpr=xmlRefProp.newCursor().getTextValue();
+// if(resourceId.equals(resIdOfEpr)){
Color color=colorFromStatus(optStatus);
- statusJPanel.setColor(ws.getName(),color);
- }
- }
+ statusJPanel.setColor(ws.getName(),color);
+// }
+// } else {
+// Color color=colorFromStatus(optStatus);
+// statusJPanel.setColor(ws.getName(),color);
+// }
}
+// }
repairIfNeeded(ws.getName(),optStatus);
}
}
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/WcImpl.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WcImpl.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/WcImpl.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/WcImpl.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WcImpl.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WcImpl.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/WcImpl.java Fri Aug 12 06:40:31 2005
@@ -2,10 +2,10 @@
* Created on May 23, 2005
*
*/
-package org.apache.wsdm.interop.wcm.impl;
+package org.apache.interop.wcmgr.impl;
-import org.apache.wsdm.interop.wcm.model.IWc;
-import org.apache.wsdm.interop.wcm.model.IWs;
+import org.apache.interop.wcmgr.model.IWc;
+import org.apache.interop.wcmgr.model.IWs;
/**
* @author wire
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/WcmImpl.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WcmImpl.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/WcmImpl.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/WcmImpl.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WcmImpl.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WcmImpl.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/WcmImpl.java Fri Aug 12 06:40:31 2005
@@ -2,13 +2,13 @@
* Created on May 23, 2005
*
*/
-package org.apache.wsdm.interop.wcm.impl;
+package org.apache.interop.wcmgr.impl;
import java.net.URL;
-import org.apache.wsdm.interop.wcm.impl.ui.WcJFrame;
-import org.apache.wsdm.interop.wcm.model.IWcm;
-import org.apache.wsdm.interop.wcm.model.IWs;
+import org.apache.interop.common.ui.WcJFrame;
+import org.apache.interop.wcmgr.model.IWcm;
+import org.apache.interop.wcmgr.model.IWs;
/**
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/WsImpl.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WsImpl.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/WsImpl.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/WsImpl.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WsImpl.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WsImpl.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/WsImpl.java Fri Aug 12 06:40:31 2005
@@ -2,21 +2,21 @@
* Created on May 23, 2005
*
*/
-package org.apache.wsdm.interop.wcm.impl;
+package org.apache.interop.wcmgr.impl;
import java.util.Observer;
import javax.xml.namespace.QName;
+import org.apache.interop.client.FaultException;
+import org.apache.interop.client.ResourceStub;
+import org.apache.interop.wcmgr.model.IWs;
import org.apache.ws.addressing.EndpointReference;
import org.apache.ws.addressing.XmlBeansEndpointReference;
import org.apache.ws.addressing.v2004_08_10.AddressingConstants;
-import org.apache.ws.muws.interop.client.FaultException;
-import org.apache.ws.muws.interop.client.ResourceStub;
import org.apache.ws.muws.v1_0.MuwsConstants;
import org.apache.ws.muws.v1_0.capability.OperationalStatusCapability;
import org.apache.ws.util.XmlBeanUtils;
-import org.apache.wsdm.interop.wcm.model.IWs;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.impl.values.XmlStringImpl;
import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.OperationalStatusDocument;
@@ -50,8 +50,10 @@
private String listenerURL;
//private QName topicQName;
private Observer observer;
+ private String m_id;
- public WsImpl(RelationshipTypeImpl relationship,String listenerURL,Observer observer){
+ public WsImpl(RelationshipTypeImpl relationship,String listenerURL,Observer observer,String identifier){
+ this.m_id=identifier;
this.listenerURL=listenerURL;
//this.topicQName=topicQName;
this.observer=observer;
@@ -78,7 +80,8 @@
private void requestNotificationFromEpr() throws FaultException {
ResourceStub resource = new ResourceStub( wsEpr );
resource.addObserver(observer);
- resource.subscribe(listenerURL,STATUS_TOPIC_QNAME);
+ String listenerFullURL=listenerURL+"/"+getId();
+ resource.subscribe(listenerFullURL,STATUS_TOPIC_QNAME);
resource.deleteObserver(observer);
}
@@ -243,6 +246,14 @@
setResourceProperties.setUpdateArray(new UpdateType[]{updateType});
ResourceStub stub = new ResourceStub(referenceToWcConfigEpr);
stub.sendRequest(setResourcePropertiesDocument,"http://foo","X");
+ }
+
+ public String getId() {
+ return m_id;
+ }
+
+ public void setId(String m_id) {
+ this.m_id = m_id;
}
}
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/WsImplTest.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WsImplTest.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/WsImplTest.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/WsImplTest.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WsImplTest.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/impl/WsImplTest.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/impl/WsImplTest.java Fri Aug 12 06:40:31 2005
@@ -4,7 +4,7 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/
-package org.apache.wsdm.interop.wcm.impl;
+package org.apache.interop.wcmgr.impl;
import java.util.Observer;
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/IWc.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/model/IWc.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/IWc.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/IWc.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/model/IWc.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/model/IWc.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/IWc.java Fri Aug 12 06:40:31 2005
@@ -2,7 +2,7 @@
* Created on May 23, 2005
*
*/
-package org.apache.wsdm.interop.wcm.model;
+package org.apache.interop.wcmgr.model;
/**
* @author wire
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/IWcm.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/model/IWcm.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/IWcm.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/IWcm.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/model/IWcm.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/model/IWcm.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/IWcm.java Fri Aug 12 06:40:31 2005
@@ -2,7 +2,7 @@
* Created on May 23, 2005
*
*/
-package org.apache.wsdm.interop.wcm.model;
+package org.apache.interop.wcmgr.model;
/**
* Interface used to report real time data to the WCM.
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/IWs.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/model/IWs.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/IWs.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/IWs.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/model/IWs.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/model/IWs.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/IWs.java Fri Aug 12 06:40:31 2005
@@ -2,7 +2,7 @@
* Created on May 23, 2005
*
*/
-package org.apache.wsdm.interop.wcm.model;
+package org.apache.interop.wcmgr.model;
/**
* @author wire
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/WcmFactory.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/model/WcmFactory.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/WcmFactory.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/WcmFactory.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/model/WcmFactory.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/model/WcmFactory.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/interop/wcmgr/model/WcmFactory.java Fri Aug 12 06:40:31 2005
@@ -2,15 +2,15 @@
* Created on May 23, 2005
*
*/
-package org.apache.wsdm.interop.wcm.model;
+package org.apache.interop.wcmgr.model;
import java.net.MalformedURLException;
import java.net.URL;
-import org.apache.wsdm.interop.wcm.impl.WcImpl;
-import org.apache.wsdm.interop.wcm.impl.WcmImpl;
-import org.apache.wsdm.interop.wcm.impl.WsImpl;
-import org.apache.wsdm.interop.wcm.impl.ui.WcJFrame;
+import org.apache.interop.common.ui.WcJFrame;
+import org.apache.interop.wcmgr.impl.WcImpl;
+import org.apache.interop.wcmgr.impl.WcmImpl;
+import org.apache.interop.wcmgr.impl.WsImpl;
/**
Modified: webservices/muse/trunk/src/examples/ieeedemo/client/test/WeatherStationNotifTest.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/test/WeatherStationNotifTest.java?rev=232286&r1=232285&r2=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/test/WeatherStationNotifTest.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/test/WeatherStationNotifTest.java Fri Aug 12 06:40:31 2005
@@ -20,10 +20,10 @@
import junit.framework.TestCase;
+import org.apache.interop.client.FaultException;
+import org.apache.interop.client.ResourceStub;
import org.apache.ws.addressing.EndpointReference;
import org.apache.ws.addressing.XmlBeansEndpointReference;
-import org.apache.ws.muws.interop.client.FaultException;
-import org.apache.ws.muws.interop.client.ResourceStub;
import org.apache.ws.muws.v1_0.MuwsConstants;
import org.apache.ws.muws.v1_0.capability.OperationalStatusCapability;
import org.apache.ws.util.XmlBeanUtils;
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/InteropSimulator.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/InteropSimulator.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/InteropSimulator.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/InteropSimulator.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/InteropSimulator.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/InteropSimulator.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/InteropSimulator.java Fri Aug 12 06:40:31 2005
@@ -4,16 +4,16 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/
-package org.apache.wsdm.interop.wcm.simulator;
+package simulators;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Timer;
import java.util.TimerTask;
-import org.apache.wsdm.interop.wcm.model.IWcm;
-import org.apache.wsdm.interop.wcm.model.IWs;
-import org.apache.wsdm.interop.wcm.model.WcmFactory;
+import org.apache.interop.wcmgr.model.IWcm;
+import org.apache.interop.wcmgr.model.IWs;
+import org.apache.interop.wcmgr.model.WcmFactory;
/**
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/InteropSimulatorTest.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/InteropSimulatorTest.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/InteropSimulatorTest.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/InteropSimulatorTest.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/InteropSimulatorTest.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/InteropSimulatorTest.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/InteropSimulatorTest.java Fri Aug 12 06:40:31 2005
@@ -2,13 +2,13 @@
* Created on May 23, 2005
*
*/
-package org.apache.wsdm.interop.wcm.simulator;
+package simulators;
import java.net.URL;
-import org.apache.wsdm.interop.wcm.model.IWc;
-import org.apache.wsdm.interop.wcm.model.IWs;
-import org.apache.wsdm.interop.wcm.model.WcmFactory;
+import org.apache.interop.wcmgr.model.IWc;
+import org.apache.interop.wcmgr.model.IWs;
+import org.apache.interop.wcmgr.model.WcmFactory;
import junit.framework.TestCase;
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/MessageSimulator.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/MessageSimulator.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/MessageSimulator.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/MessageSimulator.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/MessageSimulator.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/MessageSimulator.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/MessageSimulator.java Fri Aug 12 06:40:31 2005
@@ -2,15 +2,15 @@
* Created on May 24, 2005
*
*/
-package org.apache.wsdm.interop.wcm.simulator;
+package simulators;
import java.util.Timer;
import java.util.TimerTask;
import javax.swing.JFrame;
-import org.apache.ws.muws.interop.client.WcmMessage;
-import org.apache.wsdm.interop.wcm.impl.ui.MessagesJPanel;
+import org.apache.interop.client.WcmMessage;
+import org.apache.interop.common.ui.MessagesJPanel;
/**
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/StatusSimulator.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/StatusSimulator.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/StatusSimulator.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/StatusSimulator.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/StatusSimulator.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/StatusSimulator.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/StatusSimulator.java Fri Aug 12 06:40:31 2005
@@ -4,7 +4,7 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/
-package org.apache.wsdm.interop.wcm.simulator;
+package simulators;
import java.awt.Color;
import java.util.Timer;
@@ -12,13 +12,13 @@
import javax.swing.JFrame;
-import org.apache.wsdm.interop.wcm.impl.WcImpl;
-import org.apache.wsdm.interop.wcm.impl.WsImpl;
-import org.apache.wsdm.interop.wcm.impl.ui.MessagesJPanel;
-import org.apache.wsdm.interop.wcm.impl.ui.StatusJPanel;
-import org.apache.wsdm.interop.wcm.impl.ui.TemperatureJPanel;
-import org.apache.wsdm.interop.wcm.model.IWc;
-import org.apache.wsdm.interop.wcm.model.IWs;
+import org.apache.interop.common.ui.MessagesJPanel;
+import org.apache.interop.common.ui.StatusJPanel;
+import org.apache.interop.common.ui.TemperatureJPanel;
+import org.apache.interop.wcmgr.impl.WcImpl;
+import org.apache.interop.wcmgr.impl.WsImpl;
+import org.apache.interop.wcmgr.model.IWc;
+import org.apache.interop.wcmgr.model.IWs;
/**
Copied: webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/TemperatureSimulator.java (from r226856, webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/TemperatureSimulator.java)
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/TemperatureSimulator.java?p2=webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/TemperatureSimulator.java&p1=webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/TemperatureSimulator.java&r1=226856&r2=232286&rev=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/wsdm/interop/wcm/simulator/TemperatureSimulator.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/test/simulators/TemperatureSimulator.java Fri Aug 12 06:40:31 2005
@@ -4,15 +4,15 @@
* TODO To change the template for this generated file go to
* Window - Preferences - Java - Code Style - Code Templates
*/
-package org.apache.wsdm.interop.wcm.simulator;
+package simulators;
import java.util.Timer;
import java.util.TimerTask;
import javax.swing.JFrame;
-import org.apache.wsdm.interop.wcm.impl.ui.MessagesJPanel;
-import org.apache.wsdm.interop.wcm.impl.ui.TemperatureJPanel;
+import org.apache.interop.common.ui.MessagesJPanel;
+import org.apache.interop.common.ui.TemperatureJPanel;
/**
Modified: webservices/muse/trunk/src/examples/ieeedemo/client/test/tests/WsCompatabilityTest.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/test/tests/WsCompatabilityTest.java?rev=232286&r1=232285&r2=232286&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/test/tests/WsCompatabilityTest.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/test/tests/WsCompatabilityTest.java Fri Aug 12 06:40:31 2005
@@ -13,13 +13,13 @@
import junit.framework.TestCase;
+import org.apache.interop.client.FaultException;
+import org.apache.interop.client.ResourceStub;
import org.apache.interop.smgr.MessageListener;
import org.apache.interop.smgr.NotificationListener;
import org.apache.ws.addressing.EndpointReference;
import org.apache.ws.addressing.XmlBeansEndpointReference;
import org.apache.ws.addressing.v2004_08_10.AddressingConstants;
-import org.apache.ws.muws.interop.client.FaultException;
-import org.apache.ws.muws.interop.client.ResourceStub;
import org.apache.ws.muws.v1_0.MuwsConstants;
import org.apache.ws.muws.v1_0.capability.OperationalStatusCapability;
import org.apache.xmlbeans.GDuration;
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-dev-help@ws.apache.org