Author: sergeyb
Date: Thu Apr 12 10:04:04 2012
New Revision: 1325180
URL: http://svn.apache.org/viewvc?rev=1325180&view=rev
Log:
[CXF-4238] Updating the tests to use the specific service name and wildcards
Added:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml
(with props)
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java?rev=1325180&r1=1325179&r2=1325180&view=diff
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java
(original)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java
Thu Apr 12 10:04:04 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",
@@ -73,9 +74,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/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml?rev=1325180&r1=1325179&r2=1325180&view=diff
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml
(original)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml
Thu Apr 12 10:04:04 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"/>
Added:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml?rev=1325180&view=auto
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml
(added)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml
Thu Apr 12 10:04:04 2012
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:http="http://cxf.apache.org/transports/http/configuration";
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs";
+ xmlns:cxf="http://cxf.apache.org/core";
+ xmlns:sec="http://cxf.apache.org/configuration/security";
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/transports/http/configuration
http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
+ http://cxf.apache.org/configuration/security
http://cxf.apache.org/schemas/configuration/security.xsd
+ ">
+ <bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+ <!-- -->
+ <!-- HTTP/S configuration for proxy & web clients -->
+ <!-- -->
+ <http:conduit name="*.http-conduit">
+ <http:client ConnectionTimeout="3000000" ReceiveTimeout="3000000"/>
+ <http:tlsClientParameters disableCNCheck="true">
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="JKS" password="password"
+
file="src/test/java/org/apache/cxf/systest/http/resources/Morpit.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="JKS" password="password"
+
file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
+ </sec:trustManagers>
+ </http:tlsClientParameters>
+ </http:conduit>
+
+
+ <jaxrs:client id="bookService"
+ address="https://localhost:${testutil.ports.jaxrs-https}";
+serviceClass="org.apache.cxf.systest.jaxrs.BookStore"/>
+
+</beans>
Propchange:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
