cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r545195 - in /incubator/cxf/trunk/distribution/src/main/release/samples: hello_world_https/CherryServer.cxf hello_world_https/InsecureClient.cxf hello_world_https/WibbleClient.cxf restful_http_binding/src/com/acme/customer/Main.java
Date Thu, 07 Jun 2007 14:37:42 GMT
Author: ningjiang
Date: Thu Jun  7 07:37:40 2007
New Revision: 545195

URL: http://svn.apache.org/viewvc?view=rev&rev=545195
Log:
CXF-712 get the sample of hello_world_https work with latest trunk

Modified:
    incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/CherryServer.cxf
    incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/InsecureClient.cxf
    incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/WibbleClient.cxf
    incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Main.java

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/CherryServer.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/CherryServer.cxf?view=diff&rev=545195&r1=545194&r2=545195
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/CherryServer.cxf
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/CherryServer.cxf
Thu Jun  7 07:37:40 2007
@@ -1,63 +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.
--->
-
-<!-- 
-  ** 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:jaxws="http://java.sun.com/xml/ns/jaxws"
-  xsi:schemaLocation="
-       http://cxf.apache.org/transports/http/configuration
-           http://cxf.apache.org/schema/transports/http.xsd
-       http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-  <http:destination id="{http://apache.org/hello_world_soap_http}GreeterPort.http-destination">

-    <http: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"/>
-    </http:tlsServerParameters>
-  </http:destination>
-  
-  <!-- We need a bean named "cxf", or SpringBusFactory barfs -->
-  <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
-</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">
+
+  <http:destination name="{http://apache.org/hello_world_soap_http}GreeterPort.http-destination">

+  </http:destination>
+
+  <httpj:engine-factory bus="cxf">
+   <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_NULL_.*</sec:include>
+        <sec:exclude>.*_DH_anon_.*</sec:exclude>
+      </sec:cipherSuitesFilter>
+      <sec:clientAuthentication want="true" required="true"/>
+    </httpj:tlsServerParameters>
+   </httpj:engine>
+  </httpj:engine-factory>
+  
+  <!-- We need a bean named "cxf" -->
+  <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/>
+</beans>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/InsecureClient.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/InsecureClient.cxf?view=diff&rev=545195&r1=545194&r2=545195
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/InsecureClient.cxf
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/InsecureClient.cxf
Thu Jun  7 07:37:40 2007
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:http="http://cxf.apache.org/transports/http/configuration"
-  xsi:schemaLocation="
-http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schema/transports/http.xsd
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-  <http:conduit id="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
-  </http:conduit>
-
-</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:http="http://cxf.apache.org/transports/http/configuration"
+  xsi:schemaLocation="
+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}SoapPort.http-conduit">
+  </http:conduit>
+
+</beans>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/WibbleClient.cxf
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/WibbleClient.cxf?view=diff&rev=545195&r1=545194&r2=545195
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/WibbleClient.cxf
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_https/WibbleClient.cxf
Thu Jun  7 07:37:40 2007
@@ -1,63 +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.
--->
-
-<!-- 
-  ** This file configures the Wibble Client
-  -->
-
-<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:jaxws="http://java.sun.com/xml/ns/jaxws"
-  xsi:schemaLocation="
-           http://cxf.apache.org/transports/http/configuration
-              http://cxf.apache.org/schema/transports/http.xsd
-           http://www.springframework.org/schema/beans
-              http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-  <http:conduit id="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
-    <http:tlsClientParameters>
-      <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_NULL_.*</sec:include>
-        <sec:exclude>.*_DH_anon_.*</sec:exclude>
-      </sec:cipherSuitesFilter>
-    </http:tlsClientParameters>
-   </http:conduit>
-  
-    <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
-    </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.
+-->
+
+<!-- 
+  ** This file configures the Wibble Client
+  -->
+
+<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: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://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+  <http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
+    <http:tlsClientParameters>
+      <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_NULL_.*</sec:include>
+        <sec:exclude>.*_DH_anon_.*</sec:exclude>
+      </sec:cipherSuitesFilter>
+    </http:tlsClientParameters>
+   </http:conduit>
+  
+    <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl">
+    </bean> 
+
+</beans>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Main.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Main.java?view=diff&rev=545195&r1=545194&r2=545195
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Main.java
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/restful_http_binding/src/com/acme/customer/Main.java
Thu Jun  7 07:37:40 2007
@@ -59,6 +59,8 @@
         serveHTML();
         
         System.out.println("Started CustomerService!");
+    
+        System.out.println("Server ready...");
     }
 
     private static void createRestService(Object serviceObj) {



Mime
View raw message