svn commit: r233060 - in /webservices/wsrf/trunk/src/java/org/apache/ws: resource/handler/axis/AxisConstants.java resource/handler/axis/ResourceProvider.java util/jndi/tools/MetadataConfigImpl.java util/platform/JaxRpcPlatform.java

[sc...@apache.org]

Author: scamp
Date: Tue Aug 16 14:39:00 2005
New Revision: 233060

URL: http://svn.apache.org/viewcvs?rev=233060&view=rev
Log:
Fixes for MetadataConfigImpl.java to be serializable and platform stuff

Added:
    webservices/wsrf/trunk/src/java/org/apache/ws/resource/handler/axis/AxisConstants.java
Modified:
    webservices/wsrf/trunk/src/java/org/apache/ws/resource/handler/axis/ResourceProvider.java
    webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/tools/MetadataConfigImpl.java
    webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/JaxRpcPlatform.java

Added: webservices/wsrf/trunk/src/java/org/apache/ws/resource/handler/axis/AxisConstants.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/handler/axis/AxisConstants.java?rev=233060&view=auto
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/handler/axis/AxisConstants.java (added)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/handler/axis/AxisConstants.java Tue Aug 16 14:39:00 2005
@@ -0,0 +1,14 @@
+package org.apache.ws.resource.handler.axis;
+
+/**
+ * A constants class for Axis-Specific information.
+ *
+ * @author Sal Campana
+ */
+public interface AxisConstants
+{
+    /**
+     * a constant for reference in the JaxRpcPlatform to determine if Axis is being used.
+     */
+    String AXIS_PLATFORM = "AXIS_PLATFORM";
+}

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/handler/axis/ResourceProvider.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/handler/axis/ResourceProvider.java?rev=233060&r1=233059&r2=233060&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/handler/axis/ResourceProvider.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/handler/axis/ResourceProvider.java Tue Aug 16 14:39:00 2005
@@ -61,6 +61,11 @@
    public static final String SYSPROP_AXIS_FAULT_DEBUG = "axis.fault.debug";
    private GenericAxisHandler m_axisHelperHandler = new GenericAxisHandler( this );
 
+    static
+    {
+        System.setProperty(AxisConstants.AXIS_PLATFORM, "true");
+    }
+
    /**
     * DOCUMENT_ME
     *

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/tools/MetadataConfigImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/tools/MetadataConfigImpl.java?rev=233060&r1=233059&r2=233060&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/tools/MetadataConfigImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/tools/MetadataConfigImpl.java Tue Aug 16 14:39:00 2005
@@ -24,6 +24,7 @@
 import org.xmlsoap.schemas.ws.x2004.x09.mex.LocationDocument;
 import org.xmlsoap.schemas.ws.x2004.x09.mex.MetadataReferenceDocument;
 import java.io.File;
+import java.io.Serializable;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -42,7 +43,7 @@
  * @author Sal Campana
  */
 public class MetadataConfigImpl
-   extends MetadataConfig
+   extends MetadataConfig implements Serializable
 {
    private static final Log LOG = LogFactory.getLog( MetadataConfigImpl.class );
 

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/JaxRpcPlatform.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/JaxRpcPlatform.java?rev=233060&r1=233059&r2=233060&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/JaxRpcPlatform.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/platform/JaxRpcPlatform.java Tue Aug 16 14:39:00 2005
@@ -17,6 +17,8 @@
 
 import org.apache.ws.util.platform.axis.AxisJaxRpcPlatform;
 import org.apache.ws.util.platform.weblogic.WeblogicJaxRpcPlatform;
+import org.apache.ws.resource.handler.axis.AxisConstants;
+
 import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPFactory;
 
@@ -104,7 +106,7 @@
          throw new RuntimeException( "JAX-RPC platform not found!" );
       }
 
-      if ( soapFactory.getClass(  ).getName(  ).equals( AXIS.getSoapFactoryImpl(  ) ) )
+      if ( System.getProperty(AxisConstants.AXIS_PLATFORM) != null || soapFactory.getClass(  ).getName(  ).equals( AXIS.getSoapFactoryImpl()) )
       {
          s_platformType = AXIS;
       }