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/05/20 23:57:17 UTC
svn commit: r171162 - in /incubator/apollo/trunk: ./
src/site/content/example/
src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/
src/site/content/example/src/test/org/oasisOpen/docs/wsrf/
Author: scamp
Date: Fri May 20 14:57:16 2005
New Revision: 171162
URL: http://svn.apache.org/viewcvs?rev=171162&view=rev
Log:
fixes to move the example forward
Modified:
incubator/apollo/trunk/cutting_releases.txt
incubator/apollo/trunk/maven.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/AbstractPrinterFactoryResource.java
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractPrinterPortResource.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/JobPortService.java
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryHome.java
incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryResource.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/test/org/oasisOpen/docs/wsrf/AllScenarios.java
incubator/apollo/trunk/src/site/content/example/test-build.properties
Modified: incubator/apollo/trunk/cutting_releases.txt
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/cutting_releases.txt?rev=171162&r1=171161&r2=171162&view=diff
==============================================================================
--- incubator/apollo/trunk/cutting_releases.txt (original)
+++ incubator/apollo/trunk/cutting_releases.txt Fri May 20 14:57:16 2005
@@ -1,6 +1,7 @@
The following steps should be taken when cutting a new release:
+***Make sure any "garbage" is cleaned out of your trunk dir....i.e. quick-test files, example/interop builds etc
1. Turn off debug in log4j file...Set to INFO
2. Add an entry to the forrest site for the distribution
Modified: incubator/apollo/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/maven.xml?rev=171162&r1=171161&r2=171162&view=diff
==============================================================================
--- incubator/apollo/trunk/maven.xml (original)
+++ incubator/apollo/trunk/maven.xml Fri May 20 14:57:16 2005
@@ -191,7 +191,6 @@
<fileset dir="${site.dest.dir}" />
</copy>
- <mkdir dir="${maven.dist.bin.assembly.dir}/usr" />
<copy todir="${maven.dist.bin.assembly.dir}">
<fileset dir="${basedir}">
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?rev=171162&r1=171161&r2=171162&view=diff
==============================================================================
--- 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 May 20 14:57:16 2005
@@ -20,6 +20,7 @@
import org.apache.ws.resource.lifetime.ResourceTerminationListener;
import org.apache.ws.resource.properties.ResourceProperty;
import org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet;
+import org.apache.ws.addressing.EndpointReference;
import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.JobPropertiesDocument;
import java.util.ArrayList;
@@ -51,6 +52,7 @@
* A list of termination listeners to be notified when the resource is terminated.
*/
private List m_terminationListeners = new ArrayList();
+ private EndpointReference m_endpointReference;
/**
* Returns the current time from the prop set.
@@ -215,4 +217,30 @@
prop.add(termTime);
}
+
+ /**
+ * Returns the EndpointReference associated with this Resource.
+ *
+ * @return The Resource's EndpointReference or null if the EndpointReference has not been set.
+ *
+ * Note: It is the responsibility of the Resource creator to set the EndpointReference (i.e. ResourceHome impl)
+ */
+ public EndpointReference getEndpointReference()
+ {
+ return m_endpointReference;
+ }
+
+ /**
+ * Sets the EndpointReference associated with this Resource.
+ *
+ * @param epr The Resource's EndpointReference.
+ *
+ * Note: It is the responsibility of the Resource creator to set the EndpointReference (i.e. ResourceHome impl)
+ */
+ public void setEndpointReference(EndpointReference epr)
+ {
+ m_endpointReference = epr;
+ }
+
+
}
Modified: incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractPrinterFactoryResource.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractPrinterFactoryResource.java?rev=171162&r1=171161&r2=171162&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractPrinterFactoryResource.java (original)
+++ incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractPrinterFactoryResource.java Fri May 20 14:57:16 2005
@@ -16,6 +16,7 @@
package org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03Wsdl;
import org.apache.ws.resource.lifetime.ResourceTerminationListener;
+import org.apache.ws.addressing.EndpointReference;
/**
@@ -30,8 +31,9 @@
* The resource ID of the instance.
*/
protected String m_id;
+ private EndpointReference m_endpointReference;
- /**
+ /**
* DOCUMENT_ME
*
* @param id DOCUMENT_ME
@@ -87,4 +89,30 @@
{
}
+
+ /**
+ * Returns the EndpointReference associated with this Resource.
+ *
+ * @return The Resource's EndpointReference or null if the EndpointReference has not been set.
+ *
+ * Note: It is the responsibility of the Resource creator to set the EndpointReference (i.e. ResourceHome impl)
+ */
+ public EndpointReference getEndpointReference()
+ {
+ return m_endpointReference;
+ }
+
+ /**
+ * Sets the EndpointReference associated with this Resource.
+ *
+ * @param epr The Resource's EndpointReference.
+ *
+ * Note: It is the responsibility of the Resource creator to set the EndpointReference (i.e. ResourceHome impl)
+ */
+ public void setEndpointReference(EndpointReference epr)
+ {
+ m_endpointReference = epr;
+ }
+
+
}
Modified: incubator/apollo/trunk/src/site/content/example/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/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractPrinterPortResource.java?rev=171162&r1=171161&r2=171162&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractPrinterPortResource.java (original)
+++ incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/AbstractPrinterPortResource.java Fri May 20 14:57:16 2005
@@ -17,6 +17,7 @@
import org.apache.ws.resource.lifetime.ResourceTerminationEvent;
import org.apache.ws.resource.lifetime.ResourceTerminationListener;
+import org.apache.ws.addressing.EndpointReference;
/**
@@ -36,8 +37,9 @@
* The set of properties associated with this resource.
*/
protected org.apache.ws.resource.properties.ResourcePropertySet m_propSet;
+ private EndpointReference m_endpointReference;
- /**
+ /**
* DOCUMENT_ME
*
* @param id DOCUMENT_ME
@@ -123,4 +125,30 @@
{
}
+
+ /**
+ * Returns the EndpointReference associated with this Resource.
+ *
+ * @return The Resource's EndpointReference or null if the EndpointReference has not been set.
+ *
+ * Note: It is the responsibility of the Resource creator to set the EndpointReference (i.e. ResourceHome impl)
+ */
+ public EndpointReference getEndpointReference()
+ {
+ return m_endpointReference;
+ }
+
+ /**
+ * Sets the EndpointReference associated with this Resource.
+ *
+ * @param epr The Resource's EndpointReference.
+ *
+ * Note: It is the responsibility of the Resource creator to set the EndpointReference (i.e. ResourceHome impl)
+ */
+ public void setEndpointReference(EndpointReference epr)
+ {
+ m_endpointReference = epr;
+ }
+
+
}
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?rev=171162&r1=171161&r2=171162&view=diff
==============================================================================
--- 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 Fri May 20 14:57:16 2005
@@ -166,4 +166,24 @@
add( key, job );
return job;
}
+
+ public QName getServiceName()
+ {
+ return new QName(JobPortPropertyQNames.JOB_PRINTER_REFERENCE.getNamespaceURI(),SERVICE_NAME);
+ }
+
+ public QName getPortType()
+ {
+ return new QName(JobPortPropertyQNames.JOB_PRINTER_REFERENCE.getNamespaceURI(),"Job");
+ }
+
+ public String getServicePortName()
+ {
+ return SERVICE_NAME;
+ }
+
+ public QName getResourceKeyNameQName()
+ {
+ return QName.valueOf("{http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl}ResourceID");
+ }
}
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?rev=171162&r1=171161&r2=171162&view=diff
==============================================================================
--- 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 Fri May 20 14:57:16 2005
@@ -19,7 +19,7 @@
import org.apache.ws.resource.ResourceContextException;
import org.apache.ws.resource.ResourceException;
import org.apache.ws.resource.ResourceUnknownException;
-import org.apache.ws.resource.lifetime.v2004_06.porttype.ImmediateResourceTerminationPortType;
+import org.apache.ws.resource.lifetime.v2004_11.porttype.ImmediateResourceTerminationPortType;
import org.apache.ws.resource.properties.faults.ResourceUnknownFaultException;
import org.apache.ws.resource.properties.impl.XmlBeansResourceProperty;
import org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl;
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?rev=171162&r1=171161&r2=171162&view=diff
==============================================================================
--- 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 May 20 14:57:16 2005
@@ -17,6 +17,8 @@
import org.apache.ws.resource.*;
import org.apache.ws.resource.impl.AbstractResourceHome;
+
+import javax.xml.namespace.QName;
import java.io.Serializable;
/**
@@ -54,4 +56,24 @@
return m_printerFactory;
}
+
+ public QName getServiceName()
+ {
+ return new QName(PrinterPortPropertyQNames.PRINTER_REFERENCE.getNamespaceURI(),"PrinterFactory");
+ }
+
+ public QName getPortType()
+ {
+ return new QName(PrinterPortPropertyQNames.PRINTER_REFERENCE.getNamespaceURI(),"CreatePrinter");
+ }
+
+ public String getServicePortName()
+ {
+ return "PrinterFactory";
+ }
+
+ public QName getResourceKeyNameQName()
+ {
+ return null;
+ }
}
Modified: incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryResource.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryResource.java?rev=171162&r1=171161&r2=171162&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryResource.java (original)
+++ incubator/apollo/trunk/src/site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryResource.java Fri May 20 14:57:16 2005
@@ -43,4 +43,6 @@
{
}
+
+
}
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?rev=171162&r1=171161&r2=171162&view=diff
==============================================================================
--- 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 May 20 14:57:16 2005
@@ -126,4 +126,24 @@
"Printer" + Integer.toString( printerId ) );
return key;
}
+
+ public QName getServiceName()
+ {
+ return new QName(PrinterPortPropertyQNames.PRINTER_REFERENCE.getNamespaceURI(),"PrinterPort");
+ }
+
+ public QName getPortType()
+ {
+ return new QName(PrinterPortPropertyQNames.PRINTER_REFERENCE.getNamespaceURI(),"Printer");
+ }
+
+ public String getServicePortName()
+ {
+ return "PrinterPort";
+ }
+
+ public QName getResourceKeyNameQName()
+ {
+ return new QName("{http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl}ResourceID");
+ }
}
Modified: incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/AllScenarios.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/AllScenarios.java?rev=171162&r1=171161&r2=171162&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/AllScenarios.java (original)
+++ incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/AllScenarios.java Fri May 20 14:57:16 2005
@@ -18,7 +18,7 @@
//A scenarios
testCase.testValidatePrinterInitialState();
- /** testCase.testGetPrinterQueueCount_SCENARIO_A1();
+ testCase.testGetPrinterQueueCount_SCENARIO_A1();
testCase.testGetPrinterStateAndQueueCount_SCENARIO_A2();
testCase.testGetPrinterResourcePropertiesDocument_SCENARIO_A3();
testCase.testQueryResourceProperties_SCENARIO_A4();
@@ -45,7 +45,7 @@
//IBM E Scenario
testCase.testSendDocument_SCENARIO_E_IBM();
- **/
+
testCase.tearDown();
}
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?rev=171162&r1=171161&r2=171162&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/test-build.properties (original)
+++ incubator/apollo/trunk/src/site/content/example/test-build.properties Fri May 20 14:57:16 2005
@@ -2,19 +2,10 @@
# The endpoint url of the Printer Factory. This is the starting point for the tests.
#
# ***NOTE: To test an external endpoint this should be set to that server's url.
-# **If running in embedded mode then the printerFactoryURL is ignored
-#
+# **If running in embedded mode then the printerFactoryURL is ignored
##
-#printerFactoryURL=http://wsi.alphaworks.ibm.com:80/ettk/wsrfrpio/services/PrinterPort
-#IBM
-#printerFactoryURL=http://localhost:8080/wsrf/services/PrinterFactory
-
-#Virginia.EDU
-#printerFactoryURL=http://opteron6.cs.virginia.edu/WSRF/Test/Interop2/PrinterService.asmx
-
-#Fujitsu
-printerFactoryURL=http://193.133.239.220:8080/axis/services/PrinterFactory
+printerFactoryURL=http://localhost:8080/wsrf/services/PrinterFactory
##
# Determines if the unit test will run an embedded version of Axis
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org