You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2012/04/12 12:29:52 UTC
svn commit: r1325193 - in /cxf/branches/2.3.x-fixes: ./
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/
Author: sergeyb
Date: Thu Apr 12 10:29:52 2012
New Revision: 1325193
URL: http://svn.apache.org/viewvc?rev=1325193&view=rev
Log:
Merged revisions 1325190 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................
r1325190 | sergeyb | 2012-04-12 11:27:01 +0100 (Thu, 12 Apr 2012) | 16 lines
Merged revisions 1325185 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................
r1325185 | sergeyb | 2012-04-12 11:17:55 +0100 (Thu, 12 Apr 2012) | 9 lines
Merged revisions 1325180 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1325180 | sergeyb | 2012-04-12 11:04:04 +0100 (Thu, 12 Apr 2012) | 1 line
[CXF-4238] Updating the tests to use the specific service name and wildcards
........
................
................
Added:
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml
- copied unchanged from r1325190, cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/branches/2.5.x-fixes:r1325185
Merged /cxf/branches/2.4.x-fixes:r1325190
Merged /cxf/trunk:r1325180
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java?rev=1325193&r1=1325192&r2=1325193&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java (original)
+++ cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java Thu Apr 12 10:29:52 2012
@@ -43,7 +43,8 @@ public class JAXRSHttpsBookTest extends
"org/apache/cxf/systest/jaxrs/security/jaxrs-https-client2.xml";
private static final String CLIENT_CONFIG_FILE3 =
"org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml";
-
+ private static final String CLIENT_CONFIG_FILE4 =
+ "org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml";
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
@@ -78,9 +79,17 @@ public class JAXRSHttpsBookTest extends
@Test
public void testGetBook123ProxyFromSpring() throws Exception {
+ doTestGetBook123ProxyFromSpring(CLIENT_CONFIG_FILE3);
+ }
+ @Test
+ public void testGetBook123ProxyFromSpringWildcard() throws Exception {
+ doTestGetBook123ProxyFromSpring(CLIENT_CONFIG_FILE4);
+ }
+
+ private void doTestGetBook123ProxyFromSpring(String cfgFile) throws Exception {
ClassPathXmlApplicationContext ctx =
- new ClassPathXmlApplicationContext(new String[] {CLIENT_CONFIG_FILE3});
+ new ClassPathXmlApplicationContext(new String[] {cfgFile});
Object bean = ctx.getBean("bookService.proxyFactory");
assertNotNull(bean);
JAXRSClientFactoryBean cfb = (JAXRSClientFactoryBean) bean;
Modified: cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml?rev=1325193&r1=1325192&r2=1325193&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml (original)
+++ cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml Thu Apr 12 10:29:52 2012
@@ -35,7 +35,7 @@ under the License.
<!-- -->
<!-- HTTP/S configuration for proxy & web clients -->
<!-- -->
- <http:conduit id="httpConduit" name="{http://jaxrs.systest.cxf.apache.org/}BookStore.http-conduit">
+ <http:conduit id="httpConduit" name="{http://service.rs}BookService.http-conduit">
<http:client ConnectionTimeout="3000000" ReceiveTimeout="3000000"/>
<http:tlsClientParameters disableCNCheck="true">
<sec:keyManagers keyPassword="password">
@@ -51,6 +51,7 @@ under the License.
<jaxrs:client id="bookService"
+ xmlns:s="http://service.rs" serviceName="s:BookService"
address="https://localhost:${testutil.ports.jaxrs-https}"
serviceClass="org.apache.cxf.systest.jaxrs.BookStore"/>