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/25 23:43:24 UTC
svn commit: r155374 - in incubator/apollo/trunk/src/site/content/example: ./
src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/
Author: scamp
Date: Fri Feb 25 14:43:21 2005
New Revision: 155374
URL: http://svn.apache.org/viewcvs?view=rev&rev=155374
Log: (empty)
Added:
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/Keys.java
Modified:
incubator/apollo/trunk/src/site/content/example/build.xml
incubator/apollo/trunk/src/site/content/example/interop_requests.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/PrinterFactoryHome.java
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/PrinterPortHome.java
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortResource.java
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/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=155373&r2=155374
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/build.xml (original)
+++ incubator/apollo/trunk/src/site/content/example/build.xml Fri Feb 25 14:43:21 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" />
Modified: 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=diff&r1=155373&r2=155374
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/interop_requests.xml (original)
+++ incubator/apollo/trunk/src/site/content/example/interop_requests.xml Fri Feb 25 14:43:21 2005
@@ -16,16 +16,23 @@
<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}/UpdateProps.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/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=155373&r2=155374
==============================================================================
--- 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 Fri Feb 25 14:43:21 2005
@@ -149,6 +149,8 @@
org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceLifetime12Draft04.TerminationTimeDocument termTime =
org.oasisOpen.docs.wsrf.x2004.x11.wsrfWSResourceLifetime12Draft04.TerminationTimeDocument.Factory
.newInstance( );
- termTime.setNilTerminationTime( );
+ termTime.setNilTerminationTime( );
+ prop.add(termTime);
+
}
}
Added: incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/Keys.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/Keys.java?view=auto&rev=155374
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/Keys.java (added)
+++ incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/Keys.java Fri Feb 25 14:43:21 2005
@@ -0,0 +1,21 @@
+package org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03Wsdl;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: SACAM
+ * Date: Feb 25, 2005
+ * Time: 1:09:11 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public interface Keys {
+
+ /**
+ * @msg Printing Job {0}
+ */
+ String PRINTING_JOB = "PRINTING_JOB";
+
+ /**
+ * @msg Queuing Job {0}
+ */
+ String QUEUING_JOB = "QUEUING_JOB";
+}
Modified: incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryHome.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryHome.java?view=diff&r1=155373&r2=155374
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryHome.java (original)
+++ incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryHome.java Fri Feb 25 14:43:21 2005
@@ -49,6 +49,7 @@
{
m_printerFactory = new PrinterFactoryResource( );
m_printerFactory.init( );
+ add(null,m_printerFactory);
}
return m_printerFactory;
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=155373&r2=155374
==============================================================================
--- 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 14:43:21 2005
@@ -17,10 +17,7 @@
<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/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=155373&r2=155374
==============================================================================
--- 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 Fri Feb 25 14:43:21 2005
@@ -53,7 +53,6 @@
{
throw new ResourceUnknownException( null, SERVICE_NAME );
}
-
return m_printer;
}
@@ -98,6 +97,7 @@
m_printer = new PrinterPortResource( "Printer1",
getPrinterEpr( resourceContext.getBaseURL( ) ) );
m_printer.init( );
+ add(null, m_printer);
}
return m_printer;
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=155373&r2=155374
==============================================================================
--- 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 14:43:21 2005
@@ -17,8 +17,10 @@
import org.apache.ws.resource.properties.ResourceProperty;
import org.apache.ws.resource.properties.impl.XmlBeansResourceProperty;
+import org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet;
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.util.timer.TimerImpl;
+import org.apache.ws.util.timer.TimerManagerImpl;
import org.apache.ws.util.i18n.Messages;
import org.apache.xmlbeans.XmlInteger;
import org.apache.commons.logging.Log;
@@ -31,6 +33,7 @@
import commonj.timers.TimerListener;
import commonj.timers.Timer;
+import commonj.timers.TimerManager;
/**
* A PrinterPort WS-Resource.
@@ -121,18 +124,23 @@
public void addJobToQueue(JobPortResource job) {
//if timer doesn't exist, create
+ synchronized(this)
+ {
if (m_timer == null) {
resetTimer();
}
- LOG.debug( MSG.getMessage( Keys.QUEUING_JOB, job.m_id ) );
+ }
+ //LOG.debug( MSG.getMessage( Keys.QUEUING_JOB, job.m_id ) );
m_printQueue.add(job);
}
public void resetTimer() {
//scale and translate the random to get a number between 1 and 3 mins
- double doubleLength = m_random.nextDouble() * 120000.0 + 60000.0;
+ // double doubleLength = m_random.nextDouble() * 120000.0 + 60000.0;
+ long doubleLength = 20000; //todo remove for debug only...
long lengthOfTime = (long) doubleLength;
- m_timer = new TimerImpl(this, lengthOfTime);
+ TimerManager tm = new TimerManagerImpl();
+ m_timer = tm.schedule(this, lengthOfTime);
}
public void timerExpired(Timer timer) {
@@ -140,9 +148,16 @@
//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 ) );
+ //LOG.debug( MSG.getMessage( Keys.PRINTING_JOB, job.m_id ) );
//set termination time to now to make it be removed.
job.setTerminationTime(Calendar.getInstance());
+ //todo set job status
+ //todo remove jobprops from printer props
+ XmlBeansResourcePropertySet jobPropSet = (XmlBeansResourcePropertySet) job.getResourcePropertySet();
+
+ ResourceProperty printerJobProperties = getResourcePropertySet( ).get( PrinterPortPropertyQNames.JOB_PROPERTIES );
+ printerJobProperties.remove(jobPropSet.toXmlObject());
+
decrementQueueCount();
}
resetTimer();//restart timer
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=155373&r2=155374
==============================================================================
--- 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 14:43:21 2005
@@ -17,11 +17,7 @@
<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>
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org