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/02/22 20:24:20 UTC
svn commit: r154889 - in incubator/apollo/trunk/src:
java/org/apache/ws/resource/ java/org/apache/ws/resource/impl/
java/org/apache/ws/resource/properties/v1_2_draft05/porttype/
java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/
java/org/apache/ws/resource/tool/porttype/v1_2_draft05/
site/content/example/requests/
site/content/example/src/JobPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/
site/content/example/src/PrinterFactory/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/
site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/
templates/1_2_draft05/ test/org/apache/ws/resource/properties/
Author: scamp
Date: Tue Feb 22 11:24:12 2005
New Revision: 154889
URL: http://svn.apache.org/viewcvs?view=rev&rev=154889
Log:
updated
Added:
incubator/apollo/trunk/src/templates/1_2_draft05/Query-ExpressionDialect_init.txt
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceContext.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceContext.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/GetResourcePropertyDocumentPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/QueryResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyDocumentPortTypeImpl.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/porttype/v1_2_draft05/QueryResourcePropertiesPortType2JavaInfo.java
incubator/apollo/trunk/src/site/content/example/requests/CreatePrinter.soap
incubator/apollo/trunk/src/site/content/example/requests/Create_Job.soap
incubator/apollo/trunk/src/site/content/example/requests/DeleteAcceptingJobs.soap
incubator/apollo/trunk/src/site/content/example/requests/Destroy_Job.soap
incubator/apollo/trunk/src/site/content/example/requests/GetMulti.soap
incubator/apollo/trunk/src/site/content/example/requests/GetPrinterPropertiesDoc.soap
incubator/apollo/trunk/src/site/content/example/requests/GetPropertiesDoc.soap
incubator/apollo/trunk/src/site/content/example/requests/GetQueuedJobCount.soap
incubator/apollo/trunk/src/site/content/example/requests/InsertProps.soap
incubator/apollo/trunk/src/site/content/example/requests/PrintJobRequest.soap
incubator/apollo/trunk/src/site/content/example/requests/SendDocument.soap
incubator/apollo/trunk/src/site/content/example/requests/Set_InsertJobHoldOvernight.soap
incubator/apollo/trunk/src/site/content/example/requests/Set_JobTermination.soap
incubator/apollo/trunk/src/site/content/example/requests/Set_MultiDelete.soap
incubator/apollo/trunk/src/site/content/example/requests/Set_MultiInsertJobHold.soap
incubator/apollo/trunk/src/site/content/example/requests/Set_Should_Fail.soap
incubator/apollo/trunk/src/site/content/example/requests/Set_UpdateDocFormat.soap
incubator/apollo/trunk/src/site/content/example/requests/UpdateProps.soap
incubator/apollo/trunk/src/site/content/example/src/JobPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortHome.java
incubator/apollo/trunk/src/site/content/example/src/PrinterFactory/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryService.java
incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractPrinterPortResource.java
incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractPrinterPortService.java
incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortHome.java
incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortResource.java
incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPort_jndi-config.xml
incubator/apollo/trunk/src/test/org/apache/ws/resource/properties/SushiResourceContext.java
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=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceContext.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/ResourceContext.java Tue Feb 22 11:24:12 2005
@@ -160,6 +160,13 @@
public abstract URL getServiceURL( );
/**
+ * Gets the base URL from which service urls are based.
+ *
+ * @return The String representation of the base url
+ */
+ public abstract String getBaseURL( );
+
+ /**
* @see SOAPMessageContext#containsProperty(String)
*/
public abstract boolean containsProperty( String name );
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceContext.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceContext.java?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceContext.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceContext.java Tue Feb 22 11:24:12 2005
@@ -71,8 +71,9 @@
private String m_resourceKeyQname;
private Class m_resourceKeyClass;
private ResourceKey m_resourceKey;
+ private String m_baseURL;
- /**
+ /**
* Creates a new {@link AbstractResourceContext} object.
*
* @param soapMsgContext DOCUMENT_ME
@@ -514,10 +515,18 @@
{
m_serviceURL = getServiceURL( msgContext );
m_serviceName = getServiceName( msgContext );
+ m_baseURL = getBaseURL(m_serviceURL);
extractProperties( msgContext );
}
- private void extractProperties( MessageContext msgContext )
+ private String getBaseURL(URL serviceURL)
+ {
+ String s = serviceURL.toString();
+ s= s.substring(0, s.lastIndexOf("/"));
+ return s;
+ }
+
+ private void extractProperties( MessageContext msgContext )
{
Iterator propertyNames = msgContext.getPropertyNames();
while ( propertyNames.hasNext() )
@@ -527,4 +536,9 @@
msgContext.getProperty( keyName ) );
}
}
+
+ public String getBaseURL()
+ {
+ return m_baseURL;
+ }
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/GetResourcePropertyDocumentPortType.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/GetResourcePropertyDocumentPortType.java?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/GetResourcePropertyDocumentPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/GetResourcePropertyDocumentPortType.java Tue Feb 22 11:24:12 2005
@@ -37,5 +37,5 @@
*
* @return DOCUMENT_ME
*/
- GetResourcePropertyDocumentResponseDocument getResourcePropertyDocument( GetResourcePropertyDocumentDocument1.GetResourcePropertyDocument requestDoc );
+ GetResourcePropertyDocumentResponseDocument getResourcePropertyDocument( GetResourcePropertyDocumentDocument1 requestDoc );
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/QueryResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/QueryResourcePropertiesPortType.java?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/QueryResourcePropertiesPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/QueryResourcePropertiesPortType.java Tue Feb 22 11:24:12 2005
@@ -30,6 +30,7 @@
public interface QueryResourcePropertiesPortType
{
QName NAME = new QName( ResourcePropertiesConstants.NSURI_WSRP_WSDL, "QueryResourceProperties", ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA );
+ QName PROP_QNAME_QUERY_EXPRESSION_DIALECT = new QName( ResourcePropertiesConstants.NSURI_WSRP_SCHEMA, "QueryExpressionDialect", ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA );
/**
* DOCUMENT_ME
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyDocumentPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyDocumentPortTypeImpl.java?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyDocumentPortTypeImpl.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2_draft05/porttype/impl/GetResourcePropertyDocumentPortTypeImpl.java Tue Feb 22 11:24:12 2005
@@ -39,7 +39,7 @@
* @param requestDoc DOCUMENT_ME
* @return DOCUMENT_ME
*/
- public GetResourcePropertyDocumentResponseDocument getResourcePropertyDocument(GetResourcePropertyDocumentDocument1.GetResourcePropertyDocument requestDoc)
+ public GetResourcePropertyDocumentResponseDocument getResourcePropertyDocument(GetResourcePropertyDocumentDocument1 requestDoc)
{
GetResourcePropertyDocumentResponseDocument responseDocument = createResponseDocument();
GetResourcePropertyDocumentResponseDocument.GetResourcePropertyDocumentResponse responseDoc = responseDocument.getGetResourcePropertyDocumentResponse();
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/porttype/v1_2_draft05/QueryResourcePropertiesPortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/porttype/v1_2_draft05/QueryResourcePropertiesPortType2JavaInfo.java?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/porttype/v1_2_draft05/QueryResourcePropertiesPortType2JavaInfo.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/porttype/v1_2_draft05/QueryResourcePropertiesPortType2JavaInfo.java Tue Feb 22 11:24:12 2005
@@ -42,5 +42,8 @@
{
return "templates/1_2_draft05/Query.txt";
}
-
+ public String getAbstractResourceInitMethodIncludeLocation()
+ {
+ return "templates/1_2_draft05/Query-ExpressionDialect_init.txt";
+ }
}
Modified: incubator/apollo/trunk/src/site/content/example/requests/CreatePrinter.soap
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/CreatePrinter.soap?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/CreatePrinter.soap (original)
+++ incubator/apollo/trunk/src/site/content/example/requests/CreatePrinter.soap Tue Feb 22 11:24:12 2005
@@ -4,7 +4,7 @@
<Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
<wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
- <wsa:Action mustUnderstand="1"></wsa:Action>
+ <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
</Header>
<Body>
Modified: incubator/apollo/trunk/src/site/content/example/requests/Create_Job.soap
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/Create_Job.soap?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/Create_Job.soap (original)
+++ incubator/apollo/trunk/src/site/content/example/requests/Create_Job.soap Tue Feb 22 11:24:12 2005
@@ -1,14 +1,12 @@
<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.wsdl"
+ xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.xsd"
xmlns:wsrf-pr="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.xsd">
<Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
<wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
- <wsa:Action mustUnderstand="1"></wsa:Action>
- <wsrf-pr-wsdl:ResourceID mustUnderstand="1"
- xmlns:wsrf-pr-wsdl="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl">Printer1</fs:ResourceID>
+ <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
</Header>
<Body>
Modified: incubator/apollo/trunk/src/site/content/example/requests/DeleteAcceptingJobs.soap
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/DeleteAcceptingJobs.soap?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/DeleteAcceptingJobs.soap (original)
+++ incubator/apollo/trunk/src/site/content/example/requests/DeleteAcceptingJobs.soap Tue Feb 22 11:24:12 2005
@@ -1,18 +1,12 @@
-
-
-
-
<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.wsdl"
+ xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.xsd"
xmlns:wsrf-pr="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.xsd">
<Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
<wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
- <wsa:Action mustUnderstand="1"></wsa:Action>
- <wsrf-pr-wsdl:ResourceID mustUnderstand="1"
- xmlns:wsrf-pr-wsdl="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl">Printer1</fs:ResourceID>
+ <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
</Header>
<Body>
Modified: incubator/apollo/trunk/src/site/content/example/requests/Destroy_Job.soap
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/Destroy_Job.soap?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/Destroy_Job.soap (original)
+++ incubator/apollo/trunk/src/site/content/example/requests/Destroy_Job.soap Tue Feb 22 11:24:12 2005
@@ -1,14 +1,12 @@
<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.wsdl"
+ xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.xsd"
xmlns:wsrf-pr="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.xsd">
<Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
<wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
- <wsa:Action mustUnderstand="1"></wsa:Action>
- <wsrf-pr-wsdl:ResourceID mustUnderstand="1"
- xmlns:wsrf-pr-wsdl="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl">Job1</fs:ResourceID>
+ <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
</Header>
<Body>
Modified: incubator/apollo/trunk/src/site/content/example/requests/GetMulti.soap
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/GetMulti.soap?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/GetMulti.soap (original)
+++ incubator/apollo/trunk/src/site/content/example/requests/GetMulti.soap Tue Feb 22 11:24:12 2005
@@ -1,12 +1,10 @@
<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.wsdl"
+ xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.xsd"
xmlns:wsrf-pr="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.xsd">
<Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
<wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
- <wsa:Action mustUnderstand="1"></wsa:Action>
- <wsrf-pr-wsdl:ResourceID mustUnderstand="1"
- xmlns:wsrf-pr-wsdl="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl">Printer1</fs:ResourceID>
+ <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
</Header>
<Body>
Modified: incubator/apollo/trunk/src/site/content/example/requests/GetPrinterPropertiesDoc.soap
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/GetPrinterPropertiesDoc.soap?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/GetPrinterPropertiesDoc.soap (original)
+++ incubator/apollo/trunk/src/site/content/example/requests/GetPrinterPropertiesDoc.soap Tue Feb 22 11:24:12 2005
@@ -1,13 +1,11 @@
<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.wsdl"
+ xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.xsd"
xmlns:wsrf-pr="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.xsd">
<Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
<wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
- <wsa:Action mustUnderstand="1"></wsa:Action>
- <wsrf-pr-wsdl:ResourceID mustUnderstand="1"
- xmlns:wsrf-pr-wsdl="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl">Printer1</fs:ResourceID>
+ <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
</Header>
<Body>
Modified: incubator/apollo/trunk/src/site/content/example/requests/GetPropertiesDoc.soap
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/GetPropertiesDoc.soap?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/GetPropertiesDoc.soap (original)
+++ incubator/apollo/trunk/src/site/content/example/requests/GetPropertiesDoc.soap Tue Feb 22 11:24:12 2005
@@ -1,24 +1,16 @@
-
<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.wsdl"
+ xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.xsd"
xmlns:wsrf-pr="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.xsd">
<Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
- <wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
- <wsa:Action mustUnderstand="1"></wsa:Action>
- <wsrf-pr-wsdl:ResourceID mustUnderstand="1"
- xmlns:wsrf-pr-wsdl="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl">Printer1</fs:ResourceID>
+ <wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterPort</wsa:To>
+ <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterPort</wsa:Action>
+
</Header>
<Body>
- <wsrf-rp:QueryResourceProperties>
- <wsrf-rp:QueryExpression
- Dialect="http://www.w3.org/TR/1999/REC-xpath-19991116" >
- contains(/*/operations_supported,"Print_Job")
- </wsrf-rp:QueryExpression>
- </wsrf-rp:QueryResourceProperties>
+ <wsrf-rp:GetResourcePropertyDocument></wsrf-rp:GetResourcePropertyDocument>
</Body>
</Envelope>
-
Modified: incubator/apollo/trunk/src/site/content/example/requests/GetQueuedJobCount.soap
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/GetQueuedJobCount.soap?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/GetQueuedJobCount.soap (original)
+++ incubator/apollo/trunk/src/site/content/example/requests/GetQueuedJobCount.soap Tue Feb 22 11:24:12 2005
@@ -1,13 +1,11 @@
<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.wsdl"
+ xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.xsd"
xmlns:wsrf-pr="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.xsd">
<Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
<wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
- <wsa:Action mustUnderstand="1"></wsa:Action>
- <wsrf-pr-wsdl:ResourceID mustUnderstand="1"
- xmlns:wsrf-pr-wsdl="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl">Printer1</fs:ResourceID>
+ <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
</Header>
<Body>
Modified: incubator/apollo/trunk/src/site/content/example/requests/InsertProps.soap
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/InsertProps.soap?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/InsertProps.soap (original)
+++ incubator/apollo/trunk/src/site/content/example/requests/InsertProps.soap Tue Feb 22 11:24:12 2005
@@ -3,14 +3,12 @@
<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.wsdl"
+ xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.xsd"
xmlns:wsrf-pr="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.xsd">
<Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
<wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
- <wsa:Action mustUnderstand="1"></wsa:Action>
- <wsrf-pr-wsdl:ResourceID mustUnderstand="1"
- xmlns:wsrf-pr-wsdl="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl">Printer1</fs:ResourceID>
+ <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
</Header>
<Body>
Modified: incubator/apollo/trunk/src/site/content/example/requests/PrintJobRequest.soap
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/PrintJobRequest.soap?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/PrintJobRequest.soap (original)
+++ incubator/apollo/trunk/src/site/content/example/requests/PrintJobRequest.soap Tue Feb 22 11:24:12 2005
@@ -1,14 +1,12 @@
<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.wsdl"
+ xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.xsd"
xmlns:wsrf-pr="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.xsd">
<Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
<wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
- <wsa:Action mustUnderstand="1"></wsa:Action>
- <wsrf-pr-wsdl:ResourceID mustUnderstand="1"
- xmlns:wsrf-pr-wsdl="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl">Printer1</fs:ResourceID>
+ <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
</Header>
<Body>
Modified: incubator/apollo/trunk/src/site/content/example/requests/SendDocument.soap
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/SendDocument.soap?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/SendDocument.soap (original)
+++ incubator/apollo/trunk/src/site/content/example/requests/SendDocument.soap Tue Feb 22 11:24:12 2005
@@ -1,13 +1,13 @@
<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.wsdl"
+ xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.xsd"
xmlns:wsrf-pr="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.xsd"
xmlns:wsrf-rl="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceLifetime-1.2-draft-04.xsd">
<Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
<wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
- <wsa:Action mustUnderstand="1"></wsa:Action>
+ <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
<wsrf-pr-wsdl:ResourceID mustUnderstand="1"
xmlns:wsrf-pr-wsdl="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl">Job1</fs:ResourceID>
</Header>
Modified: incubator/apollo/trunk/src/site/content/example/requests/Set_InsertJobHoldOvernight.soap
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/Set_InsertJobHoldOvernight.soap?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/Set_InsertJobHoldOvernight.soap (original)
+++ incubator/apollo/trunk/src/site/content/example/requests/Set_InsertJobHoldOvernight.soap Tue Feb 22 11:24:12 2005
@@ -1,14 +1,12 @@
<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.wsdl"
+ xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.xsd"
xmlns:wsrf-pr="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.xsd">
<Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
<wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
- <wsa:Action mustUnderstand="1"></wsa:Action>
- <wsrf-pr-wsdl:ResourceID mustUnderstand="1"
- xmlns:wsrf-pr-wsdl="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl">Printer1</fs:ResourceID>
+ <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
</Header>
<Body>
Modified: incubator/apollo/trunk/src/site/content/example/requests/Set_JobTermination.soap
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/Set_JobTermination.soap?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/Set_JobTermination.soap (original)
+++ incubator/apollo/trunk/src/site/content/example/requests/Set_JobTermination.soap Tue Feb 22 11:24:12 2005
@@ -1,15 +1,13 @@
<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.wsdl"
+ xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.xsd"
xmlns:wsrf-pr="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.xsd"
xmlns:wsrf-rl="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceLifetime-1.2-draft-04.xsd">
<Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
<wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
- <wsa:Action mustUnderstand="1"></wsa:Action>
- <wsrf-pr-wsdl:ResourceID mustUnderstand="1"
- xmlns:wsrf-pr-wsdl="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl">Job1</fs:ResourceID>
+ <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
</Header>
<Body>
Modified: incubator/apollo/trunk/src/site/content/example/requests/Set_MultiDelete.soap
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/Set_MultiDelete.soap?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/Set_MultiDelete.soap (original)
+++ incubator/apollo/trunk/src/site/content/example/requests/Set_MultiDelete.soap Tue Feb 22 11:24:12 2005
@@ -1,15 +1,13 @@
<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.wsdl"
+ xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.xsd"
xmlns:wsrf-pr="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.xsd"
>
<Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
<wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
- <wsa:Action mustUnderstand="1"></wsa:Action>
- <wsrf-pr-wsdl:ResourceID mustUnderstand="1"
- xmlns:wsrf-pr-wsdl="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl">Printer1</fs:ResourceID>
+ <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
</Header>
<Body>
Modified: incubator/apollo/trunk/src/site/content/example/requests/Set_MultiInsertJobHold.soap
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/Set_MultiInsertJobHold.soap?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/Set_MultiInsertJobHold.soap (original)
+++ incubator/apollo/trunk/src/site/content/example/requests/Set_MultiInsertJobHold.soap Tue Feb 22 11:24:12 2005
@@ -1,14 +1,12 @@
<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.wsdl"
+ xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.xsd"
xmlns:wsrf-pr="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.xsd">
<Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
<wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
- <wsa:Action mustUnderstand="1"></wsa:Action>
- <wsrf-pr-wsdl:ResourceID mustUnderstand="1"
- xmlns:wsrf-pr-wsdl="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl">Printer1</fs:ResourceID>
+ <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
</Header>
<Body>
Modified: incubator/apollo/trunk/src/site/content/example/requests/Set_Should_Fail.soap
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/Set_Should_Fail.soap?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/Set_Should_Fail.soap (original)
+++ incubator/apollo/trunk/src/site/content/example/requests/Set_Should_Fail.soap Tue Feb 22 11:24:12 2005
@@ -1,14 +1,12 @@
<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.wsdl"
+ xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.xsd"
xmlns:wsrf-pr="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.xsd">
<Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
<wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
- <wsa:Action mustUnderstand="1"></wsa:Action>
- <wsrf-pr-wsdl:ResourceID mustUnderstand="1"
- xmlns:wsrf-pr-wsdl="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl">Printer1</fs:ResourceID>
+ <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
</Header>
<Body>
Modified: incubator/apollo/trunk/src/site/content/example/requests/Set_UpdateDocFormat.soap
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/Set_UpdateDocFormat.soap?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/Set_UpdateDocFormat.soap (original)
+++ incubator/apollo/trunk/src/site/content/example/requests/Set_UpdateDocFormat.soap Tue Feb 22 11:24:12 2005
@@ -1,14 +1,12 @@
<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.wsdl"
+ xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.xsd"
xmlns:wsrf-pr="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.xsd">
<Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
<wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
- <wsa:Action mustUnderstand="1"></wsa:Action>
- <wsrf-pr-wsdl:ResourceID mustUnderstand="1"
- xmlns:wsrf-pr-wsdl="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl">Printer1</fs:ResourceID>
+ <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
</Header>
<Body>
Modified: incubator/apollo/trunk/src/site/content/example/requests/UpdateProps.soap
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/requests/UpdateProps.soap?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/UpdateProps.soap (original)
+++ incubator/apollo/trunk/src/site/content/example/requests/UpdateProps.soap Tue Feb 22 11:24:12 2005
@@ -2,14 +2,12 @@
<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.wsdl"
+ xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/2004/11/wsrf-WS-ResourceProperties-1.2-draft-05.xsd"
xmlns:wsrf-pr="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.xsd">
<Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing">
<wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
- <wsa:Action mustUnderstand="1"></wsa:Action>
- <wsrf-pr-wsdl:ResourceID mustUnderstand="1"
- xmlns:wsrf-pr-wsdl="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl">Printer1</fs:ResourceID>
+ <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
</Header>
<Body>
Modified: incubator/apollo/trunk/src/site/content/example/src/JobPort/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/JobPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortHome.java?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/src/JobPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortHome.java (original)
+++ incubator/apollo/trunk/src/site/content/example/src/JobPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortHome.java Tue Feb 22 11:24:12 2005
@@ -63,8 +63,7 @@
{
++ m_jobId; //todo generate a job id.....counter?
SimpleTypeResourceKey key = new SimpleTypeResourceKey(QName.valueOf("{http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl}ResourceID"), Long.toString(m_jobId));
- URL serviceURL = resourceContext.getServiceURL();
- EndpointReferenceType jobEpr = getEprForResource(key,serviceURL);
+ EndpointReferenceType jobEpr = getEprForResource(key,resourceContext.getBaseURL());
JobPortResource job = new JobPortResource(jobEpr,m_jobId, jobName, origUserName, epr);
job.init();
add(key, job);
@@ -75,21 +74,21 @@
public JobPortResource createJob(ResourceContext resourceContext, String jobName, EndpointReferenceType epr)
{
++m_jobId;
- SimpleTypeResourceKey key = new SimpleTypeResourceKey(QName.valueOf("{http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl}ResourceID"), Long.toString(m_jobId));
- URL serviceURL = resourceContext.getServiceURL();
- EndpointReferenceType jobEpr = getEprForResource(key,serviceURL);
+ SimpleTypeResourceKey key = new SimpleTypeResourceKey(QName.valueOf("{http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl}ResourceID"), "Job" + Integer.toString((int)m_jobId));
+ EndpointReferenceType jobEpr = getEprForResource(key,resourceContext.getBaseURL());
JobPortResource job = new JobPortResource(jobEpr,m_jobId, jobName, epr);
job.init();
add(key, job);
return job;
}
- public EndpointReferenceType getEprForResource(ResourceKey key, URL serviceUrl)
+
+ public EndpointReferenceType getEprForResource(ResourceKey key, String serviceUrl)
{
EndpointReferenceDocument eprDoc = EndpointReferenceDocument.Factory.newInstance();
EndpointReferenceType epr = eprDoc.addNewEndpointReference();
AttributedURI address = epr.addNewAddress();
- address.setStringValue( serviceUrl.toString() );
+ address.setStringValue( serviceUrl + SERVICE_NAME );
// TODO: set portType and serviceName! (read from config file)
ReferencePropertiesType refProps = epr.addNewReferenceProperties();
Modified: incubator/apollo/trunk/src/site/content/example/src/PrinterFactory/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/PrinterFactory/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryService.java?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/src/PrinterFactory/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryService.java (original)
+++ incubator/apollo/trunk/src/site/content/example/src/PrinterFactory/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryService.java Tue Feb 22 11:24:12 2005
@@ -61,19 +61,21 @@
public org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.CreatePrinterResponseDocument CreatePrinter( org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.CreatePrinterRequestDocument requestDoc )
{
CreatePrinterResponseDocument responseDocument = createResponseDocument();
+ CreatePrinterResponseDocument.CreatePrinterResponse createPrinterResponse = responseDocument.getCreatePrinterResponse();
try
{
Context initialContext = new InitialContext( );
PrinterPortHome printerPortHome = (PrinterPortHome) initialContext.lookup( PrinterPortHome.HOME_LOCATION );
PrinterPortResource instance = (PrinterPortResource) printerPortHome.getInstance(getResourceContext());
- CreatePrinterResponseDocument.CreatePrinterResponse createPrinterResponse = responseDocument.getCreatePrinterResponse();
+
+ //get Resource Prop for Printer Ref
XmlBeansResourceProperty prop = (XmlBeansResourceProperty) instance.getResourcePropertySet().get(PrinterPortPropertyQNames.PRINTER_REFERENCE);
+ //set the Printer EPR on the response
createPrinterResponse.setPrinterReference((EndpointReferenceType) prop.toXmlObjects()[0]);
}
catch (Exception e)
{
throw new ResourceUnknownFaultException(new NamespaceVersionHolderImpl(),new ResourceUnknownException(null,"An error occurred when invoking CreatePrinter"));
-
}
return responseDocument;
Modified: incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractPrinterPortResource.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractPrinterPortResource.java?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractPrinterPortResource.java (original)
+++ incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractPrinterPortResource.java Tue Feb 22 11:24:12 2005
@@ -56,12 +56,14 @@
}
public void init()
- {
-
- org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.PrinterPropertiesDocument propsDoc = org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.PrinterPropertiesDocument.Factory.newInstance();
+ {
+ org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.PrinterPropertiesDocument propsDoc = org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.PrinterPropertiesDocument.Factory.newInstance();
m_propSet = new org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet( propsDoc );
-
-
+ // initialize wsrp:QueryExpressionDialect property
+ org.apache.ws.resource.properties.ResourceProperty queryProp = m_propSet.get( org.apache.ws.resource.properties.v1_2_draft05.porttype.QueryResourcePropertiesPortType.PROP_QNAME_QUERY_EXPRESSION_DIALECT );
+ org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.QueryExpressionDialectDocument queryExpressionDialectDocument = org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.QueryExpressionDialectDocument.Factory.newInstance();
+ queryExpressionDialectDocument.setQueryExpressionDialect(org.apache.ws.resource.properties.query.QueryConstants.DIALECT_URI__XPATH1_0.toString());
+ queryProp.add( queryExpressionDialectDocument );
}
/**
Modified: incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractPrinterPortService.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractPrinterPortService.java?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractPrinterPortService.java (original)
+++ incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractPrinterPortService.java Tue Feb 22 11:24:12 2005
@@ -140,7 +140,7 @@
*
* @return DOCUMENT_ME
*/
- public org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocumentResponseDocument getResourcePropertyDocument( org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocumentDocument1.GetResourcePropertyDocument requestDoc )
+ public org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocumentResponseDocument getResourcePropertyDocument( org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.GetResourcePropertyDocumentDocument1 requestDoc )
{
return new org.apache.ws.resource.properties.v1_2_draft05.porttype.impl.GetResourcePropertyDocumentPortTypeImpl( getResourceContext( ) ).getResourcePropertyDocument( requestDoc );
}
Modified: incubator/apollo/trunk/src/site/content/example/src/PrinterPort/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/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortHome.java?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortHome.java (original)
+++ incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortHome.java Tue Feb 22 11:24:12 2005
@@ -30,6 +30,7 @@
{
private static final String SERVICE_NAME = "PrinterPort";
public static final String HOME_LOCATION = JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME + "/" + JndiConstants.ATOMIC_NAME_HOME;
+ private PrinterPortResource m_printer;
/**
* @param resourceContext DOCUMENT_ME
@@ -43,45 +44,23 @@
ResourceContextException,
ResourceUnknownException
{
- ResourceKey key = resourceContext.getResourceKey();
- Resource resource = null;
- try
- {
- resource = find(key);
- }
- catch (ResourceException re)
- {
- /**
- * Determine if the passed-in key is, in fact, something we expect.
- */
- try
- {
- ResourceKey newkey = new SimpleTypeResourceKey(QName.valueOf("{http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl}ResourceID"), "Printer1");
- URL serviceURL = resourceContext.getServiceURL();
- resource = new PrinterPortResource("Printer1", getEprForResource(newkey, serviceURL));
- resource.init();
- add(newkey, resource);
- }
- catch (Exception e)
- {
- throw new ResourceException(e);
- }
- }
- return resource;
+ //singleton
+ if(m_printer == null)
+ {
+ m_printer = new PrinterPortResource("Printer1",getPrinterEpr(resourceContext.getBaseURL()));
+ m_printer.init();
+ }
+ return m_printer;
}
- public EndpointReferenceType getEprForResource(ResourceKey key, URL serviceUrl)
+ public EndpointReferenceType getPrinterEpr(String serviceUrl)
{
EndpointReferenceDocument eprDoc = EndpointReferenceDocument.Factory.newInstance();
EndpointReferenceType epr = eprDoc.addNewEndpointReference();
AttributedURI address = epr.addNewAddress();
- address.setStringValue( serviceUrl.toString() );
- // TODO: set portType and serviceName! (read from config file)
- ReferencePropertiesType refProps = epr.addNewReferenceProperties();
-
- XmlObject xmlObject = XmlBeanUtils.addChildElement( refProps, key.getName() );
- XmlBeanUtils.setValue(xmlObject,key.getValue().toString() );
+ address.setStringValue( serviceUrl + SERVICE_NAME );
+ // TODO: set portType and serviceName! (read from config file)
return epr;
}
}
Modified: incubator/apollo/trunk/src/site/content/example/src/PrinterPort/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/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortResource.java?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortResource.java (original)
+++ incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortResource.java Tue Feb 22 11:24:12 2005
@@ -15,10 +15,13 @@
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.QueuedJobCountDocument;
+import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.PrinterStateDocument;
+import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.PrinterStateType;
import org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType;
import java.math.BigInteger;
import java.util.List;
+import java.util.ArrayList;
/**
* A PrinterPort WS-Resource.
@@ -44,13 +47,16 @@
{
super.init();
ResourceProperty resourceProperty = m_propSet.get(PrinterPortPropertyQNames.PRINTER_REFERENCE);
-
- resourceProperty = m_propSet.get(PrinterPortPropertyQNames.PRINTER_NAME);
- PrinterReferenceDocument refdoc = PrinterReferenceDocument.Factory.newInstance();
- refdoc.setPrinterReference(getEpr());
- resourceProperty.add(refdoc);
+ PrinterReferenceDocument printerRefDoc = PrinterReferenceDocument.Factory.newInstance();
+ printerRefDoc.setPrinterReference(getEpr());
+ resourceProperty.add(printerRefDoc);
resourceProperty = m_propSet.get(PrinterPortPropertyQNames.PRINTER_STATE);
+ PrinterStateDocument printerState = PrinterStateDocument.Factory.newInstance();
+ printerState.setPrinterState(PrinterStateType.IDLE);
+ resourceProperty.add(printerState);
+
+ resourceProperty = m_propSet.get(PrinterPortPropertyQNames.PRINTER_NAME);
PrinterNameDocument printName = PrinterNameDocument.Factory.newInstance();
printName.setPrinterName(m_name);
resourceProperty.add(printName);
@@ -67,10 +73,11 @@
resourceProperty = m_propSet.get(PrinterPortPropertyQNames.OPERATIONS_SUPPORTED);
OperationsSupportedDocument operationsSupportedDocument = OperationsSupportedDocument.Factory.newInstance();
- List operationsSupported = operationsSupportedDocument.getOperationsSupported();
+ List operationsSupported = new ArrayList();
operationsSupported.add(Operations.PRINT_JOB); //refer to doc...
operationsSupported.add(Operations.CREATE_JOB); //refer to doc...
operationsSupported.add(Operations.SEND_DOCUMENT); //refer to doc...
+ operationsSupportedDocument.setOperationsSupported(operationsSupported);
resourceProperty.add(operationsSupportedDocument);
resourceProperty = m_propSet.get(PrinterPortPropertyQNames.DOCUMENT_FORMAT_SUPPORTED);
@@ -91,12 +98,7 @@
JobHoldUntilSupportedDocument jobHoldUntilSupportedDocument2 = JobHoldUntilSupportedDocument.Factory.newInstance();
jobHoldUntilSupportedDocument2.setJobHoldUntilSupported();
resourceProperty.add(jobHoldUntilSupportedDocument);
- resourceProperty.add(jobHoldUntilSupportedDocument2);*/
-
- resourceProperty = m_propSet.get(QueryResourcePropertiesPortType.PROP_QNAME_QUERY_EXPRESSION_DIALECT);
- QueryExpressionDialectDocument queryExpressionDialectDocument = QueryExpressionDialectDocument.Factory.newInstance();
- queryExpressionDialectDocument.setQueryExpressionDialect(QueryConstants.DIALECT_URI__XPATH1_0.toString()); //todo this should be done for them
- resourceProperty.add(queryExpressionDialectDocument);
+ resourceProperty.add(jobHoldUntilSupportedDocument2);*/
//todo probably need a backend representatino of job or maintain them or some htins...
Modified: incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPort_jndi-config.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPort_jndi-config.xml?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPort_jndi-config.xml (original)
+++ incubator/apollo/trunk/src/site/content/example/src/PrinterPort/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPort_jndi-config.xml Tue Feb 22 11:24:12 2005
@@ -18,10 +18,7 @@
<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>
Added: incubator/apollo/trunk/src/templates/1_2_draft05/Query-ExpressionDialect_init.txt
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/1_2_draft05/Query-ExpressionDialect_init.txt?view=auto&rev=154889
==============================================================================
--- incubator/apollo/trunk/src/templates/1_2_draft05/Query-ExpressionDialect_init.txt (added)
+++ incubator/apollo/trunk/src/templates/1_2_draft05/Query-ExpressionDialect_init.txt Tue Feb 22 11:24:12 2005
@@ -0,0 +1,5 @@
+ // initialize wsrp:QueryExpressionDialect property
+ org.apache.ws.resource.properties.ResourceProperty queryProp = m_propSet.get( org.apache.ws.resource.properties.v1_2_draft05.porttype.QueryResourcePropertiesPortType.PROP_QNAME_QUERY_EXPRESSION_DIALECT );
+ org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.QueryExpressionDialectDocument queryExpressionDialectDocument = org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceProperties12Draft05.QueryExpressionDialectDocument.Factory.newInstance();
+ queryExpressionDialectDocument.setQueryExpressionDialect(org.apache.ws.resource.properties.query.QueryConstants.DIALECT_URI__XPATH1_0.toString());
+ queryProp.add( queryExpressionDialectDocument );
Modified: incubator/apollo/trunk/src/test/org/apache/ws/resource/properties/SushiResourceContext.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/test/org/apache/ws/resource/properties/SushiResourceContext.java?view=diff&r1=154888&r2=154889
==============================================================================
--- incubator/apollo/trunk/src/test/org/apache/ws/resource/properties/SushiResourceContext.java (original)
+++ incubator/apollo/trunk/src/test/org/apache/ws/resource/properties/SushiResourceContext.java Tue Feb 22 11:24:12 2005
@@ -163,6 +163,16 @@
return null;
}
+ /**
+ * Gets the base URL from which service urls are based.
+ *
+ * @return The String representation of the base url
+ */
+ public String getBaseURL()
+ {
+ return null;
+ }
+
public boolean containsProperty( String name )
{
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org