JBossWS SVN: r15840 - in stack/native/trunk/modules/testsuite/src/test/resources: jboss711 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-05 03:45:38 -0500 (Mon, 05 Mar 2012)
New Revision: 15840
Removed:
stack/native/trunk/modules/testsuite/src/test/resources/jboss710/
Modified:
stack/native/trunk/modules/testsuite/src/test/resources/jboss711/appclient.xml
Log:
sync. appclient config with AS7 upstream + remove support for AS 710 Final
Modified: stack/native/trunk/modules/testsuite/src/test/resources/jboss711/appclient.xml
===================================================================
--- stack/native/trunk/modules/testsuite/src/test/resources/jboss711/appclient.xml 2012-03-05 08:41:43 UTC (rev 15839)
+++ stack/native/trunk/modules/testsuite/src/test/resources/jboss711/appclient.xml 2012-03-05 08:45:38 UTC (rev 15840)
@@ -20,7 +20,7 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<server xmlns="urn:jboss:domain:1.1">
+<server xmlns="urn:jboss:domain:1.2">
<extensions>
<extension module="org.jboss.as.connector"/>
13 years, 6 months
JBossWS SVN: r15839 - spi/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-05 03:41:43 -0500 (Mon, 05 Mar 2012)
New Revision: 15839
Added:
spi/tags/jbossws-spi-2.0.3.GA/
Log:
Tagging jbossws-spi-2.0.3.GA
13 years, 6 months
JBossWS SVN: r15838 - stack/cxf/branches/jbossws-cxf-4.0.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-05 03:25:42 -0500 (Mon, 05 Mar 2012)
New Revision: 15838
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
Log:
Merged revisions 15835 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r15835 | alessio.soldano(a)jboss.com | 2012-03-05 09:19:18 +0100 (Mon, 05 Mar 2012) | 2 lines
[JBWS-3439] Moving to Apache WSS4J 1.6.5
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1...
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-03-05 08:20:51 UTC (rev 15837)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-03-05 08:25:42 UTC (rev 15838)
@@ -104,7 +104,7 @@
<velocity.version>1.6.3</velocity.version>
<xerces.version>2.9.1</xerces.version>
<xmlsec.version>1.5.1</xmlsec.version>
- <wss4j.version>1.6.5-SNAPSHOT</wss4j.version>
+ <wss4j.version>1.6.5</wss4j.version>
<wstx.version>3.2.9</wstx.version>
<spring.version>3.0.6.RELEASE</spring.version>
</properties>
13 years, 6 months
JBossWS SVN: r15837 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-05 03:20:51 -0500 (Mon, 05 Mar 2012)
New Revision: 15837
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
sync. with AS7 upstream
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2012-03-05 08:19:33 UTC (rev 15836)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-03-05 08:20:51 UTC (rev 15837)
@@ -1150,7 +1150,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-ejb-client</artifactId>
- <version>1.0.3.Final</version>
+ <version>1.0.4.Final</version>
<exclusions>
<exclusion>
<groupId>org.jboss.remoting3</groupId>
13 years, 6 months
JBossWS SVN: r15836 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-05 03:19:33 -0500 (Mon, 05 Mar 2012)
New Revision: 15836
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
sync. with AS7 upstream
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2012-03-05 08:19:18 UTC (rev 15835)
+++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-05 08:19:33 UTC (rev 15836)
@@ -1065,7 +1065,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-ejb-client</artifactId>
- <version>1.0.3.Final</version>
+ <version>1.0.4.Final</version>
<exclusions>
<exclusion>
<groupId>org.jboss.remoting3</groupId>
13 years, 6 months
JBossWS SVN: r15835 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-05 03:19:18 -0500 (Mon, 05 Mar 2012)
New Revision: 15835
Modified:
stack/cxf/trunk/pom.xml
Log:
[JBWS-3439] Moving to Apache WSS4J 1.6.5
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2012-03-03 10:24:14 UTC (rev 15834)
+++ stack/cxf/trunk/pom.xml 2012-03-05 08:19:18 UTC (rev 15835)
@@ -105,7 +105,7 @@
<velocity.version>1.6.3</velocity.version>
<xerces.version>2.9.1</xerces.version>
<xmlsec.version>1.5.1</xmlsec.version>
- <wss4j.version>1.6.5-SNAPSHOT</wss4j.version>
+ <wss4j.version>1.6.5</wss4j.version>
<wstx.version>3.2.9</wstx.version>
<spring.version>3.0.6.RELEASE</spring.version>
</properties>
13 years, 6 months
JBossWS SVN: r15834 - in shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws: jbws2937 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-03 05:24:14 -0500 (Sat, 03 Mar 2012)
New Revision: 15834
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/JBWS3293DispatchTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/SOAPHandler.java
Log:
Some System.out cleanup
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.java 2012-03-03 10:06:54 UTC (rev 15833)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.java 2012-03-03 10:24:14 UTC (rev 15834)
@@ -26,6 +26,7 @@
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
+import org.jboss.logging.Logger;
import org.jboss.ws.common.DOMUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.w3c.dom.Element;
@@ -77,7 +78,7 @@
DOMResult dr = new DOMResult();
epr.writeTo(dr);
Node endpointReferenceElement = dr.getNode();
- System.out.println(DOMUtils.node2String(endpointReferenceElement));
+ Logger.getLogger(this.getClass()).info(DOMUtils.node2String(endpointReferenceElement));
assertMetaData(endpointReferenceElement);
assertRefParam(endpointReferenceElement, PARAM1_QNAME, "Hello");
assertRefParam(endpointReferenceElement, PARAM2_QNAME, "World");
@@ -99,7 +100,7 @@
DOMResult dr = new DOMResult();
epr.writeTo(dr);
Node endpointReferenceElement = dr.getNode();
- System.out.println(DOMUtils.node2String(endpointReferenceElement));
+ Logger.getLogger(this.getClass()).info(DOMUtils.node2String(endpointReferenceElement));
assertMetaData(endpointReferenceElement);
assertRefParam(endpointReferenceElement, PARAM1_QNAME, "Hello");
assertRefParam(endpointReferenceElement, PARAM2_QNAME, "World");
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java 2012-03-03 10:06:54 UTC (rev 15833)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java 2012-03-03 10:24:14 UTC (rev 15834)
@@ -191,7 +191,7 @@
DOMResult dr = new DOMResult();
epr.writeTo(dr);
Node endpointReferenceElement = dr.getNode();
- System.out.println(DOMUtils.node2String(endpointReferenceElement));
+ Logger.getLogger(this.getClass()).info(DOMUtils.node2String(endpointReferenceElement));
}
private void assertEquals(final UserType user1, final UserType user2)
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/JBWS3293DispatchTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/JBWS3293DispatchTestCase.java 2012-03-03 10:06:54 UTC (rev 15833)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/JBWS3293DispatchTestCase.java 2012-03-03 10:24:14 UTC (rev 15834)
@@ -24,7 +24,6 @@
import java.io.IOException;
import java.io.StringReader;
import java.net.MalformedURLException;
-import java.net.URL;
import java.util.List;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
@@ -34,7 +33,6 @@
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.BindingProvider;
import javax.xml.ws.Dispatch;
import javax.xml.ws.Response;
import javax.xml.ws.Service;
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/SOAPHandler.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/SOAPHandler.java 2012-03-03 10:06:54 UTC (rev 15833)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3293/SOAPHandler.java 2012-03-03 10:24:14 UTC (rev 15834)
@@ -55,7 +55,7 @@
Document document = body.extractContentAsDocument();
Node node = document;
- System.out.println(DOMWriter.printNode(node, true));
+ log.info(DOMWriter.printNode(node, true));
NodeList nodes = node.getChildNodes();
for (int i = 0; i < nodes.getLength(); i++)
@@ -73,7 +73,7 @@
}
}
- System.out.println(DOMWriter.printNode(node, true));
+ log.info(DOMWriter.printNode(node, true));
// Add document back as removed by call to 'extractContentAsDocument()'
body.addDocument(document);
13 years, 7 months
JBossWS SVN: r15833 - stack/native/branches/jbossws-native-4.0.x/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-03 05:06:54 -0500 (Sat, 03 Mar 2012)
New Revision: 15833
Modified:
stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml
Log:
[JBWS-3435] excluding some jaxrpc appclient tests on 4.0.x branch only to try stabilizing testsuite runs
Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-03 09:18:55 UTC (rev 15832)
+++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-03 10:06:54 UTC (rev 15833)
@@ -1178,6 +1178,73 @@
<exclude>org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude>
+
+
+ <!-- # [JBWS-3435] Actually passing tests excluded due to testsuite issues with appclients -->
+ <exclude>org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1010/JBWS1010TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1107/JBWS1107TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1125/JBWS1125TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1316/JBWS1316CallTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws163/JBWS163TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws168/JBWS168TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws1792/JBWS1792TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws217/JBWS217TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws2234/JBWS2234TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws231/JBWS231TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws251/JBWS251TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws316/JBWS316TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws377/JBWS377TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws381/JBWS381TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws413/JBWS413TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws414/JBWS414TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws423/JBWS423TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws424/JBWS424TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws425/JBWS425TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws456/JBWS456TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws463/JBWS463TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws464/JBWS464TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws484/JBWS484TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws632/JBWS632TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws637/JBWS637TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws643/JBWS643TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareBoundTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663BareUnboundTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedBoundTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws663/JBWS663WrappedUnboundTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws68/JBWS68TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws70/JBWS70TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws706/JBWS706TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws707/JBWS707TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws71/JBWS71TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws710/JBWS710TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws720/JBWS720TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws732/JBWS732TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws79/JBWS79TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws807/JBWS807TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws812/JBWS812TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws82/JBWS82TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws83/JBWS83TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/jbws84/JBWS84TestCase*</exclude>
+
</excludes>
</configuration>
</plugin>
13 years, 7 months
JBossWS SVN: r15832 - in stack/native/branches/jbossws-native-4.0.x: modules/resources/src/main/resources/modules/jboss700/org/apache and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-03 04:18:55 -0500 (Sat, 03 Mar 2012)
New Revision: 15832
Added:
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml
Removed:
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/xmlsec/
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/xmlsec/
Modified:
stack/native/branches/jbossws-native-4.0.x/
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
Merged revisions 15831 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/native/trunk
.......
r15831 | alessio.soldano(a)jboss.com | 2012-03-03 10:05:48 +0100 (Sat, 03 Mar 2012) | 2 lines
[JBWS-3439] Moving org.apache.xmlsec module to org.apache.santuario.xmlsec to synch with AS7 and CXF stack now that both use Santuario 1.5.x
.......
Property changes on: stack/native/branches/jbossws-native-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567...
+ https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567...
Modified: svn:mergeinfo
- /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829
+ /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml 2012-03-03 09:05:48 UTC (rev 15831)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml 2012-03-03 09:18:55 UTC (rev 15832)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2012, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-
-<module xmlns="urn:jboss:module:1.0" name="org.apache.santuario.xmlsec">
- <resources>
- <!-- Insert resources here -->
- </resources>
-
- <dependencies>
- <module name="javax.api" />
- <module name="org.apache.commons.logging" />
- <module name="org.apache.xalan" />
- </dependencies>
-</module>
Copied: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml (from rev 15831, stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml)
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml (rev 0)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml 2012-03-03 09:18:55 UTC (rev 15832)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2012, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="org.apache.santuario.xmlsec">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.api" />
+ <module name="org.apache.commons.logging" />
+ <module name="org.apache.xalan" />
+ </dependencies>
+</module>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-03 09:05:48 UTC (rev 15831)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-03 09:18:55 UTC (rev 15832)
@@ -43,7 +43,7 @@
<module name="javax.xml.ws.api" />
<module name="org.picketbox"/>
<module name="org.apache.xerces" services="import"/>
- <module name="org.apache.xmlsec" optional="true"/>
+ <module name="org.apache.santuario.xmlsec" />
<module name="org.apache.ws.commons.policy" optional="true"/>
<module name="org.javassist" />
<module name="org.codehaus.jettison" optional="true"/>
Deleted: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml 2012-03-03 09:05:48 UTC (rev 15831)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml 2012-03-03 09:18:55 UTC (rev 15832)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2012, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-
-<module xmlns="urn:jboss:module:1.1" name="org.apache.santuario.xmlsec">
- <properties>
- <property name="jboss.api" value="private"/>
- </properties>
-
- <resources>
- <!-- Insert resources here -->
- </resources>
-
- <dependencies>
- <module name="javax.api" />
- <module name="org.apache.commons.logging" />
- <module name="org.apache.xalan" />
- </dependencies>
-</module>
Copied: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml (from rev 15831, stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml)
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml (rev 0)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml 2012-03-03 09:18:55 UTC (rev 15832)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2012, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.1" name="org.apache.santuario.xmlsec">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.api" />
+ <module name="org.apache.commons.logging" />
+ <module name="org.apache.xalan" />
+ </dependencies>
+</module>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-03 09:05:48 UTC (rev 15831)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-03 09:18:55 UTC (rev 15832)
@@ -43,7 +43,7 @@
<module name="javax.xml.ws.api" />
<module name="org.picketbox"/>
<module name="org.apache.xerces" services="import"/>
- <module name="org.apache.xmlsec" optional="true"/>
+ <module name="org.apache.santuario.xmlsec" />
<module name="org.apache.ws.commons.policy" optional="true"/>
<module name="org.javassist" />
<module name="org.codehaus.jettison" optional="true"/>
Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-03 09:05:48 UTC (rev 15831)
+++ stack/native/branches/jbossws-native-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-03 09:18:55 UTC (rev 15832)
@@ -93,7 +93,7 @@
<include name="**/wscommons-policy.jar"/>
</fileset>
</copy>
- <copy todir="@{targetdir}/org/apache/xmlsec/main" flatten="false" overwrite="true">
+ <copy todir="@{targetdir}/org/apache/santuario/xmlsec/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/xmlsec.jar"/>
</fileset>
13 years, 7 months
JBossWS SVN: r15831 - in stack/native/trunk/modules/resources/src/main/resources: modules/jboss700/org/apache/santuario and 9 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-03 04:05:48 -0500 (Sat, 03 Mar 2012)
New Revision: 15831
Added:
stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/
stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/
stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/
stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/
stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/
stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/
stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml
Removed:
stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/xmlsec/
stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/xmlsec/
Modified:
stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-3439] Moving org.apache.xmlsec module to org.apache.santuario.xmlsec to synch with AS7 and CXF stack now that both use Santuario 1.5.x
Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml (rev 0)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/apache/santuario/xmlsec/main/module.xml 2012-03-03 09:05:48 UTC (rev 15831)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2012, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.0" name="org.apache.santuario.xmlsec">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.api" />
+ <module name="org.apache.commons.logging" />
+ <module name="org.apache.xalan" />
+ </dependencies>
+</module>
Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-02 16:34:12 UTC (rev 15830)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss700/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-03 09:05:48 UTC (rev 15831)
@@ -43,7 +43,7 @@
<module name="javax.xml.ws.api" />
<module name="org.picketbox"/>
<module name="org.apache.xerces" services="import"/>
- <module name="org.apache.xmlsec" optional="true"/>
+ <module name="org.apache.santuario.xmlsec" />
<module name="org.apache.ws.commons.policy" optional="true"/>
<module name="org.javassist" />
<module name="org.codehaus.jettison" optional="true"/>
Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml (rev 0)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/santuario/xmlsec/main/module.xml 2012-03-03 09:05:48 UTC (rev 15831)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2012, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.1" name="org.apache.santuario.xmlsec">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="javax.api" />
+ <module name="org.apache.commons.logging" />
+ <module name="org.apache.xalan" />
+ </dependencies>
+</module>
Modified: stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-02 16:34:12 UTC (rev 15830)
+++ stack/native/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/native/jbossws-native-core/main/module.xml 2012-03-03 09:05:48 UTC (rev 15831)
@@ -43,7 +43,7 @@
<module name="javax.xml.ws.api" />
<module name="org.picketbox"/>
<module name="org.apache.xerces" services="import"/>
- <module name="org.apache.xmlsec" optional="true"/>
+ <module name="org.apache.santuario.xmlsec" />
<module name="org.apache.ws.commons.policy" optional="true"/>
<module name="org.javassist" />
<module name="org.codehaus.jettison" optional="true"/>
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-02 16:34:12 UTC (rev 15830)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-03-03 09:05:48 UTC (rev 15831)
@@ -93,7 +93,7 @@
<include name="**/wscommons-policy.jar"/>
</fileset>
</copy>
- <copy todir="@{targetdir}/org/apache/xmlsec/main" flatten="false" overwrite="true">
+ <copy todir="@{targetdir}/org/apache/santuario/xmlsec/main" flatten="false" overwrite="true">
<fileset dir="@{thirdpartydir}/lib">
<include name="**/xmlsec.jar"/>
</fileset>
13 years, 7 months