cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r726753 [1/3] - in /cxf/branches/2.1.x-fixes: ./ common/common/src/test/java/org/apache/cxf/helpers/ distribution/src/main/release/samples/configuration_interceptor/ distribution/src/main/release/samples/configuration_interceptor/src/demo/s...
Date Mon, 15 Dec 2008 18:14:50 GMT
Author: dkulp
Date: Mon Dec 15 10:14:38 2008
New Revision: 726753

URL: http://svn.apache.org/viewvc?rev=726753&view=rev
Log:
Merged revisions 726634 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r726634 | dkulp | 2008-12-15 02:40:33 -0500 (Mon, 15 Dec 2008) | 2 lines
  
  Set some eol-style/mime-type attributes
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/common/common/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/client.xml   (contents, props changed)
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/server.xml   (contents, props changed)
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/client/AntClient.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/add_customer.xml   (props changed)
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/update_customer.xml   (props changed)
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/CherryServer.xml   (contents, props changed)
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml   (contents, props changed)
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/src/demo/jaxrs/client/add_customer.xml   (props changed)
    cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/src/demo/jaxrs/client/update_customer.xml   (props changed)
    cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/GreeterMineImpl.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/XmlBeansTest.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf.xml   (contents, props changed)
    cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf2.xml   (contents, props changed)
    cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/xmlbeanstest.wsdl   (contents, props changed)
    cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/rt/javascript/src/test/resources/attributeTestBeans.xml   (props changed)
    cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfigFeature.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/AbstractSpringSecurityTest.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringClass.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringInterface.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringNoAnnotations.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityClassTest.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityInterfaceTest.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityNoAnnotationsTest.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookInterface.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStore.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoAnnotations.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecureBookStoreNoInterface.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxrs/security/SecurityExceptionMapper.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security/WEB-INF/beans.xml   (contents, props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security/WEB-INF/web.xml   (contents, props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/beans.xml   (contents, props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_cglib/WEB-INF/web.xml   (contents, props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/beans.xml   (contents, props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/resources/jaxrs_security_no_annotations/WEB-INF/web.xml   (contents, props changed)
    cxf/branches/2.1.x-fixes/systests/src/test/resources/log4j.properties   (contents, props changed)
    cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/xmlbeans/XmlbeansBindingTest.java   (contents, props changed)
    cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1048/test.wsdl   (contents, props changed)
    cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/child.wsdl   (contents, props changed)
    cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/child2.wsdl   (contents, props changed)
    cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/test.wsdl   (contents, props changed)
    cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1662/test2.wsdl   (contents, props changed)
    cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/child.wsdl   (contents, props changed)
    cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1694/test.wsdl   (contents, props changed)
    cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/xmlbeanstest.wsdl   (contents, props changed)

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 15 10:14:38 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/common/common/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java (original)
+++ cxf/branches/2.1.x-fixes/common/common/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java Mon Dec 15 10:14:38 2008
@@ -1,41 +1,41 @@
-/**
- * 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.
- */
-package org.apache.cxf.helpers;
-
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class FileUtilsTest extends Assert {
-    
-    
-    @Test
-    public void testTempIODirExists() throws Exception {
-        
-        String originaltmpdir = System.getProperty("java.io.tmpdir");
-        try {
-            System.setProperty("java.io.tmpdir", "dummy");
-            FileUtils.createTempFile("foo", "bar");
-        } catch (RuntimeException e) {
-            assertTrue(e.toString().contains("please set java.io.tempdir to an existing directory"));
-        } finally {
-            System.setProperty("java.io.tmpdir", originaltmpdir);
-        }
-    }
-}
+/**
+ * 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.
+ */
+package org.apache.cxf.helpers;
+
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class FileUtilsTest extends Assert {
+    
+    
+    @Test
+    public void testTempIODirExists() throws Exception {
+        
+        String originaltmpdir = System.getProperty("java.io.tmpdir");
+        try {
+            System.setProperty("java.io.tmpdir", "dummy");
+            FileUtils.createTempFile("foo", "bar");
+        } catch (RuntimeException e) {
+            assertTrue(e.toString().contains("please set java.io.tempdir to an existing directory"));
+        } finally {
+            System.setProperty("java.io.tmpdir", originaltmpdir);
+        }
+    }
+}

Propchange: cxf/branches/2.1.x-fixes/common/common/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/client.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/client.xml?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/client.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/client.xml Mon Dec 15 10:14:38 2008
@@ -1,53 +1,53 @@
-<?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:cxf="http://cxf.apache.org/core"
-       xmlns:http="http://cxf.apache.org/transports/http/configuration"
-       xsi:schemaLocation="
-       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://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-  
-    <http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort9001.http-conduit">
-      <http:client DecoupledEndpoint="http://localhost:9990/decoupled_endpoint"/>
-    </http:conduit>
-    
-    <bean id="GZIPStream" class="demo.stream.interceptor.StreamInterceptor"/>
-
-    <!-- We are adding the interceptors to the bus as we will have only one endpoint/service/bus. -->
-
-    <cxf:bus>
-        <cxf:inInterceptors>
-            <ref bean="GZIPStream"/>
-        </cxf:inInterceptors>
-        <cxf:inFaultInterceptors>
-            <ref bean="GZIPStream"/>            
-        </cxf:inFaultInterceptors>
-        <!--cxf:outInterceptors>            
-            <ref bean="GZIPStream"/>        
-        </cxf:outInterceptors>
-        <cxf:outFaultInterceptors>           
-             <ref bean="GZIPStream"/>
-        </cxf:outFaultInterceptors-->
-    </cxf:bus>
-
-</beans>
+<?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:cxf="http://cxf.apache.org/core"
+       xmlns:http="http://cxf.apache.org/transports/http/configuration"
+       xsi:schemaLocation="
+       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://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+  
+    <http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort9001.http-conduit">
+      <http:client DecoupledEndpoint="http://localhost:9990/decoupled_endpoint"/>
+    </http:conduit>
+    
+    <bean id="GZIPStream" class="demo.stream.interceptor.StreamInterceptor"/>
+
+    <!-- We are adding the interceptors to the bus as we will have only one endpoint/service/bus. -->
+
+    <cxf:bus>
+        <cxf:inInterceptors>
+            <ref bean="GZIPStream"/>
+        </cxf:inInterceptors>
+        <cxf:inFaultInterceptors>
+            <ref bean="GZIPStream"/>            
+        </cxf:inFaultInterceptors>
+        <!--cxf:outInterceptors>            
+            <ref bean="GZIPStream"/>        
+        </cxf:outInterceptors>
+        <cxf:outFaultInterceptors>           
+             <ref bean="GZIPStream"/>
+        </cxf:outFaultInterceptors-->
+    </cxf:bus>
+
+</beans>

Propchange: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/client.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/client.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/server.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/server.xml?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/server.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/server.xml Mon Dec 15 10:14:38 2008
@@ -1,61 +1,61 @@
-<?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:cxf="http://cxf.apache.org/core"
-       xsi:schemaLocation="
-http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-  
-    <bean id="GZIPStream" class="demo.stream.interceptor.StreamInterceptor"/>
-
-    <!-- We are adding the interceptors to the bus as we will have only one endpoint/service/bus. -->
-
-    <cxf:bus>
-        <!--cxf:inInterceptors>
-            <ref bean="GZIPStream"/>
-        </cxf:inInterceptors>
-        <cxf:inFaultInterceptors>
-            <ref bean="GZIPStream"/>            
-        </cxf:inFaultInterceptors-->
-        <cxf:outInterceptors>            
-            <ref bean="GZIPStream"/>        
-        </cxf:outInterceptors>
-        <!--cxf:outFaultInterceptors>           
-             <ref bean="GZIPStream"/>
-        </cxf:outFaultInterceptors-->
-    </cxf:bus>
-
-    <bean id="org.apache.cxf.management.InstrumentationManager"
-          class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
-      <property name="bus" ref="cxf" />
-      <property name="enabled" value="true"/>
-      <property name="threaded" value="false"/>
-      <property name="daemon" value="false"/>
-      <property name="JMXServiceURL"
-                value="service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi" />
-    </bean>
-
-    <bean id="org.apache.cxf.management.counters.CounterRepository"
-          class="org.apache.cxf.management.counters.CounterRepository">
-      <property name="bus" ref="cxf" />
-    </bean>
-
-</beans>
+<?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:cxf="http://cxf.apache.org/core"
+       xsi:schemaLocation="
+http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+  
+    <bean id="GZIPStream" class="demo.stream.interceptor.StreamInterceptor"/>
+
+    <!-- We are adding the interceptors to the bus as we will have only one endpoint/service/bus. -->
+
+    <cxf:bus>
+        <!--cxf:inInterceptors>
+            <ref bean="GZIPStream"/>
+        </cxf:inInterceptors>
+        <cxf:inFaultInterceptors>
+            <ref bean="GZIPStream"/>            
+        </cxf:inFaultInterceptors-->
+        <cxf:outInterceptors>            
+            <ref bean="GZIPStream"/>        
+        </cxf:outInterceptors>
+        <!--cxf:outFaultInterceptors>           
+             <ref bean="GZIPStream"/>
+        </cxf:outFaultInterceptors-->
+    </cxf:bus>
+
+    <bean id="org.apache.cxf.management.InstrumentationManager"
+          class="org.apache.cxf.management.jmx.InstrumentationManagerImpl">
+      <property name="bus" ref="cxf" />
+      <property name="enabled" value="true"/>
+      <property name="threaded" value="false"/>
+      <property name="daemon" value="false"/>
+      <property name="JMXServiceURL"
+                value="service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi" />
+    </bean>
+
+    <bean id="org.apache.cxf.management.counters.CounterRepository"
+          class="org.apache.cxf.management.counters.CounterRepository">
+      <property name="bus" ref="cxf" />
+    </bean>
+
+</beans>

Propchange: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/server.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/server.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/client/AntClient.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/client/AntClient.java?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/client/AntClient.java (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/client/AntClient.java Mon Dec 15 10:14:38 2008
@@ -1,70 +1,70 @@
-/**
- * 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.
- */
-
-package demo.stream.client;
-
-import java.io.File;
-import java.net.URL;
-import javax.xml.namespace.QName;
-//import javax.xml.ws.ProtocolException;
-import org.apache.hello_world_soap_http.Greeter;
-//import org.apache.hello_world_soap_http.PingMeFault;
-import org.apache.hello_world_soap_http.SOAPService;
-//import org.apache.hello_world_soap_http.types.FaultDetail;
-
-public final class AntClient {
-
-    private static final QName SERVICE_NAME 
-        = new QName("http://apache.org/hello_world_soap_http", "SOAPService");
-
-
-    private AntClient() {
-    } 
-
-    public static void main(String args[]) throws Exception {
-  
-        if (args.length == 0) { 
-            System.out.println("please specify wsdl");
-            System.exit(1); 
-        }
-        
-        URL wsdlURL;
-        
-        File wsdlFile = new File(args[0]);
-        if (wsdlFile.exists()) {
-            wsdlURL = wsdlFile.toURL();
-        } else {
-            wsdlURL = new URL(args[0]);
-        }
-
-        
-        System.out.println(wsdlURL);
-        SOAPService ss = new SOAPService(wsdlURL, SERVICE_NAME);
-        Greeter port = ss.getSoapPort();
-        String resp; 
-
-        System.out.println("Invoking sayHi...");
-        resp = port.sayHi();
-        System.out.println("Server responded with: " + resp);
-        System.out.println();
-      
-        System.exit(0); 
-    }
-
-}
+/**
+ * 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.
+ */
+
+package demo.stream.client;
+
+import java.io.File;
+import java.net.URL;
+import javax.xml.namespace.QName;
+//import javax.xml.ws.ProtocolException;
+import org.apache.hello_world_soap_http.Greeter;
+//import org.apache.hello_world_soap_http.PingMeFault;
+import org.apache.hello_world_soap_http.SOAPService;
+//import org.apache.hello_world_soap_http.types.FaultDetail;
+
+public final class AntClient {
+
+    private static final QName SERVICE_NAME 
+        = new QName("http://apache.org/hello_world_soap_http", "SOAPService");
+
+
+    private AntClient() {
+    } 
+
+    public static void main(String args[]) throws Exception {
+  
+        if (args.length == 0) { 
+            System.out.println("please specify wsdl");
+            System.exit(1); 
+        }
+        
+        URL wsdlURL;
+        
+        File wsdlFile = new File(args[0]);
+        if (wsdlFile.exists()) {
+            wsdlURL = wsdlFile.toURL();
+        } else {
+            wsdlURL = new URL(args[0]);
+        }
+
+        
+        System.out.println(wsdlURL);
+        SOAPService ss = new SOAPService(wsdlURL, SERVICE_NAME);
+        Greeter port = ss.getSoapPort();
+        String resp; 
+
+        System.out.println("Invoking sayHi...");
+        resp = port.sayHi();
+        System.out.println("Server responded with: " + resp);
+        System.out.println();
+      
+        System.exit(0); 
+    }
+
+}

Propchange: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/client/AntClient.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/add_customer.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Mon Dec 15 10:14:38 2008
@@ -1 +1 @@
-text/plain
+text/xml

Propchange: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic/src/demo/jaxrs/client/update_customer.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Mon Dec 15 10:14:38 2008
@@ -1 +1 @@
-text/plain
+text/xml

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/CherryServer.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/CherryServer.xml?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/CherryServer.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/CherryServer.xml Mon Dec 15 10:14:38 2008
@@ -1,67 +1,67 @@
-<?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.
--->
-
-<!-- 
-  ** This file configures the Cherry Server.
- -->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:sec="http://cxf.apache.org/configuration/security"
-  xmlns:http="http://cxf.apache.org/transports/http/configuration"
-  xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
-  xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
-  xsi:schemaLocation="
-       http://cxf.apache.org/configuration/security  		      http://cxf.apache.org/schemas/configuration/security.xsd
-            http://cxf.apache.org/transports/http/configuration
-            http://cxf.apache.org/schemas/configuration/http-conf.xsd
-            http://cxf.apache.org/transports/http-jetty/configuration
-            http://cxf.apache.org/schemas/configuration/http-jetty.xsd
-            http://www.springframework.org/schema/beans
-            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-
-  <httpj:engine-factory bus="cxf">
-   <httpj:engine port="9000">
-    <httpj:tlsServerParameters>
-      <sec:keyManagers keyPassword="password">
-           <sec:keyStore type="JKS" password="password" 
-                file="certs/cherry.jks"/>
-      </sec:keyManagers>
-      <sec:trustManagers>
-          <sec:keyStore type="JKS" password="password"
-               file="certs/truststore.jks"/>
-      </sec:trustManagers>
-      <sec:cipherSuitesFilter>
-        <!-- these filters ensure that a ciphersuite with
-          export-suitable or null encryption is used,
-          but exclude anonymous Diffie-Hellman key change as
-          this is vulnerable to man-in-the-middle attacks -->
-        <sec:include>.*_EXPORT_.*</sec:include>
-        <sec:include>.*_EXPORT1024_.*</sec:include>
-        <sec:include>.*_WITH_DES_.*</sec:include>
-        <sec:include>.*_WITH_NULL_.*</sec:include>
-        <sec:exclude>.*_DH_anon_.*</sec:exclude>
-      </sec:cipherSuitesFilter>
-      <sec:clientAuthentication want="true" required="true"/>
-    </httpj:tlsServerParameters>
-   </httpj:engine>
-  </httpj:engine-factory>
-  
-</beans>
+<?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.
+-->
+
+<!-- 
+  ** This file configures the Cherry Server.
+ -->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:sec="http://cxf.apache.org/configuration/security"
+  xmlns:http="http://cxf.apache.org/transports/http/configuration"
+  xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
+  xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+  xsi:schemaLocation="
+       http://cxf.apache.org/configuration/security  		      http://cxf.apache.org/schemas/configuration/security.xsd
+            http://cxf.apache.org/transports/http/configuration
+            http://cxf.apache.org/schemas/configuration/http-conf.xsd
+            http://cxf.apache.org/transports/http-jetty/configuration
+            http://cxf.apache.org/schemas/configuration/http-jetty.xsd
+            http://www.springframework.org/schema/beans
+            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+  <httpj:engine-factory bus="cxf">
+   <httpj:engine port="9000">
+    <httpj:tlsServerParameters>
+      <sec:keyManagers keyPassword="password">
+           <sec:keyStore type="JKS" password="password" 
+                file="certs/cherry.jks"/>
+      </sec:keyManagers>
+      <sec:trustManagers>
+          <sec:keyStore type="JKS" password="password"
+               file="certs/truststore.jks"/>
+      </sec:trustManagers>
+      <sec:cipherSuitesFilter>
+        <!-- these filters ensure that a ciphersuite with
+          export-suitable or null encryption is used,
+          but exclude anonymous Diffie-Hellman key change as
+          this is vulnerable to man-in-the-middle attacks -->
+        <sec:include>.*_EXPORT_.*</sec:include>
+        <sec:include>.*_EXPORT1024_.*</sec:include>
+        <sec:include>.*_WITH_DES_.*</sec:include>
+        <sec:include>.*_WITH_NULL_.*</sec:include>
+        <sec:exclude>.*_DH_anon_.*</sec:exclude>
+      </sec:cipherSuitesFilter>
+      <sec:clientAuthentication want="true" required="true"/>
+    </httpj:tlsServerParameters>
+   </httpj:engine>
+  </httpj:engine-factory>
+  
+</beans>

Propchange: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/CherryServer.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/CherryServer.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml Mon Dec 15 10:14:38 2008
@@ -1,191 +1,191 @@
-<?xml version="1.0"?>
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.cxf.samples</groupId>
-    <artifactId>jax_rs_basic_https</artifactId>
-    <version>1.0</version>
-    <properties>
-            <cxf.version>[2,)</cxf.version>
-            <httpclient.version>3.1</httpclient.version>
-            <jsr311.version>0.8</jsr311.version>
-    </properties>
-
-    <build>
-         <sourceDirectory>src</sourceDirectory>
-         <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copyResources</id>
-                        <phase>generate-sources</phase>
-	    	        <goals>
-	    	            <goal>run</goal>
-	    	        </goals>
-	    	        <configuration>
-	    	            <tasks>
-	    	               <copy file="${basedir}/src/demo/jaxrs/client/add_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client"/>
-	    	               <copy file="${basedir}/src/demo/jaxrs/client/update_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client"/>
-                               <copy file="${basedir}/CherryServer.xml" todir="${basedir}/target/classes"/>
-                               <copy todir="${basedir}/src">
-                                  <fileset dir="${basedir}/contrib">
-                                     <include name="*.java"/> 
-                                  </fileset>
-                               </copy>
-	    	            </tasks>
-	    	        </configuration>
-	    	    </execution>
-                    <execution>
-                        <id>removeContribFromSrc</id>
-                        <phase>process-classes</phase>
-	    	        <goals>
-	    	            <goal>run</goal>
-	    	        </goals>
-	    	        <configuration>
-	    	            <tasks>
-	    	               <delete>
-                                   <fileset dir="${basedir}/src">
-                                     <include name="*.java"/> 
-                                  </fileset> 
-                               </delete>
-	    	            </tasks>
-	    	        </configuration>
-	    	    </execution>
- 	    	</executions>
-            </plugin>
-        </plugins>
-    </build>   
-    <profiles>
-        <profile>
-            <id>server</id>
-            <build>
-                <defaultGoal>test</defaultGoal>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>test</phase>
-                                <goals>
-                                    <goal>java</goal>
-                                </goals>
-                                <configuration>
-                                    <mainClass>demo.jaxrs.server.Server</mainClass>
-                                    <systemProperties>
-                                        <property>
-                                           <key>cxf.config.file</key>
-                                           <value>CherryServer.xml</value>
-                                         </property>
-                                    </systemProperties> 
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>client</id>
-            <build>
-                <defaultGoal>test</defaultGoal>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>test</phase>
-                                <goals>
-                                    <goal>java</goal>
-                                </goals>
-                                <configuration>
-                                    <mainClass>demo.jaxrs.client.Client</mainClass>
-                                    <arguments>  
-                                      <argument>${basedir}/certs/wibble.jks</argument> 
-                                      <argument>${basedir}/certs/truststore.jks</argument> 
-                                    </arguments> 
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </repository>
-                    <!-- for jaxb-impl -->
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1/</url>
-                    <layout>legacy</layout>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-plugin-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
-    </profiles>
-    <repositories>
-            <!-- for jaxb-impl -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <!-- Jetty is needed if you're using Jetty container -->
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>${httpclient.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
-            <version>${jsr311.version}</version>
-        </dependency>
-    </dependencies>
-</project>
+<?xml version="1.0"?>
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.cxf.samples</groupId>
+    <artifactId>jax_rs_basic_https</artifactId>
+    <version>1.0</version>
+    <properties>
+            <cxf.version>[2,)</cxf.version>
+            <httpclient.version>3.1</httpclient.version>
+            <jsr311.version>0.8</jsr311.version>
+    </properties>
+
+    <build>
+         <sourceDirectory>src</sourceDirectory>
+         <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copyResources</id>
+                        <phase>generate-sources</phase>
+	    	        <goals>
+	    	            <goal>run</goal>
+	    	        </goals>
+	    	        <configuration>
+	    	            <tasks>
+	    	               <copy file="${basedir}/src/demo/jaxrs/client/add_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client"/>
+	    	               <copy file="${basedir}/src/demo/jaxrs/client/update_customer.xml" todir="${basedir}/target/classes/demo/jaxrs/client"/>
+                               <copy file="${basedir}/CherryServer.xml" todir="${basedir}/target/classes"/>
+                               <copy todir="${basedir}/src">
+                                  <fileset dir="${basedir}/contrib">
+                                     <include name="*.java"/> 
+                                  </fileset>
+                               </copy>
+	    	            </tasks>
+	    	        </configuration>
+	    	    </execution>
+                    <execution>
+                        <id>removeContribFromSrc</id>
+                        <phase>process-classes</phase>
+	    	        <goals>
+	    	            <goal>run</goal>
+	    	        </goals>
+	    	        <configuration>
+	    	            <tasks>
+	    	               <delete>
+                                   <fileset dir="${basedir}/src">
+                                     <include name="*.java"/> 
+                                  </fileset> 
+                               </delete>
+	    	            </tasks>
+	    	        </configuration>
+	    	    </execution>
+ 	    	</executions>
+            </plugin>
+        </plugins>
+    </build>   
+    <profiles>
+        <profile>
+            <id>server</id>
+            <build>
+                <defaultGoal>test</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>test</phase>
+                                <goals>
+                                    <goal>java</goal>
+                                </goals>
+                                <configuration>
+                                    <mainClass>demo.jaxrs.server.Server</mainClass>
+                                    <systemProperties>
+                                        <property>
+                                           <key>cxf.config.file</key>
+                                           <value>CherryServer.xml</value>
+                                         </property>
+                                    </systemProperties> 
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>client</id>
+            <build>
+                <defaultGoal>test</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>test</phase>
+                                <goals>
+                                    <goal>java</goal>
+                                </goals>
+                                <configuration>
+                                    <mainClass>demo.jaxrs.client.Client</mainClass>
+                                    <arguments>  
+                                      <argument>${basedir}/certs/wibble.jks</argument> 
+                                      <argument>${basedir}/certs/truststore.jks</argument> 
+                                    </arguments> 
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>snapshots</id>
+            <repositories>
+                <repository>
+                    <id>apache-snapshots</id>
+                    <name>Apache SNAPSHOT Repository</name>
+                    <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                </repository>
+                    <!-- for jaxb-impl -->
+                <repository>
+                    <id>java.net</id>
+                    <url>http://download.java.net/maven/1/</url>
+                    <layout>legacy</layout>
+                </repository>
+            </repositories>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>apache-plugin-snapshots</id>
+                    <name>Apache Maven Plugin Snapshots</name>
+                    <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+                    <releases>
+                        <enabled>false</enabled>
+                    </releases>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
+    <repositories>
+            <!-- for jaxb-impl -->
+        <repository>
+            <id>java.net</id>
+            <url>http://download.java.net/maven/1/</url>
+            <layout>legacy</layout>
+        </repository>
+    </repositories>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        <!-- Jetty is needed if you're using Jetty container -->
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http-jetty</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>${httpclient.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>jsr311-api</artifactId>
+            <version>${jsr311.version}</version>
+        </dependency>
+    </dependencies>
+</project>

Propchange: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/src/demo/jaxrs/client/add_customer.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Mon Dec 15 10:14:38 2008
@@ -1 +1 @@
-text/plain
+text/xml

Propchange: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/jax_rs/basic_https/src/demo/jaxrs/client/update_customer.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Mon Dec 15 10:14:38 2008
@@ -1 +1 @@
-text/plain
+text/xml

Modified: cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/GreeterMineImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/GreeterMineImpl.java?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/GreeterMineImpl.java (original)
+++ cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/GreeterMineImpl.java Mon Dec 15 10:14:38 2008
@@ -1,48 +1,48 @@
-/**
- * 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.
- */
-
-package org.apache.cxf.xmlbeans;
-
-import javax.jws.WebService;
-import javax.xml.ws.BindingType;
-
-import org.apache.cxf.xmlbeans.wsdltest.GreeterMine;
-import org.apache.cxf.xmlbeans.wsdltest.StringListType;
-
-@WebService(endpointInterface = "org.apache.cxf.xmlbeans.wsdltest.GreeterMine",
-            targetNamespace = "http://org.apache.cxf/xmlbeans",
-            portName = "SoapPort",
-            serviceName = "SOAPMineService",
-            name = "GreeterMine")
-@BindingType(value = javax.xml.ws.soap.SOAPBinding.SOAP11HTTP_BINDING)
-public class GreeterMineImpl implements GreeterMine {
-
-/*
-    public String sayHi() {
-        System.out.println("****** Executing the operation sayHi *****");
-        return "Bonjour";
-    }
-*/
-    public void sayHi2(StringListType stringList) {
-        System.out.println("****** Executing the operation sayHi2 *****");
-    }
-
-
-
-}
+/**
+ * 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.
+ */
+
+package org.apache.cxf.xmlbeans;
+
+import javax.jws.WebService;
+import javax.xml.ws.BindingType;
+
+import org.apache.cxf.xmlbeans.wsdltest.GreeterMine;
+import org.apache.cxf.xmlbeans.wsdltest.StringListType;
+
+@WebService(endpointInterface = "org.apache.cxf.xmlbeans.wsdltest.GreeterMine",
+            targetNamespace = "http://org.apache.cxf/xmlbeans",
+            portName = "SoapPort",
+            serviceName = "SOAPMineService",
+            name = "GreeterMine")
+@BindingType(value = javax.xml.ws.soap.SOAPBinding.SOAP11HTTP_BINDING)
+public class GreeterMineImpl implements GreeterMine {
+
+/*
+    public String sayHi() {
+        System.out.println("****** Executing the operation sayHi *****");
+        return "Bonjour";
+    }
+*/
+    public void sayHi2(StringListType stringList) {
+        System.out.println("****** Executing the operation sayHi2 *****");
+    }
+
+
+
+}

Propchange: cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/GreeterMineImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/XmlBeansTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/XmlBeansTest.java?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/XmlBeansTest.java (original)
+++ cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/XmlBeansTest.java Mon Dec 15 10:14:38 2008
@@ -1,89 +1,89 @@
-/**
- * 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.
- */
-
-package org.apache.cxf.xmlbeans;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.test.AbstractCXFTest;
-import org.apache.cxf.xmlbeans.wsdltest.GreeterMine;
-import org.apache.cxf.xmlbeans.wsdltest.SOAPMineService;
-import org.apache.cxf.xmlbeans.wsdltest.StringListType;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class XmlBeansTest extends AbstractCXFTest {
-
-    private static final String CONFIG1 = "org/apache/cxf/xmlbeans/cxf.xml";
-    private static final String CONFIG2 = "org/apache/cxf/xmlbeans/cxf2.xml";
-
-    private SpringBusFactory bf;
-
-    @Before
-    public void setUp() throws Exception {
-        bf = new SpringBusFactory();
-
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        if (bus != null) {
-            bus.shutdown(false);
-            bus = null;
-        } 
-        BusFactory.setDefaultBus(null);
-    }
-    
-    
-    @Test
-    @Ignore
-    public void testBusCreationFails() throws Exception {
-        bf = new SpringBusFactory();
-        bus = bf.createBus(CONFIG1);
-        BusFactory.setDefaultBus(bus);
-    }
-
-    @Test
-    @Ignore
-    public void testBasicFails() throws Exception {
-
-        bf = new SpringBusFactory();
-        bus = bf.createBus(CONFIG2);
-        BusFactory.setDefaultBus(bus);
-        URL wsdlURL = XmlBeansTest.class.getResource("xmlbeanstest.wsdl");
-        SOAPMineService ss =
-            new SOAPMineService(wsdlURL,
-                                new QName("http://cxf.apache.org/xmlbeans", "SOAPMineService"));
-        GreeterMine port = ss.getSoapPort();
-
-        StringListType stringListType = StringListType.Factory.newInstance();
-        stringListType.setMyname("sean");
-        stringListType.setMyaddress("home");
-        port.sayHi2(stringListType);
-    }
-    
-
-
-}
+/**
+ * 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.
+ */
+
+package org.apache.cxf.xmlbeans;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.test.AbstractCXFTest;
+import org.apache.cxf.xmlbeans.wsdltest.GreeterMine;
+import org.apache.cxf.xmlbeans.wsdltest.SOAPMineService;
+import org.apache.cxf.xmlbeans.wsdltest.StringListType;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class XmlBeansTest extends AbstractCXFTest {
+
+    private static final String CONFIG1 = "org/apache/cxf/xmlbeans/cxf.xml";
+    private static final String CONFIG2 = "org/apache/cxf/xmlbeans/cxf2.xml";
+
+    private SpringBusFactory bf;
+
+    @Before
+    public void setUp() throws Exception {
+        bf = new SpringBusFactory();
+
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        if (bus != null) {
+            bus.shutdown(false);
+            bus = null;
+        } 
+        BusFactory.setDefaultBus(null);
+    }
+    
+    
+    @Test
+    @Ignore
+    public void testBusCreationFails() throws Exception {
+        bf = new SpringBusFactory();
+        bus = bf.createBus(CONFIG1);
+        BusFactory.setDefaultBus(bus);
+    }
+
+    @Test
+    @Ignore
+    public void testBasicFails() throws Exception {
+
+        bf = new SpringBusFactory();
+        bus = bf.createBus(CONFIG2);
+        BusFactory.setDefaultBus(bus);
+        URL wsdlURL = XmlBeansTest.class.getResource("xmlbeanstest.wsdl");
+        SOAPMineService ss =
+            new SOAPMineService(wsdlURL,
+                                new QName("http://cxf.apache.org/xmlbeans", "SOAPMineService"));
+        GreeterMine port = ss.getSoapPort();
+
+        StringListType stringListType = StringListType.Factory.newInstance();
+        stringListType.setMyname("sean");
+        stringListType.setMyaddress("home");
+        port.sayHi2(stringListType);
+    }
+    
+
+
+}

Propchange: cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/XmlBeansTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf.xml?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf.xml (original)
+++ cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf.xml Mon Dec 15 10:14:38 2008
@@ -1,36 +1,36 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:jaxws="http://cxf.apache.org/jaxws"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
-
-    
-    <bean id="GreeterImpl"
-          class="org.apache.cxf.xmlbeans.GreeterMineImpl"
-          scope="prototype" />
-    
-    <!--bean id="xmlBeansBean"
-          class="org.apache.cxf.jaxb.JAXBDataBinding" 
-          scope="prototype" /-->
-          
-    <bean id="xmlBeansBean"
-	  class="org.apache.cxf.xmlbeans.XmlBeansDataBinding" 
-          scope="prototype"/>
-
-    <bean id="testServiceFactory"
-          class="org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean"
-          scope="singleton">
-      <property name="dataBinding" ref="xmlBeansBean" />
-    </bean>
-
-    <jaxws:endpoint id="greeterMineEndpoint"
-                    address="http://localhost:9000/SoapContext/SoapPort"
-                    implementor="org.apache.cxf.xmlbeans.GreeterMineImpl"
-                    serviceName="ns:SOAPMineService"
-                    xmlns:ns="http://cxf.apache.org/xmlbeans">
-        <jaxws:serviceFactory>
-            <ref bean="testServiceFactory"/>
-        </jaxws:serviceFactory>
-    </jaxws:endpoint>
-</beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:jaxws="http://cxf.apache.org/jaxws"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+       http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+
+    
+    <bean id="GreeterImpl"
+          class="org.apache.cxf.xmlbeans.GreeterMineImpl"
+          scope="prototype" />
+    
+    <!--bean id="xmlBeansBean"
+          class="org.apache.cxf.jaxb.JAXBDataBinding" 
+          scope="prototype" /-->
+          
+    <bean id="xmlBeansBean"
+	  class="org.apache.cxf.xmlbeans.XmlBeansDataBinding" 
+          scope="prototype"/>
+
+    <bean id="testServiceFactory"
+          class="org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean"
+          scope="singleton">
+      <property name="dataBinding" ref="xmlBeansBean" />
+    </bean>
+
+    <jaxws:endpoint id="greeterMineEndpoint"
+                    address="http://localhost:9000/SoapContext/SoapPort"
+                    implementor="org.apache.cxf.xmlbeans.GreeterMineImpl"
+                    serviceName="ns:SOAPMineService"
+                    xmlns:ns="http://cxf.apache.org/xmlbeans">
+        <jaxws:serviceFactory>
+            <ref bean="testServiceFactory"/>
+        </jaxws:serviceFactory>
+    </jaxws:endpoint>
+</beans>

Propchange: cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf2.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf2.xml?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf2.xml (original)
+++ cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf2.xml Mon Dec 15 10:14:38 2008
@@ -1,37 +1,37 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:jaxws="http://cxf.apache.org/jaxws"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
-
-    
-    <bean id="GreeterImpl"
-          class="org.apache.cxf.xmlbeans.GreeterMineImpl"
-          scope="prototype" />
-    
-    <!--bean id="xmlBeansBean"
-          class="org.apache.cxf.jaxb.JAXBDataBinding" 
-          scope="prototype" /-->
-          
-    <bean id="xmlBeansBean"
-	  class="org.apache.cxf.xmlbeans.XmlBeansDataBinding" 
-          scope="prototype"/>
-
-    <bean id="testServiceFactory"
-          class="org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean"
-          scope="singleton">
-      <property name="dataBinding" ref="xmlBeansBean" />
-    </bean>
-
-    <jaxws:endpoint id="greeterMineEndpoint"
-                    address="http://localhost:9000/SoapContext/SoapPort"
-                    wsdlLocation="src/test/java/org/apache/cxf/xmlbeans/xmlbeanstest.wsdl"
-                    implementor="org.apache.cxf.xmlbeans.GreeterMineImpl"
-                    serviceName="ns:SOAPMineService"
-                    xmlns:ns="http://cxf.apache.org/xmlbeans">
-        <jaxws:serviceFactory>
-            <ref bean="testServiceFactory"/>
-        </jaxws:serviceFactory>
-    </jaxws:endpoint>
-</beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:jaxws="http://cxf.apache.org/jaxws"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+       http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+
+    
+    <bean id="GreeterImpl"
+          class="org.apache.cxf.xmlbeans.GreeterMineImpl"
+          scope="prototype" />
+    
+    <!--bean id="xmlBeansBean"
+          class="org.apache.cxf.jaxb.JAXBDataBinding" 
+          scope="prototype" /-->
+          
+    <bean id="xmlBeansBean"
+	  class="org.apache.cxf.xmlbeans.XmlBeansDataBinding" 
+          scope="prototype"/>
+
+    <bean id="testServiceFactory"
+          class="org.apache.cxf.jaxws.support.JaxWsServiceFactoryBean"
+          scope="singleton">
+      <property name="dataBinding" ref="xmlBeansBean" />
+    </bean>
+
+    <jaxws:endpoint id="greeterMineEndpoint"
+                    address="http://localhost:9000/SoapContext/SoapPort"
+                    wsdlLocation="src/test/java/org/apache/cxf/xmlbeans/xmlbeanstest.wsdl"
+                    implementor="org.apache.cxf.xmlbeans.GreeterMineImpl"
+                    serviceName="ns:SOAPMineService"
+                    xmlns:ns="http://cxf.apache.org/xmlbeans">
+        <jaxws:serviceFactory>
+            <ref bean="testServiceFactory"/>
+        </jaxws:serviceFactory>
+    </jaxws:endpoint>
+</beans>

Propchange: cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf2.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/cxf2.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/xmlbeanstest.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/xmlbeanstest.wsdl?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/xmlbeanstest.wsdl (original)
+++ cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/xmlbeanstest.wsdl Mon Dec 15 10:14:38 2008
@@ -1,72 +1,72 @@
-<?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.
--->
-<wsdl:definitions name="HelloWorld" targetNamespace="http://cxf.apache.org/xmlbeans" 
-    xmlns="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:tns="http://cxf.apache.org/xmlbeans"
-    xmlns:x1="http://cxf.apache.org/xmlbeans"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-
-    <wsdl:types>        
-        <schema xmlns="http://www.w3.org/2001/XMLSchema"
-	        targetNamespace="http://cxf.apache.org/xmlbeans"
-	        xmlns:x1="http://cxf.apache.org/xmlbeans"
-	        elementFormDefault="qualified">
-	
-	        <complexType name="StringListType">
-	                <all>
-	                        <element minOccurs="1" maxOccurs="1" name="myname" type="string" />
-	                        <element minOccurs="1" maxOccurs="1" name="myaddress" type="string" />
-	                </all>
-	        </complexType>
-	
-	        <element name="sayHi2Message" type="x1:StringListType" />
-	
-        </schema> 
-    </wsdl:types>
-
-  <wsdl:message name="sayHiRequest2">
-    <wsdl:part element="x1:sayHi2Message" name="in"/>
-  </wsdl:message> 
-    
-    <wsdl:portType name="GreeterMine">
-        <wsdl:operation name="sayHi2">
-             <wsdl:input message="tns:sayHiRequest2" name="sayHiRequest2"/>
-        </wsdl:operation>
-        
-    </wsdl:portType>
-    <wsdl:binding name="Greeter_SOAPBinding" type="tns:GreeterMine">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="sayHi2">
-            <soap:operation soapAction="sayHi2" style="document"/>
-            <wsdl:input name="sayHiRequest2">
-                <soap:body use="literal"/>
-            </wsdl:input>
-        </wsdl:operation>        
-    </wsdl:binding>
-    <wsdl:service name="SOAPMineService">
-        <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">
-            <soap:address location="http://localhost:9000/SoapContext/SoapPort"/>
-        </wsdl:port>
-    </wsdl:service>
-</wsdl:definitions>
-
+<?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.
+-->
+<wsdl:definitions name="HelloWorld" targetNamespace="http://cxf.apache.org/xmlbeans" 
+    xmlns="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+    xmlns:tns="http://cxf.apache.org/xmlbeans"
+    xmlns:x1="http://cxf.apache.org/xmlbeans"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+
+    <wsdl:types>        
+        <schema xmlns="http://www.w3.org/2001/XMLSchema"
+	        targetNamespace="http://cxf.apache.org/xmlbeans"
+	        xmlns:x1="http://cxf.apache.org/xmlbeans"
+	        elementFormDefault="qualified">
+	
+	        <complexType name="StringListType">
+	                <all>
+	                        <element minOccurs="1" maxOccurs="1" name="myname" type="string" />
+	                        <element minOccurs="1" maxOccurs="1" name="myaddress" type="string" />
+	                </all>
+	        </complexType>
+	
+	        <element name="sayHi2Message" type="x1:StringListType" />
+	
+        </schema> 
+    </wsdl:types>
+
+  <wsdl:message name="sayHiRequest2">
+    <wsdl:part element="x1:sayHi2Message" name="in"/>
+  </wsdl:message> 
+    
+    <wsdl:portType name="GreeterMine">
+        <wsdl:operation name="sayHi2">
+             <wsdl:input message="tns:sayHiRequest2" name="sayHiRequest2"/>
+        </wsdl:operation>
+        
+    </wsdl:portType>
+    <wsdl:binding name="Greeter_SOAPBinding" type="tns:GreeterMine">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="sayHi2">
+            <soap:operation soapAction="sayHi2" style="document"/>
+            <wsdl:input name="sayHiRequest2">
+                <soap:body use="literal"/>
+            </wsdl:input>
+        </wsdl:operation>        
+    </wsdl:binding>
+    <wsdl:service name="SOAPMineService">
+        <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">
+            <soap:address location="http://localhost:9000/SoapContext/SoapPort"/>
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
+

Propchange: cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/xmlbeanstest.wsdl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/rt/databinding/xmlbeans/src/test/java/org/apache/cxf/xmlbeans/xmlbeanstest.wsdl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java?rev=726753&r1=726752&r2=726753&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java (original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java Mon Dec 15 10:14:38 2008
@@ -1,58 +1,58 @@
-/**
- * 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.
- */
-
-package org.apache.cxf.jaxrs.impl;
-
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.PathSegment;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class PathSegmentImplTest extends Assert {
-    
-    @Test
-    public void testPlainPathSegment() { 
-        PathSegment ps = new PathSegmentImpl("bar");
-        assertEquals("bar", ps.getPath());
-        assertEquals(0, ps.getMatrixParameters().size());
-    }
-    
-    @Test
-    public void testPathSegmentWithMatrixParams() { 
-        PathSegment ps = new PathSegmentImpl("bar;a=1;a=2;b=3%202", false);
-        assertEquals("bar", ps.getPath());
-        MultivaluedMap<String, String> params = ps.getMatrixParameters();
-        assertEquals(2, params.size());
-        assertEquals(2, params.get("a").size());
-        assertEquals("1", params.get("a").get(0));
-        assertEquals("2", params.get("a").get(1));
-        assertEquals("3%202", params.getFirst("b"));
-    }
-    
-    @Test
-    public void testPathSegmentWithDecodedMatrixParams() { 
-        PathSegment ps = new PathSegmentImpl("bar%20foo;a=1%202");
-        assertEquals("bar foo", ps.getPath());
-        MultivaluedMap<String, String> params = ps.getMatrixParameters();
-        assertEquals(1, params.size());
-        assertEquals(1, params.get("a").size());
-        assertEquals("1 2", params.get("a").get(0));
-    }
-}
+/**
+ * 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.
+ */
+
+package org.apache.cxf.jaxrs.impl;
+
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.PathSegment;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class PathSegmentImplTest extends Assert {
+    
+    @Test
+    public void testPlainPathSegment() { 
+        PathSegment ps = new PathSegmentImpl("bar");
+        assertEquals("bar", ps.getPath());
+        assertEquals(0, ps.getMatrixParameters().size());
+    }
+    
+    @Test
+    public void testPathSegmentWithMatrixParams() { 
+        PathSegment ps = new PathSegmentImpl("bar;a=1;a=2;b=3%202", false);
+        assertEquals("bar", ps.getPath());
+        MultivaluedMap<String, String> params = ps.getMatrixParameters();
+        assertEquals(2, params.size());
+        assertEquals(2, params.get("a").size());
+        assertEquals("1", params.get("a").get(0));
+        assertEquals("2", params.get("a").get(1));
+        assertEquals("3%202", params.getFirst("b"));
+    }
+    
+    @Test
+    public void testPathSegmentWithDecodedMatrixParams() { 
+        PathSegment ps = new PathSegmentImpl("bar%20foo;a=1%202");
+        assertEquals("bar foo", ps.getPath());
+        MultivaluedMap<String, String> params = ps.getMatrixParameters();
+        assertEquals(1, params.size());
+        assertEquals(1, params.get("a").size());
+        assertEquals("1 2", params.get("a").get(0));
+    }
+}

Propchange: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/PathSegmentImplTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/branches/2.1.x-fixes/rt/javascript/src/test/resources/attributeTestBeans.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message