You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrf-dev@ws.apache.org by sc...@apache.org on 2005/03/09 18:38:58 UTC
svn commit: r156664 - in incubator/apollo/trunk/src:
java/org/apache/ws/resource/handler/axis/
java/org/apache/ws/resource/properties/impl/ java/org/apache/ws/util/
site/content/example/requests/
site/content/example/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/
site/content/example/src/test/org/oasisOpen/docs/wsrf/
Author: scamp
Date: Wed Mar 9 09:38:53 2005
New Revision: 156664
URL: http://svn.apache.org/viewcvs?view=rev&rev=156664
Log: (empty)
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/handler/axis/ResourceProvider.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java
incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java
incubator/apollo/trunk/src/site/content/example/requests/CreatePrinter.soap
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/PrinterPortResource.java
incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/InteropTestCase.java
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/handler/axis/ResourceProvider.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/handler/axis/ResourceProvider.java?view=diff&r1=156663&r2=156664
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/handler/axis/ResourceProvider.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/handler/axis/ResourceProvider.java Wed Mar 9 09:38:53 2005
@@ -19,6 +19,7 @@
import org.apache.axis.Handler;
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
+import org.apache.axis.Constants;
import org.apache.axis.handlers.soap.SOAPService;
import org.apache.axis.message.SOAPEnvelope;
import org.apache.commons.logging.Log;
@@ -217,6 +218,14 @@
{
LOG.debug("Fault: \n" + axisFault.dumpToString());
}
+
+
+ if (System.getProperty("AXIS_FAULT_DEBUG") == null)
+ {
+ axisFault.removeHostname();
+ axisFault.removeFaultDetail(Constants.QNAME_FAULTDETAIL_STACKTRACE);
+ }
+
throw axisFault;
}
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java?view=diff&r1=156663&r2=156664
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourceProperty.java Wed Mar 9 09:38:53 2005
@@ -195,7 +195,7 @@
}
catch ( Exception e )
{
- throw new IllegalArgumentException( MSG.getMessage( Keys.UNABLE_TO_CONVERT_TO_XMLOBJECT ) );
+ throw new IllegalArgumentException( MSG.getMessage( Keys.UNABLE_TO_CONVERT_TO_XMLOBJECT ) + " " + e );
}
if ( !XmlBeanUtils.getName(propXBeanToRemove).equals( m_metaData.getName() ) )
@@ -339,7 +339,7 @@
}
catch ( Exception e )
{
- throw new IllegalArgumentException( MSG.getMessage( Keys.UNABLE_TO_CONVERT_TO_XMLOBJECT ) );
+ throw new IllegalArgumentException( MSG.getMessage( Keys.UNABLE_TO_CONVERT_TO_XMLOBJECT ) + " " + e);
}
return propXBean;
Modified: incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java?view=diff&r1=156663&r2=156664
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java Wed Mar 9 09:38:53 2005
@@ -471,7 +471,7 @@
*
* @param obj an object
*
- * @return an XMLBean
+ * @return an XMLBean , or null if the obj param is null.
*
* @throws Exception if the object cannot be converted to an XMLBean
*/
@@ -479,6 +479,9 @@
throws Exception
{
XmlObject xBean;
+
+ if ( obj == null) return null;
+
if ( obj instanceof XmlObject )
{
xBean = (XmlObject) obj;
@@ -516,7 +519,7 @@
}
else
{
- throw new IllegalArgumentException( MSG.getMessage( Keys.PARAM_MUST_BE_TYPE ) );
+ throw new IllegalArgumentException( MSG.getMessage( Keys.PARAM_MUST_BE_TYPE ) + " " + obj.getClass().getName());
}
return xBean;
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=156663&r2=156664
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/requests/CreatePrinter.soap (original)
+++ incubator/apollo/trunk/src/site/content/example/requests/CreatePrinter.soap Wed Mar 9 09:38:53 2005
@@ -3,8 +3,7 @@
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/08/addressing">
- <wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
- <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>
+
</Header>
<Body>
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=156663&r2=156664
==============================================================================
--- 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 Wed Mar 9 09:38:53 2005
@@ -148,8 +148,12 @@
break;
}
}
- printerJobProperties.remove(properties);
-
+
+ if(properties != null)
+ {
+ printerJobProperties.remove(properties);
+ }
+
return;
}
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=156663&r2=156664
==============================================================================
--- 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 Wed Mar 9 09:38:53 2005
@@ -191,20 +191,7 @@
XmlBeansResourcePropertySet jobPropSet = (XmlBeansResourcePropertySet) job.getResourcePropertySet();
ResourceProperty resourceProperty = jobPropSet.get(JobPortPropertyQNames.JOB_ID);
XmlInteger jobint = (XmlInteger) resourceProperty.get(0);
- BigInteger bigIntegerValue = jobint.getBigIntegerValue();
-
- ResourceProperty printerJobProperties = getResourcePropertySet().get(PrinterPortPropertyQNames.JOB_PROPERTIES);
- Iterator iterator = printerJobProperties.iterator();
- JobPropertiesDocument.JobProperties properties = null;
- while (iterator.hasNext())
- {
- properties = (JobPropertiesDocument.JobProperties) iterator.next();
- if (properties.getJobId().equals(bigIntegerValue))
- {
- break;
- }
- }
- printerJobProperties.remove(properties);
+ BigInteger bigIntegerValue = jobint.getBigIntegerValue();
decrementQueueCount();
setJobState(job, JobStateType.COMPLETED);
@@ -229,12 +216,19 @@
private void setJobState(JobPortResource job, JobStateType.Enum state)
{
XmlBeansResourceProperty resourceProperty = (XmlBeansResourceProperty) job.getResourcePropertySet().get(JobPortPropertyQNames.JOB_STATE);
- JobStateType o = (JobStateType) resourceProperty.get(0);
- o.set(state);
+ JobStateType o = null;
+ if (resourceProperty != null)
+ {
+ o = (JobStateType) resourceProperty.get(0);
+ o.set(state);
+ }
resourceProperty = (XmlBeansResourceProperty) getResourcePropertySet().get(JobPortPropertyQNames.JOB_STATE);
- o = (JobStateType) resourceProperty.get(0);
- o.set(state);
+ if (resourceProperty != null)
+ {
+ o = (JobStateType) resourceProperty.get(0);
+ o.set(state);
+ }
}
private void setPrinterStateIdleProcessing()
Modified: incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/InteropTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/InteropTestCase.java?view=diff&r1=156663&r2=156664
==============================================================================
--- incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/InteropTestCase.java (original)
+++ incubator/apollo/trunk/src/site/content/example/src/test/org/oasisOpen/docs/wsrf/InteropTestCase.java Wed Mar 9 09:38:53 2005
@@ -113,6 +113,7 @@
public void createPrinter() throws IOException
{
String response = sendRequest(m_printerFactoryURL, SOAP_REQ_CREATE_PRINTER);
+ System.out.println("Create Printer Reponse: \n" + response );
assertTrue(response.indexOf("CreatePrinterResponse") > -1);
EnvelopeDocument envelopeDocument = loadResponseEnvelope(response);
CreatePrinterResponseDocument.CreatePrinterResponse createPrinter = (CreatePrinterResponseDocument.CreatePrinterResponse) XmlBeanUtils.getChildElements(envelopeDocument.getEnvelope().getBody(), new QName(PrinterPortPropertyQNames.PRINTER_REFERENCE.getNamespaceURI(), "CreatePrinterResponse"))[0];
@@ -124,6 +125,7 @@
public void testValidatePrinterInitialState() throws IOException
{
String response = sendPrinterRequest("GetPrinterPropertiesDoc.soap");
+ System.out.println("Printer Prop Doc: \n" + response);
assertTrue(response.indexOf("printer_properties") > -1);
assertTrue(response.indexOf("job_count>0") > -1);
assertTrue(response.indexOf("accepting_jobs>false") > -1);
@@ -177,6 +179,7 @@
public void testFailInsertResourceProps_SCENARIO_B1_FAIL() throws IOException
{
String response = sendPrinterRequest("InsertProps.soap");
+ System.out.println("FAULT: " + response);
assertTrue(response.indexOf("InvalidInsertResourcePropertiesRequestContentFault") > -1);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org