Author: ryman
Date: Fri Nov 17 08:51:50 2006
New Revision: 476210
URL: http://svn.apache.org/viewvc?view=rev&rev=476210
Log:
[WODEN-92] Fixed in r476114
Modified:
incubator/woden/trunk/java/ant-test/validation-results-without-ids.xml
incubator/woden/trunk/java/ant-test/validation-results.xml
incubator/woden/trunk/java/src/org/apache/woden/ant/CmHttpWriter.java
incubator/woden/trunk/java/src/org/apache/woden/ant/CmSoapWriter.java
incubator/woden/trunk/java/src/org/apache/woden/ant/CmWriter.java
Modified: incubator/woden/trunk/java/ant-test/validation-results-without-ids.xml
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/ant-test/validation-results-without-ids.xml?view=diff&rev=476210&r1=476209&r2=476210
==============================================================================
--- incubator/woden/trunk/java/ant-test/validation-results-without-ids.xml
(original)
+++ incubator/woden/trunk/java/ant-test/validation-results-without-ids.xml Fri
Nov 17 08:51:50 2006
@@ -1256,7 +1256,7 @@
<columnNumber>0</columnNumber>
</errorLocator>
<key>Endpoint-0066</key>
- <message>The binding '[EMAIL PROTECTED]' specified for this
endpoint specifies the interface '[EMAIL PROTECTED]' and not the
interface '[EMAIL PROTECTED]' specified by the service. The binding
specified for this endpoint must either not specify an interface or specify the
same interface as the service.</message>
+ <message>The binding '[EMAIL PROTECTED]' specified for this
endpoint specifies the interface '[EMAIL PROTECTED]' and not the
interface '[EMAIL PROTECTED]' specified by the service. The binding
specified for this endpoint must either not specify an interface or specify the
same interface as the service.</message>
</error>
</wsdl>
<wsdl>
@@ -1379,7 +1379,7 @@
<columnNumber>0</columnNumber>
</errorLocator>
<key>Endpoint-0066</key>
- <message>The binding '[EMAIL PROTECTED]' specified for this
endpoint specifies the interface '[EMAIL PROTECTED]' and not the
interface '[EMAIL PROTECTED]' specified by the service. The binding
specified for this endpoint must either not specify an interface or specify the
same interface as the service.</message>
+ <message>The binding '[EMAIL PROTECTED]' specified for this
endpoint specifies the interface '[EMAIL PROTECTED]' and not the
interface '[EMAIL PROTECTED]' specified by the service. The binding
specified for this endpoint must either not specify an interface or specify the
same interface as the service.</message>
</error>
</wsdl>
<wsdl>
@@ -1679,6 +1679,18 @@
<wsdl>
<uri>file:/D:/workspaces/WSD2/woden/downloads/w3c/documents/good/UnknownExtension-2G/Interface.wsdl</uri>
<success>true</success>
+ </wsdl>
+ <wsdl>
+
<uri>file:/D:/workspaces/WSD2/woden/downloads/w3c/documents/good/WSAddressing-1G/wsaTestService2.wsdl</uri>
+ <success>false</success>
+ <error>
+ <errorLocator>
+ <lineNumber>0</lineNumber>
+ <columnNumber>0</columnNumber>
+ </errorLocator>
+ <key>Endpoint-0066</key>
+ <message>The binding '[EMAIL PROTECTED]' specified for this
endpoint specifies the interface '[EMAIL PROTECTED]' and not the
interface '[EMAIL PROTECTED]' specified by the service. The binding
specified for this endpoint must either not specify an interface or specify the
same interface as the service.</message>
+ </error>
</wsdl>
<wsdl>
<uri>file:/D:/workspaces/WSD2/woden/downloads/w3c/documents/good/WeathSvc-1G/WeathSvc.wsdl</uri>
Modified: incubator/woden/trunk/java/ant-test/validation-results.xml
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/ant-test/validation-results.xml?view=diff&rev=476210&r1=476209&r2=476210
==============================================================================
--- incubator/woden/trunk/java/ant-test/validation-results.xml (original)
+++ incubator/woden/trunk/java/ant-test/validation-results.xml Fri Nov 17
08:51:50 2006
@@ -1382,7 +1382,7 @@
<columnNumber>0</columnNumber>
</errorLocator>
<key>Endpoint-0066</key>
- <message>The binding '[EMAIL PROTECTED]' specified for this endpoint
specifies the interface '[EMAIL PROTECTED]' and not the interface '[EMAIL
PROTECTED]' specified by the service. The binding specified for this endpoint
must either not specify an interface or specify the same interface as the
service.</message>
+ <message>The binding '[EMAIL PROTECTED]' specified for this endpoint
specifies the interface '[EMAIL PROTECTED]' and not the interface '[EMAIL
PROTECTED]' specified by the service. The binding specified for this endpoint
must either not specify an interface or specify the same interface as the
service.</message>
</error>
</wsdl>
<wsdl>
@@ -1526,7 +1526,7 @@
<columnNumber>0</columnNumber>
</errorLocator>
<key>Endpoint-0066</key>
- <message>The binding '[EMAIL PROTECTED]' specified for this endpoint
specifies the interface '[EMAIL PROTECTED]' and not the interface '[EMAIL
PROTECTED]' specified by the service. The binding specified for this endpoint
must either not specify an interface or specify the same interface as the
service.</message>
+ <message>The binding '[EMAIL PROTECTED]' specified for this endpoint
specifies the interface '[EMAIL PROTECTED]' and not the interface '[EMAIL
PROTECTED]' specified by the service. The binding specified for this endpoint
must either not specify an interface or specify the same interface as the
service.</message>
</error>
</wsdl>
<wsdl>
@@ -1867,6 +1867,19 @@
<identifier>http://dev.w3.org/cvsweb/2002/ws/desc/test-suite/documents/good/UnknownExtension-2G</identifier>
<uri>file:/D:/workspaces/WSD2/woden/downloads/w3c/documents/good/UnknownExtension-2G/Interface.wsdl</uri>
<success>true</success>
+ </wsdl>
+ <wsdl>
+<identifier>http://dev.w3.org/cvsweb/2002/ws/desc/test-suite/documents/good/WSAddressing-1G</identifier>
+
<uri>file:/D:/workspaces/WSD2/woden/downloads/w3c/documents/good/WSAddressing-1G/wsaTestService2.wsdl</uri>
+ <success>false</success>
+ <error>
+ <errorLocator>
+ <lineNumber>0</lineNumber>
+ <columnNumber>0</columnNumber>
+ </errorLocator>
+ <key>Endpoint-0066</key>
+ <message>The binding '[EMAIL PROTECTED]' specified for this endpoint
specifies the interface '[EMAIL PROTECTED]' and not the interface '[EMAIL
PROTECTED]' specified by the service. The binding specified for this endpoint
must either not specify an interface or specify the same interface as the
service.</message>
+ </error>
</wsdl>
<wsdl>
<identifier>http://dev.w3.org/cvsweb/2002/ws/desc/test-suite/documents/good/WeathSvc-1G</identifier>
Modified: incubator/woden/trunk/java/src/org/apache/woden/ant/CmHttpWriter.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/ant/CmHttpWriter.java?view=diff&rev=476210&r1=476209&r2=476210
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/ant/CmHttpWriter.java
(original)
+++ incubator/woden/trunk/java/src/org/apache/woden/ant/CmHttpWriter.java Fri
Nov 17 08:51:50 2006
@@ -170,7 +170,7 @@
out.beginElement(tag);
for (int i = 0; i < components.length; i++)
- write(PREFIX + ":HttpHeaderComponent", components[i]);
+ write(PREFIX + ":httpHeaderComponent", components[i]);
out.endElement();
}
Modified: incubator/woden/trunk/java/src/org/apache/woden/ant/CmSoapWriter.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/ant/CmSoapWriter.java?view=diff&rev=476210&r1=476209&r2=476210
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/ant/CmSoapWriter.java
(original)
+++ incubator/woden/trunk/java/src/org/apache/woden/ant/CmSoapWriter.java Fri
Nov 17 08:51:50 2006
@@ -143,7 +143,7 @@
if (soap == null)
return;
- out.beginElement(PREFIX + ":soapBindingFaultReferenceExtension");
+ out.beginElement(PREFIX + ":soapEndpointExtension");
out.write(CmHttpWriter.PREFIX + ":httpAuthenticationRealm",
soap.getHttpAuthenticationRealm());
cmhttp.write(CmHttpWriter.PREFIX + ":httpAuthenticationScheme",
soap.getHttpAuthenicationScheme());
Modified: incubator/woden/trunk/java/src/org/apache/woden/ant/CmWriter.java
URL:
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/ant/CmWriter.java?view=diff&rev=476210&r1=476209&r2=476210
==============================================================================
--- incubator/woden/trunk/java/src/org/apache/woden/ant/CmWriter.java (original)
+++ incubator/woden/trunk/java/src/org/apache/woden/ant/CmWriter.java Fri Nov
17 08:51:50 2006
@@ -51,6 +51,7 @@
import
org.apache.woden.wsdl20.extensions.soap.SOAPBindingFaultReferenceExtensions;
import
org.apache.woden.wsdl20.extensions.soap.SOAPBindingMessageReferenceExtensions;
import org.apache.woden.wsdl20.extensions.soap.SOAPBindingOperationExtensions;
+import org.apache.woden.wsdl20.extensions.soap.SOAPEndpointExtensions;
/**
* @author Arthur Ryman ([EMAIL PROTECTED], [EMAIL PROTECTED])
@@ -680,6 +681,10 @@
HTTPEndpointExtensions http = (HTTPEndpointExtensions) component
.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_HTTP);
cmhttp.httpEndpointExtension(http);
+
+ SOAPEndpointExtensions soap = (SOAPEndpointExtensions) component
+
.getComponentExtensionsForNamespace(ComponentExtensions.URI_NS_SOAP);
+ cmsoap.soapEndpointExtension(soap);
out.endElement();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
