Author: ips
Date: Thu Apr 7 11:53:22 2005
New Revision: 160430
URL: http://svn.apache.org/viewcvs?view=rev&rev=160430
Log:
misc minor
Modified:
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/ServerMgmtTestCase.java
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/ServiceStub.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/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=160429&r2=160430
==============================================================================
---
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
Thu Apr 7 11:53:22 2005
@@ -50,6 +50,7 @@
protected static String s_consumerURL;
private static final boolean RUN_AXIS_SERVER = Boolean.getBoolean(
"runAxis" );
+ static final boolean DEBUG = Boolean.getBoolean( "debug" );
public AbstractWsdmInteropTestCase()
{
@@ -118,7 +119,7 @@
}
/**
- * Reads an wsa03:EndpointReference XML document from the specified URL.
+ * Reads a wsa03:EndpointReference XML document from the specified URL.
*
* @param url
* @return
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=160429&r2=160430
==============================================================================
---
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
Thu Apr 7 11:53:22 2005
@@ -119,17 +119,18 @@
private XmlObject sendRequest( XmlObject requestDoc, String action )
{
- EnvelopeDocument envelopeDoc = createEnvelope();
- Envelope envelope = envelopeDoc.getEnvelope();
- addAddressingHeaders( envelope.getHeader(), action );
- XmlBeanUtils.addChildElement( envelope.getBody(), requestDoc );
+ EnvelopeDocument requestEnvelopeDoc = createEnvelope();
+ Envelope requestEnvelope = requestEnvelopeDoc.getEnvelope();
+ addAddressingHeaders( requestEnvelope.getHeader(), action );
+ XmlBeanUtils.addChildElement( requestEnvelope.getBody(), requestDoc );
try
{
URL endpointURL = new URL( m_epr.getAddress() );
URI actionURI = new URI( action );
- //System.out.println( "Sending request: \n" + envelopeDoc );
- String response = SoapClient.sendRequest( endpointURL,
envelopeDoc.newInputStream(), actionURI );
+ if ( AbstractWsdmInteropTestCase.DEBUG ) { System.out.println(
"Sending request: \n" + requestEnvelopeDoc ); }
+ String response = SoapClient.sendRequest( endpointURL,
requestEnvelopeDoc.newInputStream(), actionURI );
EnvelopeDocument responseEnvelopeDoc = (EnvelopeDocument)
XmlObject.Factory.parse( response );
+ if ( AbstractWsdmInteropTestCase.DEBUG ) { System.out.println(
"Received response: \n" + responseEnvelopeDoc ); }
Envelope responseEnvelope = responseEnvelopeDoc.getEnvelope();
XmlObject[] responseBodyElems = XmlBeanUtils.getChildElements(
responseEnvelope.getBody() );
if ( responseBodyElems.length == 0 )
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=160429&r2=160430
==============================================================================
---
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
Thu Apr 7 11:53:22 2005
@@ -53,7 +53,7 @@
{
super.setUp();
EndpointReferenceDocument ipmiServerEprDoc = getEndpointReference( new
URL( IPMI_SERVER_EPR ) );
- //System.out.println( "*** Using IPMI Server EPR:\n" +
ipmiServerEprDoc );
+ if ( DEBUG ) { System.out.println( "*** Using IPMI Server EPR:\n" +
ipmiServerEprDoc ); }
m_resource = new ResourceStub( new
XmlBeansEndpointReference(ipmiServerEprDoc.getEndpointReference()) );
}
Modified:
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/ServiceStub.java
URL:
http://svn.apache.org/viewcvs/incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/ServiceStub.java?view=diff&r1=160429&r2=160430
==============================================================================
---
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/ServiceStub.java
(original)
+++
incubator/muse/trunk/src/site/content/interop/src/test/org/apache/ws/muws/interop/client/ServiceStub.java
Thu Apr 7 11:53:22 2005
@@ -77,15 +77,16 @@
private XmlObject sendRequest( XmlObject requestDoc, String action )
{
- EnvelopeDocument envelopeDoc = createEnvelope();
- Envelope envelope = envelopeDoc.getEnvelope();
- XmlBeanUtils.addChildElement( envelope.getBody(), requestDoc );
+ EnvelopeDocument requestEnvelopeDoc = createEnvelope();
+ Envelope requestEnvelope = requestEnvelopeDoc.getEnvelope();
+ XmlBeanUtils.addChildElement( requestEnvelope.getBody(), requestDoc );
try
{
URI actionURI = new URI( action );
- //System.out.println( "Sending request: \n" + envelopeDoc );
- String response = SoapClient.sendRequest( m_url,
envelopeDoc.newInputStream(), actionURI );
+ if ( AbstractWsdmInteropTestCase.DEBUG ) { System.out.println(
"Sending request: \n" + requestEnvelopeDoc ); }
+ String response = SoapClient.sendRequest( m_url,
requestEnvelopeDoc.newInputStream(), actionURI );
EnvelopeDocument responseEnvelopeDoc = (EnvelopeDocument)
XmlObject.Factory.parse( response );
+ if ( AbstractWsdmInteropTestCase.DEBUG ) { System.out.println(
"Received response: \n" + responseEnvelopeDoc ); }
Envelope responseEnvelope = responseEnvelopeDoc.getEnvelope();
XmlObject[] responseBodyElems = XmlBeanUtils.getChildElements(
responseEnvelope.getBody() );
if ( responseBodyElems.length == 0 )
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=160429&r2=160430
==============================================================================
---
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
Thu Apr 7 11:53:22 2005
@@ -49,8 +49,10 @@
public static final String SYSPROP_BLACKBERRY_EPR = "blackberry.epr";
- private static final String DEFAULT_BLACKBERRY_EPR =
"http://cvs.apache.org/~ips/interop/blackberry-epr.xml";;
- private static final String BLACKBERRY_EPR = System.getProperty(
SYSPROP_BLACKBERRY_EPR, DEFAULT_BLACKBERRY_EPR );
+ private static final String HP_BLACKBERRY_EPR =
"http://cvs.apache.org/~ips/interop/blackberry-epr.xml";;
+ private static final String IBM_BLACKBERRY_EPR =
"http://66.57.65.244:4400/ettk/tinywsdmDemo/BBEPR/RIM2100000A";;
+
+ private static final String BLACKBERRY_EPR = System.getProperty(
SYSPROP_BLACKBERRY_EPR, HP_BLACKBERRY_EPR );
private static final String NSURI_BLACKBERRY = "http://pda.rim";;
private static final String NSPREFIX_BLACKBERRY = "bbry";
@@ -65,7 +67,7 @@
{
super.setUp();
EndpointReferenceDocument blackberryEprDoc = getEndpointReference( new
URL( BLACKBERRY_EPR ) );
- //System.out.println( "*** Using Blackberry EPR:\n" +
smallDeviceEprDoc );
+ if ( DEBUG ) { System.out.println( "*** Using Blackberry EPR:\n" +
blackberryEprDoc ); }
m_resource = new ResourceStub( new
XmlBeansEndpointReference(blackberryEprDoc.getEndpointReference()) );
}
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=160429&r2=160430
==============================================================================
---
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
Thu Apr 7 11:53:22 2005
@@ -70,13 +70,16 @@
public static final String SYSPROP_WEATHER_STATION_EPR_URL =
"weather_station.epr";
public static final String SYSPROP_WEATHER_STATION_2_EPR_URL =
"weather_station_2.epr";
- private static final String DEFAULT_WEATHER_STATION_EPR_URL =
"http://people.apache.org/~ips/interop/weather_station-epr.xml";;
- private static final String DEFAULT_WEATHER_STATION_2_EPR_URL =
"http://people.apache.org/~ips/interop/weather_station_2-epr.xml";;
- private static final String DEFAULT_WEATHER_STATION_URL =
"http://localhost:8080/muse/services/WeatherStationSoap";;
-
- private static final String WEATHER_STATION_EPR_URL = System.getProperty(
SYSPROP_WEATHER_STATION_EPR_URL, DEFAULT_WEATHER_STATION_EPR_URL );
- private static final String WEATHER_STATION_2_EPR_URL =
System.getProperty( SYSPROP_WEATHER_STATION_2_EPR_URL,
DEFAULT_WEATHER_STATION_2_EPR_URL );
- private static final String WEATHER_STATION_URL = System.getProperty(
SYSPROP_WEATHER_STATION_URL, DEFAULT_WEATHER_STATION_URL );
+ private static final String HP_WEATHER_STATION_EPR_URL =
"http://people.apache.org/~ips/interop/weather_station-epr.xml";;
+ private static final String HP_WEATHER_STATION_2_EPR_URL =
"http://people.apache.org/~ips/interop/weather_station_2-epr.xml";;
+ private static final String HP_WEATHER_STATION_URL =
"http://localhost:8080/muse/services/WeatherStationSoap";;
+
+ private static final String IBM_WEATHER_STATION_EPR_URL =
"http://24.211.145.38:4400/ettk/wsdm/InteropServlet?getepr=true";;
+ private static final String IBM_WEATHER_STATION_URL =
"http://24.211.145.38:4400/ettk/wsdm/services/WeatherStationSoap";;
+
+ private static final String WEATHER_STATION_EPR_URL = System.getProperty(
SYSPROP_WEATHER_STATION_EPR_URL, HP_WEATHER_STATION_EPR_URL );
+ private static final String WEATHER_STATION_2_EPR_URL =
System.getProperty( SYSPROP_WEATHER_STATION_2_EPR_URL,
HP_WEATHER_STATION_2_EPR_URL );
+ private static final String WEATHER_STATION_URL = System.getProperty(
SYSPROP_WEATHER_STATION_URL, HP_WEATHER_STATION_URL );
private ServiceStub m_service;
private ResourceStub m_resource;
@@ -85,7 +88,7 @@
{
super.setUp();
EndpointReferenceDocument weatherStationEprDoc = getEndpointReference(
new URL( WEATHER_STATION_EPR_URL ) );
- //System.out.println( "*** Using Weather Station EPR:\n" +
weatherStationEprDoc );
+ if ( DEBUG ) { System.out.println( "*** Using Weather Station EPR:\n"
+ weatherStationEprDoc ); }
m_service = new ServiceStub( new URL( WEATHER_STATION_URL ) );
m_resource = new ResourceStub( new XmlBeansEndpointReference(
weatherStationEprDoc.getEndpointReference() ) );
}
@@ -257,10 +260,10 @@
private String getFCCID(ResourceStub resource)
throws FaultException
{
- XmlObject resourceFCCID = getSingleProperty(resource,
WeatherstationPropertyQNames.FCCID);
- assertTrue("FCCID was not a xs:positiveInteger", resourceFCCID
instanceof XmlString);
- XmlString resFccidInt = (XmlString) resourceFCCID;
- return resFccidInt.getStringValue();
+ XmlObject fccIdPropElem = getSingleProperty(resource,
WeatherstationPropertyQNames.FCCID);
+ assertTrue("FCCID was not an xs:String", fccIdPropElem instanceof
XmlString);
+ XmlString fccId = (XmlString) fccIdPropElem;
+ return fccId.getStringValue();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
