Modified: webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java?rev=620053&r1=620052&r2=620053&view=diff ============================================================================== --- webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java (original) +++ webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingFaultExtensionsTest.java Fri Feb 8 16:57:46 2008 @@ -29,7 +29,6 @@ import org.apache.woden.wsdl20.Binding; import org.apache.woden.wsdl20.BindingFault; import org.apache.woden.wsdl20.Description; -import org.apache.woden.wsdl20.extensions.ComponentExtensions; /** * Functional verification test of HTTPBindingFaultExtensions. @@ -82,7 +81,7 @@ { BindingFault bindFault = fBindFaults[0]; HTTPBindingFaultExtensions httpBindFaultExts = (HTTPBindingFaultExtensions)bindFault - .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext(HTTPConstants.NS_URI_HTTP); assertNotNull("The BindingFault does not contain an HTTPBindingFaultExtensions object.", httpBindFaultExts); @@ -94,7 +93,7 @@ bindFault = fBindFaults[1]; httpBindFaultExts = (HTTPBindingFaultExtensions)bindFault - .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext(HTTPConstants.NS_URI_HTTP); assertNotNull("The BindingFault does not contain an HTTPBindingFaultExtensions object.", httpBindFaultExts); @@ -113,7 +112,7 @@ { BindingFault bindFault = fBindFaults[0]; HTTPBindingFaultExtensions httpBindFaultExts = (HTTPBindingFaultExtensions)bindFault - .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext(HTTPConstants.NS_URI_HTTP); String actual = httpBindFaultExts.getHttpContentEncoding(); assertNotNull("The value for http transfer coding was null", actual); @@ -141,7 +140,7 @@ { BindingFault bindFault = fBindFaults[2]; HTTPBindingFaultExtensions httpBindFaultExts = (HTTPBindingFaultExtensions)bindFault - .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext(HTTPConstants.NS_URI_HTTP); assertNotNull("The BindingFault does not contain an HTTPBindingFaultExtensions object.", httpBindFaultExts); @@ -185,7 +184,7 @@ { BindingFault bindFault = fBindFaults[3]; HTTPBindingFaultExtensions httpBindFaultExts = (HTTPBindingFaultExtensions)bindFault - .getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext(HTTPConstants.NS_URI_HTTP); assertNotNull("The BindingFault does not contain an HTTPBindingFaultExtensions object.", httpBindFaultExts);
Modified: webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java?rev=620053&r1=620052&r2=620053&view=diff ============================================================================== --- webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java (original) +++ webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingMessageReferenceExtensionsTest.java Fri Feb 8 16:57:46 2008 @@ -30,7 +30,6 @@ import org.apache.woden.wsdl20.BindingMessageReference; import org.apache.woden.wsdl20.BindingOperation; import org.apache.woden.wsdl20.Description; -import org.apache.woden.wsdl20.extensions.ComponentExtensions; /** * Functional verification test of HTTPBindingMessageReferenceExtensions. @@ -92,8 +91,8 @@ BindingMessageReference inputMsg = bindMsgRefs[0]; HTTPBindingMessageReferenceExtensions httpBindMsgRefExts = (HTTPBindingMessageReferenceExtensions) inputMsg - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String actual = httpBindMsgRefExts.getHttpContentEncoding(); assertEquals("Unexpected value for http content encoding.", @@ -104,8 +103,8 @@ BindingMessageReference outputMsg = bindMsgRefs[1]; HTTPBindingMessageReferenceExtensions httpBindMsgRefExts2 = (HTTPBindingMessageReferenceExtensions) outputMsg - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String actual2 = httpBindMsgRefExts2.getHttpContentEncoding(); assertNull("Null was expected for http content encoding.", @@ -131,8 +130,8 @@ BindingMessageReference inputMsg = bindMsgRefs[0]; HTTPBindingMessageReferenceExtensions httpBindMsgRefExts = (HTTPBindingMessageReferenceExtensions) inputMsg - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); HTTPHeader[] actual = httpBindMsgRefExts.getHttpHeaders(); assertEquals("Unexpected size of {http headers}.", @@ -143,8 +142,8 @@ BindingMessageReference outputMsg = bindMsgRefs[1]; HTTPBindingMessageReferenceExtensions httpBindMsgRefExts2 = (HTTPBindingMessageReferenceExtensions) outputMsg - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); HTTPHeader[] actual2 = httpBindMsgRefExts2.getHttpHeaders(); assertEquals("Unexpected size of {http headers}.", Modified: webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java?rev=620053&r1=620052&r2=620053&view=diff ============================================================================== --- webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java (original) +++ webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPBindingOperationExtensionsTest.java Fri Feb 8 16:57:46 2008 @@ -29,7 +29,6 @@ import org.apache.woden.wsdl20.Binding; import org.apache.woden.wsdl20.BindingOperation; import org.apache.woden.wsdl20.Description; -import org.apache.woden.wsdl20.extensions.ComponentExtensions; /** * Functional verification test of HTTPBindingOperationExtensions. @@ -88,8 +87,8 @@ BindingOperation oper = fBindOpers[0]; HTTPBindingOperationExtensions httpBindOperExts = (HTTPBindingOperationExtensions) oper - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String expected = "http://ws.apache.woden/location";; HTTPLocation httpLoc = httpBindOperExts.getHttpLocation(); @@ -102,8 +101,8 @@ BindingOperation oper2 = fBindOpers[1]; HTTPBindingOperationExtensions httpBindOperExts2 = (HTTPBindingOperationExtensions) oper2 - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); HTTPLocation actual2 = httpBindOperExts2.getHttpLocation(); assertNull("Http location did not default to null", actual2); @@ -125,8 +124,8 @@ BindingOperation oper = fBindOpers[0]; HTTPBindingOperationExtensions httpBindOperExts = (HTTPBindingOperationExtensions) oper - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); Boolean actual = httpBindOperExts.isHttpLocationIgnoreUncited(); assertTrue("Http location ignore uncited was not True", @@ -136,8 +135,8 @@ BindingOperation oper2 = fBindOpers[1]; HTTPBindingOperationExtensions httpBindOperExts2 = (HTTPBindingOperationExtensions) oper2 - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); Boolean actual2 = httpBindOperExts2.isHttpLocationIgnoreUncited(); assertFalse("Http location ignore uncited did not default to False", @@ -164,8 +163,8 @@ BindingOperation oper = fBindOpers[0]; HTTPBindingOperationExtensions httpBindOperExts = (HTTPBindingOperationExtensions) oper - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String actual = httpBindOperExts.getHttpMethod(); assertEquals("Unexpected value for http method.", @@ -176,8 +175,8 @@ BindingOperation oper2 = fBindOpers[1]; HTTPBindingOperationExtensions httpBindOperExts2 = (HTTPBindingOperationExtensions) oper2 - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String actual2 = httpBindOperExts2.getHttpMethod(); assertNull("Http method was not null by default.", @@ -219,8 +218,8 @@ BindingOperation oper = fBindOpers[0]; HTTPBindingOperationExtensions httpBindOperExts = (HTTPBindingOperationExtensions) oper - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String actual = httpBindOperExts.getHttpInputSerialization(); assertEquals("Unexpected value for http input serialization.", @@ -232,8 +231,8 @@ BindingOperation oper2 = fBindOpers[1]; HTTPBindingOperationExtensions httpBindOperExts2 = (HTTPBindingOperationExtensions) oper2 - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String actual2 = httpBindOperExts2.getHttpInputSerialization(); assertEquals("Unexpected default value for http input serialization.", @@ -245,8 +244,8 @@ BindingOperation oper3 = fBindOpers[2]; HTTPBindingOperationExtensions httpBindOperExts3 = (HTTPBindingOperationExtensions) oper3 - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String actual3 = httpBindOperExts3.getHttpInputSerialization(); assertEquals("Unexpected default value for http input serialization.", @@ -258,8 +257,8 @@ BindingOperation oper4 = fBindOpers[3]; HTTPBindingOperationExtensions httpBindOperExts4 = (HTTPBindingOperationExtensions) oper4 - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String actual4 = httpBindOperExts4.getHttpInputSerialization(); assertEquals("Unexpected default value for http input serialization.", @@ -271,8 +270,8 @@ BindingOperation oper5 = fBindOpers[4]; HTTPBindingOperationExtensions httpBindOperExts5 = (HTTPBindingOperationExtensions) oper5 - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String actual5 = httpBindOperExts5.getHttpInputSerialization(); assertEquals("Unexpected default value for http input serialization.", @@ -284,8 +283,8 @@ BindingOperation oper6 = fBindOpers[5]; HTTPBindingOperationExtensions httpBindOperExts6 = (HTTPBindingOperationExtensions) oper6 - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String actual6 = httpBindOperExts6.getHttpInputSerialization(); assertEquals("Unexpected default value for http input serialization.", @@ -297,8 +296,8 @@ BindingOperation oper7 = fBindOpers[6]; HTTPBindingOperationExtensions httpBindOperExts7 = (HTTPBindingOperationExtensions) oper7 - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String actual7 = httpBindOperExts7.getHttpInputSerialization(); assertEquals("Unexpected default value for http input serialization.", @@ -323,8 +322,8 @@ BindingOperation oper = fBindOpers[0]; HTTPBindingOperationExtensions httpBindOperExts = (HTTPBindingOperationExtensions) oper - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String actual = httpBindOperExts.getHttpOutputSerialization(); assertEquals("Unexpected value for http output serialization.", @@ -335,8 +334,8 @@ BindingOperation oper2 = fBindOpers[1]; HTTPBindingOperationExtensions httpBindOperExts2 = (HTTPBindingOperationExtensions) oper2 - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String actual2 = httpBindOperExts2.getHttpOutputSerialization(); assertEquals("Unexpected default value for http output serialization.", @@ -360,8 +359,8 @@ BindingOperation oper = fBindOpers[0]; HTTPBindingOperationExtensions httpBindOperExts = (HTTPBindingOperationExtensions) oper - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String actual = httpBindOperExts.getHttpFaultSerialization(); assertEquals("Unexpected value for http fault serialization.", @@ -372,8 +371,8 @@ BindingOperation oper2 = fBindOpers[1]; HTTPBindingOperationExtensions httpBindOperExts2 = (HTTPBindingOperationExtensions) oper2 - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String actual2 = httpBindOperExts2.getHttpFaultSerialization(); assertEquals("Unexpected default value for http fault serialization.", @@ -397,8 +396,8 @@ BindingOperation oper = fBindOpers[0]; HTTPBindingOperationExtensions httpBindOperExts = (HTTPBindingOperationExtensions) oper - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String actual = httpBindOperExts.getHttpQueryParameterSeparator(); assertEquals("Unexpected value for http query parameter separator.", @@ -409,8 +408,8 @@ BindingOperation oper2 = fBindOpers[1]; HTTPBindingOperationExtensions httpBindOperExts2 = (HTTPBindingOperationExtensions) oper2 - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String actual2 = httpBindOperExts2.getHttpQueryParameterSeparator(); assertNull("Expected a null value for http query parameter separator.", @@ -433,8 +432,8 @@ BindingOperation oper = fBindOpers[0]; HTTPBindingOperationExtensions httpBindOperExts = (HTTPBindingOperationExtensions) oper - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String actual = httpBindOperExts.getHttpContentEncodingDefault(); assertEquals("Unexpected value for http content encoding default.", @@ -445,8 +444,8 @@ BindingOperation oper2 = fBindOpers[1]; HTTPBindingOperationExtensions httpBindOperExts2 = (HTTPBindingOperationExtensions) oper2 - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String actual2 = httpBindOperExts2.getHttpContentEncodingDefault(); assertNull("Http content encoding default did not default to null.", Modified: webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java?rev=620053&r1=620052&r2=620053&view=diff ============================================================================== --- webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java (original) +++ webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java Fri Feb 8 16:57:46 2008 @@ -29,7 +29,6 @@ import org.apache.woden.wsdl20.Description; import org.apache.woden.wsdl20.Endpoint; import org.apache.woden.wsdl20.Service; -import org.apache.woden.wsdl20.extensions.ComponentExtensions; /** * Functional verification test of HTTPEndpointExtensions. @@ -93,8 +92,8 @@ Endpoint endpoint = fEndpoints[0]; HTTPEndpointExtensions httpEndpointExts = (HTTPEndpointExtensions) endpoint - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); HTTPAuthenticationScheme actual = httpEndpointExts.getHttpAuthenticationScheme(); assertEquals("Unexpected value for http authentication scheme.", @@ -105,8 +104,8 @@ Endpoint endpoint2 = fEndpoints[1]; HTTPEndpointExtensions httpEndpointExts2 = (HTTPEndpointExtensions) endpoint2 - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); HTTPAuthenticationScheme actual2 = httpEndpointExts2.getHttpAuthenticationScheme(); assertEquals("Unexpected value for http authentication scheme.", @@ -117,8 +116,8 @@ Endpoint endpoint3 = fEndpoints[2]; HTTPEndpointExtensions httpEndpointExts3 = (HTTPEndpointExtensions) endpoint3 - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); HTTPAuthenticationScheme actual3 = httpEndpointExts3.getHttpAuthenticationScheme(); assertNull("Http authentication scheme did not default to null.", @@ -138,8 +137,8 @@ Endpoint endpoint = fEndpoints[0]; HTTPEndpointExtensions httpEndpointExts = (HTTPEndpointExtensions) endpoint - .getComponentExtensionsForNamespace( - ComponentExtensions.NS_URI_HTTP); + .getComponentExtensionContext( + HTTPConstants.NS_URI_HTTP); String actual = httpEndpointExts.getHttpAuthenticationRealm(); assertEquals("Unexpected value for http authentication realm.", Modified: webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java?rev=620053&r1=620052&r2=620053&view=diff ============================================================================== --- webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java (original) +++ webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingExtensionsTest.java Fri Feb 8 16:57:46 2008 @@ -29,7 +29,6 @@ import org.apache.woden.tests.TestErrorHandler; import org.apache.woden.wsdl20.Binding; import org.apache.woden.wsdl20.Description; -import org.apache.woden.wsdl20.extensions.ComponentExtensions; /** * Functional verification test of SoapBindingExtensions. @@ -69,13 +68,13 @@ Binding binding = descComp.getBindings()[0]; assertNotNull("The Description does not contain a Binding.", binding); - fSoapBindExts = (SOAPBindingExtensions)binding.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + fSoapBindExts = (SOAPBindingExtensions)binding.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); assertNotNull("The Binding does not contain a SOAPBindingExtensions object."); Binding binding2 = descComp.getBindings()[1]; assertNotNull("The Description does not contain a second Binding.", binding2); - fSoapBind2Exts = (SOAPBindingExtensions)binding2.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + fSoapBind2Exts = (SOAPBindingExtensions)binding2.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); assertNotNull("The second Binding does not contain a SOAPBindingExtensions object."); } Modified: webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java?rev=620053&r1=620052&r2=620053&view=diff ============================================================================== --- webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java (original) +++ webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultExtensionsTest.java Fri Feb 8 16:57:46 2008 @@ -32,7 +32,6 @@ import org.apache.woden.wsdl20.Binding; import org.apache.woden.wsdl20.BindingFault; import org.apache.woden.wsdl20.Description; -import org.apache.woden.wsdl20.extensions.ComponentExtensions; /** * Functional verification test of SoapBindingFaultExtensions. @@ -92,7 +91,7 @@ { BindingFault bindFault = fBinding.getBindingFaults()[0]; SOAPBindingFaultExtensions soapBindFaultExts = - (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + (SOAPBindingFaultExtensions) bindFault.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); SOAPFaultCode soapFaultCode = soapBindFaultExts.getSoapFaultCode(); assertNotNull("The SOAPBindingFaultExtensions did not return a SOAPFaultCode.", soapFaultCode); @@ -110,7 +109,7 @@ { BindingFault bindFault = fBinding.getBindingFaults()[1]; SOAPBindingFaultExtensions soapBindFaultExts = - (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + (SOAPBindingFaultExtensions) bindFault.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); SOAPFaultCode soapFaultCode = soapBindFaultExts.getSoapFaultCode(); assertNotNull("The SOAPBindingFaultExtensions did not return a SOAPFaultCode.", soapFaultCode); @@ -128,7 +127,7 @@ { BindingFault bindFault = fBinding.getBindingFaults()[2]; SOAPBindingFaultExtensions soapBindFaultExts = - (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + (SOAPBindingFaultExtensions) bindFault.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); SOAPFaultCode soapFaultCode = soapBindFaultExts.getSoapFaultCode(); assertNotNull("The SOAPBindingFaultExtensions did not return a SOAPFaultCode.", soapFaultCode); @@ -145,7 +144,7 @@ { BindingFault bindFault = fBinding.getBindingFaults()[0]; SOAPBindingFaultExtensions soapBindFaultExts = - (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + (SOAPBindingFaultExtensions) bindFault.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); SOAPFaultSubcodes soapFaultSubcodes = soapBindFaultExts.getSoapFaultSubcodes(); assertNotNull("The SOAPBindingFaultExtensions did not return a SOAPFaultSubcodes.", soapFaultSubcodes); @@ -166,7 +165,7 @@ { BindingFault bindFault = fBinding.getBindingFaults()[1]; SOAPBindingFaultExtensions soapBindFaultExts = - (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + (SOAPBindingFaultExtensions) bindFault.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); SOAPFaultSubcodes soapFaultSubcodes = soapBindFaultExts.getSoapFaultSubcodes(); assertNotNull("The SOAPBindingFaultExtensions did not return a SOAPFaultSubcodes.", soapFaultSubcodes); @@ -184,7 +183,7 @@ { BindingFault bindFault = fBinding.getBindingFaults()[2]; SOAPBindingFaultExtensions soapBindFaultExts = - (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + (SOAPBindingFaultExtensions) bindFault.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); SOAPFaultSubcodes soapFaultSubcodes = soapBindFaultExts.getSoapFaultSubcodes(); assertNotNull("The SOAPBindingFaultExtensions did not return a SOAPFaultSubcodes.", soapFaultSubcodes); @@ -201,7 +200,7 @@ { BindingFault bindFault = fBinding.getBindingFaults()[1]; SOAPBindingFaultExtensions soapBindFaultExts = - (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + (SOAPBindingFaultExtensions) bindFault.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); SOAPModule[] actual = soapBindFaultExts.getSoapModules(); assertEquals("Unexpected number of SOAPModule objects.", 3, actual.length); } @@ -214,7 +213,7 @@ { BindingFault bindFault = fBinding.getBindingFaults()[2]; SOAPBindingFaultExtensions soapBindFaultExts = - (SOAPBindingFaultExtensions) bindFault.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + (SOAPBindingFaultExtensions) bindFault.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); SOAPHeaderBlock[] actual = soapBindFaultExts.getSoapHeaders(); assertEquals("Unexpected number of SOAPHeaderBlock objects.", 2, actual.length); } Modified: webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsTest.java URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsTest.java?rev=620053&r1=620052&r2=620053&view=diff ============================================================================== --- webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsTest.java (original) +++ webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingFaultReferenceExtensionsTest.java Fri Feb 8 16:57:46 2008 @@ -32,7 +32,6 @@ import org.apache.woden.wsdl20.Description; import org.apache.woden.wsdl20.InterfaceFaultReference; import org.apache.woden.wsdl20.enumeration.Direction; -import org.apache.woden.wsdl20.extensions.ComponentExtensions; /** * Functional verification test of SoapBindingFaultReferenceExtensions. @@ -100,7 +99,7 @@ assertTrue("The BindingFaultReference does not represent an <infault> element.", Direction.IN.equals(direction)); SOAPBindingFaultReferenceExtensions soapBindFaultRefExts = - (SOAPBindingFaultReferenceExtensions) bindFaultRef.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + (SOAPBindingFaultReferenceExtensions) bindFaultRef.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); SOAPModule[] actual = soapBindFaultRefExts.getSoapModules(); assertEquals("Unexpected number of SOAPModule objects.", 2, actual.length); } @@ -119,7 +118,7 @@ assertTrue("The BindingFaultReference does not represent an <outfault> element.", Direction.OUT.equals(direction)); SOAPBindingFaultReferenceExtensions soapBindFaultRefExts = - (SOAPBindingFaultReferenceExtensions) bindFaultRef.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + (SOAPBindingFaultReferenceExtensions) bindFaultRef.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); SOAPModule[] actual = soapBindFaultRefExts.getSoapModules(); assertEquals("Unexpected number of SOAPModule objects.", 1, actual.length); } Modified: webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsTest.java URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsTest.java?rev=620053&r1=620052&r2=620053&view=diff ============================================================================== --- webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsTest.java (original) +++ webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingMessageReferenceExtensionsTest.java Fri Feb 8 16:57:46 2008 @@ -31,7 +31,6 @@ import org.apache.woden.wsdl20.BindingOperation; import org.apache.woden.wsdl20.Description; import org.apache.woden.wsdl20.enumeration.Direction; -import org.apache.woden.wsdl20.extensions.ComponentExtensions; import org.apache.woden.wsdl20.xml.BindingMessageReferenceElement; /** @@ -100,7 +99,7 @@ assertTrue("The BindingMessageReference does not represent an <input> element.", Direction.IN.equals(direction)); SOAPBindingMessageReferenceExtensions soapBindMsgRefExts = - (SOAPBindingMessageReferenceExtensions) bindMsgRef.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + (SOAPBindingMessageReferenceExtensions) bindMsgRef.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); SOAPModule[] actual = soapBindMsgRefExts.getSoapModules(); assertEquals("Unexpected number of SOAPModule objects.", 2, actual.length); } @@ -119,7 +118,7 @@ assertTrue("The BindingMessageReference does not represent an <output> element.", Direction.OUT.equals(direction)); SOAPBindingMessageReferenceExtensions soapBindMsgRefExts = - (SOAPBindingMessageReferenceExtensions) bindMsgRef.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + (SOAPBindingMessageReferenceExtensions) bindMsgRef.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); SOAPModule[] actual = soapBindMsgRefExts.getSoapModules(); assertEquals("Unexpected number of SOAPModule objects.", 1, actual.length); } @@ -134,7 +133,7 @@ assertNotNull("The BindingOperation does not contain a BindingMessageReference.", bindMsgRef); SOAPBindingMessageReferenceExtensions soapBindMsgRefExts = - (SOAPBindingMessageReferenceExtensions) bindMsgRef.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + (SOAPBindingMessageReferenceExtensions) bindMsgRef.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); SOAPHeaderBlock[] actual = soapBindMsgRefExts.getSoapHeaders(); assertEquals("Unexpected number of SOAPHeaderBlock objects.", 2, actual.length); } @@ -149,7 +148,7 @@ assertNotNull("The BindingOperation does not contain the expected BindingMessageReference.", bindMsgRef); SOAPBindingMessageReferenceExtensions soapBindMsgRefExts = - (SOAPBindingMessageReferenceExtensions) bindMsgRef.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + (SOAPBindingMessageReferenceExtensions) bindMsgRef.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); SOAPHeaderBlock[] actual = soapBindMsgRefExts.getSoapHeaders(); assertEquals("Unexpected number of SOAPHeaderBlock objects.", 1, actual.length); } Modified: webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java?rev=620053&r1=620052&r2=620053&view=diff ============================================================================== --- webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java (original) +++ webservices/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/soap/SOAPBindingOperationExtensionsTest.java Fri Feb 8 16:57:46 2008 @@ -30,7 +30,6 @@ import org.apache.woden.wsdl20.Binding; import org.apache.woden.wsdl20.BindingOperation; import org.apache.woden.wsdl20.Description; -import org.apache.woden.wsdl20.extensions.ComponentExtensions; /** * Functional verification test of SoapBindingOperationExtensions. @@ -97,7 +96,7 @@ public void testGetSoapMep() { SOAPBindingOperationExtensions soapBindOperExts = - (SOAPBindingOperationExtensions) fBindOper.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + (SOAPBindingOperationExtensions) fBindOper.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); URI soapMep = soapBindOperExts.getSoapMep(); assertNotNull("The SOAPBindingOperationExtensions did not return a value for {soap mep}.", soapMep); @@ -111,7 +110,7 @@ public void testGetSoapAction() { SOAPBindingOperationExtensions soapBindOperExts = - (SOAPBindingOperationExtensions) fBindOper.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + (SOAPBindingOperationExtensions) fBindOper.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); URI soapAction = soapBindOperExts.getSoapAction(); assertNotNull("The SOAPBindingOperationExtensions did not return a value for {soap action}.", soapAction); @@ -125,7 +124,7 @@ public void testGetSoapModules() { SOAPBindingOperationExtensions soapBindOperExts = - (SOAPBindingOperationExtensions) fBindOper.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + (SOAPBindingOperationExtensions) fBindOper.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); SOAPModule[] actual = soapBindOperExts.getSoapModules(); assertEquals("Unexpected number of SOAPModule objects.", 1, actual.length); } @@ -138,14 +137,14 @@ public void testGetHttpQueryParameterSeparator() { SOAPBindingOperationExtensions soapBindOperExts = - (SOAPBindingOperationExtensions) fBindOper.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + (SOAPBindingOperationExtensions) fBindOper.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); String actual = soapBindOperExts.getHttpQueryParameterSeparator(); assertNotNull("The SOAPBindingOperationExtensions did not return a value for {http query parameter separator}.", actual); assertEquals("Unexpected value for http query parameter separator.", "$", actual); SOAPBindingOperationExtensions soapBind2OperExts = - (SOAPBindingOperationExtensions) fBind2Oper.getComponentExtensionsForNamespace(ComponentExtensions.NS_URI_SOAP); + (SOAPBindingOperationExtensions) fBind2Oper.getComponentExtensionContext(SOAPConstants.NS_URI_SOAP); String actual2 = soapBind2OperExts.getHttpQueryParameterSeparator(); assertNull("Non-null value for http query parameter separator.", actual2); Modified: webservices/woden/trunk/java/test/testcase/extensions/foo/FooBindingExtensions.java URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/test/testcase/extensions/foo/FooBindingExtensions.java?rev=620053&r1=620052&r2=620053&view=diff ============================================================================== --- webservices/woden/trunk/java/test/testcase/extensions/foo/FooBindingExtensions.java (original) +++ webservices/woden/trunk/java/test/testcase/extensions/foo/FooBindingExtensions.java Fri Feb 8 16:57:46 2008 @@ -16,9 +16,9 @@ */ package testcase.extensions.foo; -import org.apache.woden.wsdl20.extensions.ComponentExtensions; +import org.apache.woden.wsdl20.extensions.ComponentExtensionContext; -public interface FooBindingExtensions extends ComponentExtensions { +public interface FooBindingExtensions extends ComponentExtensionContext { public Integer getFooBar(); Modified: webservices/woden/trunk/java/test/testcase/extensions/foo/FooBindingExtensionsImpl.java URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/test/testcase/extensions/foo/FooBindingExtensionsImpl.java?rev=620053&r1=620052&r2=620053&view=diff ============================================================================== --- webservices/woden/trunk/java/test/testcase/extensions/foo/FooBindingExtensionsImpl.java (original) +++ webservices/woden/trunk/java/test/testcase/extensions/foo/FooBindingExtensionsImpl.java Fri Feb 8 16:57:46 2008 @@ -16,20 +16,71 @@ */ package testcase.extensions.foo; -import org.apache.woden.internal.wsdl20.extensions.ComponentExtensionsImpl; +import java.net.URI; + +import org.apache.woden.ErrorReporter; +import org.apache.woden.wsdl20.WSDLComponent; +import org.apache.woden.wsdl20.extensions.BaseComponentExtensionContext; +import org.apache.woden.wsdl20.extensions.ExtensionProperty; import org.apache.woden.wsdl20.xml.WSDLElement; import org.apache.woden.xml.StringAttr; -public class FooBindingExtensionsImpl extends ComponentExtensionsImpl implements - FooBindingExtensions { +public class FooBindingExtensionsImpl extends BaseComponentExtensionContext + implements FooBindingExtensions { + + public FooBindingExtensionsImpl(WSDLComponent parent, + URI extNamespace, ErrorReporter errReporter) { + + super(parent, extNamespace, errReporter); + } + + /* ************************************************************ + * Methods declared by ComponentExtensionContext + * + * These are the abstract methods inherited from BaseComponentExtensionContext, + * to be implemented by this subclass. + * ************************************************************/ + + /* + * (non-Javadoc) + * @see org.apache.woden.wsdl20.extensions.ComponentExtensionContext#getProperties() + */ + public ExtensionProperty[] getProperties() { + + return new ExtensionProperty[] { + getProperty(FooConstants.PROP_FOO_BAR), + getProperty(FooConstants.PROP_FOO_BAZ)}; + } + /* + * (non-Javadoc) + * @see org.apache.woden.wsdl20.extensions.ComponentExtensionContext#getProperty(java.lang.String) + */ + public ExtensionProperty getProperty(String propertyName) { + + if(FooConstants.PROP_FOO_BAR.equals(propertyName)) { + return newExtensionProperty(FooConstants.PROP_FOO_BAR, getFooBar()); + + } else if(FooConstants.PROP_FOO_BAZ.equals(propertyName)) { + return newExtensionProperty(FooConstants.PROP_FOO_BAZ, getFooBaz()); + + } else { + return null; //the specified property name does not exist + } + + } + + /* ************************************************************ + * Additional methods declared by FooBindingExtensions + * ************************************************************/ + public Integer getFooBar() { - FooOddAttr def = (FooOddAttr) ((WSDLElement)fParent).getExtensionAttribute(FooConstants.Q_ATTR_BAR); + FooOddAttr def = (FooOddAttr) ((WSDLElement) getParent()).getExtensionAttribute(FooConstants.Q_ATTR_BAR); return def != null ? new Integer(def.getValue()) : null; } public String getFooBaz() { - StringAttr def = (StringAttr) ((WSDLElement)fParent).getExtensionAttribute(FooConstants.Q_ATTR_BAZ); + StringAttr def = (StringAttr) ((WSDLElement) getParent()).getExtensionAttribute(FooConstants.Q_ATTR_BAZ); return def != null ? def.getString() : null; } Modified: webservices/woden/trunk/java/test/testcase/extensions/foo/FooBindingExtensionsTest.java URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/test/testcase/extensions/foo/FooBindingExtensionsTest.java?rev=620053&r1=620052&r2=620053&view=diff ============================================================================== --- webservices/woden/trunk/java/test/testcase/extensions/foo/FooBindingExtensionsTest.java (original) +++ webservices/woden/trunk/java/test/testcase/extensions/foo/FooBindingExtensionsTest.java Fri Feb 8 16:57:46 2008 @@ -82,7 +82,7 @@ FooBindingExtensions exts = null; binding = fBindings[0]; exts = (FooBindingExtensions)binding - .getComponentExtensionsForNamespace(FooConstants.NS_URI_FOO); + .getComponentExtensionContext(FooConstants.NS_URI_FOO); assertNotNull("The Binding '" + binding.getName() + "' does not contain an FooBindingExtensions object.", exts); Integer actual = exts.getFooBar(); @@ -91,7 +91,7 @@ binding = fBindings[1]; exts = (FooBindingExtensions)binding - .getComponentExtensionsForNamespace(FooConstants.NS_URI_FOO); + .getComponentExtensionContext(FooConstants.NS_URI_FOO); assertNotNull("The Binding '" + binding.getName() + "' does not contain an FooBindingExtensions object.", exts); @@ -107,7 +107,7 @@ public void testGetFooBaz() { Binding binding1 = fBindings[1]; FooBindingExtensions exts = (FooBindingExtensions)binding1 - .getComponentExtensionsForNamespace(FooConstants.NS_URI_FOO); + .getComponentExtensionContext(FooConstants.NS_URI_FOO); assertNotNull("The Binding '" + binding1.getName() + "' does not contain an FooBindingExtensions object.", exts); Modified: webservices/woden/trunk/java/test/testcase/extensions/foo/FooConstants.java URL: http://svn.apache.org/viewvc/webservices/woden/trunk/java/test/testcase/extensions/foo/FooConstants.java?rev=620053&r1=620052&r2=620053&view=diff ============================================================================== --- webservices/woden/trunk/java/test/testcase/extensions/foo/FooConstants.java (original) +++ webservices/woden/trunk/java/test/testcase/extensions/foo/FooConstants.java Fri Feb 8 16:57:46 2008 @@ -41,5 +41,9 @@ public static final QName Q_ATTR_BAZ= new QName(NS_STRING_FOO, ATTR_BAZ, PFX_WFOO); + + // Property names + public static final String PROP_FOO_BAR = "foo bar"; + public static final String PROP_FOO_BAZ = "foo baz"; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
