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 ip...@apache.org on 2005/04/08 20:34:51 UTC
svn commit: r160579 - in incubator/muse/trunk/src/site/content/interop/src:
java/com/dell/wsdm/demos/interop/x2005/x04/
java/org/apache/ws/resource/example/
java/org/apache/ws/resource/example/blackberry/
java/org/everestWeather/wsdm/samples/x2005/x04/schema/
test/org/apache/ws/muws/interop/client/
Author: ips
Date: Fri Apr 8 11:34:50 2005
New Revision: 160579
URL: http://svn.apache.org/viewcvs?view=rev&rev=160579
Log:
ResourceStub now supports both 2003/03 and 2004/08 EPRs; various minor
Modified:
incubator/muse/trunk/src/site/content/interop/src/java/com/dell/wsdm/demos/interop/x2005/x04/AbstractIpmiserverService.java
incubator/muse/trunk/src/site/content/interop/src/java/com/dell/wsdm/demos/interop/x2005/x04/IpmiserverService.java
incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/InteropConstants.java
incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/AbstractBlackberryService.java
incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryService.java
incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationService.java
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/AbstractWsdmInteropTestCase.java
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/ResourceStub.java
Modified: incubator/muse/trunk/src/site/content/interop/src/java/com/dell/wsdm/demos/interop/x2005/x04/AbstractIpmiserverService.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/java/com/dell/wsdm/demos/interop/x2005/x04/AbstractIpmiserverService.java?view=diff&r1=160578&r2=160579
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/java/com/dell/wsdm/demos/interop/x2005/x04/AbstractIpmiserverService.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/java/com/dell/wsdm/demos/interop/x2005/x04/AbstractIpmiserverService.java Fri Apr 8 11:34:50 2005
@@ -2,9 +2,9 @@
package com.dell.wsdm.demos.interop.x2005.x04;
import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.handler.SoapMethodNameMap;
-import org.apache.ws.resource.handler.WsrfService;
import org.apache.ws.resource.handler.ServiceSoapMethodNameMap;
+import org.apache.ws.resource.handler.SoapMethodNameMap;
+
import javax.xml.namespace.QName;
/**
Modified: incubator/muse/trunk/src/site/content/interop/src/java/com/dell/wsdm/demos/interop/x2005/x04/IpmiserverService.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/java/com/dell/wsdm/demos/interop/x2005/x04/IpmiserverService.java?view=diff&r1=160578&r2=160579
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/java/com/dell/wsdm/demos/interop/x2005/x04/IpmiserverService.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/java/com/dell/wsdm/demos/interop/x2005/x04/IpmiserverService.java Fri Apr 8 11:34:50 2005
@@ -1,10 +1,6 @@
package com.dell.wsdm.demos.interop.x2005.x04;
import org.apache.ws.resource.ResourceContext;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlException;
-
-import javax.xml.rpc.JAXRPCException;
/**
* This class should be generated ONCE (and not overwritten) to maintain user-added code.
Modified: incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/InteropConstants.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/InteropConstants.java?view=diff&r1=160578&r2=160579
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/InteropConstants.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/InteropConstants.java Fri Apr 8 11:34:50 2005
@@ -8,6 +8,7 @@
*/
public class InteropConstants
{
+
public static String SERVICES_URL = null;
static
@@ -15,13 +16,13 @@
initIp();
}
+ public static final String WEATHERSTATION_SERVICE_NAME = "weatherstation";
+ public static final String BLACKBERRY_SERVICE_NAME = "blackberry";
- public static String WEATHERSTATION_SERVICE_NAME = "weatherstation";
- public static String BLACKBERRY_SERVICE_NAME = "blackberry";
+ public static final String WEATHERSTATION_KEY1 = "weather1";
+ public static final String WEATHERSTATION_KEY2 = "weather2";
- public static String WEATHERSTATION_KEY1 = "weather1";
- public static String WEATHERSTATION_KEY2 = "weather2";
- public static String FCCID="weatherIsNice";
+ public static final String FCCID = "WSO22-168";
private static void initIp()
{
@@ -31,9 +32,9 @@
{ //determine the real ip address
SERVICES_URL = "http://" + InetAddress.getLocalHost().getHostAddress() + ":8080/muse/services";
}
- catch (UnknownHostException e)
+ catch (UnknownHostException uhe)
{
- e.printStackTrace();
+ uhe.printStackTrace();
}
}
}
Modified: incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/AbstractBlackberryService.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/AbstractBlackberryService.java?view=diff&r1=160578&r2=160579
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/AbstractBlackberryService.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/AbstractBlackberryService.java Fri Apr 8 11:34:50 2005
@@ -2,9 +2,9 @@
package org.apache.ws.resource.example.blackberry;
import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.handler.SoapMethodNameMap;
-import org.apache.ws.resource.handler.WsrfService;
import org.apache.ws.resource.handler.ServiceSoapMethodNameMap;
+import org.apache.ws.resource.handler.SoapMethodNameMap;
+
import javax.xml.namespace.QName;
/**
Modified: incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryService.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryService.java?view=diff&r1=160578&r2=160579
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryService.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryService.java Fri Apr 8 11:34:50 2005
@@ -1,10 +1,6 @@
package org.apache.ws.resource.example.blackberry;
import org.apache.ws.resource.ResourceContext;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlException;
-
-import javax.xml.rpc.JAXRPCException;
/**
* This class should be generated ONCE (and not overwritten) to maintain user-added code.
Modified: incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationService.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationService.java?view=diff&r1=160578&r2=160579
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationService.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationService.java Fri Apr 8 11:34:50 2005
@@ -1,10 +1,6 @@
package org.everestWeather.wsdm.samples.x2005.x04.schema;
import org.apache.ws.resource.ResourceContext;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlException;
-
-import javax.xml.rpc.JAXRPCException;
/**
* This class should be generated ONCE (and not overwritten) to maintain user-added code.
Modified: incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/AbstractWsdmInteropTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/AbstractWsdmInteropTestCase.java?view=diff&r1=160578&r2=160579
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/AbstractWsdmInteropTestCase.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/AbstractWsdmInteropTestCase.java Fri Apr 8 11:34:50 2005
@@ -54,7 +54,7 @@
protected static String s_consumerURL;
private static final boolean RUN_AXIS_SERVER = Boolean.getBoolean( "runAxis" );
- static final boolean DEBUG = Boolean.getBoolean( "debug" );
+ static final boolean DEBUG = true;//Boolean.getBoolean( "debug" );
public AbstractWsdmInteropTestCase()
{
Modified: incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/ResourceStub.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/ResourceStub.java?view=diff&r1=160578&r2=160579
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/ResourceStub.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/ResourceStub.java Fri Apr 8 11:34:50 2005
@@ -20,7 +20,9 @@
import org.apache.ws.notification.topics.v1_2.Topics1_2Constants;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.soap.SoapClient;
+import org.apache.ws.XmlObjectWrapper;
import org.apache.xmlbeans.XmlObject;
+import org.apache.axis.message.addressing.Constants;
import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.SubscribeDocument;
import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.SubscribeResponseDocument;
import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.TopicExpressionType;
@@ -32,10 +34,6 @@
import org.xmlsoap.schemas.soap.envelope.Envelope;
import org.xmlsoap.schemas.soap.envelope.EnvelopeDocument;
import org.xmlsoap.schemas.soap.envelope.Header;
-import org.xmlsoap.schemas.ws.x2003.x03.addressing.ActionDocument;
-import org.xmlsoap.schemas.ws.x2003.x03.addressing.AttributedURI;
-import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType;
-import org.xmlsoap.schemas.ws.x2003.x03.addressing.ToDocument;
import javax.xml.namespace.QName;
import java.net.URI;
@@ -93,8 +91,8 @@
Calendar instance = Calendar.getInstance();
instance.setTimeInMillis(instance.getTimeInMillis() + 20000);
subscribe.setInitialTerminationTime( instance );
- EndpointReferenceType consumerRef = subscribe.addNewConsumerReference();
- AttributedURI address = consumerRef.addNewAddress();
+ org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType consumerRef = subscribe.addNewConsumerReference();
+ org.xmlsoap.schemas.ws.x2003.x03.addressing.AttributedURI address = consumerRef.addNewAddress();
address.setStringValue( consumerURL );
TopicExpressionType topicExpr = subscribe.addNewTopicExpression();
topicExpr.setDialect( Topics1_2Constants.TOPIC_EXPR_DIALECT_SIMPLE );
@@ -150,15 +148,35 @@
private void addAddressingHeaders( Header header, String action )
{
- ToDocument toDoc = ToDocument.Factory.newInstance();
- AttributedURI attributedURI = toDoc.addNewTo();
- attributedURI.setStringValue(m_epr.getAddress());
- ActionDocument actionDoc = ActionDocument.Factory.newInstance();
- AttributedURI actionType = actionDoc.addNewAction();
- actionType.setStringValue( action );
+ XmlObject eprXBean = ((XmlObjectWrapper)m_epr).getXmlObject();
+ XmlObject toElem;
+ XmlObject actionElem;
+ if ( eprXBean.schemaType().getName().getNamespaceURI().equals( Constants.NS_URI_ADDRESSING_2003_03 ) )
+ {
+ org.xmlsoap.schemas.ws.x2003.x03.addressing.ToDocument toDoc = org.xmlsoap.schemas.ws.x2003.x03.addressing.ToDocument.Factory.newInstance();
+ org.xmlsoap.schemas.ws.x2003.x03.addressing.AttributedURI attributedURI = toDoc.addNewTo();
+ attributedURI.setStringValue(m_epr.getAddress());
+ toElem = toDoc;
+ org.xmlsoap.schemas.ws.x2003.x03.addressing.ActionDocument actionDoc = org.xmlsoap.schemas.ws.x2003.x03.addressing.ActionDocument.Factory.newInstance();
+ org.xmlsoap.schemas.ws.x2003.x03.addressing.AttributedURI actionType = actionDoc.addNewAction();
+ actionType.setStringValue( action );
+ actionElem = actionDoc;
+ }
+ else
+ {
+ org.xmlsoap.schemas.ws.x2004.x08.addressing.ToDocument toDoc = org.xmlsoap.schemas.ws.x2004.x08.addressing.ToDocument.Factory.newInstance();
+ org.xmlsoap.schemas.ws.x2004.x08.addressing.AttributedURI attributedURI = toDoc.addNewTo();
+ attributedURI.setStringValue(m_epr.getAddress());
+ toElem = toDoc;
+ org.xmlsoap.schemas.ws.x2004.x08.addressing.ActionDocument actionDoc = org.xmlsoap.schemas.ws.x2004.x08.addressing.ActionDocument.Factory.newInstance();
+ org.xmlsoap.schemas.ws.x2004.x08.addressing.AttributedURI actionType = actionDoc.addNewAction();
+ actionType.setStringValue( action );
+ actionElem = actionDoc;
+ }
+ XmlBeanUtils.addChildElement( header, toElem );
+ XmlBeanUtils.addChildElement( header, actionElem );
if (m_epr.getReferenceProperties() != null)
{
-
XmlObject[] refPropElems = (XmlObject[]) m_epr.getReferenceProperties();
for (int i = 0; i < refPropElems.length; i++)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-dev-help@ws.apache.org