Author: scamp
Date: Tue Mar 29 14:03:07 2005
New Revision: 159432
URL: http://svn.apache.org/viewcvs?view=rev&rev=159432
Log: (empty)
Modified:
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/ServerMgmtTestCase.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/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=159431&r2=159432
==============================================================================
---
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
Tue Mar 29 14:03:07 2005
@@ -15,22 +15,22 @@
*=============================================================================*/
package org.apache.ws.muws.interop.client;
-import org.xmlsoap.schemas.soap.envelope.EnvelopeDocument;
-import org.xmlsoap.schemas.soap.envelope.Envelope;
-import org.xmlsoap.schemas.soap.envelope.Header;
-import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType;
-import org.xmlsoap.schemas.ws.x2003.x03.addressing.ToDocument;
-import org.xmlsoap.schemas.ws.x2003.x03.addressing.ActionDocument;
-import org.xmlsoap.schemas.ws.x2003.x03.addressing.AttributedURI;
-import org.apache.xmlbeans.XmlObject;
+import org.apache.ws.addressing.EndpointReference;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.soap.SoapClient;
+import org.apache.xmlbeans.XmlObject;
import
org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyDocument;
import
org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyResponseDocument;
+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.ToDocument;
import javax.xml.namespace.QName;
-import java.net.URL;
import java.net.URI;
+import java.net.URL;
/**
* TODO
@@ -38,9 +38,9 @@
public class ResourceStub
{
- private EndpointReferenceType m_epr;
+ private EndpointReference m_epr;
- public ResourceStub( EndpointReferenceType epr )
+ public ResourceStub( EndpointReference epr )
{
m_epr = epr;
}
@@ -74,7 +74,7 @@
XmlBeanUtils.addChildElement( envelope.getBody(), requestDoc );
try
{
- URL endpointURL = new URL( m_epr.getAddress().getStringValue() );
+ URL endpointURL = new URL( m_epr.getAddress() );
URI actionURI = new URI( action );
String response = SoapClient.sendRequest( endpointURL,
envelopeDoc.newInputStream(), actionURI );
EnvelopeDocument responseEnvelopeDoc = (EnvelopeDocument)
XmlObject.Factory.parse( response );
@@ -98,13 +98,15 @@
private void addAddressingHeaders( Header header, String action )
{
ToDocument toDoc = ToDocument.Factory.newInstance();
- toDoc.setTo( m_epr.getAddress() );
+ AttributedURI attributedURI = toDoc.addNewTo();
+ attributedURI.setStringValue(m_epr.getAddress());
ActionDocument actionDoc = ActionDocument.Factory.newInstance();
AttributedURI actionType = actionDoc.addNewAction();
actionType.setStringValue( action );
if (m_epr.getReferenceProperties() != null)
{
- XmlObject[] refPropElems =
XmlBeanUtils.getChildElements(m_epr.getReferenceProperties());
+
+ XmlObject[] refPropElems = (XmlObject[])
m_epr.getReferenceProperties();
for (int i = 0; i < refPropElems.length; i++)
{
XmlBeanUtils.addChildElement(header, refPropElems[i]);
Modified:
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/ServerMgmtTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/ServerMgmtTestCase.java?view=diff&r1=159431&r2=159432
==============================================================================
---
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/ServerMgmtTestCase.java
(original)
+++
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/ServerMgmtTestCase.java
Tue Mar 29 14:03:07 2005
@@ -16,6 +16,7 @@
package org.apache.ws.muws.interop.client;
import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceDocument;
+import org.apache.ws.addressing.XmlBeansEndpointReference;
import java.net.URL;
@@ -40,7 +41,7 @@
super.setUp();
EndpointReferenceDocument ipmiServerEprDoc = getEndpointReference( new
URL( IPMI_SERVER_EPR ) );
//System.out.println( "*** Using IPMI Server EPR:\n" +
ipmiServerEprDoc );
- m_resource = new ResourceStub( ipmiServerEprDoc.getEndpointReference()
);
+ m_resource = new ResourceStub( new
XmlBeansEndpointReference(ipmiServerEprDoc.getEndpointReference()) );
}
public void testMuwsIdentityCharacteristics() throws FaultException
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=159431&r2=159432
==============================================================================
---
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
Tue Mar 29 14:03:07 2005
@@ -18,6 +18,7 @@
import
org.apache.ws.muws.v1_0.capability.ManageabilityCharacteristicsCapability;
import org.apache.ws.muws.v1_0.capability.MetricsCapability;
import org.apache.ws.muws.v1_0.capability.ConfigurationCapability;
+import org.apache.ws.addressing.XmlBeansEndpointReference;
import org.apache.xmlbeans.XmlDateTime;
import org.apache.xmlbeans.XmlObject;
import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceDocument;
@@ -57,7 +58,7 @@
super.setUp();
EndpointReferenceDocument blackberryEprDoc = getEndpointReference( new
URL( BLACKBERRY_EPR ) );
//System.out.println( "*** Using Blackberry EPR:\n" +
smallDeviceEprDoc );
- m_resource = new ResourceStub( blackberryEprDoc.getEndpointReference()
);
+ m_resource = new ResourceStub( new
XmlBeansEndpointReference(blackberryEprDoc.getEndpointReference()) );
}
public void testMuwsIdentityCharacteristics() throws FaultException
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=159431&r2=159432
==============================================================================
---
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
Tue Mar 29 14:03:07 2005
@@ -25,6 +25,7 @@
import org.apache.ws.muws.v1_0.capability.MetricsCapability;
import org.apache.ws.muws.v1_0.capability.RelationshipsCapability;
import org.apache.ws.util.XmlBeanUtils;
+import org.apache.ws.addressing.XmlBeansEndpointReference;
import org.apache.xmlbeans.XmlAnyURI;
import org.apache.xmlbeans.XmlDateTime;
import org.apache.xmlbeans.XmlObject;
@@ -35,6 +36,7 @@
import org.oasisOpen.docs.wsdm.x2004.x12.mows.wsdmMows.IntegerCounter;
import
org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart1.CorrelatablePropertiesType;
import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.RelationshipType;
+import
org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.RelationshipParticipantType;
import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceDocument;
import org.xmlsoap.schemas.ws.x2003.x03.addressing.ReferencePropertiesType;
import org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType;
@@ -72,7 +74,7 @@
super.setUp();
EndpointReferenceDocument weatherStationEprDoc = getEndpointReference(
new URL( WEATHER_STATION_EPR_URL ) );
//System.out.println( "*** Using Weather Station EPR:\n" +
weatherStationEprDoc );
- m_resource = new ResourceStub(
weatherStationEprDoc.getEndpointReference() );
+ m_resource = new ResourceStub( new
XmlBeansEndpointReference(weatherStationEprDoc.getEndpointReference()) );
}
public void testMuwsIdentityCharacteristics() throws FaultException
@@ -176,7 +178,19 @@
assertTrue( relationshipPropElem instanceof RelationshipType );
RelationshipType relationship =
(RelationshipType)relationshipPropElem;
assertTrue( "muws-p2-xs:Relationship element is not valid",
relationship.validate() );
- // TODO: validate response is a valid relationship by sending
request to each participant EPR
+ RelationshipParticipantType[] participantArray =
relationship.getParticipantArray();
+ for (int j = 0; j < participantArray.length; j++)
+ {
+ RelationshipParticipantType relationshipParticipantType =
participantArray[j];
+ EndpointReferenceType[] manageabilityEndpointReferenceArray =
relationshipParticipantType.getManageabilityEndpointReferenceArray();
+ for (int k = 0; k <
manageabilityEndpointReferenceArray.length; k++)
+ {
+ EndpointReferenceType endpointReferenceType =
manageabilityEndpointReferenceArray[k];
+ ResourceStub resource = new ResourceStub(new
XmlBeansEndpointReference(endpointReferenceType));
+ XmlObject[] resourceProperty =
resource.getResourceProperty(WeatherstationPropertyQNames.FCCID);
+ assertTrue("Unable to invoke operation on
resource.",resourceProperty.length == 1);
+ }
+ }
}
}
@@ -208,7 +222,7 @@
XmlBeanUtils.setValue(childElements[0],"weather2");
//end update
- ResourceStub resource2 = new ResourceStub( endpointReference );
//resource2
+ ResourceStub resource2 = new ResourceStub(new
XmlBeansEndpointReference( endpointReference) ); //resource2
BigInteger res2FccidBigIntegerValue = getFCCID(resource2);
assertEquals("FCCID's did not match.", res1FccidBigIntegerValue,
res2FccidBigIntegerValue);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
