Author: scamp
Date: Fri Feb 25 11:23:16 2005
New Revision: 155362
URL: http://svn.apache.org/viewcvs?view=rev&rev=155362
Log: (empty)
Added:
incubator/apollo/trunk/src/site/content/example/interop_requests.xml
Modified:
incubator/apollo/trunk/src/site/content/example/build.xml
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/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactory_jndi-config.xml
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/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPort_jndi-config.xml
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=155361&r2=155362
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/build.xml (original)
+++ incubator/apollo/trunk/src/site/content/example/build.xml Fri Feb 25
11:23:16 2005
@@ -8,8 +8,8 @@
<!-- workaround for those IDEs that dont set ant.home as per the ant script
-->
<property name="ant.home" value="env.ANT_HOME"/>
- <!-- <property name="endpoint.url" value="${base.url}/PrinterFactory" /> -->
-<property name="endpoint.url" value="${base.url}/PrinterPort" />
+ <property name="endpoint.url" value="${base.url}/PrinterFactory" />
+<!--<property name="endpoint.url" value="${base.url}/PrinterPort" />-->
<!-- <property name="endpoint.url" value="${base.url}/JobPort" />-->
<property name="classes.dir" location="${basedir}\classes" />
<property name="jar.dir" location="${basedir}\lib" />
Added: incubator/apollo/trunk/src/site/content/example/interop_requests.xml
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/interop_requests.xml?view=auto&rev=155362
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/interop_requests.xml (added)
+++ incubator/apollo/trunk/src/site/content/example/interop_requests.xml Fri
Feb 25 11:23:16 2005
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+
+<project name="interop_buildfile" default="sendRequests" basedir=".">
+
+ <property environment="env" />
+ <property file="build.properties" />
+ <property file="../build.properties" />
+
+ <!-- workaround for those IDEs that dont set ant.home as per the ant script
-->
+ <property name="ant.home" value="env.ANT_HOME"/>
+ <property name="factory.endpoint.url" value="${base.url}/PrinterFactory"
/>
+ <property name="printer.endpoint.url" value="${base.url}/PrinterPort" />
+ <property name="job.endpoint.url" value="${base.url}/JobPort" />
+ <property name="requests.dir" location="${basedir}/requests"/>
+
+
+ <target name="sendRequests"
+ description="Sends a requests to the services for interop testing">
+
+ <ant antfile="soapclient.xml">
+ <property name="url" value="${factory.endpoint.url}" />
+ <property name="xml" value="${requests.dir}/CreatePrinter.soap" />
+ </ant>
+
+ <ant antfile="soapclient.xml">
+ <property name="url" value="${printer.endpoint.url}" />
+ <property name="xml" value="${requests.dir}/PrintJobRequest.soap" />
+ </ant>
+
+ </target>
+</project>
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=155361&r2=155362
==============================================================================
---
incubator/apollo/trunk/src/site/content/example/requests/PrintJobRequest.soap
(original)
+++
incubator/apollo/trunk/src/site/content/example/requests/PrintJobRequest.soap
Fri Feb 25 11:23:16 2005
@@ -2,7 +2,8 @@
<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.xsd";
-
xmlns:wsrf-pr="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.xsd";>
+
xmlns:wsrf-pr="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.xsd";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
<Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/03/addressing";>
<wsa:To
mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
@@ -11,11 +12,11 @@
<Body>
<wsrf-pr:Print_JobRequest>
- <wsrf-pr:job_name>My First Printer Job</job_name>
- <wsrf-pr:document_format>text/plain</document_format>
+ <wsrf-pr:job_name>My First Printer Job</wsrf-pr:job_name>
+ <wsrf-pr:document_format>text/plain</wsrf-pr:document_format>
<wsrf-pr:document_content>
<xsd:Base64Data>SGVsbG8gV29ybGQh</xsd:Base64Data>
- <wsrf-pr:document_content>
+ </wsrf-pr:document_content>
</wsrf-pr:Print_JobRequest>
</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=155361&r2=155362
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/SendDocument.soap
(original)
+++ incubator/apollo/trunk/src/site/content/example/requests/SendDocument.soap
Fri Feb 25 11:23:16 2005
@@ -9,7 +9,7 @@
<wsa:To
mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
<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</wsrf-pr-wsdl:ResourceID>
+
xmlns:wsrf-pr-wsdl="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl";>1</wsrf-pr-wsdl:ResourceID>
</Header>
<Body>
Modified:
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactory_jndi-config.xml
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactory_jndi-config.xml?view=diff&r1=155361&r2=155362
==============================================================================
---
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactory_jndi-config.xml
(original)
+++
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactory_jndi-config.xml
Fri Feb 25 11:23:16 2005
@@ -17,6 +17,10 @@
<name>wsdlTargetNamespace</name>
<value>http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl</value>
</parameter>
+ <parameter>
+ <name>resourceKeyName</name>
+
<value>{http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl}ResourceID</value>
+ </parameter>
</resourceParams>
</resource>
</service>
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=155361&r2=155362
==============================================================================
---
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
Fri Feb 25 11:23:16 2005
@@ -17,8 +17,12 @@
import org.apache.ws.resource.properties.ResourceProperty;
import org.apache.ws.resource.properties.impl.XmlBeansResourceProperty;
+import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.util.timer.TimerImpl;
+import org.apache.ws.util.i18n.Messages;
import org.apache.xmlbeans.XmlInteger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.*;
import org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType;
@@ -35,6 +39,9 @@
*/
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;
@@ -117,6 +124,7 @@
if (m_timer == null) {
resetTimer();
}
+ LOG.debug( MSG.getMessage( Keys.QUEUING_JOB, job.m_id ) );
m_printQueue.add(job);
}
@@ -132,6 +140,7 @@
//make sure we have something in queue, remove the 0th print job
if (m_printQueue.size() > 0) {
JobPortResource job = (JobPortResource) m_printQueue.remove(0);
+ LOG.debug( MSG.getMessage( Keys.PRINTING_JOB, job.m_id ) );
//set termination time to now to make it be removed.
job.setTerminationTime(Calendar.getInstance());
decrementQueueCount();
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=155361&r2=155362
==============================================================================
---
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
Fri Feb 25 11:23:16 2005
@@ -180,7 +180,7 @@
{
PrinterPortResource resource = null;
try
- {
+ { //todo do we have a bug?????? fails for singleton
resource = (PrinterPortResource) getResourceContext( ).getResource(
);
}
catch ( Exception e )
Modified:
incubator/apollo/trunk/src/site/content/example/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/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPort_jndi-config.xml?view=diff&r1=155361&r2=155362
==============================================================================
---
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPort_jndi-config.xml
(original)
+++
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPort_jndi-config.xml
Fri Feb 25 11:23:16 2005
@@ -17,7 +17,10 @@
<name>wsdlTargetNamespace</name>
<value>http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl</value>
</parameter>
-
+ <parameter>
+ <name>resourceKeyName</name>
+
<value>{http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl}ResourceID</value>
+ </parameter>
</resourceParams>
</resource>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
