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 2005/04/04 17:20:07 UTC
svn commit: r160050 - in incubator/muse/trunk/src/site/content/interop/src:
java/org/apache/ws/resource/example/blackberry/ java/org/everest/
java/org/everestWeather/wsdm/samples/x2005/x04/schema/
test/org/apache/ws/muws/interop/client/
Author: scamp
Date: Mon Apr 4 08:20:03 2005
New Revision: 160050
URL: http://svn.apache.org/viewcvs?view=rev&rev=160050
Log: (empty)
Modified:
incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryResource.java
incubator/muse/trunk/src/site/content/interop/src/java/org/everest/WeatherStationSoapService.java
incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationHome.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
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/SmallDeviceMgmtTestCase.java
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/WebServicesMgmtTestCase.java
Modified: incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryResource.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryResource.java?view=diff&r1=160049&r2=160050
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryResource.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryResource.java Mon Apr 4 08:20:03 2005
@@ -100,7 +100,7 @@
muwsTopicSpace.addTopic( operationalStatusCapability );
ManagementEventTopic metricsCapability = new XmlBeansManagementEventTopicImpl( "MetricsCapability" );
muwsTopicSpace.addTopic( metricsCapability );
- ManagementEventTopic codeModuleSize = new XmlBeansManagementEventTopicImpl( "CodeModuleSize_Change" );
+ ManagementEventTopic codeModuleSize = new XmlBeansManagementEventTopicImpl( "CodeModuleSize" );
//Blackberry TopicSpace
TopicSpace bbryTopicSpace = new TopicSpaceImpl( BlackberryPropertyQNames.ALLOCATEDSTORAGE.getNamespaceURI() );
@@ -121,15 +121,7 @@
//Calendar for use in a few properties
Calendar calendarInstance = Calendar.getInstance();
- //current time is done like in Apollo
- resourceProperty = resourcePropertySet.get(BlackberryPropertyQNames.CURRENTTIME);
- rim.pda.CurrentTimeDocument rimCurrentTime = rim.pda.CurrentTimeDocument.Factory.newInstance();
- rimCurrentTime.setCurrentTime(calendarInstance.toString());
- resourceProperty.add(rimCurrentTime);
- //todo this won't work expects string
- // resourceProperty.setCallback( new org.apache.ws.resource.lifetime.callback.CurrentTimeCallback( ) );
-
-
+
//current time is done like in Apollo
resourceProperty = resourcePropertySet.get(BlackberryPropertyQNames.CURRENTTIME);
CurrentTimeDocument currentTimeDocument = CurrentTimeDocument.Factory.newInstance();
Modified: incubator/muse/trunk/src/site/content/interop/src/java/org/everest/WeatherStationSoapService.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/java/org/everest/WeatherStationSoapService.java?view=diff&r1=160049&r2=160050
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/java/org/everest/WeatherStationSoapService.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/java/org/everest/WeatherStationSoapService.java Mon Apr 4 08:20:03 2005
@@ -1,10 +1,6 @@
package org.everest;
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/WeatherstationHome.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationHome.java?view=diff&r1=160049&r2=160050
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationHome.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationHome.java Mon Apr 4 08:20:03 2005
@@ -60,7 +60,7 @@
resource = createInstance(key);
FCCIDDocument fccidDocument = FCCIDDocument.Factory.newInstance();
//set the same value for both instances
- fccidDocument.setFCCID(BigInteger.ONE);
+ fccidDocument.setFCCID("weatherIsNice");
((WeatherstationResource)resource).setFCCID(fccidDocument);
}
catch (Exception e)
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=160049&r2=160050
==============================================================================
--- 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 Mon Apr 4 08:20:03 2005
@@ -32,6 +32,7 @@
import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.NotificationMessageHolderType;
import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.NotifyDocument;
import org.xmlsoap.schemas.soap.envelope.EnvelopeDocument;
+import org.xmlsoap.schemas.soap.envelope.Body;
import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceDocument;
import javax.xml.namespace.QName;
@@ -144,20 +145,31 @@
XmlObject xmlObject = XmlObject.Factory.parse(incomingMsg);
assertTrue("The returned message was not a SOAP Envelope.", xmlObject instanceof EnvelopeDocument);
EnvelopeDocument envelope = (EnvelopeDocument) xmlObject;
+ Body body = envelope.getEnvelope().getBody();
- //get notify
- XmlObject bodyElems[] = XmlBeanUtils.getChildElements(envelope.getEnvelope().getBody(), new QName(BaseNotification1_2Constants.NSURI_WSNT_SCHEMA, "Notify"));
- assertEquals( "The SOAP Body does not contain exactly one element.", 1, bodyElems.length );
- XmlObject notifyDoc = bodyElems[0];
- assertTrue("The SOAP Body does not contain a Notify element.", notifyDoc instanceof NotifyDocument.Notify);
- NotifyDocument.Notify notify = (NotifyDocument.Notify) notifyDoc;
-
- //get contained management event
- NotificationMessageHolderType notificationMessageType = notify.getNotificationMessageArray(0);
- XmlObject message = notificationMessageType.getMessage();
- XmlObject xmlManagementEvent = XmlBeanUtils.getChildElements(message, new QName(MuwsConstants.NSURI_MUWS_PART1_SCHEMA, "ManagementEvent"))[0];
- assertTrue("The Notify did not contain a ManagementEvent.", xmlManagementEvent instanceof ManagementEventType);
+ XmlObject xmlManagementEvent = null;
+ if (ResourceStub.USE_WRAPPED_NOTIFICATIONS) //wrapped
+ {
+ //get notify
+ XmlObject bodyElems[] = XmlBeanUtils.getChildElements(body, new QName(BaseNotification1_2Constants.NSURI_WSNT_SCHEMA, "Notify"));
+ assertEquals("The SOAP Body does not contain exactly one element.", 1, bodyElems.length);
+ XmlObject notifyDoc = bodyElems[0];
+ assertTrue("The SOAP Body does not contain a wrapped notification with a Notify element.", notifyDoc instanceof NotifyDocument.Notify);
+ NotifyDocument.Notify notify = (NotifyDocument.Notify) notifyDoc;
+
+ //get contained management event
+ NotificationMessageHolderType notificationMessageType = notify.getNotificationMessageArray(0);
+ XmlObject message = notificationMessageType.getMessage();
+
+ xmlManagementEvent = XmlBeanUtils.getChildElements(message, new QName(MuwsConstants.NSURI_MUWS_PART1_SCHEMA, "ManagementEvent"))[0];
+ assertTrue("The Notify did not contain a ManagementEvent.", xmlManagementEvent instanceof ManagementEventType);
+ }
+ else //unwrapped
+ {
+ xmlManagementEvent = XmlBeanUtils.getChildElements(body, new QName(MuwsConstants.NSURI_MUWS_PART1_SCHEMA, "ManagementEvent"))[0];
+ assertTrue("The SOAP Body did not contain an unwrapped ManagementEvent.", xmlManagementEvent instanceof ManagementEventType);
+ }
ManagementEventType mgmtEvent = (ManagementEventType) xmlManagementEvent;
return mgmtEvent;
}
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=160049&r2=160050
==============================================================================
--- 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 Mon Apr 4 08:20:03 2005
@@ -50,6 +50,8 @@
private EndpointReference m_epr;
+ public static boolean USE_WRAPPED_NOTIFICATIONS = true;
+
public ResourceStub( EndpointReference epr )
{
m_epr = epr;
@@ -87,7 +89,7 @@
{
SubscribeDocument requestDoc = SubscribeDocument.Factory.newInstance();
SubscribeDocument.Subscribe subscribe = requestDoc.addNewSubscribe();
- //subscribe.setUseNotify(false);
+ subscribe.setUseNotify(USE_WRAPPED_NOTIFICATIONS);
Calendar instance = Calendar.getInstance();
instance.setTimeInMillis(instance.getTimeInMillis() + 20000);
subscribe.setInitialTerminationTime( instance );
Modified: incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/SmallDeviceMgmtTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/SmallDeviceMgmtTestCase.java?view=diff&r1=160049&r2=160050
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/SmallDeviceMgmtTestCase.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/SmallDeviceMgmtTestCase.java Mon Apr 4 08:20:03 2005
@@ -156,7 +156,7 @@
XmlObject[] capabilityElems = m_resource.getResourceProperty( ManageabilityCharacteristicsCapability.PROP_NAME_MANAGEABILITY_CAPABILITY );
assertContainsURI( capabilityElems, MetricsCapability.URI );
- m_resource.subscribe( s_consumerURL, new QName( NSURI_BLACKBERRY, "CodeModuleSize_Change", NSPREFIX_BLACKBERRY ) );
+ m_resource.subscribe( s_consumerURL, new QName( NSURI_BLACKBERRY, "CodeModuleSize", NSPREFIX_BLACKBERRY ) );
PortListen notifListener = new PortListen( NOTIF_LISTENER_PORT, NOTIF_LISTENER_TIMEOUT );
Modified: incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/WebServicesMgmtTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/WebServicesMgmtTestCase.java?view=diff&r1=160049&r2=160050
==============================================================================
--- incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/WebServicesMgmtTestCase.java (original)
+++ incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/WebServicesMgmtTestCase.java Mon Apr 4 08:20:03 2005
@@ -31,6 +31,7 @@
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlPositiveInteger;
import org.apache.xmlbeans.XmlQName;
+import org.apache.xmlbeans.XmlString;
import org.everestWeather.wsdm.samples.x2005.x04.schema.WeatherstationPropertyQNames;
import org.oasisOpen.docs.wsdm.x2004.x12.mows.wsdmMows.DurationMetric;
import org.oasisOpen.docs.wsdm.x2004.x12.mows.wsdmMows.EndpointDescriptionsDocument;
@@ -229,14 +230,13 @@
assertEquals("FCCIDs did not match.", getFCCID(m_resource), getFCCID(resource2));
}
- private BigInteger getFCCID(ResourceStub resource)
+ private String getFCCID(ResourceStub resource)
throws FaultException
{
XmlObject resourceFCCID = getSingleProperty(resource, WeatherstationPropertyQNames.FCCID);
- assertTrue("FCCID was not a xs:positiveInteger", resourceFCCID instanceof XmlPositiveInteger);
- XmlPositiveInteger resFccidInt = (XmlPositiveInteger) resourceFCCID;
- BigInteger resFccidBigIntegerValue = resFccidInt.getBigIntegerValue();
- return resFccidBigIntegerValue;
+ assertTrue("FCCID was not a xs:positiveInteger", resourceFCCID instanceof XmlString);
+ XmlString resFccidInt = (XmlString) resourceFCCID;
+ return resFccidInt.getStringValue();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-dev-help@ws.apache.org