You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrf-dev@ws.apache.org by sc...@apache.org on 2005/03/10 17:32:35 UTC
svn commit: r156959 - in incubator/apollo/trunk/src:
java/org/apache/ws/resource/ java/org/apache/ws/resource/impl/
java/org/apache/ws/resource/properties/ site/content/example/
site/content/example/requests/
site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/
site/content/example/src/test/org/oasisOpen/docs/wsrf/
Author: scamp
Date: Thu Mar 10 08:32:18 2005
New Revision: 156959
URL: http://svn.apache.org/viewcvs?view=rev&rev=156959
Log:
removed NoSuchResourceException and used the ResourceUnknownException in its place....they were basicalyl the same thing....
Added:
incubator/apollo/trunk/src/site/content/example/requests/GetTerminationTime.soap
Removed:
incubator/apollo/trunk/src/java/org/apache/ws/resource/NoSuchResourceException.java
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/AbstractPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/PersistenceCallback.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceContext.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceHome.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceUnknownException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/XmlBeansResourcePropertyUtils.java
incubator/apollo/trunk/src/site/content/example/build.xml
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/PrinterFactoryService.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/PrinterPortService.java
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/java/org/apache/ws/resource/AbstractPortType.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/AbstractPortType.java?view=diff&r1=156958&r2=156959
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/AbstractPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/AbstractPortType.java Thu Mar 10 08:32:18 2005
@@ -63,10 +63,6 @@
{
m_resourceKey = getResourceContext( ).getResourceKey( );
}
- catch ( ResourceUnknownException rue )
- {
- throw new ResourceUnknownFaultException(getNamespaceSet(), rue );
- }
catch ( ResourceContextException rce )
{
throw new JAXRPCException( rce );
@@ -77,13 +73,13 @@
{
m_resource = ( (ResourceHome) m_resourceHome ).getInstance( m_resourceContext );
}
- catch ( ResourceException re )
- {
- throw new JAXRPCException( re );
- }
catch ( ResourceUnknownException rce )
{
throw new org.apache.ws.resource.properties.faults.ResourceUnknownFaultException(getNamespaceSet(),rce);
+ }
+ catch ( ResourceException re )
+ {
+ throw new JAXRPCException( re );
}
catch ( ResourceContextException rce )
{
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/PersistenceCallback.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/PersistenceCallback.java?view=diff&r1=156958&r2=156959
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/PersistenceCallback.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/PersistenceCallback.java Thu Mar 10 08:32:18 2005
@@ -27,13 +27,13 @@
/**
* Loads the resource state.
*
- * @throws NoSuchResourceException if no resource state exists for the specified key.
+ * @throws ResourceUnknownException if no resource state exists for the specified key.
* @throws InvalidResourceKeyException if the resource key is invalid.
* @throws ResourceException if the load operation fails for any other reason.
*/
void load( ResourceKey key )
throws ResourceException,
- NoSuchResourceException,
+ ResourceUnknownException,
InvalidResourceKeyException;
/**
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceContext.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceContext.java?view=diff&r1=156958&r2=156959
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceContext.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceContext.java Thu Mar 10 08:32:18 2005
@@ -60,7 +60,7 @@
*
* @return The actual resource object. Cannot be null.
*
- * @throws NoSuchResourceException if resource was not specified in the request or it does not exist.
+ * @throws ResourceUnknownException if resource was not specified in the request or it does not exist.
* @throws ResourceContextException if error occurs during resource lookup.
*/
public abstract Resource getResource( )
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceHome.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceHome.java?view=diff&r1=156958&r2=156959
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceHome.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceHome.java Thu Mar 10 08:32:18 2005
@@ -106,27 +106,27 @@
*
* @return non-null resource object.
*
- * @throws NoSuchResourceException if no resource exists with the given key
+ * @throws ResourceUnknownException if no resource exists with the given key
* @throws InvalidResourceKeyException if the resource key is invalid.
* @throws ResourceException if any other error occurs.
*/
Resource find( ResourceKey key )
throws ResourceException,
- NoSuchResourceException,
+ ResourceUnknownException,
InvalidResourceKeyException;
/**
* Removes a resource. If the resource implements the {@link RemoveCallback RemoveCallback} interface, the
* implementation must invoke the remove() operation on the resource itself.
*
- * @throws NoSuchResourceException if no resource exists with the given key
+ * @throws ResourceUnknownException if no resource exists with the given key
* @throws InvalidResourceKeyException if the resource key is invalid.
* @throws RemoveNotSupportedException if remove operation is not supported.
* @throws ResourceException if any other error occurs.
*/
void remove( ResourceKey key )
throws ResourceException,
- NoSuchResourceException,
+ ResourceUnknownException,
InvalidResourceKeyException,
RemoveNotSupportedException;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceUnknownException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceUnknownException.java?view=diff&r1=156958&r2=156959
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceUnknownException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceUnknownException.java Thu Mar 10 08:32:18 2005
@@ -25,12 +25,16 @@
* @author Ian P. Springer
*/
public class ResourceUnknownException
- extends ResourceContextException
+ extends ResourceException
{
public static final Messages MSG = MessagesImpl.getInstance();
private Object m_resourceId;
private String m_serviceName;
+ public ResourceUnknownException( )
+ {
+ super( );
+ }
/**
* @param resourceId
* @param serviceName
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java?view=diff&r1=156958&r2=156959
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java Thu Mar 10 08:32:18 2005
@@ -22,12 +22,12 @@
import org.apache.commons.logging.LogFactory;
import org.apache.ws.resource.InvalidResourceKeyException;
import org.apache.ws.resource.JndiConstants;
-import org.apache.ws.resource.NoSuchResourceException;
import org.apache.ws.resource.PersistenceCallback;
import org.apache.ws.resource.Resource;
import org.apache.ws.resource.ResourceException;
import org.apache.ws.resource.ResourceHome;
import org.apache.ws.resource.ResourceKey;
+import org.apache.ws.resource.ResourceUnknownException;
import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.lifetime.ScheduledResourceTerminationResource;
@@ -540,12 +540,12 @@
if ( ResourceSweeper.isExpired( resource ) )
{
remove( key );
- throw new NoSuchResourceException( );
+ throw new ResourceUnknownException();
}
}
else
{
- throw new NoSuchResourceException( );
+ throw new ResourceUnknownException();
}
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/XmlBeansResourcePropertyUtils.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/XmlBeansResourcePropertyUtils.java?view=diff&r1=156958&r2=156959
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/XmlBeansResourcePropertyUtils.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/XmlBeansResourcePropertyUtils.java Thu Mar 10 08:32:18 2005
@@ -22,6 +22,7 @@
import org.apache.ws.resource.properties.impl.XmlBeansResourceProperty;
import org.apache.ws.util.i18n.Messages;
import org.apache.xmlbeans.XmlDateTime;
+import org.apache.xmlbeans.impl.values.XmlDateTimeImpl;
import javax.xml.rpc.JAXRPCException;
import java.util.Calendar;
@@ -40,8 +41,16 @@
Calendar time )
{
LOG.debug( MSG.getMessage( Keys.SET_PROP_TIME, prop.getMetaData().getName(), time.toString() ) );
- XmlDateTime propElem = getDateTimePropertyElement( prop );
- propElem.setCalendarValue( time );
+ XmlDateTimeImpl propElem = (XmlDateTimeImpl) getDateTimePropertyElement( prop );
+ if(time == null)
+ {
+ propElem.setNil();
+ }
+ else
+ {
+ propElem.setCalendarValue( time );
+ }
+
}
public static Calendar getDateTimePropertyValue( XmlBeansResourceProperty prop )
Modified: incubator/apollo/trunk/src/site/content/example/build.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/build.xml?view=diff&r1=156958&r2=156959
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/build.xml (original)
+++ incubator/apollo/trunk/src/site/content/example/build.xml Thu Mar 10 08:32:18 2005
@@ -41,8 +41,8 @@
classpathref="apollo.classpath.id"
debug="on"
excludes="xmlbeans/**"/>
- <copy todir="${classes.dir}">
- <fileset dir="${src.dir}" excludes="**/*.java,**/package.html" />
+ <copy todir="${classes.dir}" overwrite="true">
+ <fileset dir="${src.dir}" excludes="**/*.java,**/package.html,**/*.wsdd,**/*.xml" />
</copy>
</target>
Added: incubator/apollo/trunk/src/site/content/example/requests/GetTerminationTime.soap
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/GetTerminationTime.soap?view=auto&rev=156959
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/GetTerminationTime.soap (added)
+++ incubator/apollo/trunk/src/site/content/example/requests/GetTerminationTime.soap Thu Mar 10 08:32:18 2005
@@ -0,0 +1,23 @@
+
+
+
+
+<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
+ xmlns:wsrf-rl="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceLifetime-1.2-draft-04.xsd"
+ xmlns:wsrf-pr-wsdl="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl"
+ xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.xsd">
+
+ <Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
+ <wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
+ <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
+
+ </Header>
+
+ <Body>
+ <wsrf-rp:GetResourceProperty>
+ wsrf-rl:TerminationTime
+ </wsrf-rp:GetResourceProperty>
+
+ </Body>
+
+</Envelope>
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=156958&r2=156959
==============================================================================
--- 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 Thu Mar 10 08:32:18 2005
@@ -20,6 +20,7 @@
import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.JobPropertiesDocument;
import java.util.Iterator;
+import java.util.Calendar;
/**
@@ -181,7 +182,10 @@
org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceLifetime12Draft04.TerminationTimeDocument termTime =
org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceLifetime12Draft04.TerminationTimeDocument.Factory
.newInstance( );
- termTime.setNilTerminationTime( );
+ Calendar instance = Calendar.getInstance();
+ instance.set(Calendar.YEAR, instance.get(Calendar.YEAR) + 1);
+ termTime.setTerminationTime(instance);
+ //termTime.setNilTerminationTime( );
prop.add(termTime);
}
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=156958&r2=156959
==============================================================================
--- 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 10 08:32:18 2005
@@ -25,7 +25,7 @@
import org.apache.ws.resource.impl.AbstractResourceHome;
import org.apache.ws.resource.impl.SimpleTypeResourceKey;
import org.apache.ws.resource.properties.faults.ResourceUnknownFaultException;
-import org.apache.ws.resource.properties.v1_2_draft05.porttype.impl.NamespaceVersionHolderImpl;
+import org.apache.ws.resource.properties.v1_2_draft05.impl.NamespaceVersionHolderImpl;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.xmlbeans.XmlObject;
import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.MimeMediaTypeType;
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=156958&r2=156959
==============================================================================
--- 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 Thu Mar 10 08:32:18 2005
@@ -130,7 +130,7 @@
jobStateDocument.setJobState( JobStateType.PENDING );
resourceProperty.add( jobStateDocument );
- Calendar currentTime = getCurrentTime( );
+ Calendar currentTime = getCurrentTime();
Calendar termTime = Calendar.getInstance( );
termTime.set( currentTime.get( Calendar.YEAR ),
currentTime.get( Calendar.MONTH ),
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=156958&r2=156959
==============================================================================
--- 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 Thu Mar 10 08:32:18 2005
@@ -17,8 +17,11 @@
import org.apache.ws.resource.ResourceContext;
import org.apache.ws.resource.ResourceException;
+import org.apache.ws.resource.NoSuchResourceException;
+import org.apache.ws.resource.ResourceUnknownException;
import org.apache.ws.resource.properties.impl.XmlBeansResourceProperty;
-import org.apache.ws.resource.properties.v1_2_draft05.porttype.impl.NamespaceVersionHolderImpl;
+import org.apache.ws.resource.properties.v1_2_draft05.impl.NamespaceVersionHolderImpl;
+import org.apache.ws.resource.properties.faults.ResourceUnknownFaultException;
import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.CreationResponseDocument;
import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.JobStateType;
import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.MimeMediaTypeType;
@@ -86,10 +89,11 @@
try
{
- if ( isDocTypeSupported( documentFormat ) )
+ JobPortResource jobResource =
+ (JobPortResource) getResourceContext( ).getResource( );
+
+ if ( isDocTypeSupported( documentFormat, jobResource ) )
{
- JobPortResource jobResource =
- (JobPortResource) getResourceContext( ).getResource( );
if (lastDocument)
{
@@ -103,6 +107,10 @@
creationResponse.setSuccessStatusCode( "server-error-internal-error" );
}
}
+ catch (ResourceUnknownException nsr)
+ {
+ throw new ResourceUnknownFaultException(new NamespaceVersionHolderImpl(), nsr);
+ }
catch ( Exception e )
{
throw new ClientErrorNotPossibleFaultException(new NamespaceVersionHolderImpl(), "Error Occurred: " + e.getLocalizedMessage());
@@ -126,14 +134,14 @@
creationResponse.setSuccessStatusCode( "successful-ok" );
}
- private boolean isDocTypeSupported( String documentFormat )
+ private boolean isDocTypeSupported(String documentFormat, JobPortResource jobResource)
throws ResourceException
{
boolean docTypeSupported = false;
try
{
- PrinterPortResource printResource = ((JobPortResource)getResourceContext().getResource()).getPrinterResource();
+ PrinterPortResource printResource = jobResource.getPrinterResource();
XmlBeansResourceProperty xmlPropDocFormat =
(XmlBeansResourceProperty) printResource.getResourcePropertySet( ).get( PrinterPortPropertyQNames.DOCUMENT_FORMAT_SUPPORTED );
MimeMediaTypes documentFormatSupported =
Modified: incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryService.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryService.java?view=diff&r1=156958&r2=156959
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryService.java (original)
+++ incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryService.java Thu Mar 10 08:32:18 2005
@@ -19,7 +19,7 @@
import org.apache.ws.resource.ResourceUnknownException;
import org.apache.ws.resource.properties.faults.ResourceUnknownFaultException;
import org.apache.ws.resource.properties.impl.XmlBeansResourceProperty;
-import org.apache.ws.resource.properties.v1_2_draft05.porttype.impl.NamespaceVersionHolderImpl;
+import org.apache.ws.resource.properties.v1_2_draft05.impl.NamespaceVersionHolderImpl;
import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.CreatePrinterResponseDocument;
import org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType;
import javax.naming.Context;
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=156958&r2=156959
==============================================================================
--- 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 10 08:32:18 2005
@@ -17,7 +17,7 @@
import org.apache.ws.resource.*;
import org.apache.ws.resource.properties.faults.ResourceUnknownFaultException;
-import org.apache.ws.resource.properties.v1_2_draft05.porttype.impl.NamespaceVersionHolderImpl;
+import org.apache.ws.resource.properties.v1_2_draft05.impl.NamespaceVersionHolderImpl;
import org.apache.ws.resource.impl.AbstractResourceHome;
import org.apache.ws.resource.impl.SimpleTypeResourceKey;
import org.apache.ws.util.XmlBeanUtils;
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=156958&r2=156959
==============================================================================
--- 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 Thu Mar 10 08:32:18 2005
@@ -19,7 +19,7 @@
import org.apache.ws.resource.ResourceContextException;
import org.apache.ws.resource.ResourceException;
import org.apache.ws.resource.properties.ResourceProperty;
-import org.apache.ws.resource.properties.v1_2_draft05.porttype.impl.NamespaceVersionHolderImpl;
+import org.apache.ws.resource.properties.v1_2_draft05.impl.NamespaceVersionHolderImpl;
import org.apache.ws.resource.properties.impl.XmlBeansResourceProperty;
import org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet;
import org.apache.xmlbeans.XmlBoolean;
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=156958&r2=156959
==============================================================================
--- 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 08:32:18 2005
@@ -9,7 +9,11 @@
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;
@@ -309,6 +313,62 @@
response = sendRequest(m_jobURL, envelopeDocument.newInputStream());
assertTrue(response.indexOf("CreationResponse") > -1);
assertTrue(response.indexOf("successful-ok") > -1);
+ }
+
+ public void testSendDocument_SCENARIO_E_IBM() throws IOException
+ {
+ createPrinter();//create printer
+ testUpdateResourceProperties_SCENARIO_B1();//set accepting job state to true
+ String response = sendPrinterRequest("Set_UpdateDocFormat.soap");
+ response = createJob(); //create Job
+
+ EnvelopeDocument responseEnvelope = loadResponseEnvelope(response);
+ 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 setTerminationDoc = loadDocument("SetTerminationTime.soap");
+ addReferencePropsToEnvelope(setTerminationDoc, getJobEndpointReference(responseEnvelope).getReferenceProperties() );
+ Calendar newTermTime = Calendar.getInstance();
+ newTermTime.set(Calendar.MINUTE, newTermTime.get(Calendar.MINUTE) + 1);
+
+ System.out.println("Setting termination time on JOB: ");
+ Envelope requestEnvelope = setTerminationDoc.getEnvelope();
+ XmlObject[] termElems = XmlBeanUtils.getChildElements(requestEnvelope.getBody());
+ SetTerminationTimeDocument.SetTerminationTime childElement = (SetTerminationTimeDocument.SetTerminationTime) termElems[0];
+ childElement.setRequestedTerminationTime(newTermTime);
+ response = sendRequest(m_jobURL, setTerminationDoc.newInputStream());
+
+ //send a document
+ EnvelopeDocument envelopeDocument = loadDocument("SendDocument.soap");
+ addReferencePropsToEnvelope(envelopeDocument, getJobEndpointReference(responseEnvelope).getReferenceProperties() );
+ response = sendRequest(m_jobURL, envelopeDocument.newInputStream());
+ assertTrue(response.indexOf("Fault") == -1 );
+
+ try
+ {
+ Thread.sleep(120000L);
+ }
+ catch (InterruptedException e)
+ {
+ ;
+ }
+
+ //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() );
+ response = sendRequest(m_jobURL, envelopeDocument.newInputStream());
+ assertTrue(response.indexOf("Fault") > -1);
+
}
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=156958&r2=156959
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/test-build.properties (original)
+++ incubator/apollo/trunk/src/site/content/example/test-build.properties Thu Mar 10 08:32:18 2005
@@ -5,7 +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://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
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=156958&r2=156959
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/test.xml (original)
+++ incubator/apollo/trunk/src/site/content/example/test.xml Thu Mar 10 08:32:18 2005
@@ -54,7 +54,7 @@
classpathref="apollo.classpath.id"
debug="on"
/>
- <copy todir="${test.classes.dir}">
+ <copy todir="${test.classes.dir}" overwrite="true">
<fileset dir="${test.dir}" excludes="**/*.java,**/package.html" />
</copy>
<property name="tests.compiled" value="true" />
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org