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/07/22 01:40:09 UTC
svn commit: r220212 - in /webservices/wsrf/trunk/src:
java/org/apache/ws/resource/ java/org/apache/ws/resource/i18n/
java/org/apache/ws/resource/properties/v2004_06/porttype/ templates/
templates/v2004_06/ test/org/apache/ws/resource/properties/ test/o...
Author: ips
Date: Thu Jul 21 16:40:07 2005
New Revision: 220212
URL: http://svn.apache.org/viewcvs?rev=220212&view=rev
Log: (empty)
Added:
webservices/wsrf/trunk/src/java/org/apache/ws/resource/IllegalResourceTypeException.java
Removed:
webservices/wsrf/trunk/src/java/org/apache/ws/resource/RemoveNotSupportedException.java
Modified:
webservices/wsrf/trunk/src/java/org/apache/ws/resource/ResourceHome.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/i18n/Keys.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/GetMultipleResourcePropertiesPortType.java
webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/GetResourcePropertyPortType.java
webservices/wsrf/trunk/src/templates/AbstractHome.vm
webservices/wsrf/trunk/src/templates/AbstractResource.vm
webservices/wsrf/trunk/src/templates/AbstractService.vm
webservices/wsrf/trunk/src/templates/BaseFaultExtension.vm
webservices/wsrf/trunk/src/templates/CustomFault.vm
webservices/wsrf/trunk/src/templates/CustomOperationsPortType.vm
webservices/wsrf/trunk/src/templates/Home.vm
webservices/wsrf/trunk/src/templates/PropertyQNames.vm
webservices/wsrf/trunk/src/templates/Resource.vm
webservices/wsrf/trunk/src/templates/Service.vm
webservices/wsrf/trunk/src/templates/build.properties.vm
webservices/wsrf/trunk/src/templates/build.xml.vm
webservices/wsrf/trunk/src/templates/deploy.vm
webservices/wsrf/trunk/src/templates/jndi.vm
webservices/wsrf/trunk/src/templates/v2004_06/GetMultiple.txt
webservices/wsrf/trunk/src/templates/v2004_06/GetResource.txt
webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiHome.java
webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiResourceContext.java
webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/v2004_06/porttype/impl/GetMultipleResourcePropertiesProviderTestCase.java
webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesProviderTestCase.java
Added: webservices/wsrf/trunk/src/java/org/apache/ws/resource/IllegalResourceTypeException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/IllegalResourceTypeException.java?rev=220212&view=auto
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/IllegalResourceTypeException.java (added)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/IllegalResourceTypeException.java Thu Jul 21 16:40:07 2005
@@ -0,0 +1,64 @@
+/*=============================================================================*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed 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.
+ *=============================================================================*/
+package org.apache.ws.resource;
+
+
+/**
+ * This exception is thrown by {@link ResourceHome#add} when the specified {@link Resource}
+ * is not of the type supported by the home.
+ */
+public class IllegalResourceTypeException
+ extends ResourceException
+{
+ /**
+ * Creates a new {@link IllegalResourceTypeException} object.
+ */
+ public IllegalResourceTypeException( )
+ {
+ }
+
+ /**
+ * Creates a new {@link IllegalResourceTypeException} object.
+ *
+ * @param msg DOCUMENT_ME
+ */
+ public IllegalResourceTypeException( String msg )
+ {
+ super( msg );
+ }
+
+ /**
+ * Creates a new {@link IllegalResourceTypeException} object.
+ *
+ * @param message DOCUMENT_ME
+ * @param t DOCUMENT_ME
+ */
+ public IllegalResourceTypeException( String message,
+ Throwable t )
+ {
+ super( message, t );
+ }
+
+ /**
+ * Creates a new {@link IllegalResourceTypeException} object.
+ *
+ * @param t DOCUMENT_ME
+ */
+ public IllegalResourceTypeException( Throwable t )
+ {
+ super( t );
+ }
+}
\ No newline at end of file
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/ResourceHome.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/ResourceHome.java?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/ResourceHome.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/ResourceHome.java Thu Jul 21 16:40:07 2005
@@ -90,6 +90,25 @@
String getWsdlTargetNamespace();
/**
+ * Adds the specified resource to this home if it is not already present
+ * (optional operation). More formally, adds the specified resource,
+ * <code>resource</code>, to this home if this home contains no resource
+ * <code>existing</code> such that
+ * <code>(resource.getID().equals(existing.getID())</code>.
+ * If this home already contains a resource with the same ID as the
+ * specified resource, the call leaves the home unchanged and returns
+ * <tt>false</tt>.
+ *
+ * @param resource the resource to be added; must not be null
+ *
+ * @throws UnsupportedOperationException if the <tt>add</tt> method is not
+ * supported by this home
+ * @throws IllegalResourceTypeException if the resource is not of the type
+ * supported by this home
+ */
+ boolean add( Resource resource ) throws IllegalResourceTypeException;
+
+ /**
* Retrieves a resource. <b>Note:</b> This function must not return null. It must
* either return the resource object or throw an exception if there is no resource
* with the specified identifier.
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/i18n/Keys.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/i18n/Keys.java?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/i18n/Keys.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/i18n/Keys.java Thu Jul 21 16:40:07 2005
@@ -275,23 +275,23 @@
*/
String RESOURCE_CLASS_NOT_FOUND = "RESOURCE_CLASS_NOT_FOUND";
/**
- * @msg Adding Resource for ResourceKey: {0}
+ * @msg Adding resource with identifier {0} to {1} ...
*/
- String ADDING_RESOURCE_FOR_KEY = "ADDING_RESOURCE_FOR_KEY";
+ String ADDING_RESOURCE_WITH_ID = "ADDING_RESOURCE_WITH_ID";
/**
- * @msg Attempting to get the Resource for ResourceKey: {0}
+ * @msg Attempting to lookup resource with identifier {0} from {1} ...
*/
- String GET_RESOURCE_FOR_KEY = "GET_RESOURCE_FOR_KEY";
+ String GETTING_RESOURCE_WITH_ID = "GETTING_RESOURCE_WITH_ID";
/**
- * @msg Looking up default timer using JNDI name {0}
+ * @msg Looking up default timer using JNDI name {0} ...
*/
String TIMER_LOOKUP_WITH_JNDI_NAME = "TIMER_LOOKUP_WITH_JNDI_NAME";
/**
- * @msg Scheduling resource sweeper...
+ * @msg Scheduling resource sweeper ...
*/
String SCHEDULE_RESOURCE_SWEEPER = "SCHEDULE_RESOURCE_SWEEPER";
/**
- * @msg Cancelling resource sweeper...
+ * @msg Cancelling resource sweeper ...
*/
String CANCEL_RESOURCE_SWEEPER = "CANCEL_RESOURCE_SWEEPER";
/**
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/GetMultipleResourcePropertiesPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/GetMultipleResourcePropertiesPortType.java?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/GetMultipleResourcePropertiesPortType.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/GetMultipleResourcePropertiesPortType.java Thu Jul 21 16:40:07 2005
@@ -23,19 +23,19 @@
/**
* The WSRF-RP GetMultipleResourceProperties portType.
- *
- * @author Ian P. Springer (Hewlett-Packard Company)
*/
public interface GetMultipleResourcePropertiesPortType
{
- QName NAME = new QName( ResourcePropertiesConstants.NSURI_WSRP_WSDL, "GetMultipleResourceProperties", ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA );
+ QName NAME = new QName( ResourcePropertiesConstants.NSURI_WSRP_WSDL, "GetMultipleResourceProperties",
+ ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA );
/**
- * DOCUMENT_ME
- *
- * @param requestDoc DOCUMENT_ME
- *
- * @return DOCUMENT_ME
- */
- GetMultipleResourcePropertiesResponseDocument getMultipleResourceProperties( GetMultipleResourcePropertiesDocument requestDoc );
+ * Retrieve the values of multiple resource properties of a WS-Resource.
+ *
+ * @param requestDoc a GetMultipleResourceProperties document XMLBean
+ *
+ * @return a GetMultipleResourcePropertiesResponse document XMLBean
+ */
+ GetMultipleResourcePropertiesResponseDocument getMultipleResourceProperties(
+ GetMultipleResourcePropertiesDocument requestDoc );
}
Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/GetResourcePropertyPortType.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/GetResourcePropertyPortType.java?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/GetResourcePropertyPortType.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/v2004_06/porttype/GetResourcePropertyPortType.java Thu Jul 21 16:40:07 2005
@@ -23,19 +23,18 @@
/**
* The WSRF-RP GetResourceProperty portType.
- *
- * @author Ian P. Springer (Hewlett-Packard Company)
*/
public interface GetResourcePropertyPortType
{
- QName NAME = new QName( ResourcePropertiesConstants.NSURI_WSRP_WSDL, "GetResourceProperty", ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA );
+ QName NAME = new QName( ResourcePropertiesConstants.NSURI_WSRP_WSDL, "GetResourceProperty",
+ ResourcePropertiesConstants.NSPREFIX_WSRP_SCHEMA );
/**
- * DOCUMENT_ME
- *
- * @param requestDoc DOCUMENT_ME
- *
- * @return DOCUMENT_ME
- */
- GetResourcePropertyResponseDocument getResourceProperty( GetResourcePropertyDocument requestDoc );
+ * Retrieve the value of a single resource property of a WS-Resource.
+ *
+ * @param requestDoc a GetResourceProperty document XMLBean
+ *
+ * @return a GetResourcePropertyResponse document XMLBean
+ */
+ GetResourcePropertyResponseDocument getResourceProperty( GetResourcePropertyDocument requestDoc );
}
Modified: webservices/wsrf/trunk/src/templates/AbstractHome.vm
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/AbstractHome.vm?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/AbstractHome.vm (original)
+++ webservices/wsrf/trunk/src/templates/AbstractHome.vm Thu Jul 21 16:40:07 2005
@@ -5,51 +5,37 @@
import org.apache.ws.resource.impl.AbstractResourceHome;
import org.apache.commons.collections.map.ReferenceMap;
import java.util.Map;
-import java.util.HashMap;
-import java.util.Collections;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-/**
- * This class should not be modified.
- *
+/**
* The class acts as an extension of the AbstractResourceHome which
- * maintains a reference to the STATIC map needed for accessing resources via JNDI.
- *
- * This ensures the resources will be accessible if serialized via JNDI in certain platforms.
+ * maintains a reference to the STATIC map needed for accessing
+ * resources via JNDI. This ensures the resources will be accessible
+ * when serialized upon lookup from certain JNDI providers.
+ * <p />
+ * ***** WARNING *****
+ * This class is generated by Wsdl2Java and is NOT meant to be modified.
+ * It will be overwritten by subsequent runs of Wsdl2Java.
*/
abstract class Abstract${capitalServiceName}Home extends AbstractResourceHome
{
/**
- * The static reference which is maintained and used by the AbstractResourceHome.
- *
- * Do not modify.
+ * Map containing all ${capitalServiceName}Resource instances - this map <em>must</em> be static for
+ * compatibility with certain JNDI providers.
*/
- private static Map m_resource;
-
-
+ private static Map s_resources;
+
/**
- * Do not modify this method.
+ * Returns a map of all ${capitalServiceName}Resource instances. Called by the {@link AbstractResourceHome}
+ * superclass.
*/
- protected final Map initResourceMap( )
- throws NamingException
+ protected synchronized final Map getResourceMap()
{
- Context initialContext = new InitialContext();
- if ( m_resourceIsPersistent )
- {
- m_resources = new ReferenceMap( ReferenceMap.HARD, ReferenceMap.SOFT, true );
- initCachePolicy( initialContext );
- }
- else
- {
- m_resources = new HashMap();
- }
-
- m_resources = Collections.synchronizedMap( m_resources );
- return m_resources;
+ if ( s_resources == null )
+ {
+ s_resources = AbstractResourceHome.createResourceMap( m_resourceIsPersistent );
+ }
+ return s_resources;
}
-
-}
\ No newline at end of file
+
+}
Modified: webservices/wsrf/trunk/src/templates/AbstractResource.vm
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/AbstractResource.vm?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/AbstractResource.vm (original)
+++ webservices/wsrf/trunk/src/templates/AbstractResource.vm Thu Jul 21 16:40:07 2005
@@ -8,11 +8,11 @@
import org.apache.ws.addressing.EndpointReference;
/**
- * **** WARNING: This file will be overwritten during generation ****
- *
- * An abstract $serviceName WS-Resource.
- * <p/>
- * NOTE: This class is generated and is NOT meant to be modified.
+ * An abstract base class for the $serviceName resource.
+ * <p />
+ * ***** WARNING *****
+ * This class is generated by Wsdl2Java and is NOT meant to be modified.
+ * It will be overwritten by subsequent runs of Wsdl2Java.
*/
public abstract class Abstract${serviceName}Resource #if($implements) implements ${implements} #end
{
Modified: webservices/wsrf/trunk/src/templates/AbstractService.vm
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/AbstractService.vm?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/AbstractService.vm (original)
+++ webservices/wsrf/trunk/src/templates/AbstractService.vm Thu Jul 21 16:40:07 2005
@@ -15,12 +15,11 @@
import javax.xml.namespace.QName;
/**
- * **** WARNING: This file will be overwritten during generation ****
- *
- * This class should be generated on every "generation" against the WSDL.
- * This will ensure it is always up-to-date with the WSDL.
- *
- * NOTE: This class is generated and is NOT meant to be modified.
+ * An abstract base class for the $serviceName service.
+ * <p />
+ * ***** WARNING *****
+ * This class is generated by Wsdl2Java and is NOT meant to be modified.
+ * It will be overwritten by subsequent runs of Wsdl2Java.
*/
public abstract class Abstract${serviceName}Service extends AbstractPortType
#if($implements) implements ${implements} #end
Modified: webservices/wsrf/trunk/src/templates/BaseFaultExtension.vm
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/BaseFaultExtension.vm?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/BaseFaultExtension.vm (original)
+++ webservices/wsrf/trunk/src/templates/BaseFaultExtension.vm Thu Jul 21 16:40:07 2005
@@ -12,7 +12,11 @@
import org.apache.ws.resource.properties.NamespaceVersionHolder;
/**
- * **** WARNING: This file will be overwritten during generation ****
+ * An exception representing a $faultName WSRF base fault.
+ * <p />
+ * ***** WARNING *****
+ * This class is generated by Wsdl2Java and is NOT meant to be modified.
+ * It will be overwritten by subsequent runs of Wsdl2Java.
*/
public class $faultName
extends AbstractBaseFaultException
Modified: webservices/wsrf/trunk/src/templates/CustomFault.vm
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/CustomFault.vm?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/CustomFault.vm (original)
+++ webservices/wsrf/trunk/src/templates/CustomFault.vm Thu Jul 21 16:40:07 2005
@@ -14,7 +14,11 @@
import javax.xml.namespace.QName;
/**
- * **** WARNING: This file will be overwritten during generation ****
+ * An exception representing a $faultName fault.
+ <p />
+ * ***** WARNING *****
+ * This class is generated by Wsdl2Java and is NOT meant to be modified.
+ * It will be overwritten by subsequent runs of Wsdl2Java.
*/
public class $faultName
extends FaultException
Modified: webservices/wsrf/trunk/src/templates/CustomOperationsPortType.vm
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/CustomOperationsPortType.vm?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/CustomOperationsPortType.vm (original)
+++ webservices/wsrf/trunk/src/templates/CustomOperationsPortType.vm Thu Jul 21 16:40:07 2005
@@ -5,12 +5,12 @@
package $package;
/**
- * **** WARNING: This file will be overwritten during generation ****
- *
- * Custom operations portType.
- *
- * NOTE: This class is generated and is NOT meant to be modified.
- *
+ * An interface containing all custom operations from the $serviceName service's
+ * most-derived portType.
+ * <p />
+ * ***** WARNING *****
+ * This class is generated by Wsdl2Java and is NOT meant to be modified.
+ * It will be overwritten by subsequent runs of Wsdl2Java.
*/
public interface ${serviceName}CustomOperationsPortType
{
Modified: webservices/wsrf/trunk/src/templates/Home.vm
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/Home.vm?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/Home.vm (original)
+++ webservices/wsrf/trunk/src/templates/Home.vm Thu Jul 21 16:40:07 2005
@@ -23,9 +23,10 @@
import java.io.Serializable;
/**
- * **** NOTE: This file will not be overwritten during generation ****
- *
- * Home for $capitalServiceName WS-Resources.
+ * The home for $capitalServiceName resources.
+ * <p />
+ * NOTE: This file is generated, but is meant to be modified.
+ * It will NOT be overwritten by subsequent runs of Wsdl2Java.
*/
public class ${capitalServiceName}Home
extends Abstract${capitalServiceName}Home
Modified: webservices/wsrf/trunk/src/templates/PropertyQNames.vm
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/PropertyQNames.vm?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/PropertyQNames.vm (original)
+++ webservices/wsrf/trunk/src/templates/PropertyQNames.vm Thu Jul 21 16:40:07 2005
@@ -5,13 +5,12 @@
import javax.xml.namespace.QName;
-/**
- * **** WARNING: This file will be overwritten during generation ****
- *
- * QNames of the resource properties defined by $serviceName WSDL.
- * <p/>
- * NOTE: This class is generated and is NOT meant to be modified.
- *
+/**
+ * QNames of the resource properties associated with the $serviceName resource.
+ * <p />
+ * ***** WARNING *****
+ * This class is generated by Wsdl2Java and is NOT meant to be modified.
+ * It will be overwritten by subsequent runs of Wsdl2Java.
*/
public interface ${serviceName}PropertyQNames
{
Modified: webservices/wsrf/trunk/src/templates/Resource.vm
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/Resource.vm?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/Resource.vm (original)
+++ webservices/wsrf/trunk/src/templates/Resource.vm Thu Jul 21 16:40:07 2005
@@ -5,11 +5,10 @@
package $package;
/**
- * **** NOTE: This file will not be overwritten during generation ****
- *
* A $serviceName WS-Resource.
- * <p/>
- * NOTE: This class is generated but IS meant to be modified.
+ * <p />
+ * NOTE: This file is generated, but is meant to be modified.
+ * It will NOT be overwritten by subsequent runs of Wsdl2Java.
*/
public class ${serviceName}Resource extends Abstract${serviceName}Resource
@@ -82,5 +81,5 @@
*/
org.apache.ws.notification.topics.util.TopicUtils.initNotificationProducerProperties(getTopicSpaceSet() , getResourcePropertySet());
#end
-}
+ }
}
Modified: webservices/wsrf/trunk/src/templates/Service.vm
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/Service.vm?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/Service.vm (original)
+++ webservices/wsrf/trunk/src/templates/Service.vm Thu Jul 21 16:40:07 2005
@@ -11,16 +11,15 @@
import javax.xml.rpc.JAXRPCException;
/**
- * **** NOTE: This file will not be overwritten during generation ****
+ * A $serviceName service.
*
- * This class should be generated ONCE (and not overwritten) to maintain user-added code.
+ * This class is generated ONCE and never overwritten.
* If there is a change to the WSDL, then the generated implemented interfaces
- * (representing the "base" portTypes) will change, thus showing a compile error to the
+ * representing the implemented portTypes will change, thus showing a compile error to the
* user.
- *
- * NOTE: This class is generated. However, it will not be overwritten by subsequent
- * calls to the code generator.
- *
+ * <p />
+ * NOTE: This file is generated, but is meant to be modified.
+ * It will NOT be overwritten by subsequent runs of Wsdl2Java.
*/
public class ${serviceName}Service
extends Abstract${serviceName}Service
Modified: webservices/wsrf/trunk/src/templates/build.properties.vm
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/build.properties.vm?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/build.properties.vm (original)
+++ webservices/wsrf/trunk/src/templates/build.properties.vm Thu Jul 21 16:40:07 2005
@@ -1,4 +1,5 @@
-# **** NOTE: This file will not be overwritten during generation ****
+# NOTE: This file is generated, but is meant to be modified.
+# It will NOT be overwritten by subsequent runs of Wsdl2Java.
endpoint.url = $generated.EndpointURL
@@ -7,7 +8,7 @@
# ../webapps/$generated.WebappName (e.g. \${env.CATALINA_HOME}/webapps/$generated.WebappName )
#${generated.WebappName}.webapp.dir =
-# Uncomment and modify the below lines if you require a proxy to connect to external web sites
+# Uncomment and modify the below lines if you require a proxy to connect to external web sites.
#http.proxyHost = proxy.xyz.com
#http.proxyPort = 8088
#http.nonProxyHosts = localhost
Modified: webservices/wsrf/trunk/src/templates/build.xml.vm
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/build.xml.vm?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/build.xml.vm (original)
+++ webservices/wsrf/trunk/src/templates/build.xml.vm Thu Jul 21 16:40:07 2005
@@ -7,7 +7,7 @@
#set( $serviceName = $generated.ServiceName )
<?xml version="1.0"?>
-<!-- **** WARNING: This file will be overwritten during generation **** -->
+<!-- ***** WARNING: This file will be overwritten during generation. ***** -->
<project name="${serviceName}_buildfile" default="usage" basedir=".">
Modified: webservices/wsrf/trunk/src/templates/deploy.vm
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/deploy.vm?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/deploy.vm (original)
+++ webservices/wsrf/trunk/src/templates/deploy.vm Thu Jul 21 16:40:07 2005
@@ -1,7 +1,9 @@
#set( $endpointServiceName = $generated.EndpointServiceName )
#set( $wsdlName = $generated.wsdlName )
<?xml version="1.0"?>
-<!-- **** WARNING: This file will be overwritten during generation **** -->
+
+<!-- ***** WARNING: This file will be overwritten during generation. ***** -->
+
<deployment xmlns="http://xml.apache.org/axis/wsdd/"
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
Modified: webservices/wsrf/trunk/src/templates/jndi.vm
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/jndi.vm?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/jndi.vm (original)
+++ webservices/wsrf/trunk/src/templates/jndi.vm Thu Jul 21 16:40:07 2005
@@ -5,7 +5,7 @@
#set( $resourcekey = $generated.resourcekey )
<?xml version="1.0"?>
-<!-- **** WARNING: This file will be overwritten during generation **** -->
+<!-- ***** WARNING: This file will be overwritten during generation. ***** -->
<jndiConfig xmlns="http://www.apache.org/wsfx/wsrf/jndi/config">
Modified: webservices/wsrf/trunk/src/templates/v2004_06/GetMultiple.txt
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/v2004_06/GetMultiple.txt?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/v2004_06/GetMultiple.txt (original)
+++ webservices/wsrf/trunk/src/templates/v2004_06/GetMultiple.txt Thu Jul 21 16:40:07 2005
@@ -1,9 +1,5 @@
/**
- * DOCUMENT_ME
- *
- * @param requestDoc DOCUMENT_ME
- *
- * @return DOCUMENT_ME
+ * @see org.apache.ws.resource.properties.v2004_06.porttype.GetMultipleResourcePropertiesPortType#getMultipleResourceProperties
*/
public org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetMultipleResourcePropertiesResponseDocument getMultipleResourceProperties( org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetMultipleResourcePropertiesDocument requestDoc )
{
Modified: webservices/wsrf/trunk/src/templates/v2004_06/GetResource.txt
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/templates/v2004_06/GetResource.txt?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/templates/v2004_06/GetResource.txt (original)
+++ webservices/wsrf/trunk/src/templates/v2004_06/GetResource.txt Thu Jul 21 16:40:07 2005
@@ -1,11 +1,7 @@
/**
- * DOCUMENT_ME
- *
- * @param requestDoc DOCUMENT_ME
- *
- * @return DOCUMENT_ME
+ * @see
*/
public org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyResponseDocument getResourceProperty( org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyDocument requestDoc )
{
return new org.apache.ws.resource.properties.v2004_06.porttype.impl.GetResourcePropertyPortTypeImpl( getResourceContext( ) ).getResourceProperty( requestDoc );
- }
\ No newline at end of file
+ }
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=220212&r1=220211&r2=220212&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 Thu Jul 21 16:40:07 2005
@@ -17,10 +17,6 @@
import org.apache.ws.resource.PropertiesResource;
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.resource.properties.impl.XmlBeansResourcePropertySet;
import org.apache.xmlbeans.XmlObject;
@@ -39,17 +35,28 @@
implements Serializable
{
- /** The service endpoint name as registered with the SOAP Platform. This is useful for building EPR's. **/
- public static final QName SERVICE_NAME = javax.xml.namespace.QName.valueOf("{http://ws.apache.org/resource/properties/test/sushi}sushi");
+ /**
+ * The service endpoint name as registered with the SOAP Platform. This is useful for building EPR's. *
+ */
+ public static final QName SERVICE_NAME = javax.xml.namespace.QName.valueOf(
+ "{http://ws.apache.org/resource/properties/test/sushi}sushi" );
- /** The management PortType associated with this resource. This is useful for building EPR's.**/
- public static final QName PORT_TYPE = javax.xml.namespace.QName.valueOf("{http://ws.apache.org/resource/properties/test/sushi}sushi");
+ /**
+ * The management PortType associated with this resource. This is useful for building EPR's.*
+ */
+ public static final QName PORT_TYPE = javax.xml.namespace.QName.valueOf(
+ "{http://ws.apache.org/resource/properties/test/sushi}sushi" );
- /** The WSDL Port name associated with the resource. This is useful for building EPR's. **/
+ /**
+ * The WSDL Port name associated with the resource. This is useful for building EPR's. *
+ */
public static final String PORT_NAME = "sushi";
- /** The name of the resource key for this resource. **/
- public static final QName RESOURCE_ID_REF_PARAM_NAME = javax.xml.namespace.QName.valueOf("{http://ws.apache.org/resource/properties/test/sushi}ResourceID");
+ /**
+ * The name of the resource key for this resource. *
+ */
+ public static final QName RESOURCE_ID_REF_PARAM_NAME = javax.xml.namespace.QName.valueOf(
+ "{http://ws.apache.org/resource/properties/test/sushi}ResourceID" );
/**
* DOCUMENT_ME
@@ -67,92 +74,66 @@
init();
}
- /**
- * DOCUMENT_ME
- *
- * @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
- {
- try
- { //added because of AbstractPortType
- Resource resource = null;
- Object resourceId = SushiResourceContext.ID;
- try
- {
- resource = find( resourceId );
- }
- catch ( ResourceException re )
- {
- ;
- }
- if ( resource == null )
- {
- InputStream in = getClass().getClassLoader().getResourceAsStream( RESOURCE_PROPS_RESOURCE_PATH );
- XmlOptions parseOpts = new XmlOptions().setLoadStripWhitespace();
- if ( ! m_isOpenContent ) {
- parseOpts.setLoadReplaceDocumentElement( new QName( AbstractResourcePropertiesTestCase.NSURI_SUSHI, "ClosedSushiProperties", "sushi" ) );
- }
- XmlObject propsDocXBean = XmlObject.Factory.parse( in, parseOpts );
- in.close();
- ResourcePropertySet propSet = new XmlBeansResourcePropertySet( propsDocXBean );
- resource = createInstance( resourceId );
- ( (PropertiesResource) resource ).setResourcePropertySet( propSet );
- }
- add( resourceId, resource );
- return resource;
- }
- catch ( Exception e )
+ public void init() throws Exception
+ {
+ super.init();
+ InputStream in = getClass().getClassLoader().getResourceAsStream( RESOURCE_PROPS_RESOURCE_PATH );
+ XmlOptions parseOpts = new XmlOptions().setLoadStripWhitespace();
+ if ( !m_isOpenContent )
{
- throw new ResourceException( e );
+ parseOpts.setLoadReplaceDocumentElement(
+ new QName( AbstractResourcePropertiesTestCase.NSURI_SUSHI, "ClosedSushiProperties", "sushi" ) );
}
+ XmlObject propsDocXBean = XmlObject.Factory.parse( in, parseOpts );
+ in.close();
+ ResourcePropertySet propSet = new XmlBeansResourcePropertySet( propsDocXBean );
+ Resource resource = createInstance( SushiResourceContext.ID );
+ ( (PropertiesResource) resource ).setResourcePropertySet( propSet );
+ add( resource );
}
- public void setResourcePropsDocPath( String propsDoc )
+ public void setResourcePropsDocPath
+ ( String
+ propsDoc )
{
SushiHome.RESOURCE_PROPS_RESOURCE_PATH = propsDoc;
}
- public QName getServiceName()
+ public QName getServiceName
+ ()
{
return SERVICE_NAME;
}
- public QName getPortType()
+ public QName getPortType
+ ()
{
return PORT_TYPE;
}
- public String getServicePortName()
+ public String getServicePortName
+ ()
{
return PORT_NAME;
}
- public QName getResourceIdentifierReferenceParameterQName()
+ public QName getResourceIdentifierReferenceParameterQName
+ ()
{
return RESOURCE_ID_REF_PARAM_NAME;
}
/**
- * Map containing all SushiResource instances - this map <em>must</em> be static for
- * compatibility with certain JNDI providers.
+ * Map containing all SushiResource instances - this map <em>must</em> be static for compatibility with certain JNDI
+ * providers.
*/
private static Map s_resources;
/**
- * Returns a map of all SushiResource instances. Used by the {@link AbstractResourceHome}
- * superclass.
+ * Returns a map of all SushiResource instances. Used by the {@link AbstractResourceHome} superclass.
*/
- protected synchronized final Map getResourceMap()
+ protected synchronized final Map getResourceMap
+ ()
{
if ( s_resources == null )
{
@@ -162,11 +143,15 @@
}
/**
- * Resets (sets to null) the resource map.
+ * Resets (clears) the resource map.
*/
- public synchronized final void resetResourceMap()
+ public synchronized final void resetResourceMap
+ ()
{
- s_resources = null;
+ if ( s_resources != null )
+ {
+ s_resources.clear();
+ }
}
}
Modified: webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiResourceContext.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiResourceContext.java?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiResourceContext.java (original)
+++ webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/SushiResourceContext.java Thu Jul 21 16:40:07 2005
@@ -42,15 +42,7 @@
public SushiResourceContext( boolean isOpenContent ) throws Exception
{
m_home = new SushiHome( isOpenContent );
-
- try
- {
- m_resource = ( (SushiHome) m_home ).getInstance( this );
- }
- catch ( Exception e )
- {
- e.printStackTrace();
- }
+ m_resource = m_home.find( SushiResourceContext.ID );
}
public ResourceHome getResourceHome()
@@ -120,7 +112,6 @@
public void setProperty( String name, Object value )
{
-
}
public Object getProperty( String name )
Modified: webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/v2004_06/porttype/impl/GetMultipleResourcePropertiesProviderTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/v2004_06/porttype/impl/GetMultipleResourcePropertiesProviderTestCase.java?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/v2004_06/porttype/impl/GetMultipleResourcePropertiesProviderTestCase.java (original)
+++ webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/v2004_06/porttype/impl/GetMultipleResourcePropertiesProviderTestCase.java Thu Jul 21 16:40:07 2005
@@ -30,6 +30,8 @@
import javax.xml.namespace.QName;
/**
+ * Test case for {@link GetMultipleResourcePropertiesPortTypeImpl}.
+ *
* @author Sal Campana, Ian Springer
*/
public class GetMultipleResourcePropertiesProviderTestCase
Modified: webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesProviderTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesProviderTestCase.java?rev=220212&r1=220211&r2=220212&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesProviderTestCase.java (original)
+++ webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesProviderTestCase.java Thu Jul 21 16:40:07 2005
@@ -30,6 +30,8 @@
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyResponseDocument;
/**
+ * Test case for {@link SetResourcePropertiesPortTypeImpl}.
+ *
* @author Sal Campana, Ian Springer
*/
public class SetResourcePropertiesProviderTestCase