Author: scamp
Date: Thu Mar 3 08:31:02 2005
New Revision: 156057
URL: http://svn.apache.org/viewcvs?view=rev&rev=156057
Log: (empty)
Modified:
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortHome.java
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortHome.java
incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/InteropTestCase.java
Modified:
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortHome.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortHome.java?view=diff&r1=156056&r2=156057
==============================================================================
---
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortHome.java
(original)
+++
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortHome.java
Thu Mar 3 08:31:02 2005
@@ -67,7 +67,7 @@
EndpointReferenceDocument eprDoc =
EndpointReferenceDocument.Factory.newInstance( );
EndpointReferenceType epr = eprDoc.addNewEndpointReference( );
AttributedURI address = epr.addNewAddress( );
- address.setStringValue( serviceUrl + SERVICE_NAME );
+ address.setStringValue( serviceUrl + "/" +SERVICE_NAME );
ReferencePropertiesType refProps = epr.addNewReferenceProperties( );
XmlObject xmlObject = XmlBeanUtils.addChildElement(
refProps,
Modified:
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortHome.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortHome.java?view=diff&r1=156056&r2=156057
==============================================================================
---
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortHome.java
(original)
+++
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortHome.java
Thu Mar 3 08:31:02 2005
@@ -69,7 +69,7 @@
EndpointReferenceType epr = eprDoc.addNewEndpointReference( );
AttributedURI address = epr.addNewAddress( );
- address.setStringValue( serviceUrl + SERVICE_NAME );
+ address.setStringValue( serviceUrl + "/" + SERVICE_NAME );
return epr;
}
Modified:
incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/InteropTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/InteropTestCase.java?view=diff&r1=156056&r2=156057
==============================================================================
---
incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/InteropTestCase.java
(original)
+++
incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/InteropTestCase.java
Thu Mar 3 08:31:02 2005
@@ -10,10 +10,14 @@
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
import
org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceLifetime12Draft04.SetTerminationTimeDocument;
+import
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.CreatePrinterResponseDocument;
+import
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.CreationResponseDocument;
import
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03Wsdl.JobPortPropertyQNames;
import
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03Wsdl.JobPortService;
+import
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03Wsdl.PrinterPortPropertyQNames;
import org.xmlsoap.schemas.soap.envelope.Envelope;
import org.xmlsoap.schemas.soap.envelope.EnvelopeDocument;
+import org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType;
import javax.xml.namespace.QName;
import java.io.File;
@@ -59,6 +63,7 @@
protected void setUp() throws Exception
{
super.setUp();
+
//set the base url to the Axis one if running server embedded in unit
test
if (m_runAxisServer)
{
@@ -66,14 +71,14 @@
//reinit urls for axis path
m_printerFactoryURL = m_baseURL + PRINTER_FACTORY_PORT;
- m_printerURL = m_baseURL + PRINTER_PORT;
- m_jobURL = m_baseURL + JOB_PORT;
//init jndi from config
XmlBeanJndiUtils.initializeFromInputStream(Thread.currentThread().getContextClassLoader().getResourceAsStream(XmlBeanJndiUtils.JNDI_CONFIG_FILENAME));
}
//init the printer so its ready
createPrinter();
+
+
}
/**
@@ -97,6 +102,15 @@
{
String response = sendRequest(m_printerFactoryURL,
SOAP_REQ_CREATE_PRINTER);
assertTrue(response.indexOf("CreatePrinterResponse") > -1);
+ EnvelopeDocument envelopeDocument = loadResponseEnvelope(response);
+ CreatePrinterResponseDocument.CreatePrinterResponse creatPrinter =
(CreatePrinterResponseDocument.CreatePrinterResponse)
XmlBeanUtils.getChildElements(envelopeDocument.getEnvelope().getBody(), new
QName(PrinterPortPropertyQNames.PRINTER_REFERENCE.getNamespaceURI(),
"CreatePrinterResponse"))[0];
+ setPrinterURL(creatPrinter);
+ }
+
+ private void
setPrinterURL(CreatePrinterResponseDocument.CreatePrinterResponse create)
+ {
+ EndpointReferenceType printerRef = (EndpointReferenceType)
XmlBeanUtils.getChildElements(create,
PrinterPortPropertyQNames.PRINTER_REFERENCE )[0];
+ m_printerURL = printerRef.getAddress().getStringValue();
}
public void testValidatePrinterInitialState() throws IOException
@@ -166,7 +180,7 @@
assertTrue(response.indexOf("application/postscript") > -1);
// document_format_supported insert/delete should fail
- response = sendRequest(m_printerURL, "Set_DeleteDocFormat.soap");
+ response = sendRequest(m_printerURL, "Set_DeleteDocFormat.soap");
assertTrue(response.indexOf("fault") > -1);
response = sendRequest(m_printerURL, "Set_InsertDocFormat.soap");
assertTrue(response.indexOf("Fault") > -1);
@@ -222,6 +236,8 @@
String jobResponse = printJob();
String resourceID = null;
EnvelopeDocument envelope = loadResponseEnvelope(jobResponse);
+
+ setJobURL(getCreationResponse(envelope));
resourceID = getResourceID(envelope);
EnvelopeDocument destroyEnvelopeDocument =
loadDocument("Destroy_Job.soap");
setResourceID(destroyEnvelopeDocument, resourceID);
@@ -236,6 +252,11 @@
assertTrue(response.indexOf("fault") > -1);
}
+ private CreationResponseDocument.CreationResponse
getCreationResponse(EnvelopeDocument envelope)
+ {
+ return (CreationResponseDocument.CreationResponse)
XmlBeanUtils.getChildElements(envelope.getEnvelope().getBody(), new
QName(PrinterPortPropertyQNames.PRINTER_REFERENCE.getNamespaceURI(),
"CreationResponse"))[0];
+ }
+
public void testCreateJob_SCENARIO_E() throws IOException
{
String response = createJob();
@@ -255,6 +276,7 @@
{
String response = createJob();
EnvelopeDocument envelope = loadResponseEnvelope(response);
+ setJobURL(getCreationResponse(envelope));
String resourceID = getResourceID(envelope);
EnvelopeDocument envelopeDoc = null;
@@ -278,12 +300,19 @@
{
String response = createJob();
EnvelopeDocument envelope = loadResponseEnvelope(response);
+ setJobURL(getCreationResponse(envelope));
String resourceID = getResourceID(envelope);
EnvelopeDocument envelopeDocument = loadDocument("SendDocument.soap");
setResourceID(envelopeDocument,resourceID);
response = sendRequest(m_jobURL, envelopeDocument.newInputStream());
assertTrue(response.indexOf("CreationResponse") > -1);
assertTrue(response.indexOf("successful-ok") > -1);
+ }
+
+ private void setJobURL(CreationResponseDocument.CreationResponse
creationResponse)
+ {
+ EndpointReferenceType jobRef = (EndpointReferenceType)
XmlBeanUtils.getChildElements(creationResponse,
JobPortPropertyQNames.JOB_REFERENCE)[0];
+ setJobURL(jobRef.getAddress().getStringValue());
}
//***** end tests ********
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
