Author: scamp
Date: Wed Mar 2 15:00:11 2005
New Revision: 155968
URL: http://svn.apache.org/viewcvs?view=rev&rev=155968
Log: (empty)
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractJobPortResource.java
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/JobPortResource.java
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortService.java
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryHome.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/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortResource.java
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortService.java
incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/AllScenarios.java
incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/DScenario.java
incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/EScenario.java
incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/InteropTestCase.java
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java?view=diff&r1=155967&r2=155968
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java
Wed Mar 2 15:00:11 2005
@@ -207,7 +207,7 @@
for ( int index = 0; index < m_propElems.size(); index++ )
{
XmlObject propXBean = (org.apache.xmlbeans.XmlObject)
m_propElems.get( index );
- if ( propXBean.valueEquals( propXBeanToRemove ) )
+ if ( propXBean.equals( propXBeanToRemove ) )
{
XmlBeanUtils.remove( propXBean );
m_propElems.remove( index );
Modified:
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractJobPortResource.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractJobPortResource.java?view=diff&r1=155967&r2=155968
==============================================================================
---
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractJobPortResource.java
(original)
+++
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractJobPortResource.java
Wed Mar 2 15:00:11 2005
@@ -15,6 +15,12 @@
*=============================================================================*/
package org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03Wsdl;
+import org.apache.ws.resource.properties.ResourceProperty;
+import org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet;
+import
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.JobPropertiesDocument;
+
+import java.util.Iterator;
+
/**
* An abstract JobPort WS-Resource.
@@ -117,11 +123,33 @@
.get(
org.apache.ws.resource.lifetime.v1_2_draft04.porttype.ScheduledResourceTerminationPortType.PROP_QNAME_TERMINATION_TIME
) );
}
+
+ public abstract PrinterPortResource getPrinterResource();
/**
* DOCUMENT_ME
*/
public void destroy( )
{
+ JobPropertiesDocument jobPropDoc = (JobPropertiesDocument)
((XmlBeansResourcePropertySet)getResourcePropertySet()).toXmlObject();
+
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.JobPropertiesDocument.JobProperties
jobProperties = jobPropDoc.getJobProperties();
+ java.math.BigInteger jobId = jobProperties.getJobId();
+
+ PrinterPortResource printerResource = getPrinterResource();
+ ResourceProperty printerJobProperties =
+ printerResource.getResourcePropertySet( ).get(
PrinterPortPropertyQNames.JOB_PROPERTIES );
+
+ Iterator iterator = printerJobProperties.iterator();
+ JobPropertiesDocument.JobProperties properties = null;
+ while (iterator.hasNext())
+ {
+ properties = (JobPropertiesDocument.JobProperties) iterator.next();
+ if(properties.getJobId().equals(jobId))
+ {
+ break;
+ }
+ }
+ printerJobProperties.remove(properties);
+
return;
}
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=155967&r2=155968
==============================================================================
---
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
Wed Mar 2 15:00:11 2005
@@ -15,7 +15,13 @@
*=============================================================================*/
package org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03Wsdl;
-import org.apache.ws.resource.*;
+import org.apache.ws.resource.JndiConstants;
+import org.apache.ws.resource.Resource;
+import org.apache.ws.resource.ResourceContext;
+import org.apache.ws.resource.ResourceContextException;
+import org.apache.ws.resource.ResourceException;
+import org.apache.ws.resource.ResourceKey;
+import org.apache.ws.resource.ResourceUnknownException;
import org.apache.ws.resource.impl.AbstractResourceHome;
import org.apache.ws.resource.impl.SimpleTypeResourceKey;
import org.apache.ws.resource.properties.faults.ResourceUnknownFaultException;
@@ -27,10 +33,9 @@
import org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceDocument;
import org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType;
import org.xmlsoap.schemas.ws.x2004.x08.addressing.ReferencePropertiesType;
+
import javax.xml.namespace.QName;
import java.io.Serializable;
-import java.util.List;
-import java.util.ArrayList;
/**
* Home for JobPort WS-Resources.
@@ -63,8 +68,6 @@
EndpointReferenceType epr = eprDoc.addNewEndpointReference( );
AttributedURI address = epr.addNewAddress( );
address.setStringValue( serviceUrl + SERVICE_NAME );
-
- // TODO: set portType and serviceName! (read from config file)
ReferencePropertiesType refProps = epr.addNewReferenceProperties( );
XmlObject xmlObject = XmlBeanUtils.addChildElement(
refProps,
@@ -121,7 +124,7 @@
byte[] base64Data,
PrinterPortResource printerResource )
{
- ++m_jobId; //todo generate a job id.....counter?
+ ++m_jobId;
SimpleTypeResourceKey key = createResourceKey();
EndpointReferenceType jobEpr = getEprForResource( key,
resourceContext.getBaseURL( ) );
Modified:
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortResource.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortResource.java?view=diff&r1=155967&r2=155968
==============================================================================
---
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortResource.java
(original)
+++
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortResource.java
Wed Mar 2 15:00:11 2005
@@ -86,7 +86,12 @@
m_printerRef = printerResource.getEpr();
}
- /**
+ public PrinterPortResource getPrinterResource()
+ {
+ return m_printerResource;
+ }
+
+ /**
* Initializes this resource's state (properties, etc.).
*/
public void init( )
Modified:
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortService.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortService.java?view=diff&r1=155967&r2=155968
==============================================================================
---
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortService.java
(original)
+++
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortService.java
Wed Mar 2 15:00:11 2005
@@ -16,12 +16,10 @@
package org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03Wsdl;
import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.ResourceContextException;
import org.apache.ws.resource.ResourceException;
import org.apache.ws.resource.properties.impl.XmlBeansResourceProperty;
import
org.apache.ws.resource.properties.v1_2_draft05.porttype.impl.NamespaceVersionHolderImpl;
import
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.CreationResponseDocument;
-import
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.DocumentContentType;
import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.JobStateType;
import
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.MimeMediaTypeType;
import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.MimeMediaTypes;
@@ -79,8 +77,8 @@
CreationResponseDocument responseDoc =
createResponseDocument( );
CreationResponseDocument.CreationResponse creationResponse =
responseDoc.getCreationResponse( );
SendDocumentRequestDocument.SendDocumentRequest sendDocumentRequest =
requestDoc.getSendDocumentRequest( );
- DocumentContentType documentContent =
- sendDocumentRequest.getDocumentContent( );
+ //DocumentContentType documentContent =
+ //sendDocumentRequest.getDocumentContent( );
String documentFormat =
sendDocumentRequest.getDocumentFormat( );
boolean lastDocument =
@@ -129,22 +127,10 @@
}
private boolean isDocTypeSupported( String documentFormat )
- throws ResourceContextException,
- ResourceException
+ throws ResourceException
{
boolean docTypeSupported = false;
- JobPortResource jobPortResource = (JobPortResource)
getResourceContext( ).getResource( );
- XmlBeansResourceProperty xmlProp =
- (XmlBeansResourceProperty) jobPortResource.getResourcePropertySet(
).get( JobPortPropertyQNames.JOB_PRINTER_REFERENCE );
- EndpointReferenceType jobPrinterReference =
(EndpointReferenceType) xmlProp.get( 0 );
- //EndpointReferenceType jobPrinterReference =
printRef.getJobPrinterReference( );
- /* ReferencePropertiesType referenceProperties =
jobPrinterReference.getReferenceProperties( );
- QName keyQName =
- QName.valueOf(
"{http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl}ResourceID)"
);
- XmlObject[] childElements =
- XmlBeanUtils.getChildElements( referenceProperties, keyQName );
- String value = XmlBeanUtils.getValue(
childElements[0] ); //todo check this
- SimpleTypeResourceKey key = new
SimpleTypeResourceKey( keyQName, value );*/
+
try
{
InitialContext ctx = new
InitialContext( );
@@ -159,7 +145,6 @@
MimeMediaTypeType.Enum[] mimeMediaTypeArray =
documentFormatSupported.getMimeMediaTypeArray( );
- //todo chekc that the equals check really works
for ( int i = 0; i < mimeMediaTypeArray.length; i++ )
{
MimeMediaTypeType.Enum enum = mimeMediaTypeArray[i];
Modified:
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryHome.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryHome.java?view=diff&r1=155967&r2=155968
==============================================================================
---
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryHome.java
(original)
+++
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryHome.java
Wed Mar 2 15:00:11 2005
@@ -29,7 +29,7 @@
private PrinterFactoryResource m_printerFactory;
/**
- * TODO
+ *
*
* @param resourceContext DOCUMENT_ME
*
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=155967&r2=155968
==============================================================================
---
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
Wed Mar 2 15:00:11 2005
@@ -69,9 +69,7 @@
EndpointReferenceType epr = eprDoc.addNewEndpointReference( );
AttributedURI address = epr.addNewAddress( );
- address.setStringValue( serviceUrl + SERVICE_NAME );
-
- // TODO: set portType and serviceName! (read from config file)
+ address.setStringValue( serviceUrl + SERVICE_NAME );
return epr;
}
Modified:
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortResource.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortResource.java?view=diff&r1=155967&r2=155968
==============================================================================
---
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortResource.java
(original)
+++
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortResource.java
Wed Mar 2 15:00:11 2005
@@ -18,20 +18,31 @@
import commonj.timers.Timer;
import commonj.timers.TimerListener;
import commonj.timers.TimerManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.properties.ResourceProperty;
import org.apache.ws.resource.properties.impl.XmlBeansResourceProperty;
import org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet;
-import org.apache.ws.util.i18n.Messages;
import org.apache.ws.util.timer.TimerManagerImpl;
import org.apache.xmlbeans.XmlInteger;
-import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.*;
+import
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.DocumentFormatSupportedDocument;
+import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.JobStateType;
+import
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.MimeMediaTypeType;
+import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.MimeMediaTypes;
+import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.Operations;
+import
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.OperationsSupportedDocument;
+import
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.PrinterIsAcceptingJobsDocument;
+import
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.PrinterNameDocument;
+import
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.PrinterReferenceDocument;
+import
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.PrinterStateDocument;
+import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.PrinterStateType;
+import
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.QueuedJobCountDocument;
import org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType;
import java.math.BigInteger;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
/**
* A PrinterPort WS-Resource.
@@ -41,8 +52,6 @@
public class PrinterPortResource
extends AbstractPrinterPortResource implements TimerListener {
- private static final Log LOG = LogFactory.getLog(
PrinterPortResource.class );
- private static final Messages MSG = MessagesImpl.getInstance();
private String m_name;
private EndpointReferenceType m_epr;
@@ -147,8 +156,8 @@
public void resetTimer() {
//scale and translate the random to get a number between 1 and 3 mins
- // double doubleLength = m_random.nextDouble() * 120000.0 + 60000.0;
- long doubleLength = 20000; //todo remove for debug only...
+ double doubleLength = m_random.nextDouble() * 120000.0 + 60000.0;
+ //long doubleLength = 20000; //for debug only...
long lengthOfTime = (long) doubleLength;
TimerManager tm = new TimerManagerImpl();
m_timer = tm.schedule(this, lengthOfTime);
@@ -168,11 +177,10 @@
//LOG.debug( MSG.getMessage( Keys.PRINTING_JOB, job.m_id )
);
//set termination time to now to make it be removed.
job.setTerminationTime(Calendar.getInstance());
- //todo set job status
- //todo remove jobprops from printer props
- XmlBeansResourcePropertySet jobPropSet =
(XmlBeansResourcePropertySet) job.getResourcePropertySet();
+ XmlBeansResourcePropertySet jobPropSet =
(XmlBeansResourcePropertySet) job.getResourcePropertySet();
ResourceProperty printerJobProperties =
getResourcePropertySet( ).get( PrinterPortPropertyQNames.JOB_PROPERTIES );
+ //todo does this work?
printerJobProperties.remove(jobPropSet.toXmlObject());
decrementQueueCount();
@@ -200,6 +208,10 @@
XmlBeansResourceProperty resourceProperty = (XmlBeansResourceProperty)
job.getResourcePropertySet().get(JobPortPropertyQNames.JOB_STATE);
JobStateType o = (JobStateType) resourceProperty.get(0);
o.set(state);
+
+ resourceProperty = (XmlBeansResourceProperty)
getResourcePropertySet().get(JobPortPropertyQNames.JOB_STATE);
+ o = (JobStateType) resourceProperty.get(0);
+ o.set(state);
}
private void setPrinterStateIdleProcessing()
Modified:
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortService.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortService.java?view=diff&r1=155967&r2=155968
==============================================================================
---
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortService.java
(original)
+++
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortService.java
Wed Mar 2 15:00:11 2005
@@ -207,7 +207,6 @@
MimeMediaTypes documentFormatSupported = (MimeMediaTypes)
resourceProperty.get( 0 );
MimeMediaTypeType.Enum[] mimeMediaTypeArray =
documentFormatSupported.getMimeMediaTypeArray( );
- //todo chekc that the equals check really works
for ( int i = 0; i < mimeMediaTypeArray.length; i++ )
{
MimeMediaTypeType.Enum enum = mimeMediaTypeArray[i];
Modified:
incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/AllScenarios.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/AllScenarios.java?view=diff&r1=155967&r2=155968
==============================================================================
---
incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/AllScenarios.java
(original)
+++
incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/AllScenarios.java
Wed Mar 2 15:00:11 2005
@@ -1,11 +1,7 @@
package org.oasisOpen.docs.wsrf;
-import junit.framework.Test;
-import junit.framework.TestSuite;
import junit.framework.TestCase;
-import java.io.IOException;
-
/**
* @author Sal Campana
@@ -40,7 +36,7 @@
testCase.testValidatePrinterJobProperties();
//D scenarios
- testCase.testDestroy_SCENARIO_D();
+ testCase.testDestroy_SCENARIO_D();
//E scenarios
testCase.testCreateJob_SCENARIO_E();
Modified:
incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/DScenario.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/DScenario.java?view=diff&r1=155967&r2=155968
==============================================================================
---
incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/DScenario.java
(original)
+++
incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/DScenario.java
Wed Mar 2 15:00:11 2005
@@ -15,11 +15,11 @@
testCase.createPrinter();
- //set the printer to accepting jobs //todo here?
+ //set the printer to accepting jobs // here?
testCase.testUpdateResourceProperties_SCENARIO_B1();
testCase.testPrintJob_SCENARIO_C();
- testCase.testDestroy_SCENARIO_D();
+ testCase.testDestroy_SCENARIO_D();
testCase.tearDown();
}
Modified:
incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/EScenario.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/EScenario.java?view=diff&r1=155967&r2=155968
==============================================================================
---
incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/EScenario.java
(original)
+++
incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/EScenario.java
Wed Mar 2 15:00:11 2005
@@ -14,7 +14,7 @@
testCase.setUp();
testCase.createPrinter();
- //set the printer to accepting jobs //todo here?
+ //set the printer to accepting jobs // here?
testCase.testUpdateResourceProperties_SCENARIO_B1();
testCase.testSetResourceProperties_SCENARIO_B2();
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=155967&r2=155968
==============================================================================
---
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
Wed Mar 2 15:00:11 2005
@@ -10,9 +10,8 @@
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.wsrfInterop20Draft03Wsdl.PrinterPortService;
-import
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03Wsdl.JobPortService;
import
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03Wsdl.JobPortPropertyQNames;
+import
org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03Wsdl.JobPortService;
import org.xmlsoap.schemas.soap.envelope.Envelope;
import org.xmlsoap.schemas.soap.envelope.EnvelopeDocument;
@@ -73,7 +72,7 @@
XmlBeanJndiUtils.initializeFromInputStream(Thread.currentThread().getContextClassLoader().getResourceAsStream(XmlBeanJndiUtils.JNDI_CONFIG_FILENAME));
}
- //init the printer so its ready///todo not sure if should do it
here...maybe in scenarios...
+ //init the printer so its ready
createPrinter();
}
@@ -138,14 +137,14 @@
assertTrue(response.indexOf("true") > -1);
}
- public void testQueryCompletedJobs_SCENARIO_A4_VARIANT() throws IOException
- { //todo this is after jobs are created
+ /* public void testQueryCompletedJobs_SCENARIO_A4_VARIANT() throws
IOException
+ { //do this is after jobs are created
String response = sendRequest(m_printerURL, "QueryJobsCompleted.soap");
assertTrue(response.indexOf("QueryResourcePropertiesResponse") > -1);
- //todo look at response to see how to validate
+ // look at response to see how to validate
//assertTrue(response.indexOf("true") > -1);//check further once
understand issue
}
-
+*/
public void testUpdateResourceProperties_SCENARIO_B1() throws IOException
{
String response = sendRequest(m_printerURL, "UpdateProps.soap");
@@ -166,11 +165,11 @@
assertTrue(response.indexOf("text/plain") > -1);
assertTrue(response.indexOf("application/postscript") > -1);
- //todo document_format_supported insert/delete should fail
- response = sendRequest(m_printerURL, "Set_DeleteDocFormat.soap");
+ // document_format_supported insert/delete should fail
+ response = sendRequest(m_printerURL, "Set_DeleteDocFormat.soap");
assertTrue(response.indexOf("fault") > -1);
response = sendRequest(m_printerURL, "Set_InsertDocFormat.soap");
- assertTrue(response.indexOf("fault") > -1);
+ assertTrue(response.indexOf("Fault") > -1);
}
@@ -240,12 +239,14 @@
public void testCreateJob_SCENARIO_E() throws IOException
{
String response = createJob();
+
+ String resourceID = getResourceID(loadResponseEnvelope(response));
assertTrue(response.indexOf("CreationResponse") > -1);
assertTrue(response.indexOf("successful-ok") > -1);
response = sendRequest(m_printerURL, "GetPrinterPropertiesDoc.soap");
//job id should be gotten for reponse
- assertTrue(response.indexOf("job_id>1") > -1);
+ assertTrue(response.indexOf(resourceID) > -1);
}
@@ -278,7 +279,6 @@
String response = createJob();
EnvelopeDocument envelope = loadResponseEnvelope(response);
String resourceID = getResourceID(envelope);
- //todo use the job response to get the resourceid of the job
EnvelopeDocument envelopeDocument = loadDocument("SendDocument.soap");
setResourceID(envelopeDocument,resourceID);
response = sendRequest(m_jobURL, envelopeDocument.newInputStream());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
