Author: jkaputin
Date: Fri Nov 17 16:12:08 2006
New Revision: 476385
URL: http://svn.apache.org/viewvc?view=rev&rev=476385
Log:
[WODEN-94] HTTP extension attribute authenticationType
changed to authenticationScheme, as per WSDL2 CR060.
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPConstants.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPEndpointExtensionsImpl.java
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPEndpointExtensionsImpl.java
incubator/woden/trunk/java/src/org/apache/woden/internal/xml/HTTPAuthenticationSchemeAttrImpl.java
incubator/woden/trunk/java/src/org/apache/woden/xml/HTTPAuthenticationSchemeAttr.java
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/wsdl20-http.xsd
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPEndpointExtensions.wsdl
incubator/woden/trunk/java/test/org/apache/woden/xml/TokenAttrTest.java
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java?view=diff&rev=476385&r1=476384&r2=476385
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/PopulatedExtensionRegistry.java
Fri Nov 17 16:12:08 2006
@@ -263,7 +263,7 @@
HTTPConstants.Q_ATTR_TRANSFER_CODING,
StringAttrImpl.class);
registerExtAttributeType(EndpointElement.class,
- HTTPConstants.Q_ATTR_AUTHENTICATION_TYPE,
+ HTTPConstants.Q_ATTR_AUTHENTICATION_SCHEME,
HTTPAuthenticationSchemeAttrImpl.class);
registerExtAttributeType(EndpointElement.class,
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPConstants.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPConstants.java?view=diff&rev=476385&r1=476384&r2=476385
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPConstants.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPConstants.java
Fri Nov 17 16:12:08 2006
@@ -35,7 +35,7 @@
// Attribute names.
public static final String ATTR_AUTHENTICATION_REALM =
"authenticationRealm";
- public static final String ATTR_AUTHENTICATION_TYPE = "authenticationType";
+ public static final String ATTR_AUTHENTICATION_SCHEME =
"authenticationScheme";
public static final String ATTR_CODE = "code";
public static final String ATTR_COOKIES = "cookies";
public static final String ATTR_FAULT_SERIALIZATION = "faultSerialization";
@@ -63,8 +63,8 @@
public static final QName Q_ATTR_AUTHENTICATION_REALM =
new QName(NS_STRING_HTTP, ATTR_AUTHENTICATION_REALM, PFX_WHTTP);
- public static final QName Q_ATTR_AUTHENTICATION_TYPE =
- new QName(NS_STRING_HTTP, ATTR_AUTHENTICATION_TYPE, PFX_WHTTP);
+ public static final QName Q_ATTR_AUTHENTICATION_SCHEME =
+ new QName(NS_STRING_HTTP, ATTR_AUTHENTICATION_SCHEME, PFX_WHTTP);
public static final QName Q_ATTR_CODE =
new QName(NS_STRING_HTTP, ATTR_CODE, PFX_WHTTP);
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPEndpointExtensionsImpl.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPEndpointExtensionsImpl.java?view=diff&rev=476385&r1=476384&r2=476385
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPEndpointExtensionsImpl.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/http/HTTPEndpointExtensionsImpl.java
Fri Nov 17 16:12:08 2006
@@ -41,7 +41,7 @@
public HTTPAuthenticationScheme getHttpAuthenticationScheme() {
HTTPAuthenticationSchemeAttr scheme =
(HTTPAuthenticationSchemeAttr) ((WSDLElement) fParent)
-
.getExtensionAttribute(HTTPConstants.Q_ATTR_AUTHENTICATION_TYPE);
+
.getExtensionAttribute(HTTPConstants.Q_ATTR_AUTHENTICATION_SCHEME);
return scheme != null ? scheme.getScheme() : null;
}
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPEndpointExtensionsImpl.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPEndpointExtensionsImpl.java?view=diff&rev=476385&r1=476384&r2=476385
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPEndpointExtensionsImpl.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/extensions/soap/SOAPEndpointExtensionsImpl.java
Fri Nov 17 16:12:08 2006
@@ -66,7 +66,7 @@
("1.1".equals(version) &&
protocol.toString().equals(SOAPConstants.URI_SOAP11_HTTP)) )
{
HTTPAuthenticationSchemeAttr scheme =
(HTTPAuthenticationSchemeAttr) ((WSDLElement) fParent)
-
.getExtensionAttribute(HTTPConstants.Q_ATTR_AUTHENTICATION_TYPE);
+
.getExtensionAttribute(HTTPConstants.Q_ATTR_AUTHENTICATION_SCHEME);
return scheme != null ? scheme.getScheme() : null;
}
else
Modified:
incubator/woden/trunk/java/src/org/apache/woden/internal/xml/HTTPAuthenticationSchemeAttrImpl.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/xml/HTTPAuthenticationSchemeAttrImpl.java?view=diff&rev=476385&r1=476384&r2=476385
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/internal/xml/HTTPAuthenticationSchemeAttrImpl.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/internal/xml/HTTPAuthenticationSchemeAttrImpl.java
Fri Nov 17 16:12:08 2006
@@ -23,7 +23,7 @@
import org.apache.woden.xml.HTTPAuthenticationSchemeAttr;
/**
- * This class implements the whttp:authenticationType attribute.
+ * This class implements the whttp:authenticationScheme attribute.
*
* @author Arthur Ryman ([EMAIL PROTECTED], [EMAIL PROTECTED])
*
Modified:
incubator/woden/trunk/java/src/org/apache/woden/xml/HTTPAuthenticationSchemeAttr.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/xml/HTTPAuthenticationSchemeAttr.java?view=diff&rev=476385&r1=476384&r2=476385
==============================================================================
---
incubator/woden/trunk/java/src/org/apache/woden/xml/HTTPAuthenticationSchemeAttr.java
(original)
+++
incubator/woden/trunk/java/src/org/apache/woden/xml/HTTPAuthenticationSchemeAttr.java
Fri Nov 17 16:12:08 2006
@@ -18,7 +18,7 @@
import org.apache.woden.wsdl20.extensions.http.HTTPAuthenticationScheme;
/**
- * This interface represents the value of the whttp:authenticationType
+ * This interface represents the value of the whttp:authenticationScheme
* attribute.
*
* @author Arthur Ryman ([EMAIL PROTECTED], [EMAIL PROTECTED])
Modified:
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/wsdl20-http.xsd
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/wsdl20-http.xsd?view=diff&rev=476385&r1=476384&r2=476385
==============================================================================
---
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/wsdl20-http.xsd
(original)
+++
incubator/woden/trunk/java/test/org/apache/woden/resolver/resources/wsdl20-http.xsd
Fri Nov 17 16:12:08 2006
@@ -50,7 +50,7 @@
<xs:attribute name="cookies" type="xs:boolean"/>
- <xs:attribute name="authenticationType">
+ <xs:attribute name="authenticationScheme">
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="basic"/>
Modified:
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java?view=diff&rev=476385&r1=476384&r2=476385
==============================================================================
---
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java
(original)
+++
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/HTTPEndpointExtensionsTest.java
Fri Nov 17 16:12:08 2006
@@ -79,10 +79,10 @@
* Testcases for the {http authentication scheme} property returned by the
* <code>getHttpAuthenticationScheme</code> method.
* <p>
- * Test that the method returns "basic" if the whttp:authenticationType
+ * Test that the method returns "basic" if the whttp:authenticationScheme
* attribute parsed from the WSDL contains "basic".
* <p>
- * Test that the method returns "digest" if the whttp:authenticationType
+ * Test that the method returns "digest" if the whttp:authenticationScheme
* attribute parsed from the WSDL contains "digest".
* <p>
* Test that it returns null by default when the attribute is omitted
Modified:
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPEndpointExtensions.wsdl
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPEndpointExtensions.wsdl?view=diff&rev=476385&r1=476384&r2=476385
==============================================================================
---
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPEndpointExtensions.wsdl
(original)
+++
incubator/woden/trunk/java/test/org/apache/woden/wsdl20/extensions/http/resources/HTTPEndpointExtensions.wsdl
Fri Nov 17 16:12:08 2006
@@ -44,13 +44,13 @@
<endpoint name="endpoint1"
binding="tns:binding1"
address="http://ws.apache.woden/endpoint1";
- whttp:authenticationType="basic"
+ whttp:authenticationScheme="basic"
whttp:authenticationRealm="abc">
</endpoint>
<endpoint name="endpoint2"
binding="tns:binding1"
address="http://ws.apache.woden/endpoint2";
- whttp:authenticationType="digest"
+ whttp:authenticationScheme="digest"
whttp:authenticationRealm="abc">
</endpoint>
<endpoint name="endpoint3"
Modified:
incubator/woden/trunk/java/test/org/apache/woden/xml/TokenAttrTest.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/test/org/apache/woden/xml/TokenAttrTest.java?view=diff&rev=476385&r1=476384&r2=476385
==============================================================================
--- incubator/woden/trunk/java/test/org/apache/woden/xml/TokenAttrTest.java
(original)
+++ incubator/woden/trunk/java/test/org/apache/woden/xml/TokenAttrTest.java Fri
Nov 17 16:12:08 2006
@@ -39,7 +39,7 @@
private ErrorReporter reporter;
private TestErrorHandler handler;
private XMLElement el = null; //Element arg not used to initialize this
attr
- private QName qn = new
QName("http://wsdl/http","authenticationType","whttp";);
+ private QName qn = new
QName("http://wsdl/http","authenticationScheme","whttp";);
private TokenAttr attr = null;
public static Test suite()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
