JBossWS SVN: r13935 - stack/native/tags.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-03-25 00:49:52 -0400 (Fri, 25 Mar 2011)
New Revision: 13935
Added:
stack/native/tags/jbossws-native-3.4.0.SP1/
Log:
Tag 3.4.0.SP1
13 years, 9 months
JBossWS SVN: r13934 - stack/native/tags.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-03-25 00:48:17 -0400 (Fri, 25 Mar 2011)
New Revision: 13934
Removed:
stack/native/tags/jbossws-native-3.4.0.SP1/
Log:
Remove and tag it again later
13 years, 9 months
JBossWS SVN: r13933 - stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/soap.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-03-25 00:46:30 -0400 (Fri, 25 Mar 2011)
New Revision: 13933
Modified:
stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
Log:
[JBWS-3251]:change all addChild to use element's owner document
Modified: stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2011-03-24 20:53:16 UTC (rev 13932)
+++ stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2011-03-25 04:46:30 UTC (rev 13933)
@@ -187,9 +187,8 @@
*/
public SOAPElement addChildElement(String name) throws SOAPException
{
- SOAPElement soapElement = new SOAPElementImpl(name);
- soapElement = addChildElement(soapElement);
- return soapElement;
+ Name nameImp = new NameImpl(name);
+ return addChildElement(nameImp);
}
/**
@@ -206,9 +205,8 @@
if (nsURI == null)
throw new IllegalArgumentException("Cannot obtain namespace URI for prefix: " + prefix);
- SOAPElement soapElement = new SOAPElementImpl(localName, prefix, nsURI);
- soapElement = addChildElement(soapElement);
- return soapElement;
+ Name nameImp = new NameImpl(localName, prefix, nsURI);
+ return addChildElement(nameImp);
}
/**
@@ -222,9 +220,8 @@
*/
public SOAPElement addChildElement(String localName, String prefix, String uri) throws SOAPException
{
- SOAPElement soapElement = new SOAPElementImpl(localName, prefix, uri);
- soapElement = addChildElement(soapElement);
- return soapElement;
+ Name nameImpl = new NameImpl(localName, prefix, uri);
+ return addChildElement(nameImpl);
}
/**
13 years, 9 months
JBossWS SVN: r13932 - in stack/native/branches/jbossws-native-3.1.2: modules/core/src/main/java/org/jboss/ws/extensions/security/auth/callback and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: bmaxwell
Date: 2011-03-24 16:53:16 -0400 (Thu, 24 Mar 2011)
New Revision: 13932
Modified:
stack/native/branches/jbossws-native-3.1.2/
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/DigestTestCase.java
Log:
[JBPAPP-6186] decode base64 nonce before sha hashing
Property changes on: stack/native/branches/jbossws-native-3.1.2
___________________________________________________________________
Added: svn:mergeinfo
+ /stack/native/trunk:12502
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java 2011-03-24 16:34:13 UTC (rev 13931)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java 2011-03-24 20:53:16 UTC (rev 13932)
@@ -32,6 +32,7 @@
import org.jboss.crypto.digest.DigestCallback;
import org.jboss.security.Base64Encoder;
import org.jboss.security.auth.callback.MapCallback;
+import org.jboss.util.Base64;
import org.jboss.ws.WSException;
/**
@@ -64,7 +65,10 @@
{
String nonce = (String)info.getInfo(NONCE);
if (nonce != null)
- digest.update(nonce.getBytes("UTF-8"));
+ {
+ byte[] rawNonce = Base64.decode(nonce);
+ digest.update(rawNonce);
+ }
String created = (String)info.getInfo(CREATED);
if (created != null)
digest.update(created.getBytes("UTF-8"));
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/DigestTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/DigestTestCase.java 2011-03-24 16:34:13 UTC (rev 13931)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/DigestTestCase.java 2011-03-24 20:53:16 UTC (rev 13932)
@@ -37,14 +37,14 @@
String password = "taadtaadpstcsm";
String nonce = "d36e316282959a9ed4c89851497a717f";
String created = "2003-12-15T14:43:07Z";
- String expectedDigest = "quR/EWLAV4xLf9Zqyw4pDmfV9OY=";
+ String expectedDigest = "0WSAldY9ogqqVyQo7ubbZxxFU/s=";
String digest = SendUsernameOperation.createPasswordDigest(nonce, created, password);
assertEquals(expectedDigest, digest);
password = "therealfrog";
nonce = "gHGIdDEWjX1Ay/LiVd3qJ1ua8VbjXis8CJwNDQh1ySA=";
created = "2008-03-12T17:12:31.310Z";
- expectedDigest = "IEeuDaP/NTozwiyJHzTgBoCCDjg=";
+ expectedDigest = "gx8TcJ9VG2hOFC6ZFmNi/JI2rh4=";
digest = SendUsernameOperation.createPasswordDigest(nonce, created, password);
assertEquals(expectedDigest, digest);
}
@@ -53,7 +53,7 @@
{
String password = "therealfrog";
String nonce = "gHGIdDEWjX1Ay/LiVd3qJ1ua8VbjXis8CJwNDQh1ySA=";
- String expectedDigest = "sdA2umjMZQEY2ejbt5L6WbJOrB0=";
+ String expectedDigest = "MBqDfskkdh3eEtRlLdkWa79+w58=";
String digest = SendUsernameOperation.createPasswordDigest(nonce, null, password);
assertEquals(expectedDigest, digest);
}
13 years, 9 months
JBossWS SVN: r13931 - in stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163: modules/core/src/main/java/org/jboss/ws/extensions/security/auth/callback and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: bmaxwell
Date: 2011-03-24 12:34:13 -0400 (Thu, 24 Mar 2011)
New Revision: 13931
Modified:
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/core/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java
Log:
[JBPAPP-6163] one off for JBWS-2640 JBWS-3014
Property changes on: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163
___________________________________________________________________
Added: svn:mergeinfo
+ /stack/native/branches/jbossws-native-3.1.2:13621
Modified: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/core/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/core/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java 2011-03-24 16:13:58 UTC (rev 13930)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/core/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java 2011-03-24 16:34:13 UTC (rev 13931)
@@ -32,6 +32,7 @@
import org.jboss.crypto.digest.DigestCallback;
import org.jboss.security.Base64Encoder;
import org.jboss.security.auth.callback.MapCallback;
+import org.jboss.util.Base64;
import org.jboss.ws.WSException;
/**
@@ -64,7 +65,10 @@
{
String nonce = (String)info.getInfo(NONCE);
if (nonce != null)
- digest.update(nonce.getBytes("UTF-8"));
+ {
+ byte[] rawNonce = Base64.decode(nonce);
+ digest.update(rawNonce);
+ }
String created = (String)info.getInfo(CREATED);
if (created != null)
digest.update(created.getBytes("UTF-8"));
Property changes on: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/core/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java
___________________________________________________________________
Added: svn:mergeinfo
+ /stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java:13621
/stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/auth/callback/UsernameTokenCallback.java:12502
Modified: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java 2011-03-24 16:13:58 UTC (rev 13930)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java 2011-03-24 16:34:13 UTC (rev 13931)
@@ -96,7 +96,7 @@
this.nonce = XMLUtils.getFullTextChildrenFromElement(elem);
}
- Iterator<Element> itCreated = DOMUtils.getChildElements(element, new QName(Constants.WSSE_NS, "Created"));
+ Iterator<Element> itCreated = DOMUtils.getChildElements(element, new QName(Constants.WSU_NS, "Created"));
if (itCreated != null && itCreated.hasNext())
{
this.created = XMLUtils.getFullTextChildrenFromElement(itCreated.next());
@@ -163,7 +163,7 @@
}
if (created != null)
{
- child = doc.createElementNS(Constants.WSSE_NS, Constants.WSSE_PREFIX + ":" + "Created");
+ child = doc.createElementNS(Constants.WSU_NS, Constants.WSU_PREFIX + ":" + "Created");
child.appendChild(doc.createTextNode(created));
element.appendChild(child);
}
Modified: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java 2011-03-24 16:13:58 UTC (rev 13930)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6163/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java 2011-03-24 16:34:13 UTC (rev 13931)
@@ -112,7 +112,7 @@
"<wsse:Username>kermit</wsse:Username>" +
"<wsse:Password Type='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-pr...'>IEeuDaP/NTozwiyJHzTgBoCCDjg=</wsse:Password>" +
"<wsse:Nonce EncodingType='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-secu...'>gHGIdDEWjX1Ay/LiVd3qJ1ua8VbjXis8CJwNDQh1ySA=</wsse:Nonce>" +
- "<wsse:Created>CREATED</wsse:Created>" +
+ "<wsu:Created>CREATED</wsu:Created>" +
"</wsse:UsernameToken>" +
"</wsse:Security>" +
"</env:Header>" +
@@ -148,7 +148,7 @@
"<wsse:Username>kermit</wsse:Username>" +
"<wsse:Password Type='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-pr...'>IEeuDaP/NTozwiyJHzTgBoCCDjg=</wsse:Password>" +
"<wsse:Nonce>gHGIdDEWjX1Ay/LiVd3qJ1ua8VbjXis8CJwNDQh1ySA=</wsse:Nonce>" +
- "<wsse:Created>CREATED</wsse:Created>" +
+ "<wsu:Created>CREATED</wsu:Created>" +
"</wsse:UsernameToken>" +
"</wsse:Security>" +
"</env:Header>" +
@@ -196,7 +196,7 @@
assertNotNull(nonceEl);
assertNotNull(DOMUtils.getTextContent(nonceEl));
assertEquals(nonceEl.getAttribute("EncodingType"), Constants.WSS_SOAP_NS+"#Base64Binary");
- Element createdEl = (Element)DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSSE_NS, "Created")).next();
+ Element createdEl = (Element)DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSU_NS, "Created")).next();
assertNotNull(createdEl);
assertNotNull(DOMUtils.getTextContent(createdEl));
}
@@ -218,7 +218,7 @@
assertNotNull(nonceEl);
assertNotNull(DOMUtils.getTextContent(nonceEl));
assertEquals(nonceEl.getAttribute("EncodingType"), Constants.WSS_SOAP_NS+"#Base64Binary");
- assertFalse(DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSSE_NS, "Created")).hasNext());
+ assertFalse(DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSU_NS, "Created")).hasNext());
}
public void testEncodeMessageWithCreated() throws Exception
@@ -235,7 +235,7 @@
Element usernameTokenEl = (Element)DOMUtils.getChildElements(securityEl, new QName(Constants.WSSE_NS, "UsernameToken")).next();
assertPassword(usernameTokenEl);
assertFalse(DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSSE_NS, "Nonce")).hasNext());
- Element createdEl = (Element)DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSSE_NS, "Created")).next();
+ Element createdEl = (Element)DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSU_NS, "Created")).next();
assertNotNull(createdEl);
assertNotNull(DOMUtils.getTextContent(createdEl));
}
13 years, 9 months
JBossWS SVN: r13930 - stack/native/tags.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-03-24 12:13:58 -0400 (Thu, 24 Mar 2011)
New Revision: 13930
Added:
stack/native/tags/jbossws-native-3.4.0.SP1/
Log:
Tag 3.4.0.SP1
13 years, 9 months
JBossWS SVN: r13929 - in stack/native/branches/jbossws-native-3.4.0.SP1: modules/client and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-03-24 12:08:31 -0400 (Thu, 24 Mar 2011)
New Revision: 13929
Modified:
stack/native/branches/jbossws-native-3.4.0.SP1/modules/client/pom.xml
stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/pom.xml
stack/native/branches/jbossws-native-3.4.0.SP1/modules/endorsed/pom.xml
stack/native/branches/jbossws-native-3.4.0.SP1/modules/management/pom.xml
stack/native/branches/jbossws-native-3.4.0.SP1/modules/resources/pom.xml
stack/native/branches/jbossws-native-3.4.0.SP1/modules/services/pom.xml
stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/framework-tests/pom.xml
stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests/pom.xml
stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/pom.xml
stack/native/branches/jbossws-native-3.4.0.SP1/pom.xml
Log:
Update version in pom.xml
Modified: stack/native/branches/jbossws-native-3.4.0.SP1/modules/client/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.0.SP1/modules/client/pom.xml 2011-03-24 16:05:57 UTC (rev 13928)
+++ stack/native/branches/jbossws-native-3.4.0.SP1/modules/client/pom.xml 2011-03-24 16:08:31 UTC (rev 13929)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.0.GA</version>
+ <version>3.4.0.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/pom.xml 2011-03-24 16:05:57 UTC (rev 13928)
+++ stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/pom.xml 2011-03-24 16:08:31 UTC (rev 13929)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.0.GA</version>
+ <version>3.4.0.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.4.0.SP1/modules/endorsed/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.0.SP1/modules/endorsed/pom.xml 2011-03-24 16:05:57 UTC (rev 13928)
+++ stack/native/branches/jbossws-native-3.4.0.SP1/modules/endorsed/pom.xml 2011-03-24 16:08:31 UTC (rev 13929)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.0.GA</version>
+ <version>3.4.0.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.4.0.SP1/modules/management/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.0.SP1/modules/management/pom.xml 2011-03-24 16:05:57 UTC (rev 13928)
+++ stack/native/branches/jbossws-native-3.4.0.SP1/modules/management/pom.xml 2011-03-24 16:08:31 UTC (rev 13929)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.0.GA</version>
+ <version>3.4.0.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.4.0.SP1/modules/resources/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.0.SP1/modules/resources/pom.xml 2011-03-24 16:05:57 UTC (rev 13928)
+++ stack/native/branches/jbossws-native-3.4.0.SP1/modules/resources/pom.xml 2011-03-24 16:08:31 UTC (rev 13929)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.0.GA</version>
+ <version>3.4.0.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.4.0.SP1/modules/services/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.0.SP1/modules/services/pom.xml 2011-03-24 16:05:57 UTC (rev 13928)
+++ stack/native/branches/jbossws-native-3.4.0.SP1/modules/services/pom.xml 2011-03-24 16:08:31 UTC (rev 13929)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.0.GA</version>
+ <version>3.4.0.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/framework-tests/pom.xml 2011-03-24 16:05:57 UTC (rev 13928)
+++ stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/framework-tests/pom.xml 2011-03-24 16:08:31 UTC (rev 13929)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.4.0.GA</version>
+ <version>3.4.0.SP1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests/pom.xml 2011-03-24 16:05:57 UTC (rev 13928)
+++ stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests/pom.xml 2011-03-24 16:08:31 UTC (rev 13929)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.4.0.GA</version>
+ <version>3.4.0.SP1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/pom.xml 2011-03-24 16:05:57 UTC (rev 13928)
+++ stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/pom.xml 2011-03-24 16:08:31 UTC (rev 13929)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.4.0.GA</version>
+ <version>3.4.0.SP1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.4.0.SP1/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.4.0.SP1/pom.xml 2011-03-24 16:05:57 UTC (rev 13928)
+++ stack/native/branches/jbossws-native-3.4.0.SP1/pom.xml 2011-03-24 16:08:31 UTC (rev 13929)
@@ -18,7 +18,7 @@
<packaging>pom</packaging>
<description>JBossWS Native stack</description>
- <version>3.4.0.GA</version>
+ <version>3.4.0.SP1</version>
<!-- Parent -->
<parent>
@@ -29,9 +29,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url>
</scm>
<!-- Modules -->
13 years, 9 months
JBossWS SVN: r13928 - stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/soap.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-03-24 12:05:57 -0400 (Thu, 24 Mar 2011)
New Revision: 13928
Modified:
stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
Log:
[JBWS-3251]:Use element's OwnerDocument to create Child
Modified: stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2011-03-24 16:04:18 UTC (rev 13927)
+++ stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2011-03-24 16:05:57 UTC (rev 13928)
@@ -75,7 +75,7 @@
public SOAPElementImpl(String localPart, String prefix, String nsURI)
{
super(DOMUtils.createElement(localPart, prefix, nsURI));
- this.element = (Element)domNode;
+ this.element = (Element)domNode;
}
/** Called by SOAPFactory */
@@ -83,6 +83,13 @@
{
this(name.getLocalName(), name.getPrefix(), name.getURI());
}
+
+ /** Called by addChild */
+ private SOAPElementImpl(Element element)
+ {
+ super(element);
+ this.element = element;
+ }
/** Called by SOAPFactory */
public SOAPElementImpl(QName qname)
@@ -228,10 +235,19 @@
* @throws javax.xml.soap.SOAPException if there is an error in creating the SOAPElement object
*/
public SOAPElement addChildElement(Name name) throws SOAPException
- {
- SOAPElement soapElement = new SOAPElementImpl(name);
- soapElement = addChildElement(soapElement);
- return soapElement;
+ {
+ Document doc = this.element.getOwnerDocument();
+ Element childEle = null;
+ if (name.getPrefix() == null || name.getPrefix().length() == 0)
+ {
+ childEle = doc.createElementNS(name.getURI(), name.getLocalName());
+ } else
+ {
+ childEle = doc.createElementNS(name.getURI(), name.getPrefix() + ":" + name.getLocalName());
+ }
+
+ SOAPElement child = new SOAPElementImpl(childEle);
+ return addChildElement(child);
}
public SOAPElement addChildElement(QName qname) throws SOAPException
13 years, 9 months
JBossWS SVN: r13927 - stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-03-24 12:04:18 -0400 (Thu, 24 Mar 2011)
New Revision: 13927
Modified:
stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
Log:
[JBWS-3198] merging fix in 3.4.0.SP1
Modified: stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2011-03-24 07:15:05 UTC (rev 13926)
+++ stack/native/branches/jbossws-native-3.4.0.SP1/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2011-03-24 16:04:18 UTC (rev 13927)
@@ -482,6 +482,12 @@
NativeEndpointReference nepr = EndpointReferenceUtil.transform(NativeEndpointReference.class, epr);
portName = nepr.getEndpointName();
+ // From the JAXWS dispacth api, EPR's address MUST be used for invocations on the endpoint
+ if (getEndpointMetaData(portName) != null && nepr.getAddress() != null && nepr.getAddress().length() > 0)
+ {
+ getEndpointMetaData(portName).setEndpointAddress(nepr.getAddress());
+ }
+
Dispatch<T> dispatch = createDispatch(portName, type, mode);
initAddressingProperties(dispatch, epr);
initWebserviceFeatures(dispatch, this.features);
13 years, 9 months
JBossWS SVN: r13926 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-03-24 03:15:05 -0400 (Thu, 24 Mar 2011)
New Revision: 13926
Removed:
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/
Log:
Remove obsolete native maven3 branch
13 years, 9 months