cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1325346 - in /cxf/branches/2.5.x-fixes: ./ distribution/src/main/release/samples/corba/hello_world/src/main/idl/ distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/ distribution/src/main/release/samples/ws_se...
Date Thu, 12 Apr 2012 16:14:08 GMT
Author: dkulp
Date: Thu Apr 12 16:14:07 2012
New Revision: 1325346

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

........
  r1325343 | dkulp | 2012-04-12 12:09:53 -0400 (Thu, 12 Apr 2012) | 1 line
  
  Fix some spring2 compat issues
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/idl/HelloWorld.idl
    cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/wssec.xml
    cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/server/wssec.xml
    cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl
    cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world_no_policy.wsdl
    cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
    cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java
    cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
    cxf/branches/2.5.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractBusTestServerBase.java
    cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl
    cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl
    cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl
    cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml

Propchange: cxf/branches/2.5.x-fixes/
            ('svn:mergeinfo' removed)

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

Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/idl/HelloWorld.idl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/idl/HelloWorld.idl?rev=1325346&r1=1325345&r2=1325346&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/idl/HelloWorld.idl (original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/corba/hello_world/src/main/idl/HelloWorld.idl Thu Apr 12 16:14:07 2012
@@ -1,25 +1,25 @@
-/* 
- * 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.
-*/ 
-
-interface HelloWorld {
-    string
-    greetMe(
-        in string return_message
-    );
-};
+/* 
+ * 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.
+*/ 
+
+interface HelloWorld {
+    string
+    greetMe(
+        in string return_message
+    );
+};

Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/wssec.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/wssec.xml?rev=1325346&r1=1325345&r2=1325346&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/wssec.xml (original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/client/wssec.xml Thu Apr 12 16:14:07 2012
@@ -1,86 +1,86 @@
-<?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 Wibble Client
-  -->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:cxf="http://cxf.apache.org/core"
-  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:jaxws="http://cxf.apache.org/jaxws"
-  xsi:schemaLocation="
-           http://cxf.apache.org/core
-           http://cxf.apache.org/schemas/core.xsd
-           http://cxf.apache.org/configuration/security
-           http://cxf.apache.org/schemas/configuration/security.xsd
-           http://cxf.apache.org/jaxws
-           http://cxf.apache.org/schemas/jaxws.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">
-
-    <cxf:bus>
-        <cxf:features>
-            <cxf:logging/>
-        </cxf:features>
-    </cxf:bus>
-
-  <http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
-    <http:tlsClientParameters disableCNCheck="true">
-      <sec:trustManagers>
-          <sec:keyStore type="JKS" password="password"
-               file="certs/truststore.jks"/>
-      </sec:trustManagers>
-      <sec:keyManagers keyPassword="password">
-           <sec:keyStore type="JKS" password="password" 
-                file="certs/wibble.jks"/>
-      </sec:keyManagers>
-      <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_AES_.*</sec:include>
-        <sec:include>.*_WITH_NULL_.*</sec:include>
-        <sec:exclude>.*_DH_anon_.*</sec:exclude>
-      </sec:cipherSuitesFilter>
-    </http:tlsClientParameters>
-   </http:conduit>
-
-  
-   <jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort" createdFromAPI="true">
-      <jaxws:properties>
-        <entry key="ws-security.username" value="Alice" />
-        <entry key="ws-security.callback-handler" value="demo.wssec.client.UTPasswordCallback" />
-      </jaxws:properties>
-        
-   </jaxws:client>
-   
-
-   
-</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 Wibble Client
+  -->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:cxf="http://cxf.apache.org/core"
+  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:jaxws="http://cxf.apache.org/jaxws"
+  xsi:schemaLocation="
+           http://cxf.apache.org/core
+           http://cxf.apache.org/schemas/core.xsd
+           http://cxf.apache.org/configuration/security
+           http://cxf.apache.org/schemas/configuration/security.xsd
+           http://cxf.apache.org/jaxws
+           http://cxf.apache.org/schemas/jaxws.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">
+
+    <cxf:bus>
+        <cxf:features>
+            <cxf:logging/>
+        </cxf:features>
+    </cxf:bus>
+
+  <http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
+    <http:tlsClientParameters disableCNCheck="true">
+      <sec:trustManagers>
+          <sec:keyStore type="JKS" password="password"
+               file="certs/truststore.jks"/>
+      </sec:trustManagers>
+      <sec:keyManagers keyPassword="password">
+           <sec:keyStore type="JKS" password="password" 
+                file="certs/wibble.jks"/>
+      </sec:keyManagers>
+      <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_AES_.*</sec:include>
+        <sec:include>.*_WITH_NULL_.*</sec:include>
+        <sec:exclude>.*_DH_anon_.*</sec:exclude>
+      </sec:cipherSuitesFilter>
+    </http:tlsClientParameters>
+   </http:conduit>
+
+  
+   <jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort" createdFromAPI="true">
+      <jaxws:properties>
+        <entry key="ws-security.username" value="Alice" />
+        <entry key="ws-security.callback-handler" value="demo.wssec.client.UTPasswordCallback" />
+      </jaxws:properties>
+        
+   </jaxws:client>
+   
+
+   
+</beans> 
+

Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/server/wssec.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/server/wssec.xml?rev=1325346&r1=1325345&r2=1325346&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/server/wssec.xml (original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/src/demo/wssec/server/wssec.xml Thu Apr 12 16:14:07 2012
@@ -1,106 +1,106 @@
-<?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:cxf="http://cxf.apache.org/core"
-  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://cxf.apache.org/jaxws"
-  xsi:schemaLocation="
-            http://cxf.apache.org/core
-            http://cxf.apache.org/schemas/core.xsd 
-            http://cxf.apache.org/configuration/security  		      
-            http://cxf.apache.org/schemas/configuration/security.xsd
-            http://cxf.apache.org/jaxws
-            http://cxf.apache.org/schemas/jaxws.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.xsd">
-
-    <cxf:bus>
-        <cxf:features>
-            <cxf:logging/>
-        </cxf:features>
-    </cxf:bus>
-
-  <!--
-  <http:destination name="{http://apache.org/hello_world_soap_http}GreeterPort.http-destination"> 
-  </http:destination>
-  -->
-  
-  <jaxws:endpoint id="server"
-    endpointName="s:SoapPort"
-    serviceName="s:SOAPService"
-    implementor="demo.wssec.server.GreeterImpl"    
-    address="https://localhost:9001/SoapContext/SoapPort"
-    wsdlLocation="wsdl/hello_world.wsdl"
-    depends-on="ClientAuthHttpsSettings"
-    xmlns:s="http://apache.org/hello_world_soap_http" >
-    
-    <jaxws:properties>
-        <entry key="ws-security.callback-handler" value="demo.wssec.server.UTPasswordCallback" />
-        <!--<entry key="passwordCallbackRef">
-           <ref bean="myPasswordCallback"/>
-        </entry>-->
-    </jaxws:properties>
-  </jaxws:endpoint>
-  
-  <!--
-  <bean id="myPasswordCallback"
-      class="demo.hw_https.server.UTPasswordCallback"/>
-  -->
-
-  <httpj:engine-factory id="ClientAuthHttpsSettings">
-   <httpj:engine port="9001">
-    <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_AES_.*</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:cxf="http://cxf.apache.org/core"
+  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://cxf.apache.org/jaxws"
+  xsi:schemaLocation="
+            http://cxf.apache.org/core
+            http://cxf.apache.org/schemas/core.xsd 
+            http://cxf.apache.org/configuration/security  		      
+            http://cxf.apache.org/schemas/configuration/security.xsd
+            http://cxf.apache.org/jaxws
+            http://cxf.apache.org/schemas/jaxws.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.xsd">
+
+    <cxf:bus>
+        <cxf:features>
+            <cxf:logging/>
+        </cxf:features>
+    </cxf:bus>
+
+  <!--
+  <http:destination name="{http://apache.org/hello_world_soap_http}GreeterPort.http-destination"> 
+  </http:destination>
+  -->
+  
+  <jaxws:endpoint id="server"
+    endpointName="s:SoapPort"
+    serviceName="s:SOAPService"
+    implementor="demo.wssec.server.GreeterImpl"    
+    address="https://localhost:9001/SoapContext/SoapPort"
+    wsdlLocation="wsdl/hello_world.wsdl"
+    depends-on="ClientAuthHttpsSettings"
+    xmlns:s="http://apache.org/hello_world_soap_http" >
+    
+    <jaxws:properties>
+        <entry key="ws-security.callback-handler" value="demo.wssec.server.UTPasswordCallback" />
+        <!--<entry key="passwordCallbackRef">
+           <ref bean="myPasswordCallback"/>
+        </entry>-->
+    </jaxws:properties>
+  </jaxws:endpoint>
+  
+  <!--
+  <bean id="myPasswordCallback"
+      class="demo.hw_https.server.UTPasswordCallback"/>
+  -->
+
+  <httpj:engine-factory id="ClientAuthHttpsSettings">
+   <httpj:engine port="9001">
+    <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_AES_.*</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>

Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl?rev=1325346&r1=1325345&r2=1325346&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl (original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world.wsdl Thu Apr 12 16:14:07 2012
@@ -1,106 +1,106 @@
-<?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://apache.org/hello_world_soap_http" 
-    xmlns="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:tns="http://apache.org/hello_world_soap_http"
-    xmlns:x1="http://apache.org/hello_world_soap_http/types"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <wsdl:types>
-        <schema targetNamespace="http://apache.org/hello_world_soap_http/types" 
-            xmlns="http://www.w3.org/2001/XMLSchema"
-	    xmlns:tns="http://apache.org/hello_world_soap_http/types"
-            elementFormDefault="qualified">
-
-	    <simpleType name="MyStringType">
-		<restriction base="string">
-		    <maxLength value="30" />
-		</restriction>
-	    </simpleType>
-
-            <element name="greetMe">
-                <complexType>
-                    <sequence>
-                        <element name="requestType" type="tns:MyStringType"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMeResponse">
-                <complexType>
-                    <sequence>
-                        <element name="responseType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-    </wsdl:types>
-    <wsdl:message name="greetMeRequest">
-        <wsdl:part element="x1:greetMe" name="in"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeResponse">
-        <wsdl:part element="x1:greetMeResponse" name="out"/>
-    </wsdl:message>
-    
-    <wsdl:portType name="Greeter">
-        
-        <wsdl:operation name="greetMe">
-            <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
-            <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
-        </wsdl:operation>
-        
-    </wsdl:portType>
-    <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        
-        <wsdl:operation name="greetMe">
-            <soap:operation soapAction="" style="document"/>
-            <wsdl:input name="greetMeRequest">
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="greetMeResponse">
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        
-        
-    </wsdl:binding>
-    <wsdl:service name="SOAPService">
-        <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">
-            <wsp:PolicyReference xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" URI="#UP_policy"/>
-            <soap:address location="https://localhost:9001/SoapContext/SoapPort"/>
-        </wsdl:port>
-    </wsdl:service>
-    
-    <wsp:Policy wsu:Id="UP_policy" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
-    <sp:TransportBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-    <wsp:Policy><sp:TransportToken><wsp:Policy><sp:HttpsToken/></wsp:Policy></sp:TransportToken><sp:Layout><wsp:Policy><sp:Strict/></wsp:Policy></sp:Layout><sp:AlgorithmSuite><wsp:Policy><sp:Basic128/></wsp:Policy></sp:AlgorithmSuite></wsp:Policy>
-    </sp:TransportBinding>    
-    <sp:SupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-    <wsp:Policy>
-    <sp:UsernameToken xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always">
-    <wsp:Policy>
-    <sp:WssUsernameToken11/>
-    </wsp:Policy>
-    </sp:UsernameToken>
-    </wsp:Policy></sp:SupportingTokens></wsp:Policy>
-        
-</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://apache.org/hello_world_soap_http" 
+    xmlns="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+    xmlns:tns="http://apache.org/hello_world_soap_http"
+    xmlns:x1="http://apache.org/hello_world_soap_http/types"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <wsdl:types>
+        <schema targetNamespace="http://apache.org/hello_world_soap_http/types" 
+            xmlns="http://www.w3.org/2001/XMLSchema"
+	    xmlns:tns="http://apache.org/hello_world_soap_http/types"
+            elementFormDefault="qualified">
+
+	    <simpleType name="MyStringType">
+		<restriction base="string">
+		    <maxLength value="30" />
+		</restriction>
+	    </simpleType>
+
+            <element name="greetMe">
+                <complexType>
+                    <sequence>
+                        <element name="requestType" type="tns:MyStringType"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="greetMeResponse">
+                <complexType>
+                    <sequence>
+                        <element name="responseType" type="string"/>
+                    </sequence>
+                </complexType>
+            </element>
+        </schema>
+    </wsdl:types>
+    <wsdl:message name="greetMeRequest">
+        <wsdl:part element="x1:greetMe" name="in"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeResponse">
+        <wsdl:part element="x1:greetMeResponse" name="out"/>
+    </wsdl:message>
+    
+    <wsdl:portType name="Greeter">
+        
+        <wsdl:operation name="greetMe">
+            <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
+            <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
+        </wsdl:operation>
+        
+    </wsdl:portType>
+    <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        
+        <wsdl:operation name="greetMe">
+            <soap:operation soapAction="" style="document"/>
+            <wsdl:input name="greetMeRequest">
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="greetMeResponse">
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+        
+        
+    </wsdl:binding>
+    <wsdl:service name="SOAPService">
+        <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">
+            <wsp:PolicyReference xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" URI="#UP_policy"/>
+            <soap:address location="https://localhost:9001/SoapContext/SoapPort"/>
+        </wsdl:port>
+    </wsdl:service>
+    
+    <wsp:Policy wsu:Id="UP_policy" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
+    <sp:TransportBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+    <wsp:Policy><sp:TransportToken><wsp:Policy><sp:HttpsToken/></wsp:Policy></sp:TransportToken><sp:Layout><wsp:Policy><sp:Strict/></wsp:Policy></sp:Layout><sp:AlgorithmSuite><wsp:Policy><sp:Basic128/></wsp:Policy></sp:AlgorithmSuite></wsp:Policy>
+    </sp:TransportBinding>    
+    <sp:SupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+    <wsp:Policy>
+    <sp:UsernameToken xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always">
+    <wsp:Policy>
+    <sp:WssUsernameToken11/>
+    </wsp:Policy>
+    </sp:UsernameToken>
+    </wsp:Policy></sp:SupportingTokens></wsp:Policy>
+        
+</wsdl:definitions>
+

Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world_no_policy.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world_no_policy.wsdl?rev=1325346&r1=1325345&r2=1325346&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world_no_policy.wsdl (original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/wsdl/hello_world_no_policy.wsdl Thu Apr 12 16:14:07 2012
@@ -1,93 +1,93 @@
-<?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://apache.org/hello_world_soap_http" 
-    xmlns="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:tns="http://apache.org/hello_world_soap_http"
-    xmlns:x1="http://apache.org/hello_world_soap_http/types"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <wsdl:types>
-        <schema targetNamespace="http://apache.org/hello_world_soap_http/types" 
-            xmlns="http://www.w3.org/2001/XMLSchema"
-	    xmlns:tns="http://apache.org/hello_world_soap_http/types"
-            elementFormDefault="qualified">
-
-	    <simpleType name="MyStringType">
-		<restriction base="string">
-		    <maxLength value="30" />
-		</restriction>
-	    </simpleType>
-
-            <element name="greetMe">
-                <complexType>
-                    <sequence>
-                        <element name="requestType" type="tns:MyStringType"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="greetMeResponse">
-                <complexType>
-                    <sequence>
-                        <element name="responseType" type="string"/>
-                    </sequence>
-                </complexType>
-            </element>
-        </schema>
-    </wsdl:types>
-    <wsdl:message name="greetMeRequest">
-        <wsdl:part element="x1:greetMe" name="in"/>
-    </wsdl:message>
-    <wsdl:message name="greetMeResponse">
-        <wsdl:part element="x1:greetMeResponse" name="out"/>
-    </wsdl:message>
-    
-    <wsdl:portType name="Greeter">
-        
-        <wsdl:operation name="greetMe">
-            <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
-            <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
-        </wsdl:operation>
-        
-    </wsdl:portType>
-    <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        
-        <wsdl:operation name="greetMe">
-            <soap:operation soapAction="" style="document"/>
-            <wsdl:input name="greetMeRequest">
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="greetMeResponse">
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        
-        
-    </wsdl:binding>
-    <wsdl:service name="SOAPService">
-        <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">
-            <soap:address location="https://localhost:9001/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://apache.org/hello_world_soap_http" 
+    xmlns="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+    xmlns:tns="http://apache.org/hello_world_soap_http"
+    xmlns:x1="http://apache.org/hello_world_soap_http/types"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <wsdl:types>
+        <schema targetNamespace="http://apache.org/hello_world_soap_http/types" 
+            xmlns="http://www.w3.org/2001/XMLSchema"
+	    xmlns:tns="http://apache.org/hello_world_soap_http/types"
+            elementFormDefault="qualified">
+
+	    <simpleType name="MyStringType">
+		<restriction base="string">
+		    <maxLength value="30" />
+		</restriction>
+	    </simpleType>
+
+            <element name="greetMe">
+                <complexType>
+                    <sequence>
+                        <element name="requestType" type="tns:MyStringType"/>
+                    </sequence>
+                </complexType>
+            </element>
+            <element name="greetMeResponse">
+                <complexType>
+                    <sequence>
+                        <element name="responseType" type="string"/>
+                    </sequence>
+                </complexType>
+            </element>
+        </schema>
+    </wsdl:types>
+    <wsdl:message name="greetMeRequest">
+        <wsdl:part element="x1:greetMe" name="in"/>
+    </wsdl:message>
+    <wsdl:message name="greetMeResponse">
+        <wsdl:part element="x1:greetMeResponse" name="out"/>
+    </wsdl:message>
+    
+    <wsdl:portType name="Greeter">
+        
+        <wsdl:operation name="greetMe">
+            <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
+            <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
+        </wsdl:operation>
+        
+    </wsdl:portType>
+    <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        
+        <wsdl:operation name="greetMe">
+            <soap:operation soapAction="" style="document"/>
+            <wsdl:input name="greetMeRequest">
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="greetMeResponse">
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+        
+        
+    </wsdl:binding>
+    <wsdl:service name="SOAPService">
+        <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">
+            <soap:address location="https://localhost:9001/SoapContext/SoapPort"/>
+        </wsdl:port>
+    </wsdl:service>
+    
+        
+</wsdl:definitions>
+

Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java?rev=1325346&r1=1325345&r2=1325346&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java (original)
+++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java Thu Apr 12 16:14:07 2012
@@ -96,7 +96,7 @@ public class BusDefinitionParser extends
     private void copyProps(BeanDefinitionBuilder src, BeanDefinition def) {
         for (PropertyValue v : src.getBeanDefinition().getPropertyValues().getPropertyValues()) {
             if (!"bus".equals(v.getName())) {
-                def.getPropertyValues().add(v.getName(), v.getValue());
+                def.getPropertyValues().addPropertyValue(v.getName(), v.getValue());
             }
             src.getBeanDefinition().getPropertyValues().removePropertyValue(v);
         }

Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java?rev=1325346&r1=1325345&r2=1325346&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java (original)
+++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java Thu Apr 12 16:14:07 2012
@@ -74,7 +74,7 @@ public class BusWiringBeanFactoryPostPro
             ConfigurableApplicationContext cctx = (ConfigurableApplicationContext)context;
             cctx.getBeanFactory().registerSingleton(name, b);
         }
-        return context.getBean(name, Bus.class);
+        return (Bus)context.getBean(name, Bus.class);
     }
     private Object getBusForName(String name,
                                  ConfigurableListableBeanFactory factory,
@@ -89,7 +89,7 @@ public class BusWiringBeanFactoryPostPro
             df.registerBeanDefinition(name, rbd);
         } else if (cn != null) {
             BeanDefinition bd = factory.getBeanDefinition(name);
-            bd.getPropertyValues().add("busConfig", new RuntimeBeanReference(cn));
+            bd.getPropertyValues().addPropertyValue("busConfig", new RuntimeBeanReference(cn));
         }
         return new RuntimeBeanReference(name);        
     }

Modified: cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java?rev=1325346&r1=1325345&r2=1325346&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java (original)
+++ cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java Thu Apr 12 16:14:07 2012
@@ -20,12 +20,16 @@ package org.apache.cxf.transport.servlet
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.util.Collection;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
+import org.apache.cxf.common.util.ReflectionUtil;
+import org.apache.cxf.helpers.CastUtils;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
@@ -49,7 +53,7 @@ public class CXFServlet extends CXFNonSp
             getWebApplicationContext(sc.getServletContext());
         
         if (wac instanceof AbstractApplicationContext) {
-            ((AbstractApplicationContext)wac).getApplicationListeners().add(this);
+            addListener((AbstractApplicationContext)wac);
         }
         
         String configLocation = sc.getInitParameter("config-location");
@@ -68,13 +72,25 @@ public class CXFServlet extends CXFNonSp
             wac = createSpringContext(wac, sc, configLocation);
         }
         if (wac != null) {
-            setBus(wac.getBean("cxf", Bus.class));
+            setBus((Bus)wac.getBean("cxf", Bus.class));
         } else {
             busCreated = true;
             setBus(BusFactory.newInstance().createBus());
         }
     }
 
+    protected void addListener(AbstractApplicationContext wac) {
+        try {
+            //spring 2 vs spring 3 return type is different
+            Method m = wac.getClass().getMethod("getApplicationListeners");
+            Collection<Object> c = CastUtils.cast((Collection<?>)ReflectionUtil
+                                                      .setAccessible(m).invoke(wac));
+            c.add(this);
+        } catch (Throwable t) {
+            //ignore.
+        }
+    }
+
     /**
      * Try to create a spring application context from the config location.
      * Will first try to resolve the location using the servlet context.

Modified: cxf/branches/2.5.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractBusTestServerBase.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractBusTestServerBase.java?rev=1325346&r1=1325345&r2=1325346&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractBusTestServerBase.java (original)
+++ cxf/branches/2.5.x-fixes/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractBusTestServerBase.java Thu Apr 12 16:14:07 2012
@@ -28,7 +28,11 @@ public abstract class AbstractBusTestSer
     public boolean stopInProcess() throws Exception {
         boolean ret = super.stopInProcess();
         if (bus != null) {
-            bus.shutdown(true);
+            try {
+                bus.shutdown(true);
+            } catch (Throwable t) {
+                //ignore, we're shutting down
+            }
         }
         return ret;
     }    

Modified: cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl?rev=1325346&r1=1325345&r2=1325346&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl (original)
+++ cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug.wsdl Thu Apr 12 16:14:07 2012
@@ -1,51 +1,51 @@
-<?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 
-    xmlns:tns="http://bugs3290.cxf.apache.org/services/bug1"
-    xmlns:bug2="http://bugs3290.cxf.apache.org/services/bug2"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    targetNamespace="http://bugs3290.cxf.apache.org/services/bug1" 
-    name="bug1">
-
-<wsdl:import namespace="http://bugs3290.cxf.apache.org/services/bug2" location="bug2.wsdl" />
-
-	<wsdl:binding name="myBug1PortSoapBinding" type="bug2:myBugService">
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-
-		<wsdl:operation name="myBug1">
-			<soap:operation style="document" />
-			<wsdl:input>
-				<soap:body use="literal" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="myBugService">
-		<wsdl:port name="myBug1" binding="tns:myBug1PortSoapBinding">
-			<soap:address location="http://REPLACE_WITH_HOST_INFO/myBug1" />
-		</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 
+    xmlns:tns="http://bugs3290.cxf.apache.org/services/bug1"
+    xmlns:bug2="http://bugs3290.cxf.apache.org/services/bug2"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+    targetNamespace="http://bugs3290.cxf.apache.org/services/bug1" 
+    name="bug1">
+
+<wsdl:import namespace="http://bugs3290.cxf.apache.org/services/bug2" location="bug2.wsdl" />
+
+	<wsdl:binding name="myBug1PortSoapBinding" type="bug2:myBugService">
+		<soap:binding style="document"
+			transport="http://schemas.xmlsoap.org/soap/http" />
+
+		<wsdl:operation name="myBug1">
+			<soap:operation style="document" />
+			<wsdl:input>
+				<soap:body use="literal" />
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+	</wsdl:binding>
+	<wsdl:service name="myBugService">
+		<wsdl:port name="myBug1" binding="tns:myBug1PortSoapBinding">
+			<soap:address location="http://REPLACE_WITH_HOST_INFO/myBug1" />
+		</wsdl:port>
+	</wsdl:service>
+
+</wsdl:definitions>

Modified: cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl?rev=1325346&r1=1325345&r2=1325346&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl (original)
+++ cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf-3290/bug2.wsdl Thu Apr 12 16:14:07 2012
@@ -1,65 +1,65 @@
-<?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 
-    xmlns:tns="http://bugs3290.cxf.apache.org/services/bug2"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    targetNamespace="http://bugs3290.cxf.apache.org/services/bug2" 
-    name="bug2">
-
-	<wsdl:types>
-
-		<schema xmlns="http://www.w3.org/2001/XMLSchema"
-			elementFormDefault="qualified" attributeFormDefault="qualified"
-			targetNamespace="http://bugs3290.cxf.apache.org/services/bug2">
-
-			<xsd:complexType name="requestDataType">
-				<xsd:sequence>
-					<xsd:element name="myString1" type="xsd:string" />
-				</xsd:sequence>
-			</xsd:complexType>
-
-			<xsd:complexType name="responseDataType">
-				<xsd:sequence>
-					<xsd:element name="myString2" type="xsd:string" />
-				</xsd:sequence>
-			</xsd:complexType>
-
-			<element name="myBug1" type="tns:requestDataType" />
-			<element name="myBug1Response" type="tns:responseDataType" />
-		</schema>
-	</wsdl:types>
-
-	<wsdl:message name="myBug1RequestMessage">
-		<wsdl:part name="parameters" element="tns:myBug1" />
-	</wsdl:message>
-	<wsdl:message name="myBug1ResponseMessage">
-		<wsdl:part name="parameters" element="tns:myBug1Response" />
-	</wsdl:message>
-
-	<wsdl:portType name="myBugService">
-		<wsdl:operation name="myBug1">
-			<wsdl:input message="tns:myBug1RequestMessage" />
-			<wsdl:output message="tns:myBug1ResponseMessage" />
-		</wsdl:operation>
-	</wsdl:portType>
-
-</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 
+    xmlns:tns="http://bugs3290.cxf.apache.org/services/bug2"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+    targetNamespace="http://bugs3290.cxf.apache.org/services/bug2" 
+    name="bug2">
+
+	<wsdl:types>
+
+		<schema xmlns="http://www.w3.org/2001/XMLSchema"
+			elementFormDefault="qualified" attributeFormDefault="qualified"
+			targetNamespace="http://bugs3290.cxf.apache.org/services/bug2">
+
+			<xsd:complexType name="requestDataType">
+				<xsd:sequence>
+					<xsd:element name="myString1" type="xsd:string" />
+				</xsd:sequence>
+			</xsd:complexType>
+
+			<xsd:complexType name="responseDataType">
+				<xsd:sequence>
+					<xsd:element name="myString2" type="xsd:string" />
+				</xsd:sequence>
+			</xsd:complexType>
+
+			<element name="myBug1" type="tns:requestDataType" />
+			<element name="myBug1Response" type="tns:responseDataType" />
+		</schema>
+	</wsdl:types>
+
+	<wsdl:message name="myBug1RequestMessage">
+		<wsdl:part name="parameters" element="tns:myBug1" />
+	</wsdl:message>
+	<wsdl:message name="myBug1ResponseMessage">
+		<wsdl:part name="parameters" element="tns:myBug1Response" />
+	</wsdl:message>
+
+	<wsdl:portType name="myBugService">
+		<wsdl:operation name="myBug1">
+			<wsdl:input message="tns:myBug1RequestMessage" />
+			<wsdl:output message="tns:myBug1ResponseMessage" />
+		</wsdl:operation>
+	</wsdl:portType>
+
+</wsdl:definitions>

Modified: cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl?rev=1325346&r1=1325345&r2=1325346&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl (original)
+++ cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl Thu Apr 12 16:14:07 2012
@@ -1,89 +1,89 @@
-<?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 xmlns:fc="http://cxf.apache.org/testcase/cxf3105" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="center" targetNamespace="http://cxf.apache.org/testcase/cxf3105">
-    <wsdl:types>
-        <xsd:schema targetNamespace="http://cxf.apache.org/testcase/cxf3105">
-            <xsd:complexType name="loginrequesttype">
-                <xsd:sequence>
-                    <xsd:element name="username" type="xsd:string"/>
-                    <xsd:element name="password" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:complexType name="loginresponsetype">
-                <xsd:sequence>
-                    <xsd:element name="userid" type="xsd:int"/>
-                    <xsd:element name="groupid" type="xsd:int"/>
-                </xsd:sequence>
-            </xsd:complexType>
-            
-
-            <xsd:element name="login">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="login" type="fc:loginrequesttype"/>
-                        <xsd:element name="id" type="xsd:int" maxOccurs="1" minOccurs="0"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="loginResponse">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="login" type="fc:loginresponsetype"/>
-                        <xsd:element name="password_temp" type="xsd:string"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:schema>
-    </wsdl:types>
-
-    <wsdl:message name="loginRequest">
-        <wsdl:part name="parameters" element="fc:login"/>
-    </wsdl:message>
-    <wsdl:message name="loginResponse">
-        <wsdl:part name="parameters" element="fc:loginResponse"/>
-    </wsdl:message>
-    
-
-    <wsdl:portType name="Login">
-        <wsdl:operation name="login">
-            <wsdl:input message="fc:loginRequest"/>
-            <wsdl:output message="fc:loginResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="Login" type="fc:Login">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
-        <wsdl:operation name="login">
-            <soap:operation soapAction="http://cxf.apache.org/testcase/cxf3105login"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="Login">
-        <wsdl:port binding="fc:Login" name="center">
-            <soap:address location="http://localhost:9000/"/>
-        </wsdl:port>
-    </wsdl:service>
-
+<?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 xmlns:fc="http://cxf.apache.org/testcase/cxf3105" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="center" targetNamespace="http://cxf.apache.org/testcase/cxf3105">
+    <wsdl:types>
+        <xsd:schema targetNamespace="http://cxf.apache.org/testcase/cxf3105">
+            <xsd:complexType name="loginrequesttype">
+                <xsd:sequence>
+                    <xsd:element name="username" type="xsd:string"/>
+                    <xsd:element name="password" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="loginresponsetype">
+                <xsd:sequence>
+                    <xsd:element name="userid" type="xsd:int"/>
+                    <xsd:element name="groupid" type="xsd:int"/>
+                </xsd:sequence>
+            </xsd:complexType>
+            
+
+            <xsd:element name="login">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="login" type="fc:loginrequesttype"/>
+                        <xsd:element name="id" type="xsd:int" maxOccurs="1" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="loginResponse">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="login" type="fc:loginresponsetype"/>
+                        <xsd:element name="password_temp" type="xsd:string"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:schema>
+    </wsdl:types>
+
+    <wsdl:message name="loginRequest">
+        <wsdl:part name="parameters" element="fc:login"/>
+    </wsdl:message>
+    <wsdl:message name="loginResponse">
+        <wsdl:part name="parameters" element="fc:loginResponse"/>
+    </wsdl:message>
+    
+
+    <wsdl:portType name="Login">
+        <wsdl:operation name="login">
+            <wsdl:input message="fc:loginRequest"/>
+            <wsdl:output message="fc:loginResponse"/>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="Login" type="fc:Login">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+        <wsdl:operation name="login">
+            <soap:operation soapAction="http://cxf.apache.org/testcase/cxf3105login"/>
+            <wsdl:input>
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="Login">
+        <wsdl:port binding="fc:Login" name="center">
+            <soap:address location="http://localhost:9000/"/>
+        </wsdl:port>
+    </wsdl:service>
+
 </wsdl:definitions>
\ No newline at end of file

Modified: cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml?rev=1325346&r1=1325345&r2=1325346&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml (original)
+++ cxf/branches/2.5.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/ws-binding.xml Thu Apr 12 16:14:07 2012
@@ -1,49 +1,49 @@
-<?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.
--->
-<jaxws:bindings wsdlLocation="cxf3105.wsdl"
-          xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
-          xmlns:xs="http://www.w3.org/2001/XMLSchema"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-          xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-          xmlns:fc="http://cxf.apache.org/testcase/cxf3105"
-          xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
-          	http://java.sun.com/xml/ns/jaxws http://java.sun.com/xml/ns/jaxws/wsdl_customizationschema_2_0.xsd">
-  <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema">
-  	<jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginrequest']">
-  		<jaxb:property name="LoginRequest"/>
-  	</jaxb:bindings>
-  	<jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginresponse']">
-  		<jaxb:property name="LoginResponse"/>
-  	</jaxb:bindings>
-  	<jaxb:bindings node="xs:element[@name='login']">
-  		<jaxb:class name="LoginRequest"/>
-  	</jaxb:bindings>
-  </jaxws:bindings>
-  
-  
-  
-  <jaxws:bindings node="wsdl:definitions/wsdl:portType[@name='Login']/wsdl:operation[@name='login']">
-  	<jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginRequest']/wsdl:part[@name='parameters']" childElementName="login" name="loginRequest"/>
-  	<jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginResponse']/wsdl:part[@name='parameters']" childElementName="login" name="loginResponse"/>
-  </jaxws:bindings>
-  
-  <jaxws:enableWrapperStyle>true</jaxws:enableWrapperStyle>
-</jaxws:bindings>
+<?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.
+-->
+<jaxws:bindings wsdlLocation="cxf3105.wsdl"
+          xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
+          xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+          xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+          xmlns:fc="http://cxf.apache.org/testcase/cxf3105"
+          xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd
+          	http://java.sun.com/xml/ns/jaxws http://java.sun.com/xml/ns/jaxws/wsdl_customizationschema_2_0.xsd">
+  <jaxws:bindings node="wsdl:definitions/wsdl:types/xs:schema">
+  	<jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginrequest']">
+  		<jaxb:property name="LoginRequest"/>
+  	</jaxb:bindings>
+  	<jaxb:bindings node="xs:element//xs:element[@name='login' and @type='fc:loginresponse']">
+  		<jaxb:property name="LoginResponse"/>
+  	</jaxb:bindings>
+  	<jaxb:bindings node="xs:element[@name='login']">
+  		<jaxb:class name="LoginRequest"/>
+  	</jaxb:bindings>
+  </jaxws:bindings>
+  
+  
+  
+  <jaxws:bindings node="wsdl:definitions/wsdl:portType[@name='Login']/wsdl:operation[@name='login']">
+  	<jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginRequest']/wsdl:part[@name='parameters']" childElementName="login" name="loginRequest"/>
+  	<jaxws:parameter part="wsdl:definitions/wsdl:message[@name='loginResponse']/wsdl:part[@name='parameters']" childElementName="login" name="loginResponse"/>
+  </jaxws:bindings>
+  
+  <jaxws:enableWrapperStyle>true</jaxws:enableWrapperStyle>
+</jaxws:bindings>



Mime
View raw message