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/10/05 00:53:21 UTC

svn commit: r294940 [2/2] - in /webservices/wsrf/trunk/src: examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/ examples/interop/src/java/org/oasisOpen/docs/wsrf/x2005/x01/wsrfInterop20Draft03Wsdl/ java/org/apache/ws/resource/ java/...

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetMultipleResourcePropertiesPortTypeImpl.java Tue Oct  4 15:52:49 2005
@@ -16,7 +16,8 @@
 package org.apache.ws.resource.properties.v2004_11.porttype.impl;
 
 import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
 import org.apache.ws.resource.properties.ResourceProperty;
 import org.apache.ws.resource.properties.impl.AbstractGetResourcePropertiesPortType;
 import org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl;

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetResourcePropertyDocumentPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetResourcePropertyDocumentPortTypeImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetResourcePropertyDocumentPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetResourcePropertyDocumentPortTypeImpl.java Tue Oct  4 15:52:49 2005
@@ -18,8 +18,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.resource.ResourceContext;
+import org.apache.ws.resource.NamespaceVersionHolder;
 import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
 import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPortType;
 import org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet;
 import org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl;

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetResourcePropertyPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetResourcePropertyPortTypeImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetResourcePropertyPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/GetResourcePropertyPortTypeImpl.java Tue Oct  4 15:52:49 2005
@@ -16,7 +16,7 @@
 package org.apache.ws.resource.properties.v2004_11.porttype.impl;
 
 import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
 import org.apache.ws.resource.properties.ResourceProperty;
 import org.apache.ws.resource.properties.impl.AbstractGetResourcePropertiesPortType;
 import org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl;

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/InsertResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/InsertResourcePropertiesPortTypeImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/InsertResourcePropertiesPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/InsertResourcePropertiesPortTypeImpl.java Tue Oct  4 15:52:49 2005
@@ -16,7 +16,8 @@
 package org.apache.ws.resource.properties.v2004_11.porttype.impl;
 
 import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
 import org.apache.ws.resource.properties.impl.AbstractSetResourcePropertiesPortType;
 import org.apache.ws.resource.properties.impl.AbstractXmlBeansResourcePropertyValueChangeEvent;
 import org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl;

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/QueryResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/QueryResourcePropertiesPortTypeImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/QueryResourcePropertiesPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/QueryResourcePropertiesPortTypeImpl.java Tue Oct  4 15:52:49 2005
@@ -20,7 +20,7 @@
 import org.apache.ws.resource.ResourceContext;
 import org.apache.ws.resource.i18n.Keys;
 import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
 import org.apache.ws.resource.properties.faults.InvalidQueryExpressionFaultException;
 import org.apache.ws.resource.properties.faults.QueryEvaluationErrorFaultException;
 import org.apache.ws.resource.properties.faults.UnknownQueryExpressionDialectFaultException;

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/SetResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/SetResourcePropertiesPortTypeImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/SetResourcePropertiesPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/SetResourcePropertiesPortTypeImpl.java Tue Oct  4 15:52:49 2005
@@ -18,9 +18,10 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.resource.ResourceContext;
+import org.apache.ws.resource.NamespaceVersionHolder;
 import org.apache.ws.resource.i18n.Keys;
 import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
 import org.apache.ws.resource.properties.faults.DeleteResourcePropertyRequestFailedFaultException;
 import org.apache.ws.resource.properties.faults.InsertResourcePropertyRequestFailedFaultException;
 import org.apache.ws.resource.properties.faults.InvalidInsertResourcePropertiesRequestContentFaultException;

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_11/porttype/impl/UpdateResourcePropertiesPortTypeImpl.java Tue Oct  4 15:52:49 2005
@@ -16,7 +16,7 @@
 package org.apache.ws.resource.properties.v2004_11.porttype.impl;
 
 import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
 import org.apache.ws.resource.properties.impl.AbstractSetResourcePropertiesPortType;
 import org.apache.ws.resource.properties.impl.AbstractXmlBeansResourcePropertyValueChangeEvent;
 import org.apache.ws.resource.properties.v2004_11.impl.NamespaceVersionHolderImpl;

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java Tue Oct  4 15:52:49 2005
@@ -367,7 +367,7 @@
          else
          {
             System.err.println( "\n\nUnable to find a port type info for the implemented capability: "
-                                + ptName.toString(  ) + "!!!!!!\n\n" );
+                                + ptName + "!\n\n" );
          }
       }
 

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java Tue Oct  4 15:52:49 2005
@@ -16,6 +16,7 @@
 package org.apache.ws.resource.tool.velocity;
 
 import org.apache.ws.resource.ResourceDefinition;
+import org.apache.ws.resource.NamespaceVersionHolder;
 import org.apache.ws.util.XmlBeanNameUtils;
 import javax.xml.namespace.QName;
 import java.util.ArrayList;
@@ -338,16 +339,15 @@
    /**
     * DOCUMENT_ME
     *
-    * @param namespaceValueHolder DOCUMENT_ME
+    * @param namespaceVersionHolderClass DOCUMENT_ME
     */
-   public void setNamespaceVersionHolder( Class namespaceValueHolder )
+   public void setNamespaceVersionHolder( Class namespaceVersionHolderClass )
    {
-      if ( namespaceValueHolder != null )
+      if ( namespaceVersionHolderClass != null )
       {
-         setNamespaceVersionHolderClassName( namespaceValueHolder );
-         String className = namespaceValueHolder.getName(  );
+         setNamespaceVersionHolderClassName( namespaceVersionHolderClass );
          m_namespaceVersionHolder =
-            "private static final " + className + " " + NAMESPACE_SET_CONSTANT_NAME + " = new " + className + "();";
+            "private static final " + NamespaceVersionHolder.class.getName() + " " + NAMESPACE_SET_CONSTANT_NAME + " = new " + namespaceVersionHolderClass.getName() + "();";
       }
    }
 

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/SpringJndiPopulator.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/SpringJndiPopulator.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/SpringJndiPopulator.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/SpringJndiPopulator.java Tue Oct  4 15:52:49 2005
@@ -15,74 +15,96 @@
  *=============================================================================*/
 package org.apache.ws.util.jndi;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ws.resource.ResourceHome;
+import org.apache.ws.resource.JndiConstants;
 import org.springframework.beans.factory.ListableBeanFactory;
 
-import javax.naming.CompoundName;
 import javax.naming.Context;
-import javax.naming.InvalidNameException;
-import javax.naming.Name;
+import javax.naming.InitialContext;
 import javax.naming.NameAlreadyBoundException;
 import javax.naming.NamingException;
-import java.util.Properties;
 
 /**
- * Provides the ability to populate a JNDI context with the beans from a
- * Spring listable bean factory.
+ * Provides the ability to populate a JNDI context with the beans from a Spring listable bean factory.
  *
  * @author Ian Springer
  */
 public abstract class SpringJndiPopulator
 {
 
-    public static void populateContext( Context context, ListableBeanFactory beanFactory ) throws NamingException
+    private static Log LOG = LogFactory.getLog( SpringJndiPopulator.class.getName() );
+
+    public static void populateJndi( ListableBeanFactory beanFactory )
     {
+        Context resourceContext = getResourceContext();
         String[] beanDefNames = beanFactory.getBeanDefinitionNames();
         for ( int i = 0; i < beanDefNames.length; i++ )
         {
             String beanDefName = beanDefNames[i];
-            if ( ! beanFactory.isSingleton( beanDefName ) )
-            {
-                continue;  // skip non-singleton beans
-            }
-            Name jndiName = createJndiName( beanDefName );
-            Context targetContext = createTargetContext( context, jndiName );
-            String bindingName = jndiName.get( jndiName.size() - 1 );
             Object bean = beanFactory.getBean( beanDefName );
-            targetContext.bind( bindingName, bean );
-        }
-    }
-
-    private static Context createTargetContext( Context context, Name jndiName )
-            throws NamingException
-    {
-        Context targetContext = context;
-        int numComponents = jndiName.size();
-        if ( numComponents > 1 )
-        {
-            for ( int j = 0; j < ( numComponents - 1 ); j++ )
+            if ( bean instanceof ResourceHome )
             {
-                String subcontextName = jndiName.get( j );
+                ResourceHome resourceHome = (ResourceHome) bean;
+                String portComponentName = resourceHome.getPortComponentName();
+                if ( portComponentName == null )
+                {
+                    throw new IllegalStateException( "Bean definition for " + resourceHome.getClass().getName() + " does not initialize the 'portComponentName' property." );
+                }
+                LOG.info( "Binding " + resourceHome.getClass().getName() + " instance in JNDI with name '" + JndiConstants.CONTEXT_NAME_RESOURCE + "/" + portComponentName + "'..." );
                 try
                 {
-                    targetContext = targetContext.createSubcontext( subcontextName );
+                    resourceContext.bind( portComponentName, resourceHome );
                 }
-                catch ( NameAlreadyBoundException nabe )
+                catch ( NamingException ne )
                 {
-                    targetContext = (Context) targetContext.lookup( subcontextName );
+                    throw new RuntimeException( ne );
                 }
             }
         }
-        return targetContext;
     }
 
-    private static Name createJndiName( String beanDefName )
-            throws InvalidNameException
+    private static Context getResourceContext()
+    {
+        Context wsrfContext = createContext( getInitialContext(), "wsrf" );
+        Context resourceContext = createContext( wsrfContext, "resource" );
+        return resourceContext;
+    }
+
+    private static Context getInitialContext()
+    {
+        Context initialContext;
+        try
+        {
+            initialContext = new InitialContext();
+        }
+        catch ( NamingException ne )
+        {
+            throw new RuntimeException( ne );
+        }
+        return initialContext;
+    }
+
+    private static Context createContext( Context targetContext, String name )
     {
-        Properties nameSyntax = new Properties();
-        nameSyntax.setProperty( "jndi.syntax.direction", "left_to_right" );
-        nameSyntax.setProperty( "jndi.syntax.separator", "/" );
-        Name jndiName = new CompoundName( beanDefName, nameSyntax );
-        return jndiName;
+        try
+        {
+            Context context;
+            try
+            {
+                context = targetContext.createSubcontext( name );
+            }
+            catch ( NameAlreadyBoundException nabe )
+            {
+                context = (Context) targetContext.lookup( name );
+            }
+            return context;
+        }
+        catch ( NamingException ne )
+        {
+            throw new RuntimeException( ne );
+        }
     }
 
 }

Modified: webservices/wsrf/trunk/src/templates/AbstractResource.vm
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/AbstractResource.vm?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/AbstractResource.vm (original)
+++ webservices/wsrf/trunk/src/templates/AbstractResource.vm Tue Oct  4 15:52:49 2005
@@ -1,7 +1,9 @@
-#set( $package = $generated.packageName)
-#set( $serviceName = $generated.ServiceName)
-#set( $implements = $generated.resourceImplements)
-#set( $propDoc = $generated.propertyDocumentName)
+#set( $package = $generated.packageName )
+#set( $serviceName = $generated.serviceName )
+#set( $implements = $generated.resourceImplements )
+#set( $propDoc = $generated.propertyDocumentName )
+#set( $namespaceSetConstantName = $generated.namespaceSetConstantName )
+#set( $namespaceVersionHolder = $generated.namespaceVersionHolder )
 
 package $package;
 
@@ -17,7 +19,7 @@
 public abstract class Abstract${serviceName}Resource #if($implements) implements ${implements} #end
 {
 
-    #if($namespaceVersionHolder)
+    #if( $namespaceVersionHolder )
     $namespaceVersionHolder
     #end
 
@@ -35,14 +37,12 @@
      */
     protected org.apache.ws.resource.properties.ResourcePropertySet m_propSet;
     #end
-        
-    
+
     /**
      * A list of termination listeners to be notified when the resource is terminated.
      */
     private java.util.List m_terminationListeners = new java.util.ArrayList(); 
-     
-     
+          
     /**
      * DOCUMENT_ME
      *
@@ -98,7 +98,6 @@
 
     public void init()
     {
-                
         #if($generated.hasProperties)	    
         $propDoc propsDoc = ${propDoc}.Factory.newInstance();
         m_propSet = new org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet( propsDoc );
@@ -106,8 +105,7 @@
 	
         #foreach( $includeFile in $generated.AbstractResourceInitIncludeLocations )
         #parse( $includeFile )
-        #end         	
-      
+        #end
     }
     
    /**
@@ -125,7 +123,7 @@
    /**
     * Sets the EndpointReference associated with this Resource.
     *
-    * @param epr The Resource's EndpointReference.
+    * @param epr the Resource's EndpointReference
     * 
     * Note: It is the responsibility of the Resource creator to set the EndpointReference (i.e. ResourceHome impl)
     */
@@ -137,7 +135,7 @@
     /**
      * @see org.apache.ws.resource.Resource#getNamespaceSet()
      */
-    public NamespaceVersionHolder getNamespaceSet()
+    public org.apache.ws.resource.NamespaceVersionHolder getNamespaceSet()
     {
         return $namespaceSetConstantName;
     }

Modified: webservices/wsrf/trunk/src/templates/BaseFaultExtension.vm
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/BaseFaultExtension.vm?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/BaseFaultExtension.vm (original)
+++ webservices/wsrf/trunk/src/templates/BaseFaultExtension.vm Tue Oct  4 15:52:49 2005
@@ -3,13 +3,9 @@
 
 package $package;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ws.resource.i18n.MessagesImpl;
-import org.apache.ws.util.i18n.Messages;
 import javax.xml.namespace.QName;
 import org.apache.ws.resource.faults.AbstractBaseFaultException;
-import org.apache.ws.resource.properties.NamespaceVersionHolder;
+import org.apache.ws.resource.NamespaceVersionHolder;
 
 /**
  * An exception representing a $faultName WSRF base fault.
@@ -22,9 +18,6 @@
         extends AbstractBaseFaultException
 {
 
-    private static final Messages MSG = MessagesImpl.getInstance();
-    private static final Log LOG = LogFactory.getLog( ${faultName}.class );
-
     private QName m_name;
 
     /**
@@ -33,10 +26,10 @@
      * @param namespaces
      * @param faultString 
      */
-    public $faultName( NamespaceVersionHolder namespaces, String faultString )
+    public $faultName( NamespaceVersionHolder namespaceSet, String faultString )
     {
-        super( namespaces, faultString );
-        m_name = new QName( "$namespace", "$faultName");        
+        super( namespaceSet, faultString );
+        m_name = new QName( "$namespace", "$faultName" );        
     }
     
     /**

Modified: webservices/wsrf/trunk/src/templates/Home.vm
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/Home.vm?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/Home.vm (original)
+++ webservices/wsrf/trunk/src/templates/Home.vm Tue Oct  4 15:52:49 2005
@@ -14,6 +14,7 @@
 import org.apache.ws.resource.ResourceContextException;
 import org.apache.ws.resource.ResourceException;
 import org.apache.ws.resource.ResourceUnknownException;
+import org.apache.ws.resource.NamespaceVersionHolder;
 import org.apache.ws.resource.impl.AbstractResourceHome;
 import org.apache.ws.addressing.EndpointReference;
 
@@ -87,7 +88,7 @@
         return RESOURCE_KEY_NAME;
     }
     
-    public org.apache.ws.resource.properties.NamespaceVersionHolder getNamespaceVersionHolder()
+    public NamespaceVersionHolder getNamespaceVersionHolder()
     {
         return SPEC_NAMESPACE_SET; 
     }

Modified: webservices/wsrf/trunk/src/templates/Service.vm
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/Service.vm?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/Service.vm (original)
+++ webservices/wsrf/trunk/src/templates/Service.vm Tue Oct  4 15:52:49 2005
@@ -1,6 +1,5 @@
 #set( $package = $generated.packageName)
 #set( $serviceName = $generated.ServiceName)
-#set( $namespaceVersionHolder = $generated.NamespaceVersionHolder)
 #set( $customMethodList = $generated.CustomMappings)
 package $package;
 
@@ -26,14 +25,6 @@
    implements ${serviceName}CustomOperationsPortType
 {
    
-   #if($namespaceVersionHolder)    
-   
-   /**
-    * A NamespaceVerionHolder which maintains the QNames of Spec Wsdls
-    */
-   $namespaceVersionHolder
-    #end
-
    /**
     * Creates a new {@link ${serviceName}Service } object.
     *
@@ -44,19 +35,6 @@
       super(resourceContext);
       init();
    }
-   
-   #if($namespaceVersionHolder) 
-   /**
-    * Returns a collection of Spec Namespaces associated with this Service
-    *
-    * @return A NamespaceVersionHolder impl which represents the collection of spec namespaces 
-    *         associated with this service.
-    */
-   protected org.apache.ws.resource.properties.NamespaceVersionHolder getNamespaceSet()
-   {
-      return SPEC_NAMESPACE_SET;
-   }
-   #end   
 
    #foreach( $key in $customMethodList.keySet() )
    
@@ -73,8 +51,7 @@
      	 */
      	return responseDocument;
    }
-   
-   
+      
    #end   
    
 }

Modified: webservices/wsrf/trunk/src/templates/spring-jndi-config.xml.vm
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/spring-jndi-config.xml.vm?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/spring-jndi-config.xml.vm (original)
+++ webservices/wsrf/trunk/src/templates/spring-jndi-config.xml.vm Tue Oct  4 15:52:49 2005
@@ -9,6 +9,7 @@
 <beans>
 
   <bean name="resource/${endpointServiceName}" class="org.apache.ws.resource.example.filesystem.FilesystemHome" init-method="init">
+    <property name="portComponentName"><value>${endpointServiceName}</value></property>
     <property name="serviceClass"><value>${package}.${serviceName}Service</value></property>
     <property name="resourceClass"><value>${package}.${serviceName}Resource</value></property>
     <property name="resourceIdentifierReferenceParameterName"><value>{${resourcekey.NamespaceURI}}${resourcekey.LocalPart}</value></property>

Modified: webservices/wsrf/trunk/src/test/org/apache/ws/resource/WsrfRuntimeTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/test/org/apache/ws/resource/WsrfRuntimeTestCase.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/test/org/apache/ws/resource/WsrfRuntimeTestCase.java (original)
+++ webservices/wsrf/trunk/src/test/org/apache/ws/resource/WsrfRuntimeTestCase.java Tue Oct  4 15:52:49 2005
@@ -17,13 +17,10 @@
 
 import junit.framework.TestCase;
 import org.apache.naming.java.javaURLContextFactory;
-import org.apache.ws.util.jndi.DefaultParameters;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import java.util.Properties;
-import java.util.List;
-import java.util.Map;
 
 /**
  * A test case for {@link WsrfRuntime}.
@@ -54,27 +51,16 @@
 
     public void testInit() throws Exception
     {
-        WsrfRuntime runtime = WsrfRuntime.getRuntime();
+        /*WsrfRuntime runtime = WsrfRuntime.getRuntime();
         Properties initProps = new Properties();
         initProps.setProperty( WsrfRuntime.JNDI_CONFIG_DIALECT, WsrfRuntime.CONFIG_DIALECT_SPRING_BEANS );
         initProps.setProperty( WsrfRuntime.JNDI_CONFIG_LOCATION, "spring-jndi-config.xml" );
         runtime.init( initProps );
         InitialContext initialContext = new InitialContext( );
-        Object obj = initialContext.lookup( "wsrf/global/DefaultParameters" );
-        assertNotNull( obj );
-        assertTrue( obj instanceof DefaultParameters );
-        DefaultParameters params = (DefaultParameters) obj;
-        assertEquals( "org.apache.ws.util.jndi.BeanFactory", params.getFactory() );
-        obj = initialContext.lookup( "wsrf/test/mybean" );
+        Object obj = initialContext.lookup( "wsrf/resource/filesystem" );
         assertNotNull( obj );
-        assertTrue( obj instanceof TestBean );
-        TestBean testBean = (TestBean) obj;
-        List myList = testBean.getMyList();
-        assertNotNull( myList );
-        assertEquals( 2, myList.size() );
-        Map myMap = testBean.getMyMap();
-        assertNotNull( myMap );
-        assertEquals( 2, myMap.size() );
+        assertTrue( obj instanceof ResourceHome );
+        ResourceHome home = (ResourceHome) obj;*/
     }
 
 }

Modified: webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiHome.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiHome.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiHome.java (original)
+++ webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiHome.java Tue Oct  4 15:52:49 2005
@@ -17,6 +17,7 @@
 
 import org.apache.ws.resource.PropertiesResource;
 import org.apache.ws.resource.Resource;
+import org.apache.ws.resource.NamespaceVersionHolder;
 import org.apache.ws.resource.impl.AbstractResourceHome;
 import org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet;
 import org.apache.ws.resource.properties.v2004_06.impl.NamespaceVersionHolderImpl;
@@ -179,7 +180,7 @@
     *
     * @return DOCUMENT_ME
     */
-   public org.apache.ws.resource.properties.NamespaceVersionHolder getNamespaceVersionHolder(  )
+   public org.apache.ws.resource.NamespaceVersionHolder getNamespaceVersionHolder(  )
    {
       return SPEC_NAMESPACE_SET;
    }

Modified: webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiResource.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiResource.java?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiResource.java (original)
+++ webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiResource.java Tue Oct  4 15:52:49 2005
@@ -18,6 +18,7 @@
 import org.apache.ws.addressing.EndpointReference;
 import org.apache.ws.resource.PropertiesResource;
 import org.apache.ws.resource.Resource;
+import org.apache.ws.resource.NamespaceVersionHolder;
 import org.apache.ws.resource.properties.v2004_06.impl.NamespaceVersionHolderImpl;
 import org.apache.ws.resource.lifetime.ResourceTerminationEvent;
 import org.apache.ws.resource.lifetime.ResourceTerminationListener;

Modified: webservices/wsrf/trunk/src/test/spring-jndi-config.xml
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/test/spring-jndi-config.xml?rev=294940&r1=294939&r2=294940&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/test/spring-jndi-config.xml (original)
+++ webservices/wsrf/trunk/src/test/spring-jndi-config.xml Tue Oct  4 15:52:49 2005
@@ -35,4 +35,11 @@
     </property>
   </bean>
 
+  <bean name="resource/filesystem" class="org.apache.ws.resource.example.filesystem.FilesystemHome" init-method="init">
+    <property name="portComponentName"><value>filesystem</value></property>
+    <property name="serviceClass"><value>org.apache.ws.resource.example.filesystem.FilesystemService</value></property>
+    <property name="resourceClass"><value>org.apache.ws.resource.example.filesystem.FilesystemResource</value></property>
+    <property name="resourceIdentifierReferenceParameterName"><value>{http://ws.apache.org/resource/example/filesystem}ResourceIdentifier</value></property>
+  </bean>
+
 </beans>