You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrf-commits@ws.apache.org by ip...@apache.org on 2005/08/01 16:48:03 UTC

svn commit: r226806 - in /webservices/wsrf/trunk: ./ src/examples/interop/requests/ src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/ src/examples/interop/src/test/org/oasisOpen/docs/wsrf/ src/java/org/apache/ws/...

Author: ips
Date: Mon Aug  1 07:47:57 2005
New Revision: 226806

URL: http://svn.apache.org/viewcvs?rev=226806&view=rev
Log:
began to port WSRF interop app to run on latest WSRF

Modified:
    webservices/wsrf/trunk/maven.xml
    webservices/wsrf/trunk/src/examples/interop/requests/CreatePrinter.soap
    webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortHome.java
    webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryHome.java
    webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryResource.java
    webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryService.java
    webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortHome.java
    webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortService.java
    webservices/wsrf/trunk/src/examples/interop/src/test/org/oasisOpen/docs/wsrf/InteropTestCase.java
    webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java

Modified: webservices/wsrf/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/maven.xml?rev=226806&r1=226805&r2=226806&view=diff
==============================================================================
--- webservices/wsrf/trunk/maven.xml (original)
+++ webservices/wsrf/trunk/maven.xml Mon Aug  1 07:47:57 2005
@@ -201,7 +201,9 @@
     <delete dir="${examples.assembly.dir}" />
     <mkdir dir="${examples.assembly.dir}" />
     <copy todir="${examples.assembly.dir}">
-      <fileset dir="${maven.src.dir}/examples" />
+      <fileset dir="${maven.src.dir}/examples">
+         <include name="filesystem/**" />
+      </fileset>
     </copy>
 
     <property name="template.assembly.dir" location="${maven.dist.bin.assembly.dir}/template" />

Modified: webservices/wsrf/trunk/src/examples/interop/requests/CreatePrinter.soap
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/examples/interop/requests/CreatePrinter.soap?rev=226806&r1=226805&r2=226806&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/examples/interop/requests/CreatePrinter.soap (original)
+++ webservices/wsrf/trunk/src/examples/interop/requests/CreatePrinter.soap Mon Aug  1 07:47:57 2005
@@ -3,7 +3,8 @@
           xmlns:wsrf-pr="http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.xsd">
 
    <Header xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
-    
+      <wsa:To mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:To>
+      <wsa:Action mustUnderstand="1">http://localhost:8080/wsrf/services/PrinterFactory</wsa:Action>            
    </Header>
 
    <Body>

Modified: webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortHome.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortHome.java?rev=226806&r1=226805&r2=226806&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortHome.java (original)
+++ webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/JobPortHome.java Mon Aug  1 07:47:57 2005
@@ -15,11 +15,11 @@
  *=============================================================================*/
 package org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03Wsdl;
 
-import org.apache.axis.message.addressing.Constants;
 import org.apache.ws.addressing.EndpointReference;
+import org.apache.ws.resource.IllegalResourceTypeException;
 import org.apache.ws.resource.JndiConstants;
-import org.apache.ws.resource.ResourceContext;
 import org.apache.ws.resource.impl.AbstractResourceHome;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
 import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.MimeMediaTypeType;
 
 import javax.xml.namespace.QName;
@@ -42,12 +42,16 @@
     public static final String HOME_LOCATION =
             JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME + "/" + JndiConstants.ATOMIC_NAME_HOME;
 
+    /**
+     * A NamespaceVerionHolder which maintains the QNames of Spec Wsdls
+     */
+    public static final org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl SPEC_NAMESPACE_SET = new org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl();
+
     private long m_jobId;
 
     /**
      * DOCUMENT_ME
      *
-     * @param resourceContext DOCUMENT_ME
      * @param jobName         DOCUMENT_ME
      * @param origUserName    DOCUMENT_ME
      * @param documentFormat  DOCUMENT_ME
@@ -56,7 +60,7 @@
      *
      * @return DOCUMENT_ME
      */
-    public JobPortResource createJob( ResourceContext resourceContext,
+    public JobPortResource createJob(
                                       String jobName,
                                       String origUserName,
                                       MimeMediaTypeType.Enum documentFormat,
@@ -65,32 +69,45 @@
     {
         ++m_jobId;
         String jobId = "Job" + m_jobId;
-        EndpointReference jobEpr = getEndpointReference( resourceContext.getBaseURL() + "/" + SERVICE_NAME, jobId, Constants.NS_URI_ADDRESSING_2004_08 );
+        EndpointReference jobEpr = getEndpointReference( jobId );
         JobPortResource job = new JobPortResource( jobEpr, jobId, jobName, printerResource, origUserName );
         job.init();
-        add( jobId, job );
+        try
+        {
+            add( job );
+        }
+        catch ( IllegalResourceTypeException e )
+        {
+            throw new RuntimeException( e );
+        }
         return job;
     }
 
     /**
      * DOCUMENT_ME
      *
-     * @param resourceContext DOCUMENT_ME
      * @param jobName         DOCUMENT_ME
      * @param printerResource DOCUMENT_ME
      *
      * @return DOCUMENT_ME
      */
-    public JobPortResource createJob( ResourceContext resourceContext,
+    public JobPortResource createJob(
                                       String jobName,
                                       PrinterPortResource printerResource )
     {
         ++m_jobId;
         String jobId = "Job" + m_jobId;
-        EndpointReference jobEpr = getEndpointReference( resourceContext.getBaseURL() + "/" + SERVICE_NAME, jobId, Constants.NS_URI_ADDRESSING_2004_08 );
+        EndpointReference jobEpr = getEndpointReference( jobId );
         JobPortResource job = new JobPortResource( jobEpr, jobId, jobName, printerResource );
         job.init();
-        add( jobId, job );
+        try
+        {
+            add( job );
+        }
+        catch ( IllegalResourceTypeException e )
+        {
+            throw new RuntimeException( e );
+        }
         return job;
     }
 
@@ -109,9 +126,9 @@
         return SERVICE_NAME;
     }
 
-    public QName getResourceIdentifierReferenceParameterQName()
+    public NamespaceVersionHolder getNamespaceVersionHolder()
     {
-        return QName.valueOf( "{http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl}ResourceID" );
+        return SPEC_NAMESPACE_SET;
     }
 
     /**

Modified: webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryHome.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryHome.java?rev=226806&r1=226805&r2=226806&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryHome.java (original)
+++ webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryHome.java Mon Aug  1 07:47:57 2005
@@ -15,8 +15,8 @@
  *=============================================================================*/
 package org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03Wsdl;
 
-import org.apache.ws.resource.*;
 import org.apache.ws.resource.impl.AbstractResourceHome;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
 
 import javax.xml.namespace.QName;
 import java.io.Serializable;
@@ -29,34 +29,25 @@
    extends AbstractResourceHome
    implements Serializable
 {
-   private PrinterFactoryResource m_printerFactory;
 
-   /**
-    * 
-    *
-    * @param resourceContext DOCUMENT_ME
-    *
-    * @return DOCUMENT_ME
-    *
-    * @throws ResourceException        DOCUMENT_ME
-    * @throws ResourceContextException DOCUMENT_ME
-    * @throws ResourceUnknownException DOCUMENT_ME
-    */
-   public Resource getInstance( ResourceContext resourceContext )
-   throws ResourceException, 
-          ResourceContextException, 
-          ResourceUnknownException
-   {
-      //singleton
-      if ( m_printerFactory == null )
-      {
-         m_printerFactory = new PrinterFactoryResource(  );
-         m_printerFactory.init(  );
-         add(null,m_printerFactory);
-      }
+    /**
+     * A NamespaceVerionHolder which maintains the QNames of Spec Wsdls
+     */
+    public static final org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl SPEC_NAMESPACE_SET = new org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl();
+
+   private PrinterFactoryResource m_printerFactory;
 
-      return m_printerFactory;
-   }
+    public void init() throws Exception
+    {
+        super.init();
+        if ( m_printerFactory == null )
+        {
+           //singleton
+           m_printerFactory = new PrinterFactoryResource(  );
+           m_printerFactory.init(  );
+           add(m_printerFactory);
+        }
+    }
 
     public QName getServiceName()
     {
@@ -73,9 +64,9 @@
         return "PrinterFactory";
     }
 
-    public QName getResourceIdentifierReferenceParameterQName()
+    public NamespaceVersionHolder getNamespaceVersionHolder()
     {
-        return null;
+        return SPEC_NAMESPACE_SET;
     }
 
     /**

Modified: webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryResource.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryResource.java?rev=226806&r1=226805&r2=226806&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryResource.java (original)
+++ webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryResource.java Mon Aug  1 07:47:57 2005
@@ -31,7 +31,8 @@
     */
    public void init(  )
    {
-      super.init(  );
+       super.init(  );
+       setID( null );
    }
 
     /**

Modified: webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryService.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryService.java?rev=226806&r1=226805&r2=226806&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryService.java (original)
+++ webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterFactoryService.java Mon Aug  1 07:47:57 2005
@@ -81,7 +81,7 @@
          PrinterPortHome     printerPortHome =
             (PrinterPortHome) initialContext.lookup( PrinterPortHome.HOME_LOCATION );
          PrinterPortResource instance        =
-            (PrinterPortResource) printerPortHome.createPrinter( getResourceContext(  ) );
+            (PrinterPortResource) printerPortHome.createPrinter();
 
          //get Resource Prop for Printer Ref
          XmlBeansResourceProperty prop =

Modified: webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortHome.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortHome.java?rev=226806&r1=226805&r2=226806&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortHome.java (original)
+++ webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortHome.java Mon Aug  1 07:47:57 2005
@@ -15,16 +15,14 @@
  *=============================================================================*/
 package org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03Wsdl;
 
+import org.apache.ws.addressing.EndpointReference;
 import org.apache.ws.resource.JndiConstants;
 import org.apache.ws.resource.Resource;
-import org.apache.ws.resource.ResourceContext;
 import org.apache.ws.resource.ResourceContextException;
 import org.apache.ws.resource.ResourceException;
 import org.apache.ws.resource.ResourceUnknownException;
 import org.apache.ws.resource.impl.AbstractResourceHome;
-import org.apache.ws.addressing.EndpointReference;
-import org.apache.axis.message.addressing.Constants;
-import org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType;
+import org.apache.ws.resource.properties.NamespaceVersionHolder;
 
 import javax.xml.namespace.QName;
 import java.io.Serializable;
@@ -37,6 +35,7 @@
         extends AbstractResourceHome
         implements Serializable
 {
+
     private static final String SERVICE_NAME = "PrinterPort";
 
     /**
@@ -44,32 +43,35 @@
      */
     public static final String HOME_LOCATION =
             JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME + "/" + JndiConstants.ATOMIC_NAME_HOME;
+
+    /**
+     * A NamespaceVerionHolder which maintains the QNames of Spec Wsdls
+     */
+    public static final org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl SPEC_NAMESPACE_SET = new org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl();
+
     // private PrinterPortResource m_printer;
     private int m_printerId;
 
     /**
      * DOCUMENT_ME
      *
-     * @param resourceContext DOCUMENT_ME
-     *
      * @return DOCUMENT_ME
      *
      * @throws ResourceException        DOCUMENT_ME
      * @throws ResourceContextException DOCUMENT_ME
      * @throws ResourceUnknownException DOCUMENT_ME
      */
-    public Resource createPrinter( ResourceContext resourceContext )
+    public Resource createPrinter()
             throws ResourceException,
             ResourceContextException,
             ResourceUnknownException
     {
         ++m_printerId;
         String printerId = "Printer" + m_printerId;
-        EndpointReference printerEpr = getEndpointReference( resourceContext.getBaseURL() + "/" + SERVICE_NAME, printerId, Constants.NS_URI_ADDRESSING_2004_08 );
-        PrinterPortResource printer = new PrinterPortResource( "Printer" + printerId,
-                printerEpr );
+        EndpointReference printerEpr = getEndpointReference( printerId );
+        PrinterPortResource printer = new PrinterPortResource( "Printer" + printerId, printerEpr );
         printer.init();
-        add( printerId, printer );
+        add( printer );
         return printer;
     }
 
@@ -88,9 +90,9 @@
         return "PrinterPort";
     }
 
-    public QName getResourceIdentifierReferenceParameterQName()
+    public NamespaceVersionHolder getNamespaceVersionHolder()
     {
-        return new QName( "{http://docs.oasis-open.org/wsrf/2005/01/wsrf-Interop-2.0-draft-03.wsdl}ResourceID" );
+        return SPEC_NAMESPACE_SET;
     }
 
     /**

Modified: webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortService.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortService.java?rev=226806&r1=226805&r2=226806&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortService.java (original)
+++ webservices/wsrf/trunk/src/examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/PrinterPortService.java Mon Aug  1 07:47:57 2005
@@ -16,16 +16,23 @@
 package org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03Wsdl;
 
 import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.ResourceContextException;
 import org.apache.ws.resource.ResourceException;
 import org.apache.ws.resource.properties.ResourceProperty;
-import org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl;
 import org.apache.ws.resource.properties.impl.XmlBeansResourceProperty;
 import org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet;
+import org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl;
 import org.apache.xmlbeans.XmlBoolean;
 import org.apache.xmlbeans.XmlInteger;
-import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.*;
+import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.CreateJobRequestDocument;
+import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.CreationResponseDocument;
+import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.DocumentContentType;
+import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.JobPropertiesDocument;
+import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.JobStateType;
+import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.MimeMediaTypeType;
+import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.MimeMediaTypes;
+import org.oasisOpen.docs.wsrf.x2005.x01.wsrfInterop20Draft03.PrintJobRequestDocument;
 import org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType;
+
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import java.math.BigInteger;
@@ -89,7 +96,7 @@
                (JobPortHome) initialContext.lookup( JobPortHome.HOME_LOCATION );
             CreateJobRequestDocument.CreateJobRequest createJobRequest = requestDoc.getCreateJobRequest(  );
             String                                    jobName          = createJobRequest.getJobName(  );
-            jobResource = (JobPortResource) home.createJob( getResourceContext(  ),
+            jobResource = (JobPortResource) home.createJob(
                                                             jobName,
                                                             (PrinterPortResource)getResourceContext().getResource() );
             Calendar currentTime = jobResource.getCurrentTime(  );
@@ -147,7 +154,7 @@
                DocumentContentType documentContent = printJobRequest.getDocumentContent(  );
                byte[]              base64Data = documentContent.getBase64Data(  );
                jobResource =
-                  (JobPortResource) home.createJob( getResourceContext(  ),
+                  (JobPortResource) home.createJob(
                                                     jobName,
                                                     "",
                                                     documentFormat,
@@ -196,7 +203,7 @@
    }
 
    private boolean isDocTypeSupported( MimeMediaTypeType.Enum documentFormat )
-   throws ResourceContextException, 
+   throws
           ResourceException
    {
       boolean                  docTypeSupported        = false;
@@ -241,7 +248,7 @@
    }
 
    private void addJobPropsToPrinterProps( JobPortResource instance )
-   throws ResourceContextException, 
+   throws
           ResourceException
    {
       JobPropertiesDocument jobPropDoc           = getJobPropDoc( instance );
@@ -259,8 +266,7 @@
    }
 
    private void incrementQueueCount(  )
-   throws ResourceException, 
-          ResourceContextException
+   throws ResourceException
    {
       PrinterPortResource printerResource      = (PrinterPortResource) getResourceContext(  ).getResource(  );
       ResourceProperty    printerJobProperties =

Modified: webservices/wsrf/trunk/src/examples/interop/src/test/org/oasisOpen/docs/wsrf/InteropTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/examples/interop/src/test/org/oasisOpen/docs/wsrf/InteropTestCase.java?rev=226806&r1=226805&r2=226806&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/examples/interop/src/test/org/oasisOpen/docs/wsrf/InteropTestCase.java (original)
+++ webservices/wsrf/trunk/src/examples/interop/src/test/org/oasisOpen/docs/wsrf/InteropTestCase.java Mon Aug  1 07:47:57 2005
@@ -45,7 +45,7 @@
     /**
      * Check system property, else the default is true
      */
-    private static boolean m_runAxisServer = System.getProperty("runAxis") != null ? Boolean.valueOf(System.getProperty("runAxis")).booleanValue() : true;
+    private static boolean m_runAxisServer = System.getProperty("runAxis") != null ? Boolean.valueOf(System.getProperty("runAxis")).booleanValue() : false;
 
     private static String PRINTER_FACTORY_PORT = "PrinterFactory";
     private static final String PRINTER_PORT = "PrinterPort";

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java?rev=226806&r1=226805&r2=226806&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java Mon Aug  1 07:47:57 2005
@@ -710,8 +710,6 @@
     {
         String endpointAddress = JaxRpcPlatform.getJaxRpcPlatform().getEndpointUrl(getBaseWebappUrl(),getServiceName().getLocalPart());
         String wsAddressingURI = getNamespaceVersionHolder().getAddressingNamespace();
-
-
         XmlBeansEndpointReference xmlBeansEndpointReference = new XmlBeansEndpointReference( endpointAddress,
                 wsAddressingURI );
         xmlBeansEndpointReference.setResourceIdentifierReferenceParameterName(