Author: scamp
Date: Thu Mar 10 10:13:56 2005
New Revision: 156973

URL: http://svn.apache.org/viewcvs?view=rev&rev=156973
Log: (empty)


Modified:
    incubator/apollo/trunk/src/site/content/example/src/test/jndi-config.xml
    
incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/InteropTestCase.java
    incubator/apollo/trunk/src/site/content/example/test-build.properties
    incubator/apollo/trunk/src/site/content/example/test.xml

Modified: 
incubator/apollo/trunk/src/site/content/example/src/test/jndi-config.xml
URL: 
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/test/jndi-config.xml?view=diff&r1=156972&r2=156973
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/src/test/jndi-config.xml 
(original)
+++ incubator/apollo/trunk/src/site/content/example/src/test/jndi-config.xml 
Thu Mar 10 10:13:56 2005
@@ -82,7 +82,10 @@
                <name>wsdlTargetNamespace</name>
                
<value>http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl</value>
             </parameter>
-                
+                        <parameter>
+               <name>resourceKeyName</name>
+               
<value>{http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl}ResourceID</value>
+            </parameter>   
                      </resourceParams>
       </resource>
    </service></jndiConfig>

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=156972&r2=156973
==============================================================================
--- 
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 10 10:13:56 2005
@@ -9,11 +9,7 @@
 import org.apache.ws.util.test.axis.AbstractOneAxisTestCase;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.impl.values.XmlDateTimeImpl;
 import 
org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceLifetime12Draft04.SetTerminationTimeDocument;
-import 
org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceLifetime12Draft04.TerminationTimeDocument;
-import 
org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocumentResponseDocument;
-import 
org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyResponseDocument;
 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;
@@ -114,10 +110,10 @@
         return new 
FileProvider(InteropTestCase.class.getResourceAsStream("/server-config.wsdd"));
     }
 
-     public void createPrinter() throws IOException
+    public void createPrinter() throws IOException
     {
         String response = sendRequest(m_printerFactoryURL, 
SOAP_REQ_CREATE_PRINTER);
-        System.out.println("Create Printer Reponse: \n" + response );
+        System.out.println("Create Printer Reponse: \n" + response);
         assertTrue(response.indexOf("CreatePrinterResponse") > -1);
         EnvelopeDocument envelopeDocument = loadResponseEnvelope(response);
         CreatePrinterResponseDocument.CreatePrinterResponse createPrinter = 
(CreatePrinterResponseDocument.CreatePrinterResponse) 
XmlBeanUtils.getChildElements(envelopeDocument.getEnvelope().getBody(), new 
QName(PrinterPortPropertyQNames.PRINTER_REFERENCE.getNamespaceURI(), 
"CreatePrinterResponse"))[0];
@@ -255,7 +251,7 @@
 
         setJobURL(envelope);
         EnvelopeDocument destroyEnvelopeDocument = 
loadDocument("Destroy_Job.soap");
-        addReferencePropsToEnvelope(destroyEnvelopeDocument, 
getJobEndpointReference(envelope).getReferenceProperties() );
+        addReferencePropsToEnvelope(destroyEnvelopeDocument, 
getJobEndpointReference(envelope).getReferenceProperties());
 
         System.out.println("Destroying JOB: ");
         String response = sendRequest(m_jobURL, 
destroyEnvelopeDocument.newInputStream());
@@ -286,7 +282,7 @@
 
         EnvelopeDocument envelopeDoc = null;
         envelopeDoc = loadDocument("SetTerminationTime.soap");
-        addReferencePropsToEnvelope(envelopeDoc, 
getJobEndpointReference(responseEnvelope).getReferenceProperties() );
+        addReferencePropsToEnvelope(envelopeDoc, 
getJobEndpointReference(responseEnvelope).getReferenceProperties());
         Calendar instance = Calendar.getInstance();
         instance.set(Calendar.MINUTE, instance.get(Calendar.MINUTE) + 5);
 
@@ -309,7 +305,7 @@
         setJobURL(responseEnvelope);
 
         EnvelopeDocument envelopeDocument = loadDocument("SendDocument.soap");
-        addReferencePropsToEnvelope(envelopeDocument, 
getJobEndpointReference(responseEnvelope).getReferenceProperties() );
+        addReferencePropsToEnvelope(envelopeDocument, 
getJobEndpointReference(responseEnvelope).getReferenceProperties());
         response = sendRequest(m_jobURL, envelopeDocument.newInputStream());
         assertTrue(response.indexOf("CreationResponse") > -1);
         assertTrue(response.indexOf("successful-ok") > -1);
@@ -326,18 +322,18 @@
         setJobURL(responseEnvelope);
 
         //set termination time
-        EnvelopeDocument getTermTime = loadDocument("GetTerminationTime.soap");
-        addReferencePropsToEnvelope(getTermTime, 
getJobEndpointReference(responseEnvelope).getReferenceProperties() );
-        response = sendRequest(m_jobURL, getTermTime.newInputStream());
-        EnvelopeDocument getTermTimeEnvel = loadResponseEnvelope(response);
-        XmlObject[] childElements = 
XmlBeanUtils.getChildElements(getTermTimeEnvel.getEnvelope().getBody());
-        GetResourcePropertyResponseDocument.GetResourcePropertyResponse 
termTime =  (GetResourcePropertyResponseDocument.GetResourcePropertyResponse) 
childElements[0];
-        childElements = XmlBeanUtils.getChildElements(termTime);
-        XmlDateTimeImpl o = (XmlDateTimeImpl) childElements[0];
-        Calendar terminationTime = o.getCalendarValue();
-
+        /*   EnvelopeDocument getTermTime = 
loadDocument("GetTerminationTime.soap");
+           addReferencePropsToEnvelope(getTermTime, 
getJobEndpointReference(responseEnvelope).getReferenceProperties() );
+           response = sendRequest(m_jobURL, getTermTime.newInputStream());
+           EnvelopeDocument getTermTimeEnvel = loadResponseEnvelope(response);
+           XmlObject[] childElements = 
XmlBeanUtils.getChildElements(getTermTimeEnvel.getEnvelope().getBody());
+           GetResourcePropertyResponseDocument.GetResourcePropertyResponse 
termTime =  (GetResourcePropertyResponseDocument.GetResourcePropertyResponse) 
childElements[0];
+           childElements = XmlBeanUtils.getChildElements(termTime);
+           XmlDateTimeImpl o = (XmlDateTimeImpl) childElements[0];
+           Calendar terminationTime = o.getCalendarValue();
+   */
         EnvelopeDocument setTerminationDoc = 
loadDocument("SetTerminationTime.soap");
-        addReferencePropsToEnvelope(setTerminationDoc, 
getJobEndpointReference(responseEnvelope).getReferenceProperties() );
+        addReferencePropsToEnvelope(setTerminationDoc, 
getJobEndpointReference(responseEnvelope).getReferenceProperties());
         Calendar newTermTime = Calendar.getInstance();
         newTermTime.set(Calendar.MINUTE, newTermTime.get(Calendar.MINUTE) + 1);
 
@@ -350,9 +346,9 @@
 
         //send a document
         EnvelopeDocument envelopeDocument = loadDocument("SendDocument.soap");
-        addReferencePropsToEnvelope(envelopeDocument, 
getJobEndpointReference(responseEnvelope).getReferenceProperties() );
+        addReferencePropsToEnvelope(envelopeDocument, 
getJobEndpointReference(responseEnvelope).getReferenceProperties());
         response = sendRequest(m_jobURL, envelopeDocument.newInputStream());
-        assertTrue(response.indexOf("Fault") == -1 );
+        assertTrue(response.indexOf("Fault") == -1);
 
         try
         {
@@ -365,9 +361,9 @@
 
         //this request should be bad and return with a fault if the Job 
successfully timed out
         envelopeDocument = loadDocument("SendDocument.soap");
-        addReferencePropsToEnvelope(envelopeDocument, 
getJobEndpointReference(responseEnvelope).getReferenceProperties() );
+        addReferencePropsToEnvelope(envelopeDocument, 
getJobEndpointReference(responseEnvelope).getReferenceProperties());
         response = sendRequest(m_jobURL, envelopeDocument.newInputStream());
-        assertTrue(response.indexOf("Fault") > -1);
+        assertTrue(response.indexOf("ResourceUnknownFault") > -1);
 
     }
 
@@ -376,19 +372,19 @@
     //***** end tests ********
 
     private String sendPrinterRequest(String fileName) throws IOException
-      {
-          EnvelopeDocument envelopeDocument = loadDocument(fileName);
-          addReferencePropsToEnvelope(envelopeDocument, 
m_printerReferenceProperties);
-          return sendRequest(m_printerURL, envelopeDocument.newInputStream());
-      }
+    {
+        EnvelopeDocument envelopeDocument = loadDocument(fileName);
+        addReferencePropsToEnvelope(envelopeDocument, 
m_printerReferenceProperties);
+        return sendRequest(m_printerURL, envelopeDocument.newInputStream());
+    }
 
 
     private CreationResponseDocument.CreationResponse 
getCreationResponse(EnvelopeDocument envelope)
-       {
-           return (CreationResponseDocument.CreationResponse) 
XmlBeanUtils.getChildElements(envelope.getEnvelope().getBody(), new 
QName(PrinterPortPropertyQNames.PRINTER_REFERENCE.getNamespaceURI(), 
"CreationResponse"))[0];
-       }
+    {
+        return (CreationResponseDocument.CreationResponse) 
XmlBeanUtils.getChildElements(envelope.getEnvelope().getBody(), new 
QName(PrinterPortPropertyQNames.PRINTER_REFERENCE.getNamespaceURI(), 
"CreationResponse"))[0];
+    }
 
-     private void setJobURL(EnvelopeDocument envelope)
+    private void setJobURL(EnvelopeDocument envelope)
     {
         EndpointReferenceType jobRef = getJobEndpointReference(envelope);
         setJobURL(jobRef.getAddress().getStringValue());
@@ -403,14 +399,14 @@
     private void addReferencePropsToEnvelope(EnvelopeDocument 
envelopeDocument, ReferencePropertiesType referenceProperties)
     {
         Header header = envelopeDocument.getEnvelope().getHeader();
-        if(referenceProperties != null)
+        if (referenceProperties != null)
         {
-        XmlObject[] childElements = 
XmlBeanUtils.getChildElements(referenceProperties);
-        for (int i = 0; i < childElements.length; i++)
-        {
-            XmlObject childElement = childElements[i];
-            XmlBeanUtils.addChildElement(header, childElement);
-        }
+            XmlObject[] childElements = 
XmlBeanUtils.getChildElements(referenceProperties);
+            for (int i = 0; i < childElements.length; i++)
+            {
+                XmlObject childElement = childElements[i];
+                XmlBeanUtils.addChildElement(header, childElement);
+            }
         }
     }
 

Modified: incubator/apollo/trunk/src/site/content/example/test-build.properties
URL: 
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/test-build.properties?view=diff&r1=156972&r2=156973
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/test-build.properties 
(original)
+++ incubator/apollo/trunk/src/site/content/example/test-build.properties Thu 
Mar 10 10:13:56 2005
@@ -5,8 +5,8 @@
 #           **If running in embedded mode then the printerFactoryURL is ignored
 #
 ##
-#printerFactoryURL=http://wsi.alphaworks.ibm.com:80/ettk/wsrfrpio/services/PrinterPort
-printerFactoryURL=http://localhost:8080/wsrf/services/PrinterFactory
+printerFactoryURL=http://wsi.alphaworks.ibm.com:80/ettk/wsrfrpio/services/PrinterPort
+#printerFactoryURL=http://localhost:8080/wsrf/services/PrinterFactory
 
 ##        
 # Determines if the unit test will run an embedded version of Axis
@@ -14,4 +14,4 @@
 #
 #  ***NOTE: To test an external endpoint this should be set to false
 ##
-runAxis=true
\ No newline at end of file
+runAxis=false
\ No newline at end of file

Modified: incubator/apollo/trunk/src/site/content/example/test.xml
URL: 
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/test.xml?view=diff&r1=156972&r2=156973
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/test.xml (original)
+++ incubator/apollo/trunk/src/site/content/example/test.xml Thu Mar 10 
10:13:56 2005
@@ -20,7 +20,6 @@
         
         <path id="apollo.classpath.id">
           <pathelement location="${test.classes.dir}"/>
-          <pathelement location="${basedir}/classes" />
           <pathelement location="${wsrf.webapp.dir}/WEB-INF/classes" />
           <fileset dir="${wsrf.webapp.dir}/WEB-INF/lib" includes="*.jar" />
           <fileset dir="${jar.dir}" />



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to