You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/07/11 03:09:29 UTC
svn commit: r1502081 - in /cxf/trunk: api/src/main/java/org/apache/cxf/common/util/ rt/core/src/main/java/org/apache/cxf/bus/spring/ rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/

Author: dkulp
Date: Thu Jul 11 01:09:29 2013
New Revision: 1502081

URL: http://svn.apache.org/r1502081
Log:
Move some more stuff from api

Added:
    cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java
      - copied, changed from r1502080, cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ClassReader.java
    cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ParamReader.java
      - copied, changed from r1502080, cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ParamReader.java
Removed:
    cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ClassReader.java
    cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ParamReader.java
    cxf/trunk/api/src/main/java/org/apache/cxf/common/util/SystemUtils.java
Modified:
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
    cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java?rev=1502081&r1=1502080&r2=1502081&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java Thu Jul 11 01:09:29 2013
@@ -40,7 +40,6 @@ import org.apache.cxf.common.classloader
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.SystemPropertyAction;
-import org.apache.cxf.common.util.SystemUtils;
 import org.apache.cxf.configuration.Configurer;
 import org.apache.cxf.interceptor.Fault;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -290,7 +289,7 @@ public class BusApplicationContext exten
         }
         reader.setNamespaceHandlerResolver(nsHandlerResolver);
         
-        String mode = SystemUtils.getSpringValidationMode();
+        String mode = getSpringValidationMode();
         if (null != mode) {
             reader.setValidationModeName(mode);
         }
@@ -299,6 +298,19 @@ public class BusApplicationContext exten
         setEntityResolvers(reader);        
     }
     
+    static String getSpringValidationMode() {
+        return AccessController.doPrivileged(new PrivilegedAction<String>() {
+            public String run() {
+                String mode = SystemPropertyAction.getPropertyOrNull("org.apache.cxf.spring.validation.mode");
+                if (mode == null) {
+                    mode = SystemPropertyAction.getPropertyOrNull("spring.validation.mode");
+                }
+                return mode;
+            }
+        });
+    }
+        
+    
     void setEntityResolvers(XmlBeanDefinitionReader reader) {
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
         reader.setEntityResolver(new BusEntityResolver(new BeansDtdResolver(),

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java (from r1502080, cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ClassReader.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ClassReader.java&r1=1502080&r2=1502081&rev=1502081&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ClassReader.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java Thu Jul 11 01:09:29 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.common.util;
+package org.apache.cxf.wsdl.service.factory;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -45,7 +45,7 @@ import java.util.Map;
  * threadsafe -- don't share them.
  * <p>
  */
-public class ClassReader extends ByteArrayInputStream {
+class ClassReader extends ByteArrayInputStream {
     // constants values that appear in java class files,
     // from jvm spec 2nd ed, section 4.4, pp 103
     private static final int CONSTANT_CLASS = 7;

Modified: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java?rev=1502081&r1=1502080&r2=1502081&view=diff
==============================================================================
--- cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/DefaultServiceConfiguration.java Thu Jul 11 01:09:29 2013
@@ -30,7 +30,6 @@ import java.util.Arrays;
 
 import javax.xml.namespace.QName;
 
-import org.apache.cxf.common.util.ParamReader;
 import org.apache.cxf.helpers.ServiceUtils;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.service.factory.ServiceConstructionException;

Copied: cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ParamReader.java (from r1502080, cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ParamReader.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ParamReader.java?p2=cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ParamReader.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ParamReader.java&r1=1502080&r2=1502081&rev=1502081&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/common/util/ParamReader.java (original)
+++ cxf/trunk/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ParamReader.java Thu Jul 11 01:09:29 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.common.util;
+package org.apache.cxf.wsdl.service.factory;
 
 // import org.apache.axis.utils.Messages;
 
@@ -42,7 +42,7 @@ import java.util.Map;
  * don't get tricky, it's the bare minimum. Instances of this class are not
  * threadsafe -- don't share them.
  */
-public class ParamReader extends ClassReader {
+class ParamReader extends ClassReader {
     private String methodName;
     private Map<String, MethodInfo> methods = new HashMap<String, MethodInfo>();
     private Class<?>[] paramTypes;