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 sc...@apache.org on 2004/11/22 17:54:53 UTC

svn commit: r106197 - in incubator/muse/trunk/examples: disk disk/client probe probe/src/generated-override/axis/com/probe/service/ac probe/src/generated-override/axis/com/probe/service/sensor probe/src/java/com/probe/sensor/subscriber template template/src/java/com/hp/template

Author: scamp
Date: Mon Nov 22 08:54:52 2004
New Revision: 106197

Modified:
   incubator/muse/trunk/examples/disk/build.xml
   incubator/muse/trunk/examples/disk/client/build.xml
   incubator/muse/trunk/examples/probe/build.xml
   incubator/muse/trunk/examples/probe/src/generated-override/axis/com/probe/service/ac/ACSystemWsdmServiceWSResource.java
   incubator/muse/trunk/examples/probe/src/generated-override/axis/com/probe/service/sensor/SensorWsdmServiceWSResource.java
   incubator/muse/trunk/examples/probe/src/java/com/probe/sensor/subscriber/SensorSubscriber.java
   incubator/muse/trunk/examples/template/build.xml
   incubator/muse/trunk/examples/template/src/java/com/hp/template/TemplateDiscoveryAgent.java
Log:
made the examples build-able again

Modified: incubator/muse/trunk/examples/disk/build.xml
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/examples/disk/build.xml?view=diff&rev=106197&p1=incubator/muse/trunk/examples/disk/build.xml&r1=106196&p2=incubator/muse/trunk/examples/disk/build.xml&r2=106197
==============================================================================
--- incubator/muse/trunk/examples/disk/build.xml	(original)
+++ incubator/muse/trunk/examples/disk/build.xml	Mon Nov 22 08:54:52 2004
@@ -46,7 +46,7 @@
      <property name="tmp.dir" location="${wsdm.webapp.dir}/_tmp_" />
      <mkdir dir="${tmp.dir}" />
      <copy file="${disk.wsdl}" todir="${tmp.dir}" overwrite="true" />
-     <taskdef name="wsdmWsdl2Java" classname="com.hp.ws.tool.taskdef.WsdmWsdl2JavaTask" classpath="${jmuws.classpath}" />              
+     <taskdef name="wsdmWsdl2Java" classname="org.apache.ws.tool.taskdef.WsdmWsdl2JavaTask" classpath="${jmuws.classpath}" />
      <wsdmWsdl2Java wsdl="${tmp.dir}/disk.wsdl"
                     srcDestDir="${generated.src.dir}"
                     classesDestDir="${generated.classes.dir}"  
@@ -83,7 +83,7 @@
 
        <antcall target="copy-discovery-agent-xml" />
               
-       <taskdef name="wsddUpdater" classname="com.hp.ws.platform.axis.deployment.wsdd.WsddUpdater" classpathref="jmuws.classpath.id" />
+       <taskdef name="wsddUpdater" classname="org.apache.ws.platform.axis.deployment.wsdd.WsddUpdater" classpathref="jmuws.classpath.id" />
        <property name="config.wsdd" location="${wsdm.webapp.dir}/WEB-INF/server-config.wsdd" />  <!-- normalize path -->       
        <wsddUpdater configWsdd="${wsdm.webapp.dir}/WEB-INF/server-config.wsdd">   
           <wsddPaths dir="${generated.src.dir}" includes="**/deploy.wsdd" />          

Modified: incubator/muse/trunk/examples/disk/client/build.xml
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/examples/disk/client/build.xml?view=diff&rev=106197&p1=incubator/muse/trunk/examples/disk/client/build.xml&r1=106196&p2=incubator/muse/trunk/examples/disk/client/build.xml&r2=106197
==============================================================================
--- incubator/muse/trunk/examples/disk/client/build.xml	(original)
+++ incubator/muse/trunk/examples/disk/client/build.xml	Mon Nov 22 08:54:52 2004
@@ -27,7 +27,7 @@
       <fail unless="xml" message="Please use -Dxml=&lt;request file&gt; for invocation."/>
       <echo>Endpoint URL: ${endpoint.url}</echo>
       <echo>Request File: ${xml}</echo>
-      <java classname="com.hp.ws.soap.SOAPClient"
+      <java classname="org.apache.ws.soap.SOAPClient"
       	 classpathref="jmuws.classpath.id">
          <arg value="${endpoint.url}"/>
          <arg value="${xml}"/>

Modified: incubator/muse/trunk/examples/probe/build.xml
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/examples/probe/build.xml?view=diff&rev=106197&p1=incubator/muse/trunk/examples/probe/build.xml&r1=106196&p2=incubator/muse/trunk/examples/probe/build.xml&r2=106197
==============================================================================
--- incubator/muse/trunk/examples/probe/build.xml	(original)
+++ incubator/muse/trunk/examples/probe/build.xml	Mon Nov 22 08:54:52 2004
@@ -48,7 +48,7 @@
            <include name="**/*.wsdl" />       
         </fileset>
      </copy>
-     <taskdef name="wsdmWsdl2Java" classname="com.hp.ws.tool.taskdef.WsdmWsdl2JavaTask" classpath="${jmuws.classpath}" />         
+     <taskdef name="wsdmWsdl2Java" classname="org.apache.ws.tool.taskdef.WsdmWsdl2JavaTask" classpath="${jmuws.classpath}" />
      <wsdmWsdl2Java srcDestDir="${generated.src.dir}"
                     classesDestDir="${generated.classes.dir}"  
                     classpath="${jmuws.classpath}"
@@ -95,7 +95,7 @@
         <fileset dir="${generated.classes.dir}" />        
      </copy>
      <antcall target="copy-discovery-agent-xml" />
-     <taskdef name="wsddUpdater" classname="com.hp.ws.platform.axis.deployment.wsdd.WsddUpdater" classpathref="jmuws.classpath.id" />
+     <taskdef name="wsddUpdater" classname="org.apache.ws.platform.axis.deployment.wsdd.WsddUpdater" classpathref="jmuws.classpath.id" />
      <echo>Deploying probe example services to ${wsdm.webapp.dir}/WEB-INF/server-config.wsdd...</echo>
      <wsddUpdater configWsdd="${wsdm.webapp.dir}/WEB-INF/server-config.wsdd">   
         <wsddPaths dir="${generated.src.dir}" includes="**/deploy.wsdd" />          

Modified: incubator/muse/trunk/examples/probe/src/generated-override/axis/com/probe/service/ac/ACSystemWsdmServiceWSResource.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/examples/probe/src/generated-override/axis/com/probe/service/ac/ACSystemWsdmServiceWSResource.java?view=diff&rev=106197&p1=incubator/muse/trunk/examples/probe/src/generated-override/axis/com/probe/service/ac/ACSystemWsdmServiceWSResource.java&r1=106196&p2=incubator/muse/trunk/examples/probe/src/generated-override/axis/com/probe/service/ac/ACSystemWsdmServiceWSResource.java&r2=106197
==============================================================================
--- incubator/muse/trunk/examples/probe/src/generated-override/axis/com/probe/service/ac/ACSystemWsdmServiceWSResource.java	(original)
+++ incubator/muse/trunk/examples/probe/src/generated-override/axis/com/probe/service/ac/ACSystemWsdmServiceWSResource.java	Mon Nov 22 08:54:52 2004
@@ -9,7 +9,8 @@
  */
 package axis.com.probe.service.ac;
 
-import com.hp.ws.muws.state.StateTransitionFailedException;
+import org.apache.ws.muws.state.StateTransitionFailedException;
+import org.apache.ws.muws.Muws05Constants;
 import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.NotificationMessageHolderType;
 import com.ibm.xmlns.stdwip.webServices.wsResourceProperties.ResourcePropertyValueChangeNotificationDocument;
 import com.ibm.xmlns.stdwip.webServices.wsResourceProperties.ResourcePropertyValueChangeNotificationType.NewValue;
@@ -78,7 +79,7 @@
          {
             StateInformation si = StateInformation.Factory.newInstance();
             si.setTimeEntered( Calendar.getInstance() );
-            si.setState( com.hp.ws.muws.Muws05Constants.RESOURCE_STATE_URI_UNAVAILABLE );
+            si.setState( Muws05Constants.RESOURCE_STATE_URI_UNAVAILABLE );
             getProperties().setResourceState( si );
          }
       }
@@ -122,9 +123,9 @@
     * method that will appropriately update the state of the "backend"
     * managed resource.
     *
-    * @throws com.hp.ws.muws.state.StateTransitionFailedException if failed to change state
+    * @throws StateTransitionFailedException if failed to change state
     */
-   protected void backendStart( ) throws com.hp.ws.muws.state.StateTransitionFailedException
+   protected void backendStart( ) throws StateTransitionFailedException
    {
       try
       {
@@ -150,9 +151,9 @@
     * method that will appropriately update the state of the "backend"
     * managed resource.
     *
-    * @throws com.hp.ws.muws.state.StateTransitionFailedException if failed to change state
+    * @throws StateTransitionFailedException if failed to change state
     */
-   protected void backendStop( ) throws com.hp.ws.muws.state.StateTransitionFailedException
+   protected void backendStop( ) throws StateTransitionFailedException
    {
       try
       {

Modified: incubator/muse/trunk/examples/probe/src/generated-override/axis/com/probe/service/sensor/SensorWsdmServiceWSResource.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/examples/probe/src/generated-override/axis/com/probe/service/sensor/SensorWsdmServiceWSResource.java?view=diff&rev=106197&p1=incubator/muse/trunk/examples/probe/src/generated-override/axis/com/probe/service/sensor/SensorWsdmServiceWSResource.java&r1=106196&p2=incubator/muse/trunk/examples/probe/src/generated-override/axis/com/probe/service/sensor/SensorWsdmServiceWSResource.java&r2=106197
==============================================================================
--- incubator/muse/trunk/examples/probe/src/generated-override/axis/com/probe/service/sensor/SensorWsdmServiceWSResource.java	(original)
+++ incubator/muse/trunk/examples/probe/src/generated-override/axis/com/probe/service/sensor/SensorWsdmServiceWSResource.java	Mon Nov 22 08:54:52 2004
@@ -9,7 +9,9 @@
  */
 package axis.com.probe.service.sensor;
 
-import com.hp.ws.util.XmlBeansUtils;
+import org.apache.ws.util.XmlBeansUtils;
+import org.apache.ws.muws.Muws05Constants;
+import org.apache.ws.muws.state.StateTransitionFailedException;
 import com.probe.sensor.gauge.TemperatureScanner;
 import com.probe.service.sensor.TemperatureDocument;
 import org.oasisOpen.docs.wsdm.x2004.x04.muws05.schema.IntegerMetric;
@@ -103,7 +105,7 @@
          {
             StateInformation si = StateInformation.Factory.newInstance();
             si.setTimeEntered( Calendar.getInstance() );
-            si.setState( com.hp.ws.muws.Muws05Constants.RESOURCE_STATE_URI_UNAVAILABLE );
+            si.setState( Muws05Constants.RESOURCE_STATE_URI_UNAVAILABLE );
             getProperties().setResourceState( si );
          }
       }
@@ -150,9 +152,9 @@
     * method that will appropriately update the state of the "backend"
     * managed resource.
     *
-    * @throws com.hp.ws.muws.state.StateTransitionFailedException if failed to change state
+    * @throws org.apache.ws.muws.state.StateTransitionFailedException if failed to change state
     */
-   protected void backendStart( ) throws com.hp.ws.muws.state.StateTransitionFailedException
+   protected void backendStart( ) throws StateTransitionFailedException
    {
       m_temperatureScanner.start();
       return;
@@ -165,9 +167,9 @@
     * method that will appropriately update the state of the "backend"
     * managed resource.
     *
-    * @throws com.hp.ws.muws.state.StateTransitionFailedException if failed to change state
+    * @throws StateTransitionFailedException if failed to change state
     */
-   protected void backendStop( ) throws com.hp.ws.muws.state.StateTransitionFailedException
+   protected void backendStop( ) throws StateTransitionFailedException
    {
       m_temperatureScanner.stop();
       return;

Modified: incubator/muse/trunk/examples/probe/src/java/com/probe/sensor/subscriber/SensorSubscriber.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/examples/probe/src/java/com/probe/sensor/subscriber/SensorSubscriber.java?view=diff&rev=106197&p1=incubator/muse/trunk/examples/probe/src/java/com/probe/sensor/subscriber/SensorSubscriber.java&r1=106196&p2=incubator/muse/trunk/examples/probe/src/java/com/probe/sensor/subscriber/SensorSubscriber.java&r2=106197
==============================================================================
--- incubator/muse/trunk/examples/probe/src/java/com/probe/sensor/subscriber/SensorSubscriber.java	(original)
+++ incubator/muse/trunk/examples/probe/src/java/com/probe/sensor/subscriber/SensorSubscriber.java	Mon Nov 22 08:54:52 2004
@@ -3,7 +3,7 @@
  *=============================================================================*/
 package com.probe.sensor.subscriber;
 
-import com.hp.ws.addressing.AddressingUtils;
+import org.apache.ws.addressing.AddressingUtils;
 import axis.com.hp.ws.generated.registry.RegistryPortType;
 import axis.com.hp.ws.generated.registry.RegistryWsdmServiceLocator;
 import axis.com.hp.ws.generated.registry._FindRequest;
@@ -11,8 +11,8 @@
 import axis.com.hp.ws.generated.submgr.SubscriptionManagerHttpBindingStub;
 import axis.com.hp.ws.generated.submgr.SubscriptionManagerServiceLocator;
 import axis.com.hp.ws.generated.submgr.SubscriptionManagerServiceWSResource;
-import com.hp.ws.topics.TopicsConstants;
-import com.hp.ws.util.AxisGenTypesUtils;
+import org.apache.ws.topics.TopicsConstants;
+import org.apache.ws.util.AxisGenTypesUtils;
 import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification.TopicExpressionType;
 import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification._Subscribe;
 import axis.com.ibm.www.xmlns.stdwip.web_services.WS_BaseNotification._SubscribeResponse;

Modified: incubator/muse/trunk/examples/template/build.xml
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/examples/template/build.xml?view=diff&rev=106197&p1=incubator/muse/trunk/examples/template/build.xml&r1=106196&p2=incubator/muse/trunk/examples/template/build.xml&r2=106197
==============================================================================
--- incubator/muse/trunk/examples/template/build.xml	(original)
+++ incubator/muse/trunk/examples/template/build.xml	Mon Nov 22 08:54:52 2004
@@ -19,7 +19,14 @@
   <target name="init">
      
     <available file="${jmuws.home}/webapps/wsdm" type="dir" property="internal.wsdm.webapp.dir" value="${jmuws.home}/webapps/wsdm" />
-    <property name="wsdm.webapp.dir" location="internal.wsdm.webapp.dir" />
+    <available file="${jmuws.home}/target/wsdm" type="dir" property="dist.wsdm.webapp.dir" value="${jmuws.home}/target/wsdm" />         
+    <condition property="wsdm.webapp.dir" value="${internal.wsdm.webapp.dir}">
+      <isset property="internal.wsdm.webapp.dir"/>
+    </condition>
+    <condition property="wsdm.webapp.dir" value="${dist.wsdm.webapp.dir}">
+      <isset property="dist.wsdm.webapp.dir"/>
+    </condition>
+    
     <fail unless="wsdm.webapp.dir" message="webapp dir ${jmuws.home}/webapps/wsdm does not exist." />    
     <echo>Using webapp dir: ${wsdm.webapp.dir}</echo>
    
@@ -46,7 +53,7 @@
       </fileset>
     </copy>
    
-    <taskdef name="wsdmWsdl2Java" classname="com.hp.ws.tool.taskdef.WsdmWsdl2JavaTask" classpath="${jmuws.classpath}" />         
+    <taskdef name="wsdmWsdl2Java" classname="org.apache.ws.tool.taskdef.WsdmWsdl2JavaTask" classpath="${jmuws.classpath}" />
     <wsdmWsdl2Java srcDestDir="${generated.src.dir}"
                    classesDestDir="${generated.classes.dir}"  
                    classpath="${jmuws.classpath}"
@@ -96,7 +103,7 @@
    
     <antcall target="copy-discovery-agent-xml" />
    
-    <taskdef name="wsddUpdater" classname="com.hp.ws.platform.axis.deployment.wsdd.WsddUpdater" classpathref="jmuws.classpath.id" />
+    <taskdef name="wsddUpdater" classname="org.apache.ws.platform.axis.deployment.wsdd.WsddUpdater" classpathref="jmuws.classpath.id" />
     <echo>Deploying services to ${wsdm.webapp.dir}/WEB-INF/server-config.wsdd...</echo>
     <wsddUpdater configWsdd="${wsdm.webapp.dir}/WEB-INF/server-config.wsdd">   
       <wsddPaths dir="${generated.src.dir}" includes="**/deploy.wsdd" />          

Modified: incubator/muse/trunk/examples/template/src/java/com/hp/template/TemplateDiscoveryAgent.java
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/examples/template/src/java/com/hp/template/TemplateDiscoveryAgent.java?view=diff&rev=106197&p1=incubator/muse/trunk/examples/template/src/java/com/hp/template/TemplateDiscoveryAgent.java&r1=106196&p2=incubator/muse/trunk/examples/template/src/java/com/hp/template/TemplateDiscoveryAgent.java&r2=106197
==============================================================================
--- incubator/muse/trunk/examples/template/src/java/com/hp/template/TemplateDiscoveryAgent.java	(original)
+++ incubator/muse/trunk/examples/template/src/java/com/hp/template/TemplateDiscoveryAgent.java	Mon Nov 22 08:54:52 2004
@@ -3,10 +3,10 @@
  *=============================================================================*/
 package com.hp.template;
 
-import com.hp.ws.resource.discovery.DiscoveryAgent;
-import com.hp.ws.resource.discovery.RegistrationManager;
-import com.hp.ws.resource.discovery.impl.DiscoveryAgentProperty;
 import axis.com.hp.service.template.TemplateWsdmServiceWSResource;
+import org.apache.ws.resource.discovery.DiscoveryAgent;
+import org.apache.ws.resource.discovery.RegistrationManager;
+import org.apache.ws.resource.discovery.impl.DiscoveryAgentProperty;
 
 /**
  * Example Discovery agent that can be customized for specific application requirements.

---------------------------------------------------------------------
To unsubscribe, e-mail: muse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-dev-help@ws.apache.org