[jbossws-commits] JBossWS SVN: r15758 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/dist/src/main/scripts and 2 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Feb 27 09:02:24 EST 2012
Author: ropalka
Date: 2012-02-27 09:02:23 -0500 (Mon, 27 Feb 2012)
New Revision: 15758
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml
Log:
Merged revisions 15750,15754,15757 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r15750 | ropalka | 2012-02-27 10:37:06 +0100 (Mon, 27 Feb 2012) | 1 line
sync. with AS7 upstream
.......
r15754 | ropalka | 2012-02-27 13:39:55 +0100 (Mon, 27 Feb 2012) | 1 line
[JBWS-3444] properly teardown initial context to cleanup caches
.......
r15757 | ropalka | 2012-02-27 14:56:16 +0100 (Mon, 27 Feb 2012) | 1 line
[JBWS-3435] fix appclient tests in bin distro too
.......
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,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748-15749,15751
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748-15757
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,15751
+ /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
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-02-27 13:56:16 UTC (rev 15757)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-02-27 14:02:23 UTC (rev 15758)
@@ -120,6 +120,7 @@
<include>java/org/jboss/test/ws/jaxrpc/samples/**</include>
<include>java/org/jboss/test/ws/jaxws/samples/**</include>
<include>java/org/jboss/test/ws/jaxws/smoke/**</include>
+ <include>java/org/jboss/test/ws/appclient/**</include>
<include>java/org/jboss/test/ws/management/**</include>
<include>java/org/jboss/test/ws/projectGenerator/**</include>
<include>java/org/jboss/test/ws/saaj/**</include>
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2012-02-27 13:56:16 UTC (rev 15757)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2012-02-27 14:02:23 UTC (rev 15758)
@@ -45,10 +45,11 @@
public void testSingleDeploy() throws Exception
{
deploy("jaxws-cxf-bus-ejb3-client.jar");
+ InitialContext iniCtx = null;
try
{
String host = getServerHost();
- InitialContext iniCtx = getInitialContext();
+ iniCtx = getServerInitialContext();
Object obj = iniCtx.lookup("ejb:/jaxws-cxf-bus-ejb3-client//EJB3Client!" + EJB3ClientRemoteInterface.class.getName());
EJB3ClientRemoteInterface ejb3Remote = (EJB3ClientRemoteInterface)obj;
ejb3Remote.testBusCreation();
@@ -60,6 +61,10 @@
}
finally
{
+ if (iniCtx != null)
+ {
+ iniCtx.close();
+ }
undeploy("jaxws-cxf-bus-ejb3-client.jar");
}
}
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-27 13:56:16 UTC (rev 15757)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-27 14:02:23 UTC (rev 15758)
@@ -1165,7 +1165,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-ejb-client</artifactId>
- <version>1.0.2.Final</version>
+ <version>1.0.3.Final</version>
<exclusions>
<exclusion>
<groupId>org.jboss.remoting3</groupId>
@@ -1251,13 +1251,13 @@
<dependency>
<groupId>org.jboss.remoting3</groupId>
<artifactId>remoting-jmx</artifactId>
- <version>1.0.0.Final</version>
+ <version>1.0.1.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.remoting3</groupId>
<artifactId>jboss-remoting</artifactId>
- <version>3.2.1.GA</version>
+ <version>3.2.2.GA</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -1328,9 +1328,6 @@
<!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude>
- <!-- # [JBWS-3444] WebServiceRefClientTestCase causes Hudson job to hang -->
- <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude>
-
<!-- # TODO: JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
</excludes>
More information about the jbossws-commits
mailing list