svn commit: r598104 - in /incubator/cxf/trunk: distribution/src/main/release/samples/java_first_jaxws/wsdl/ distribution/src/main/release/samples/java_first_jaxws/wsdl/cxf-servlet.xml rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java

[ni...@apache.org]

Author: ningjiang
Date: Sun Nov 25 17:32:57 2007
New Revision: 598104

URL: http://svn.apache.org/viewvc?rev=598104&view=rev
Log:
Added cxf-servlet.xml in java_first_jaxws sample and took Glen's advice of changing keepalive to preKeepalive

Added:
    incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/wsdl/
    incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/wsdl/cxf-servlet.xml   (with props)
Modified:
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java

Added: incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/wsdl/cxf-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/wsdl/cxf-servlet.xml?rev=598104&view=auto
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/wsdl/cxf-servlet.xml (added)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/wsdl/cxf-servlet.xml Sun Nov 25 17:32:57 2007
@@ -0,0 +1,35 @@
+<?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:jaxws="http://cxf.apache.org/jaxws"
+      xmlns:soap="http://cxf.apache.org/bindings/soap"
+      xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd
+http://cxf.apache.org/jaxws
+http://cxf.apache.org/schemas/jaxws.xsd">
+
+  <jaxws:server id="jaxwsService" serviceClass="demo.hw.server.HelloWorld" address="/hello_world">
+  	<jaxws:serviceBean>
+  		<bean class="demo.hw.server.HelloWorldImpl" />
+  	</jaxws:serviceBean>
+  </jaxws:server>
+</beans>

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/wsdl/cxf-servlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/wsdl/cxf-servlet.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/wsdl/cxf-servlet.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java?rev=598104&r1=598103&r2=598104&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/test/TestUtilities.java Sun Nov 25 17:32:57 2007
@@ -65,7 +65,7 @@
 public class TestUtilities {
     
     private static final Charset UTF8 = Charset.forName("utf-8");
-    private static String keepAlive;
+    private static String preKeepAlive;
     
     private static String basedirPath;
     protected Bus bus;
@@ -90,13 +90,13 @@
     }
     
     public static void setKeepAliveSystemProperty(boolean setAlive) {
-        keepAlive = System.getProperty("http.keepAlive");
+        preKeepAlive = System.getProperty("http.keepAlive");
         System.setProperty("http.keepAlive", Boolean.toString(setAlive));
     }
     
     public static void recoverKeepAliveSystemProperty() {
-        if (keepAlive != null) {
-            System.setProperty("http.keepAlive", keepAlive);
+        if (preKeepAlive != null) {
+            System.setProperty("http.keepAlive", preKeepAlive);
         } else {
             System.clearProperty("http.keepAlive");
         }