You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-dev@ws.apache.org by ip...@apache.org on 2005/07/27 18:17:12 UTC
svn commit: r225544 - in /webservices/muse/trunk/src/examples:
enterprise/services/application/src/java/org/apache/ws/muse/example/application/
enterprise/services/businessprocesstype/src/java/org/apache/ws/muse/example/businessprocesstype/
enterprise/...
Author: ips
Date: Wed Jul 27 09:16:52 2005
New Revision: 225544
URL: http://svn.apache.org/viewcvs?rev=225544&view=rev
Log:
updated to compile against refactored WSRF home interface
Removed:
webservices/muse/trunk/src/examples/enterprise/services/businessprocesstype/src/java/org/apache/ws/muse/example/businessprocesstype/AbstractBusinessprocesstypeHome.java
webservices/muse/trunk/src/examples/enterprise/services/host/src/java/org/apache/ws/muse/example/host/AbstractHostHome.java
webservices/muse/trunk/src/examples/enterprise/services/integrationserver/src/java/org/apache/ws/muse/example/integrationserver/AbstractIntegrationserverHome.java
webservices/muse/trunk/src/examples/enterprise/services/resourceadmin/src/java/org/apache/ws/muse/example/resourceadmin/AbstractResourceadminHome.java
webservices/muse/trunk/src/examples/ieeedemo/src/java/org/wsdmdemo/service/weatherClientConfig/AbstractWeatherClientConfigHome.java
webservices/muse/trunk/src/examples/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/AbstractWeatherStationHome.java
webservices/muse/trunk/src/examples/interop/src/java/com/dell/wsdm/demos/interop/x2005/x04/AbstractIpmiserverHome.java
webservices/muse/trunk/src/examples/interop/src/java/org/apache/ws/resource/example/blackberry/AbstractBlackberryHome.java
webservices/muse/trunk/src/examples/interop/src/java/org/everest/AbstractWeatherStationSoapHome.java
webservices/muse/trunk/src/examples/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/AbstractWeatherstationHome.java
Modified:
webservices/muse/trunk/src/examples/enterprise/services/application/src/java/org/apache/ws/muse/example/application/ApplicationHome.java
webservices/muse/trunk/src/examples/enterprise/services/businessprocesstype/src/java/org/apache/ws/muse/example/businessprocesstype/BusinessprocesstypeHome.java
webservices/muse/trunk/src/examples/enterprise/services/businessprocesstype/src/java/org/apache/ws/muse/example/businessprocesstype/BusinessprocesstypeResource.java
webservices/muse/trunk/src/examples/enterprise/services/host/src/java/org/apache/ws/muse/example/host/HostHome.java
webservices/muse/trunk/src/examples/enterprise/services/host/src/java/org/apache/ws/muse/example/host/HostResource.java
webservices/muse/trunk/src/examples/enterprise/services/integrationserver/src/java/org/apache/ws/muse/example/integrationserver/IntegrationserverHome.java
webservices/muse/trunk/src/examples/enterprise/services/integrationserver/src/java/org/apache/ws/muse/example/integrationserver/IntegrationserverResource.java
webservices/muse/trunk/src/examples/enterprise/services/resourceadmin/src/java/org/apache/ws/muse/example/resourceadmin/ResourceadminHome.java
webservices/muse/trunk/src/examples/enterprise/services/resourceadmin/src/java/org/apache/ws/muse/example/resourceadmin/ResourceadminService.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/AbstractWsdmInteropTestCase.java
webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/ServiceStub.java
webservices/muse/trunk/src/examples/ieeedemo/src/java/org/wsdmdemo/service/weatherClientConfig/WeatherClientConfigHome.java
webservices/muse/trunk/src/examples/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/WeatherStationHome.java
webservices/muse/trunk/src/examples/interop/src/java/com/dell/wsdm/demos/interop/x2005/x04/IpmiserverHome.java
webservices/muse/trunk/src/examples/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryHome.java
webservices/muse/trunk/src/examples/interop/src/java/org/everest/WeatherStationSoapHome.java
webservices/muse/trunk/src/examples/interop/src/java/org/everest/WeatherStationSoapService.java
webservices/muse/trunk/src/examples/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationHome.java
webservices/muse/trunk/src/examples/interop/src/test/org/apache/ws/muws/interop/client/AbstractWsdmInteropTestCase.java
webservices/muse/trunk/src/examples/interop/src/test/org/apache/ws/muws/interop/client/ServiceStub.java
webservices/muse/trunk/src/examples/interop/src/test/org/apache/xmlbeans/FeatureTester.java
Modified: webservices/muse/trunk/src/examples/enterprise/services/application/src/java/org/apache/ws/muse/example/application/ApplicationHome.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/enterprise/services/application/src/java/org/apache/ws/muse/example/application/ApplicationHome.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/enterprise/services/application/src/java/org/apache/ws/muse/example/application/ApplicationHome.java (original)
+++ webservices/muse/trunk/src/examples/enterprise/services/application/src/java/org/apache/ws/muse/example/application/ApplicationHome.java Wed Jul 27 09:16:52 2005
@@ -131,7 +131,7 @@
ResourceContextException,
ResourceUnknownException
{
- Resource resource = null;
+ Resource resource;
long currentId = ++m_instances;
Object resourceId = SERVICE_NAME + Long.toString( currentId );
try
@@ -158,7 +158,7 @@
return resource;
}
- /**
+ /**
* Map containing all FilesystemResource instances - this map <em>must</em> be static for
* compatibility with certain JNDI providers.
*/
Modified: webservices/muse/trunk/src/examples/enterprise/services/businessprocesstype/src/java/org/apache/ws/muse/example/businessprocesstype/BusinessprocesstypeHome.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/enterprise/services/businessprocesstype/src/java/org/apache/ws/muse/example/businessprocesstype/BusinessprocesstypeHome.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/enterprise/services/businessprocesstype/src/java/org/apache/ws/muse/example/businessprocesstype/BusinessprocesstypeHome.java (original)
+++ webservices/muse/trunk/src/examples/enterprise/services/businessprocesstype/src/java/org/apache/ws/muse/example/businessprocesstype/BusinessprocesstypeHome.java Wed Jul 27 09:16:52 2005
@@ -18,17 +18,16 @@
import org.apache.ws.addressing.EndpointReference;
import org.apache.ws.muse.example.ExampleConstants;
import org.apache.ws.muse.example.resourceadmin.properties.CreateParamsType;
-import org.apache.ws.muse.example.utils.ResourceKeyFactory;
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.ResourceKey;
import org.apache.ws.resource.ResourceUnknownException;
import org.apache.ws.resource.impl.AbstractResourceHome;
-import org.apache.ws.resource.impl.SimpleTypeResourceKey;
+
import javax.xml.namespace.QName;
import java.io.Serializable;
+import java.util.Map;
/**
* @author Kinga Dziembowski
@@ -36,7 +35,7 @@
* Home for Businessprocesstype WS-Resources.
*/
public class BusinessprocesstypeHome
- extends AbstractBusinessprocesstypeHome
+ extends AbstractResourceHome
implements Serializable
{
/** The service endpoint name as registered with the SOAP Platform. This is useful for building EPR's. **/
@@ -72,45 +71,6 @@
private long m_instances = 0;
/**
- *
- * @param resourceContext
- *
- * @return A Resource
- *
- * @throws ResourceException
- * @throws ResourceContextException
- * @throws ResourceUnknownException
- */
- public Resource getInstance( ResourceContext resourceContext )
- throws ResourceException,
- ResourceContextException,
- ResourceUnknownException
- {
- ResourceKey key = resourceContext.getResourceKey( );
- Resource resource = null;
- try
- {
- resource = find( key );
- }
- catch ( ResourceException re )
- {
- throw new ResourceUnknownException( key.getValue( ),
- resourceContext.getServiceName( ) );
-
- //TODO add any checking for key validity
-
- /**
- * You can build an EndpointReference for a Resource you create by uncommenting the following code.
- * Note: You can set the EndpointReference on your Resource using the setter (not in Resource interface)
- */
-
- //EndpointReference epr = getEndpointReference(resourceContext.getBaseURL( ) + "/" + getServiceName().getLocalPart() , key, SPEC_NAMESPACE_SET.getAddressingNamespace());
- }
-
- return resource;
- }
-
- /**
* DOCUMENT_ME
*
* @return DOCUMENT_ME
@@ -170,23 +130,23 @@
{
Resource resource = null;
long currentId = ++m_instances;
- SimpleTypeResourceKey aKey =
- ResourceKeyFactory.createKey( RESOURCE_ID, SERVICE_NAME + Long.toString( currentId ) );
+ Object resourceId = SERVICE_NAME + Long.toString( currentId );
+
try
{
//resource = createInstance(aKey);
- resource = new BusinessprocesstypeResource( aKey, params );
+ resource = new BusinessprocesstypeResource( resourceId, params );
//The EPRs should be build using "http://schemas.xmlsoap.org/ws/2003/03/addressing" addressing namespace. It introduces spec conflicts
//To work around thes problem the "http://schemas.xmlsoap.org/ws/2004/08/addressing" is used as namespace for addressing
//EndpointReference epr = getEndpointReference(resourceContext.getBaseURL( ) + "/" + getServiceName().getLocalPart() , null, SPEC_NAMESPACE_SET.getAddressingNamespace());
EndpointReference epr =
getEndpointReference( resourceContext.getBaseURL( ) + "/" + getServiceName( ).getLocalPart( ),
- aKey,
+ resourceId,
ExampleConstants.getAddressingNamespace( ) );
( (BusinessprocesstypeResource) resource ).setEndpointReference( epr );
resource.init( );
- add( aKey, resource );
+ add( resource );
}
catch ( Exception e )
{
@@ -195,4 +155,24 @@
return resource;
}
+
+ /**
+ * Map containing all FilesystemResource instances - this map <em>must</em> be static for
+ * compatibility with certain JNDI providers.
+ */
+ private static Map s_resources;
+
+ /**
+ * Returns a map of all FilesystemResource instances. Used by the {@link org.apache.ws.resource.impl.AbstractResourceHome}
+ * superclass.
+ */
+ protected synchronized final Map getResourceMap()
+ {
+ if ( s_resources == null )
+ {
+ s_resources = AbstractResourceHome.createResourceMap( m_resourceIsPersistent );
+ }
+ return s_resources;
+ }
+
}
Modified: webservices/muse/trunk/src/examples/enterprise/services/businessprocesstype/src/java/org/apache/ws/muse/example/businessprocesstype/BusinessprocesstypeResource.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/enterprise/services/businessprocesstype/src/java/org/apache/ws/muse/example/businessprocesstype/BusinessprocesstypeResource.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/enterprise/services/businessprocesstype/src/java/org/apache/ws/muse/example/businessprocesstype/BusinessprocesstypeResource.java (original)
+++ webservices/muse/trunk/src/examples/enterprise/services/businessprocesstype/src/java/org/apache/ws/muse/example/businessprocesstype/BusinessprocesstypeResource.java Wed Jul 27 09:16:52 2005
@@ -20,7 +20,6 @@
import org.apache.ws.muse.example.ExampleConstants;
import org.apache.ws.muse.example.ExampleUtils;
import org.apache.ws.muse.example.application.ApplicationPropertyQNames;
-import org.apache.ws.muse.example.businessprocesstype.BusinessprocesstypePropertyQNames;
import org.apache.ws.muse.example.businessprocesstype.backend.BusinessProcessInstance;
import org.apache.ws.muse.example.businessprocesstype.callback.CumulativeExecutionTimeCallback;
import org.apache.ws.muse.example.businessprocesstype.callback.NumberOfRunningProcessesCallback;
@@ -39,12 +38,12 @@
import org.apache.ws.notification.topics.TopicSpace;
import org.apache.ws.notification.topics.TopicSpaceSet;
import org.apache.ws.notification.topics.impl.TopicSpaceImpl;
-import org.apache.ws.resource.ResourceKey;
import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart1.ManageabilityCapabilityDocument;
import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.CurrentTimeDocument;
import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.LangString;
import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.RelationshipParticipantType;
import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.RelationshipType;
+
import java.util.Calendar;
/**
@@ -82,13 +81,13 @@
/**
* Creates a new {@link BusinessprocesstypeResource} object.
*
- * @param key DOCUMENT_ME
+ * @param resourceId DOCUMENT_ME
* @param params DOCUMENT_ME
*/
- public BusinessprocesstypeResource( ResourceKey key,
+ public BusinessprocesstypeResource( Object resourceId,
CreateParamsType params )
{
- setID( ( key != null ) ? key.getValue( ) : null );
+ setID( resourceId );
// params can have any important information for the creation of Resource
// in this example it is not used.
Modified: webservices/muse/trunk/src/examples/enterprise/services/host/src/java/org/apache/ws/muse/example/host/HostHome.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/enterprise/services/host/src/java/org/apache/ws/muse/example/host/HostHome.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/enterprise/services/host/src/java/org/apache/ws/muse/example/host/HostHome.java (original)
+++ webservices/muse/trunk/src/examples/enterprise/services/host/src/java/org/apache/ws/muse/example/host/HostHome.java Wed Jul 27 09:16:52 2005
@@ -18,17 +18,16 @@
import org.apache.ws.addressing.EndpointReference;
import org.apache.ws.muse.example.ExampleConstants;
import org.apache.ws.muse.example.resourceadmin.properties.CreateParamsType;
-import org.apache.ws.muse.example.utils.ResourceKeyFactory;
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.ResourceKey;
import org.apache.ws.resource.ResourceUnknownException;
import org.apache.ws.resource.impl.AbstractResourceHome;
-import org.apache.ws.resource.impl.SimpleTypeResourceKey;
+
import javax.xml.namespace.QName;
import java.io.Serializable;
+import java.util.Map;
/**
* @author Kinga Dziembowski
@@ -36,7 +35,7 @@
* Home for Host WS-Resources.
*/
public class HostHome
- extends AbstractHostHome
+ extends AbstractResourceHome
implements Serializable
{
/** The service endpoint name as registered with the SOAP Platform. This is useful for building EPR's. **/
@@ -72,43 +71,6 @@
private long m_instances = 0;
/**
- *
- * @param resourceContext
- *
- * @return A Resource
- *
- * @throws ResourceException
- * @throws ResourceContextException
- * @throws ResourceUnknownException
- */
- public Resource getInstance( ResourceContext resourceContext )
- throws ResourceException,
- ResourceContextException,
- ResourceUnknownException
- {
- ResourceKey key = resourceContext.getResourceKey( );
- Resource resource = null;
- try
- {
- resource = find( key );
- }
- catch ( ResourceException re )
- {
- throw new ResourceUnknownException( key.getValue( ),
- resourceContext.getServiceName( ) );
-
- /**
- * You can build an EndpointReference for a Resource you create by uncommenting the following code.
- * Note: You can set the EndpointReference on your Resource using the setter (not in Resource interface)
- */
-
- //EndpointReference epr = getEndpointReference(resourceContext.getBaseURL( ) + "/" + getServiceName().getLocalPart() , key, SPEC_NAMESPACE_SET.getAddressingNamespace());
- }
-
- return resource;
- }
-
- /**
* DOCUMENT_ME
*
* @return DOCUMENT_ME
@@ -168,23 +130,23 @@
{
Resource resource = null;
long currentId = ++m_instances;
- SimpleTypeResourceKey aKey =
- ResourceKeyFactory.createKey( RESOURCE_ID, SERVICE_NAME + Long.toString( currentId ) );
+ Object resourceId = SERVICE_NAME + Long.toString( currentId );
+
try
{
//resource = createInstance(aKey);
- resource = new HostResource( aKey, createParams );
+ resource = new HostResource( resourceId, createParams );
//The EPRs should be build using "http://schemas.xmlsoap.org/ws/2003/03/addressing" addressing namespace. It introduces spec conflicts
//To work around thes problem the "http://schemas.xmlsoap.org/ws/2004/08/addressing" is used as namespace for addressing
//EndpointReference epr = getEndpointReference(resourceContext.getBaseURL( ) + "/" + getServiceName().getLocalPart() , null, SPEC_NAMESPACE_SET.getAddressingNamespace());
EndpointReference epr =
getEndpointReference( resourceContext.getBaseURL( ) + "/" + getServiceName( ).getLocalPart( ),
- aKey,
+ resourceId,
ExampleConstants.getAddressingNamespace( ) );
( (HostResource) resource ).setEndpointReference( epr );
resource.init( );
- add( aKey, resource );
+ add( resource );
}
catch ( Exception e )
{
@@ -193,4 +155,24 @@
return resource;
}
+
+ /**
+ * Map containing all FilesystemResource instances - this map <em>must</em> be static for
+ * compatibility with certain JNDI providers.
+ */
+ private static Map s_resources;
+
+ /**
+ * Returns a map of all FilesystemResource instances. Used by the {@link org.apache.ws.resource.impl.AbstractResourceHome}
+ * superclass.
+ */
+ protected synchronized final Map getResourceMap()
+ {
+ if ( s_resources == null )
+ {
+ s_resources = AbstractResourceHome.createResourceMap( m_resourceIsPersistent );
+ }
+ return s_resources;
+ }
+
}
Modified: webservices/muse/trunk/src/examples/enterprise/services/host/src/java/org/apache/ws/muse/example/host/HostResource.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/enterprise/services/host/src/java/org/apache/ws/muse/example/host/HostResource.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/enterprise/services/host/src/java/org/apache/ws/muse/example/host/HostResource.java (original)
+++ webservices/muse/trunk/src/examples/enterprise/services/host/src/java/org/apache/ws/muse/example/host/HostResource.java Wed Jul 27 09:16:52 2005
@@ -34,7 +34,6 @@
import org.apache.ws.notification.topics.TopicSpace;
import org.apache.ws.notification.topics.TopicSpaceSet;
import org.apache.ws.notification.topics.impl.TopicSpaceImpl;
-import org.apache.ws.resource.ResourceKey;
import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart1.ManageabilityCapabilityDocument;
import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.CurrentTimeDocument;
import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.LangString;
@@ -74,13 +73,13 @@
/**
* Creates a new {@link HostResource} object.
*
- * @param key DOCUMENT_ME
+ * @param resourceId DOCUMENT_ME
* @param params DOCUMENT_ME
*/
- public HostResource( ResourceKey key,
+ public HostResource( Object resourceId,
CreateParamsType params )
{
- setID( ( key != null ) ? key.getValue( ) : null );
+ setID( resourceId );
// params can have any important information for the creation of Resource
// in this example it is not used
Modified: webservices/muse/trunk/src/examples/enterprise/services/integrationserver/src/java/org/apache/ws/muse/example/integrationserver/IntegrationserverHome.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/enterprise/services/integrationserver/src/java/org/apache/ws/muse/example/integrationserver/IntegrationserverHome.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/enterprise/services/integrationserver/src/java/org/apache/ws/muse/example/integrationserver/IntegrationserverHome.java (original)
+++ webservices/muse/trunk/src/examples/enterprise/services/integrationserver/src/java/org/apache/ws/muse/example/integrationserver/IntegrationserverHome.java Wed Jul 27 09:16:52 2005
@@ -3,25 +3,24 @@
import org.apache.ws.muse.example.ExampleConstants;
import org.apache.ws.muse.example.resourceadmin.properties.CreateParamsType;
-import org.apache.ws.muse.example.utils.ResourceKeyFactory;
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.impl.SimpleTypeResourceKey;
import org.apache.ws.addressing.EndpointReference;
import javax.xml.namespace.QName;
import java.io.Serializable;
+import java.util.Map;
/**
* Home for Integrationserver WS-Resources.
*/
public class IntegrationserverHome
- extends AbstractIntegrationserverHome
+ extends AbstractResourceHome
implements Serializable
{
@@ -49,47 +48,30 @@
/** A variable to hold the factory resource object */
private IntegrationserverResource m_serverResource = null;
- /**
- *
- * @param resourceContext
- *
- * @return A Resource
- *
- * @throws ResourceException
- * @throws ResourceContextException
- * @throws ResourceUnknownException
- */
- public Resource getInstance( ResourceContext resourceContext )
- throws ResourceException,
- ResourceContextException,
- ResourceUnknownException
- {
- if(m_serverResource == null)
- throw new ResourceUnknownException("IntegrationserverResource", resourceContext.getServiceName());
- else
- return m_serverResource;
+
+ public void init() throws Exception
+ {
+ super.init();
}
-
+
public Resource create(ResourceContext resourceContext, CreateParamsType createParams) throws ResourceException,
ResourceContextException,
ResourceUnknownException
{
if (m_serverResource == null)
{
- SimpleTypeResourceKey aKey = ResourceKeyFactory.createKey(RESOURCE_ID, SERVICE_NAME.toString() );
try
{
- //m_serverResource = (IntegrationserverResource)createInstance(aKey);
- m_serverResource = new IntegrationserverResource(aKey, createParams );
+ //m_serverResource = (IntegrationserverResource)createInstance(null);
+ m_serverResource = new IntegrationserverResource( createParams );
//The EPRs should be build using "http://schemas.xmlsoap.org/ws/2003/03/addressing" addressing namespace. It introduces spec conflicts
//To work around thes problem the "http://schemas.xmlsoap.org/ws/2004/08/addressing" is used as namespace for addressing
//EndpointReference epr = getEndpointReference(resourceContext.getBaseURL( ) + "/" + getServiceName().getLocalPart() , aKey, SPEC_NAMESPACE_SET.getAddressingNamespace());
- EndpointReference epr = getEndpointReference(resourceContext.getBaseURL( ) + "/" + getServiceName().getLocalPart() , aKey, ExampleConstants.getAddressingNamespace());
-
+ EndpointReference epr = getEndpointReference(resourceContext.getBaseURL( ) + "/" + getServiceName().getLocalPart() , resourceId, ExampleConstants.getAddressingNamespace());
((IntegrationserverResource)m_serverResource).setEndpointReference( epr );
m_serverResource.init();
- add(aKey, m_serverResource);
+ add(m_serverResource);
}
catch (Exception e)
{
@@ -118,4 +100,24 @@
{
return RESOURCE_KEY_NAME;
}
+
+ /**
+ * Map containing all FilesystemResource instances - this map <em>must</em> be static for
+ * compatibility with certain JNDI providers.
+ */
+ private static Map s_resources;
+
+ /**
+ * Returns a map of all FilesystemResource instances. Used by the {@link org.apache.ws.resource.impl.AbstractResourceHome}
+ * superclass.
+ */
+ protected synchronized final Map getResourceMap()
+ {
+ if ( s_resources == null )
+ {
+ s_resources = AbstractResourceHome.createResourceMap( m_resourceIsPersistent );
+ }
+ return s_resources;
+ }
+
}
Modified: webservices/muse/trunk/src/examples/enterprise/services/integrationserver/src/java/org/apache/ws/muse/example/integrationserver/IntegrationserverResource.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/enterprise/services/integrationserver/src/java/org/apache/ws/muse/example/integrationserver/IntegrationserverResource.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/enterprise/services/integrationserver/src/java/org/apache/ws/muse/example/integrationserver/IntegrationserverResource.java (original)
+++ webservices/muse/trunk/src/examples/enterprise/services/integrationserver/src/java/org/apache/ws/muse/example/integrationserver/IntegrationserverResource.java Wed Jul 27 09:16:52 2005
@@ -1,40 +1,32 @@
package org.apache.ws.muse.example.integrationserver;
-import java.util.Calendar;
-
-import javax.xml.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.ws.mows.v1_0.MowsConstants;
import org.apache.ws.mows.v1_0.capability.MetricsCapability;
import org.apache.ws.mows.v1_0.capability.OperationalStatusCapability;
import org.apache.ws.muse.example.ExampleConstants;
import org.apache.ws.muse.example.ExampleUtils;
-import org.apache.ws.muse.example.integrationserver.IntegrationserverPropertyQNames;
import org.apache.ws.muse.example.resourceadmin.properties.CreateParamsType;
import org.apache.ws.muws.MuwsUtils;
-import org.apache.ws.muws.v1_0.MuwsConstants;
-import org.apache.ws.notification.topics.TopicSpaceSet;
+import org.apache.ws.muws.v1_0.capability.DescriptionCapability;
+import org.apache.ws.muws.v1_0.capability.IdentityCapability;
+import org.apache.ws.muws.v1_0.capability.ManageabilityCharacteristicsCapability;
+import org.apache.ws.muws.v1_0.capability.RelationshipsCapability;
+import org.apache.ws.muws.v1_0.topics.ManagementEventTopic;
+import org.apache.ws.muws.v1_0.topics.impl.XmlBeansManagementEventTopicImpl;
import org.apache.ws.notification.topics.TopicSpace;
+import org.apache.ws.notification.topics.TopicSpaceSet;
import org.apache.ws.notification.topics.impl.TopicSpaceImpl;
-import org.apache.ws.resource.ResourceKey;
-import org.apache.ws.util.XmlBeanUtils;
-import org.apache.xmlbeans.XmlObject;
import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart1.ManageabilityCapabilityDocument;
import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.CurrentTimeDocument;
import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.LangString;
import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.OperationalStatusDocument;
-import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.RelationshipDocument;
import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.RelationshipParticipantType;
import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.RelationshipType;
-import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.RelationshipTypeType;
-import org.apache.ws.muws.v1_0.capability.DescriptionCapability;
-import org.apache.ws.muws.v1_0.capability.IdentityCapability;
-import org.apache.ws.muws.v1_0.capability.ManageabilityCharacteristicsCapability;
-import org.apache.ws.muws.v1_0.capability.RelationshipsCapability;
-import org.apache.ws.muws.v1_0.topics.ManagementEventTopic;
-import org.apache.ws.muws.v1_0.topics.impl.XmlBeansManagementEventTopicImpl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
+import java.util.Calendar;
/**
* A Integrationserver WS-Resource.
@@ -71,12 +63,11 @@
private static final Log LOG = LogFactory.getLog( IntegrationserverResource.class.getName() );
- public IntegrationserverResource( ResourceKey key, CreateParamsType params)
+ public IntegrationserverResource( CreateParamsType params)
{
- setID( key != null ? key.getValue() : null );
+ setID( null );
// params can have any important information for the creation of Resource
// in this example it is not used
-
}
/**
Modified: webservices/muse/trunk/src/examples/enterprise/services/resourceadmin/src/java/org/apache/ws/muse/example/resourceadmin/ResourceadminHome.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/enterprise/services/resourceadmin/src/java/org/apache/ws/muse/example/resourceadmin/ResourceadminHome.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/enterprise/services/resourceadmin/src/java/org/apache/ws/muse/example/resourceadmin/ResourceadminHome.java (original)
+++ webservices/muse/trunk/src/examples/enterprise/services/resourceadmin/src/java/org/apache/ws/muse/example/resourceadmin/ResourceadminHome.java Wed Jul 27 09:16:52 2005
@@ -25,9 +25,9 @@
import org.apache.ws.resource.ResourceContext;
import org.apache.ws.resource.ResourceContextException;
import org.apache.ws.resource.ResourceException;
-import org.apache.ws.resource.ResourceKey;
import org.apache.ws.resource.ResourceUnknownException;
import org.apache.ws.resource.impl.AbstractResourceHome;
+
import javax.xml.namespace.QName;
import java.io.Serializable;
import java.util.HashMap;
@@ -39,7 +39,7 @@
* Home for Resourceadmin WS-Resources.
*/
public class ResourceadminHome
- extends AbstractResourceadminHome
+ extends AbstractResourceHome
implements Serializable
{
/** The service endpoint name as registered with the SOAP Platform. This is useful for building EPR's. **/
@@ -106,9 +106,6 @@
ResourceContextException,
ResourceUnknownException
{
- ResourceKey key = resourceContext.getResourceKey( );
- Resource resource = null;
-
try
{
if ( m_adminResource == null )
@@ -123,7 +120,7 @@
null,
ExampleConstants.getAddressingNamespace( ) );
m_adminResource.setEndpointReference( epr );
- add( null, m_adminResource );
+ add( m_adminResource );
}
}
catch ( ResourceException e )
@@ -192,4 +189,24 @@
{
return PORT_NAME;
}
+
+ /**
+ * Map containing all FilesystemResource instances - this map <em>must</em> be static for
+ * compatibility with certain JNDI providers.
+ */
+ private static Map s_resources;
+
+ /**
+ * Returns a map of all FilesystemResource instances. Used by the {@link org.apache.ws.resource.impl.AbstractResourceHome}
+ * superclass.
+ */
+ protected synchronized final Map getResourceMap()
+ {
+ if ( s_resources == null )
+ {
+ s_resources = AbstractResourceHome.createResourceMap( m_resourceIsPersistent );
+ }
+ return s_resources;
+ }
+
}
Modified: webservices/muse/trunk/src/examples/enterprise/services/resourceadmin/src/java/org/apache/ws/muse/example/resourceadmin/ResourceadminService.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/enterprise/services/resourceadmin/src/java/org/apache/ws/muse/example/resourceadmin/ResourceadminService.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/enterprise/services/resourceadmin/src/java/org/apache/ws/muse/example/resourceadmin/ResourceadminService.java (original)
+++ webservices/muse/trunk/src/examples/enterprise/services/resourceadmin/src/java/org/apache/ws/muse/example/resourceadmin/ResourceadminService.java Wed Jul 27 09:16:52 2005
@@ -27,10 +27,8 @@
import org.apache.ws.muse.example.integrationserver.IntegrationserverHome;
import org.apache.ws.muse.example.integrationserver.IntegrationserverResource;
import org.apache.ws.muse.example.resourceadmin.properties.CreateParamsType;
-import org.apache.ws.muse.example.utils.ResourceKeyFactory;
import org.apache.ws.resource.Resource;
import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.impl.SimpleTypeResourceKey;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.xmlbeans.XmlObject;
import org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType;
@@ -172,40 +170,36 @@
org.apache.ws.muse.example.resourceadmin.DestroyResourceFaultException,
org.apache.ws.muse.example.resourceadmin.ResourceUnknownFaultException
{
- ResourceadminHome aResourceAdminHome =
- (ResourceadminHome) getResourceHome( );
+ ResourceadminHome resourceAdminHome =
+ (ResourceadminHome) getResourceContext( ).getResourceHome();
org.apache.ws.muse.example.resourceadmin.properties.DestroyResourceResponseDocument responseDocument =
org.apache.ws.muse.example.resourceadmin.properties.DestroyResourceResponseDocument.Factory.newInstance( );
- org.apache.ws.muse.example.resourceadmin.properties.DestroyResourceResponseDocument.DestroyResourceResponse response =
- responseDocument.addNewDestroyResourceResponse( );
+ responseDocument.addNewDestroyResourceResponse( );
try
{
Context initialContext = new InitialContext( );
- ResourceadminHome aHome = (ResourceadminHome) getResourceHome( );
- QName[] resourceIDQNames = aHome.getResourcesKeyNameQnames( );
+ QName[] resourceIDQNames = resourceAdminHome.getResourcesKeyNameQnames( );
String reqType =
requestDoc.getDestroyResource( ).getDestroyResourceParams( ).getResourceType( );
if ( !validateType( reqType ) )
{
throw new DestroyResourceFaultException( getNamespaceSet( ),
- "Try to destroy Resource of unknown type " );
+ "Attempt to destroy Resource of unknown type" );
}
- ReferencePropertiesType refProp =
+ ReferencePropertiesType refProps =
requestDoc.getDestroyResource( ).getDestroyResourceParams( ).getEndpointReference( )
.getReferenceProperties( );
boolean found = false;
for ( int i = 0; i < resourceIDQNames.length; i++ )
{
- XmlObject[] childElems = XmlBeanUtils.getChildElements( refProp, resourceIDQNames[i] );
+ XmlObject[] childElems = XmlBeanUtils.getChildElements( refProps, resourceIDQNames[i] );
if ( childElems.length > 0 )
{
XmlObject obj = childElems[0];
- QName tag = XmlBeanUtils.getName( obj );
String value = XmlBeanUtils.getValue( obj );
- SimpleTypeResourceKey aKey = ResourceKeyFactory.createKey( tag, value );
- Map resources = aHome.getResources( );
+ Map resources = resourceAdminHome.getResources( );
if ( resources.containsKey( value ) )
{
found = true;
@@ -215,35 +209,35 @@
ApplicationResource appResource = (ApplicationResource) resource;
ApplicationHome appHome =
(ApplicationHome) initialContext.lookup( ApplicationHome.HOME_LOCATION );
- appHome.remove( aKey );
- aResourceAdminHome.getResources( ).remove( appResource.getID( ) );
+ appHome.remove( value );
+ resourceAdminHome.getResources( ).remove( appResource.getID( ) );
}
else if ( resource instanceof HostResource )
{
HostResource hostResource = (HostResource) resource;
HostHome hostHome = (HostHome) initialContext.lookup( HostHome.HOME_LOCATION );
- hostHome.remove( aKey );
- aResourceAdminHome.getResources( ).remove( hostResource.getID( ) );
+ hostHome.remove( value );
+ resourceAdminHome.getResources( ).remove( hostResource.getID( ) );
}
else if ( resource instanceof IntegrationserverResource )
{
IntegrationserverResource isResource = (IntegrationserverResource) resource;
IntegrationserverHome isHome =
(IntegrationserverHome) initialContext.lookup( IntegrationserverHome.HOME_LOCATION );
- isHome.remove( aKey );
- aResourceAdminHome.getResources( ).remove( isResource.getID( ) );
+ isHome.remove( value );
+ resourceAdminHome.getResources( ).remove( isResource.getID( ) );
}
else if ( resource instanceof BusinessprocesstypeResource )
{
BusinessprocesstypeResource bpResource = (BusinessprocesstypeResource) resource;
BusinessprocesstypeHome bpHome =
(BusinessprocesstypeHome) initialContext.lookup( BusinessprocesstypeHome.HOME_LOCATION );
- bpHome.remove( aKey );
- aResourceAdminHome.getResources( ).remove( bpResource.getID( ) );
+ bpHome.remove( value );
+ resourceAdminHome.getResources( ).remove( bpResource.getID( ) );
}
else
{
- throw new Exception( "The EPR is unregistered " );
+ throw new Exception( "The EPR is unregistered." );
}
break;
@@ -283,11 +277,10 @@
org.apache.ws.muse.example.resourceadmin.properties.RemoveRelationshipResponseDocument responseDocument =
org.apache.ws.muse.example.resourceadmin.properties.RemoveRelationshipResponseDocument.Factory
.newInstance( );
- org.apache.ws.muse.example.resourceadmin.properties.RemoveRelationshipResponseDocument.RemoveRelationshipResponse response =
- responseDocument.addNewRemoveRelationshipResponse( );
+ responseDocument.addNewRemoveRelationshipResponse( );
try
{
- ResourceadminHome aHome = (ResourceadminHome) getResourceHome( );
+ ResourceadminHome aHome = (ResourceadminHome) getResourceContext().getResourceHome( );
QName[] resourceIDQNames = aHome.getResourcesKeyNameQnames( );
// Assume that the first partici[pant in the relationship own the relationship
@@ -305,9 +298,7 @@
{
found = true;
XmlObject obj = childElems[0];
- QName tag = XmlBeanUtils.getName( obj );
String value = XmlBeanUtils.getValue( obj );
- SimpleTypeResourceKey aKey = ResourceKeyFactory.createKey( tag, value );
Map resources = aHome.getResources( );
if ( resources.containsKey( value ) )
@@ -334,7 +325,7 @@
}
else
{
- throw new Exception( "Paticipant is unregistered " );
+ throw new Exception( "Paticipant is unregistered." );
}
break;
@@ -373,11 +364,10 @@
{
org.apache.ws.muse.example.resourceadmin.properties.SetRelationshipResponseDocument responseDocument =
org.apache.ws.muse.example.resourceadmin.properties.SetRelationshipResponseDocument.Factory.newInstance( );
- org.apache.ws.muse.example.resourceadmin.properties.SetRelationshipResponseDocument.SetRelationshipResponse response =
- responseDocument.addNewSetRelationshipResponse( );
+ responseDocument.addNewSetRelationshipResponse( );
try
{
- ResourceadminHome aHome = (ResourceadminHome) getResourceHome( );
+ ResourceadminHome aHome = (ResourceadminHome) getResourceContext().getResourceHome( );
QName[] resourceIDQNames = aHome.getResourcesKeyNameQnames( );
ReferencePropertiesType refProp =
requestDoc.getSetRelationship( ).getRelationshipFrom( ).getParticipant( )
@@ -391,9 +381,7 @@
{
found = true;
XmlObject obj = childElems[0];
- QName tag = XmlBeanUtils.getName( obj );
String value = XmlBeanUtils.getValue( obj );
- SimpleTypeResourceKey aKey = ResourceKeyFactory.createKey( tag, value );
Map resources = aHome.getResources( );
if ( resources.containsKey( value ) )
@@ -460,7 +448,7 @@
BusinessprocesstypeHome home =
(BusinessprocesstypeHome) initialContext.lookup( BusinessprocesstypeHome.HOME_LOCATION );
BusinessprocesstypeResource resource = (BusinessprocesstypeResource) home.create( context, createparams );
- ResourceadminHome aHome = (ResourceadminHome) getResourceHome( );
+ ResourceadminHome aHome = (ResourceadminHome) getResourceContext().getResourceHome( );
aHome.getResources( ).put( resource.getID( ),
resource );
return resource.getEndpointReference( );
@@ -483,7 +471,7 @@
Context initialContext = new InitialContext( );
ApplicationHome home = (ApplicationHome) initialContext.lookup( ApplicationHome.HOME_LOCATION );
ApplicationResource resource = (ApplicationResource) home.create( context, createparams );
- ResourceadminHome aHome = (ResourceadminHome) getResourceHome( );
+ ResourceadminHome aHome = (ResourceadminHome) getResourceContext().getResourceHome( );
aHome.getResources( ).put( resource.getID( ),
resource );
return resource.getEndpointReference( );
@@ -506,7 +494,7 @@
Context initialContext = new InitialContext( );
HostHome home = (HostHome) initialContext.lookup( HostHome.HOME_LOCATION );
HostResource resource = (HostResource) home.create( context, createparams );
- ResourceadminHome aHome = (ResourceadminHome) getResourceHome( );
+ ResourceadminHome aHome = (ResourceadminHome) context.getResourceHome( );
aHome.getResources( ).put( resource.getID( ),
resource );
return resource.getEndpointReference( );
@@ -530,7 +518,7 @@
IntegrationserverHome home =
(IntegrationserverHome) initialContext.lookup( IntegrationserverHome.HOME_LOCATION );
IntegrationserverResource resource = (IntegrationserverResource) home.create( context, createparams );
- ResourceadminHome aHome = (ResourceadminHome) getResourceHome( );
+ ResourceadminHome aHome = (ResourceadminHome) context.getResourceHome( );
aHome.getResources( ).put( resource.getID( ),
resource );
return resource.getEndpointReference( );
@@ -564,7 +552,7 @@
return true;
}
}
-
return false;
}
-}
\ No newline at end of file
+
+}
Modified: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/AbstractWsdmInteropTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/AbstractWsdmInteropTestCase.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/AbstractWsdmInteropTestCase.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/AbstractWsdmInteropTestCase.java Wed Jul 27 09:16:52 2005
@@ -68,7 +68,7 @@
if ( RUN_AXIS_SERVER )
{
//init jndi from config
- XmlBeanJndiUtils.initializeFromInputStream( Thread.currentThread().getContextClassLoader()
+ XmlBeanJndiUtils.initFromInputStream( Thread.currentThread().getContextClassLoader()
.getResourceAsStream( XmlBeanJndiUtils.JNDI_CONFIG_FILENAME ) );
}
}
Modified: webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/ServiceStub.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/ServiceStub.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/ServiceStub.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/client/src/org/apache/ws/muws/interop/client/ServiceStub.java Wed Jul 27 09:16:52 2005
@@ -15,27 +15,21 @@
*=============================================================================*/
package org.apache.ws.muws.interop.client;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.Observable;
-
-import javax.xml.namespace.QName;
-
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.soap.SoapClient;
-import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlOptions;
import org.oasisOpen.docs.wsdm.x2004.x12.mows.wsdmMows.GetManageabilityReferencesDocument;
import org.oasisOpen.docs.wsdm.x2004.x12.mows.wsdmMows.GetManageabilityReferencesResponseDocument;
-import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.QueryRelationshipsByTypeDocument;
-import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.QueryRelationshipsByTypeResponseDocument;
-import org.oasisOpen.docs.wsdm.x2004.x12.muws.wsdmMuwsPart2.RelationshipType;
import org.xmlsoap.schemas.soap.envelope.Envelope;
import org.xmlsoap.schemas.soap.envelope.EnvelopeDocument;
import org.xmlsoap.schemas.soap.envelope.Header;
import org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType;
+
+import javax.xml.namespace.QName;
+import java.net.URI;
+import java.net.URL;
+import java.util.Observable;
/**
* TODO
Modified: webservices/muse/trunk/src/examples/ieeedemo/src/java/org/wsdmdemo/service/weatherClientConfig/WeatherClientConfigHome.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/src/java/org/wsdmdemo/service/weatherClientConfig/WeatherClientConfigHome.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/src/java/org/wsdmdemo/service/weatherClientConfig/WeatherClientConfigHome.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/src/java/org/wsdmdemo/service/weatherClientConfig/WeatherClientConfigHome.java Wed Jul 27 09:16:52 2005
@@ -1,16 +1,13 @@
package org.wsdmdemo.service.weatherClientConfig;
-import org.apache.ws.addressing.EndpointReference;
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.ResourceKey;
import org.apache.ws.resource.ResourceUnknownException;
import org.apache.ws.resource.impl.AbstractResourceHome;
import javax.xml.namespace.QName;
import java.io.Serializable;
+import java.util.Map;
/**
* **** NOTE: This file will not be overwritten during generation ****
@@ -18,7 +15,7 @@
* Home for WeatherClientConfig WS-Resources.
*/
public class WeatherClientConfigHome
- extends AbstractWeatherClientConfigHome
+ extends AbstractResourceHome
implements Serializable
{
@@ -52,44 +49,18 @@
public static final String HOME_LOCATION =
org.apache.ws.resource.JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME.getLocalPart() + "/" + org.apache.ws.resource.JndiConstants.ATOMIC_NAME_HOME;
- private static Object m_lock = new Object();
- /**
- * @param resourceContext
- * @return A Resource
- * @throws ResourceException
- * @throws ResourceContextException
- * @throws ResourceUnknownException
- */
- public Resource getInstance(ResourceContext resourceContext)
- throws ResourceException,
- ResourceContextException,
- ResourceUnknownException
+ public Resource find( Object resourceId ) throws ResourceUnknownException, ResourceException
{
- ResourceKey key = resourceContext.getResourceKey();
- Resource resource = null;
+ Resource resource;
try
{
- synchronized (m_lock)
- {
- resource = find(key); //attempt to find from the underlying cache
- }
+ resource = super.find( resourceId );
}
- catch (ResourceException re)
+ catch ( ResourceUnknownException rue )
{
- Object id = key.getValue();
- //create as many clients as requested...
- try
- {
- WeatherClientConfigResource myresource = (WeatherClientConfigResource) createInstance(key); //this will create the resource IF it is has default constructor. It also calls init() on the resource.
- //the next line will create an EPR
- EndpointReference epr = getEndpointReference(resourceContext.getBaseURL() + "/" + getServiceName().getLocalPart(), key, SPEC_NAMESPACE_SET.getAddressingNamespace());
- myresource.setEndpointReference(epr); //make sure to set the EPR on your new instance
- add(key, myresource); //make sure to add your instance to the underlying cache to be found in future requests using find(..)
- }
- catch (Exception e)
- {
- throw new ResourceException(e);
- }
+ // if an unknown client instance is requestsed, create a new client with that ID...
+ resource = createInstance(resourceId);
+ add( resource );
}
return resource;
}
@@ -113,4 +84,24 @@
{
return RESOURCE_KEY_NAME;
}
+
+ /**
+ * Map containing all FilesystemResource instances - this map <em>must</em> be static for
+ * compatibility with certain JNDI providers.
+ */
+ private static Map s_resources;
+
+ /**
+ * Returns a map of all FilesystemResource instances. Used by the {@link org.apache.ws.resource.impl.AbstractResourceHome}
+ * superclass.
+ */
+ protected synchronized final Map getResourceMap()
+ {
+ if ( s_resources == null )
+ {
+ s_resources = AbstractResourceHome.createResourceMap( m_resourceIsPersistent );
+ }
+ return s_resources;
+ }
+
}
Modified: webservices/muse/trunk/src/examples/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/WeatherStationHome.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/WeatherStationHome.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/WeatherStationHome.java (original)
+++ webservices/muse/trunk/src/examples/ieeedemo/src/java/org/wsdmdemo/service/weatherStation/WeatherStationHome.java Wed Jul 27 09:16:52 2005
@@ -1,17 +1,11 @@
package org.wsdmdemo.service.weatherStation;
-import org.apache.ws.addressing.EndpointReference;
-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.ResourceKey;
-import org.apache.ws.resource.ResourceUnknownException;
import org.apache.ws.resource.impl.AbstractResourceHome;
import org.wsdmdemo.service.InteropConstants;
import javax.xml.namespace.QName;
import java.io.Serializable;
+import java.util.Map;
/**
* **** NOTE: This file will not be overwritten during generation ****
@@ -19,7 +13,7 @@
* Home for WeatherStation WS-Resources.
*/
public class WeatherStationHome
- extends AbstractWeatherStationHome
+ extends AbstractResourceHome
implements Serializable
{
@@ -53,83 +47,17 @@
public static final String HOME_LOCATION =
org.apache.ws.resource.JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME.getLocalPart() + "/" + org.apache.ws.resource.JndiConstants.ATOMIC_NAME_HOME;
- private static Object m_lock = new Object();
-
- public WeatherStationHome()
- {
-
- }
-
- /**
- * DOCUMENT_ME
- *
- * @throws Exception DOCUMENT_ME
- */
- public synchronized void init() throws Exception
+ public void init() throws Exception
{
super.init();
+ WeatherStationResource ws1 = (WeatherStationResource) createInstance( InteropConstants.WS1_KEY );
+ ws1.setName( "IBM's Space Co." );
+ add( ws1 );
+ WeatherStationResource ws2 = (WeatherStationResource) createInstance( InteropConstants.WS2_KEY );
+ ws2.setName( "HP's NASA" );
+ add( ws2 );
}
- /**
- * @param resourceContext
- * @return A Resource
- * @throws ResourceException
- * @throws ResourceContextException
- * @throws ResourceUnknownException
- */
- public Resource getInstance(ResourceContext resourceContext)
- throws ResourceException,
- ResourceContextException,
- ResourceUnknownException
- {
- ResourceKey key = resourceContext.getResourceKey();
- Resource resource = null;
- try
- {
- synchronized (m_lock)
- {
- resource = find(key); //attempt to find from the underlying cache
- }
- }
- catch (ResourceException re)
- {
- Object id = key.getValue();
- if (InteropConstants.WS1_KEY.equals(id) || InteropConstants.WS2_KEY.equals(id))
- {
- String name = null;
- if(InteropConstants.WS1_KEY.equals(id))
- {
- name = "IBM's Space Co.";
- }
- else
- {
- name = "HP's NASA";
- }
- try
- {
- WeatherStationResource myresource = (WeatherStationResource) createInstance(key); //this will create the resource IF it is has default constructor. It also calls init() on the resource.
- myresource.setName(name);
- //the next line will create an EPR
- EndpointReference epr = getEndpointReference(resourceContext.getBaseURL() + "/" + getServiceName().getLocalPart(), key, SPEC_NAMESPACE_SET.getAddressingNamespace());
- myresource.setEndpointReference(epr); //make sure to set the EPR on your new instance
- add(key, myresource); //make sure to add your instance to the underlying cache to be found in future requests using find(..)
- }
- catch (Exception e)
- {
- throw new ResourceException(e);
- }
- }
- else
- {
- throw new ResourceUnknownException(id,
- resourceContext.getServiceName());
- }
- }
-
- return resource;
- }
-
-
public QName getServiceName()
{
return SERVICE_NAME;
@@ -149,4 +77,24 @@
{
return RESOURCE_KEY_NAME;
}
+
+ /**
+ * Map containing all FilesystemResource instances - this map <em>must</em> be static for
+ * compatibility with certain JNDI providers.
+ */
+ private static Map s_resources;
+
+ /**
+ * Returns a map of all FilesystemResource instances. Used by the {@link org.apache.ws.resource.impl.AbstractResourceHome}
+ * superclass.
+ */
+ protected synchronized final Map getResourceMap()
+ {
+ if ( s_resources == null )
+ {
+ s_resources = AbstractResourceHome.createResourceMap( m_resourceIsPersistent );
+ }
+ return s_resources;
+ }
+
}
Modified: webservices/muse/trunk/src/examples/interop/src/java/com/dell/wsdm/demos/interop/x2005/x04/IpmiserverHome.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/interop/src/java/com/dell/wsdm/demos/interop/x2005/x04/IpmiserverHome.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/interop/src/java/com/dell/wsdm/demos/interop/x2005/x04/IpmiserverHome.java (original)
+++ webservices/muse/trunk/src/examples/interop/src/java/com/dell/wsdm/demos/interop/x2005/x04/IpmiserverHome.java Wed Jul 27 09:16:52 2005
@@ -1,22 +1,16 @@
package com.dell.wsdm.demos.interop.x2005.x04;
-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.ResourceKey;
-import org.apache.ws.resource.ResourceUnknownException;
import org.apache.ws.resource.impl.AbstractResourceHome;
-import org.apache.ws.addressing.EndpointReference;
import javax.xml.namespace.QName;
import java.io.Serializable;
+import java.util.Map;
/**
* Home for Ipmiserver WS-Resources.
*/
public class IpmiserverHome
- extends AbstractIpmiserverHome
+ extends AbstractResourceHome
implements Serializable
{
@@ -50,53 +44,14 @@
public static final String HOME_LOCATION =
org.apache.ws.resource.JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME.getLocalPart() + "/" + org.apache.ws.resource.JndiConstants.ATOMIC_NAME_HOME;
- /**
- * TODO
- *
- * @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
- {
- ResourceKey key = resourceContext.getResourceKey();
- IpmiserverResource resource = null;
- try
- {
- resource = (IpmiserverResource)find(key);
- }
- catch (ResourceException re)
- {
- Object id = key.getValue();
- /**
- * Determine if the passed-in key is, in fact, something we expect.
- */
- if (id.equals("ipmi1") || id.equals("ipmi2"))
- {
- try
- {
- resource = (IpmiserverResource)createInstance(key);
- EndpointReference epr = getEndpointReference(resourceContext.getBaseURL( ) + "/" + getServiceName().getLocalPart() , key, SPEC_NAMESPACE_SET.getAddressingNamespace());
- resource.setEndpointReference(epr);
- }
- catch (Exception e)
- {
- throw new ResourceException(e);
- }
- add(key, resource);
- }
- else
- {
- throw new ResourceUnknownException(id,
- resourceContext.getServiceName());
- }
- }
- return resource;
+ private static final String IPMI1_ID = "ipmi1";
+ private static final String IPMI2_ID = "ipmi2";
+
+ public void init() throws Exception
+ {
+ super.init();
+ add( createInstance( IPMI1_ID ) );
+ add( createInstance( IPMI2_ID ) );
}
public QName getServiceName()
@@ -118,4 +73,24 @@
{
return RESOURCE_KEY_NAME;
}
+
+ /**
+ * Map containing all FilesystemResource instances - this map <em>must</em> be static for
+ * compatibility with certain JNDI providers.
+ */
+ private static Map s_resources;
+
+ /**
+ * Returns a map of all FilesystemResource instances. Used by the {@link org.apache.ws.resource.impl.AbstractResourceHome}
+ * superclass.
+ */
+ protected synchronized final Map getResourceMap()
+ {
+ if ( s_resources == null )
+ {
+ s_resources = AbstractResourceHome.createResourceMap( m_resourceIsPersistent );
+ }
+ return s_resources;
+ }
+
}
Modified: webservices/muse/trunk/src/examples/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryHome.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryHome.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryHome.java (original)
+++ webservices/muse/trunk/src/examples/interop/src/java/org/apache/ws/resource/example/blackberry/BlackberryHome.java Wed Jul 27 09:16:52 2005
@@ -1,22 +1,16 @@
package org.apache.ws.resource.example.blackberry;
-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.ResourceKey;
-import org.apache.ws.resource.ResourceUnknownException;
import org.apache.ws.resource.impl.AbstractResourceHome;
-import org.apache.ws.addressing.EndpointReference;
import javax.xml.namespace.QName;
import java.io.Serializable;
+import java.util.Map;
/**
* Home for Blackberry WS-Resources.
*/
public class BlackberryHome
- extends AbstractBlackberryHome
+ extends AbstractResourceHome
implements Serializable
{
/**
@@ -49,53 +43,14 @@
public static final String HOME_LOCATION =
org.apache.ws.resource.JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME.getLocalPart() + "/" + org.apache.ws.resource.JndiConstants.ATOMIC_NAME_HOME;
- /**
- * TODO
- *
- * @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
- {
- ResourceKey key = resourceContext.getResourceKey();
- BlackberryResource resource = null;
- try
- {
- resource = (BlackberryResource)find(key);
- }
- catch (ResourceException re)
- {
- Object id = key.getValue();
- /**
- * Determine if the passed-in key is, in fact, something we expect.
- */
- if (id.equals("bb1") || id.equals("bb2"))
- {
- try
- {
- resource = (BlackberryResource)createInstance(key);
- EndpointReference epr = getEndpointReference(resourceContext.getBaseURL( ) + "/" + getServiceName().getLocalPart() , key, SPEC_NAMESPACE_SET.getAddressingNamespace());
- resource.setEndpointReference(epr);
- }
- catch (Exception e)
- {
- throw new ResourceException(e);
- }
- add(key, resource);
- }
- else
- {
- throw new ResourceUnknownException(id,
- resourceContext.getServiceName());
- }
- }
- return resource;
+ private static final String BB1_ID = "bb1";
+ private static final String BB2_ID = "bb2";
+
+ public void init() throws Exception
+ {
+ super.init();
+ add( createInstance( BB1_ID ) );
+ add( createInstance( BB2_ID ) );
}
public QName getServiceName()
@@ -117,4 +72,24 @@
{
return RESOURCE_KEY_NAME;
}
+
+ /**
+ * Map containing all FilesystemResource instances - this map <em>must</em> be static for
+ * compatibility with certain JNDI providers.
+ */
+ private static Map s_resources;
+
+ /**
+ * Returns a map of all FilesystemResource instances. Used by the {@link org.apache.ws.resource.impl.AbstractResourceHome}
+ * superclass.
+ */
+ protected synchronized final Map getResourceMap()
+ {
+ if ( s_resources == null )
+ {
+ s_resources = AbstractResourceHome.createResourceMap( m_resourceIsPersistent );
+ }
+ return s_resources;
+ }
+
}
Modified: webservices/muse/trunk/src/examples/interop/src/java/org/everest/WeatherStationSoapHome.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/interop/src/java/org/everest/WeatherStationSoapHome.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/interop/src/java/org/everest/WeatherStationSoapHome.java (original)
+++ webservices/muse/trunk/src/examples/interop/src/java/org/everest/WeatherStationSoapHome.java Wed Jul 27 09:16:52 2005
@@ -1,21 +1,16 @@
package org.everest;
-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.ResourceKey;
-import org.apache.ws.resource.ResourceUnknownException;
import org.apache.ws.resource.impl.AbstractResourceHome;
import javax.xml.namespace.QName;
import java.io.Serializable;
+import java.util.Map;
/**
* Home for WeatherStationSoap WS-Resources.
*/
public class WeatherStationSoapHome
- extends AbstractWeatherStationSoapHome
+ extends AbstractResourceHome
implements Serializable
{
@@ -49,33 +44,6 @@
public static final String HOME_LOCATION =
org.apache.ws.resource.JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME.getLocalPart() + "/" + org.apache.ws.resource.JndiConstants.ATOMIC_NAME_HOME;
- /**
- * TODO
- *
- * @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
- {
- ResourceKey key = resourceContext.getResourceKey();
- Resource resource = null;
- try
- {
- resource = find(key);
- }
- catch (ResourceException re)
- {
- //todo add any checking for key validity
- }
- return resource;
- }
-
public QName getServiceName()
{
return SERVICE_NAME;
@@ -95,4 +63,24 @@
{
return RESOURCE_KEY_NAME;
}
+
+ /**
+ * Map containing all FilesystemResource instances - this map <em>must</em> be static for
+ * compatibility with certain JNDI providers.
+ */
+ private static Map s_resources;
+
+ /**
+ * Returns a map of all FilesystemResource instances. Used by the {@link org.apache.ws.resource.impl.AbstractResourceHome}
+ * superclass.
+ */
+ protected synchronized final Map getResourceMap()
+ {
+ if ( s_resources == null )
+ {
+ s_resources = AbstractResourceHome.createResourceMap( m_resourceIsPersistent );
+ }
+ return s_resources;
+ }
+
}
Modified: webservices/muse/trunk/src/examples/interop/src/java/org/everest/WeatherStationSoapService.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/interop/src/java/org/everest/WeatherStationSoapService.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/interop/src/java/org/everest/WeatherStationSoapService.java (original)
+++ webservices/muse/trunk/src/examples/interop/src/java/org/everest/WeatherStationSoapService.java Wed Jul 27 09:16:52 2005
@@ -10,7 +10,6 @@
import org.apache.ws.notification.topics.Topic;
import org.apache.ws.resource.ResourceContext;
import org.apache.ws.resource.example.InteropConstants;
-import org.apache.ws.resource.impl.SimpleTypeResourceKey;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.xmlbeans.XmlObject;
import org.everestWeather.wsdm.samples.x2005.x04.schema.WeatherstationHome;
@@ -102,9 +101,7 @@
{
InitialContext initialContext = new InitialContext();
WeatherstationHome home = (WeatherstationHome) initialContext.lookup(WeatherstationHome.HOME_LOCATION);
- SimpleTypeResourceKey simpleTypeResourceKey = new SimpleTypeResourceKey(new QName(WeatherstationPropertyQNames.FCCID.getNamespaceURI(), "ResourceID"),
- InteropConstants.WEATHERSTATION_KEY1);
- WeatherstationResource resource = (WeatherstationResource) home.find(simpleTypeResourceKey);
+ WeatherstationResource resource = (WeatherstationResource) home.find(InteropConstants.WEATHERSTATION_KEY1);
Topic topic = resource.getTopicSpaceSet().getTopicSpace(MowsConstants.NSURI_MOWS_TOPICS).getTopic("RequestProcessingObservations");
Calendar currentTime = Calendar.getInstance();
Modified: webservices/muse/trunk/src/examples/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationHome.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationHome.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationHome.java (original)
+++ webservices/muse/trunk/src/examples/interop/src/java/org/everestWeather/wsdm/samples/x2005/x04/schema/WeatherstationHome.java Wed Jul 27 09:16:52 2005
@@ -1,23 +1,17 @@
package org.everestWeather.wsdm.samples.x2005.x04.schema;
-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.ResourceKey;
-import org.apache.ws.resource.ResourceUnknownException;
import org.apache.ws.resource.example.InteropConstants;
import org.apache.ws.resource.impl.AbstractResourceHome;
-import org.apache.ws.addressing.EndpointReference;
import javax.xml.namespace.QName;
import java.io.Serializable;
+import java.util.Map;
/**
* Home for Weatherstation WS-Resources.
*/
public class WeatherstationHome
- extends AbstractWeatherstationHome
+ extends AbstractResourceHome
implements Serializable
{
/**
@@ -50,62 +44,20 @@
public static final String HOME_LOCATION =
org.apache.ws.resource.JndiConstants.CONTEXT_NAME_SERVICES + "/" + SERVICE_NAME.getLocalPart() + "/" + org.apache.ws.resource.JndiConstants.ATOMIC_NAME_HOME;
-
- /**
- * TODO
- *
- * @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
- {
- ResourceKey key = resourceContext.getResourceKey();
- WeatherstationResource resource = null;
- try
- {
- resource = (WeatherstationResource)find(key);
- }
- catch (ResourceException re)
- {
- Object id = key.getValue();
- /**
- * Determine if the passed-in key is, in fact, something we expect.
- */
- if (id.equals(InteropConstants.WEATHERSTATION_KEY1) || id.equals(InteropConstants.WEATHERSTATION_KEY2))
- {
- try
- {
- resource = (WeatherstationResource)createInstance(key);
- FCCIDDocument fccidDocument = FCCIDDocument.Factory.newInstance();
- //set the same value for both instances
- fccidDocument.setFCCID(InteropConstants.FCCID);
- ((WeatherstationResource) resource).setFCCID(fccidDocument);
- EndpointReference epr = getEndpointReference(resourceContext.getBaseURL( ) + "/" + getServiceName().getLocalPart() , key, SPEC_NAMESPACE_SET.getAddressingNamespace());
- resource.setEndpointReference(epr);
-
- }
- catch (Exception e)
- {
- throw new ResourceException(e);
- }
- add(key, resource);
- }
- else
- {
- throw new ResourceUnknownException(id,
- resourceContext.getServiceName());
- }
- }
- return resource;
-
+ public void init() throws Exception
+ {
+ super.init();
+ FCCIDDocument fccidDoc = FCCIDDocument.Factory.newInstance();
+ //set the same FCCID value for both instances
+ fccidDoc.setFCCID(InteropConstants.FCCID);
+ WeatherstationResource ws1 = (WeatherstationResource) createInstance( InteropConstants.WEATHERSTATION_KEY1 );
+ ws1.setFCCID( fccidDoc );
+ add( ws1 );
+ WeatherstationResource ws2 = (WeatherstationResource) createInstance( InteropConstants.WEATHERSTATION_KEY1 );
+ ws2.setFCCID( fccidDoc );
+ add( ws2 );
}
-
+
public QName getServiceName()
{
return SERVICE_NAME;
@@ -125,4 +77,24 @@
{
return RESOURCE_KEY_NAME;
}
+
+ /**
+ * Map containing all FilesystemResource instances - this map <em>must</em> be static for
+ * compatibility with certain JNDI providers.
+ */
+ private static Map s_resources;
+
+ /**
+ * Returns a map of all FilesystemResource instances. Used by the {@link org.apache.ws.resource.impl.AbstractResourceHome}
+ * superclass.
+ */
+ protected synchronized final Map getResourceMap()
+ {
+ if ( s_resources == null )
+ {
+ s_resources = AbstractResourceHome.createResourceMap( m_resourceIsPersistent );
+ }
+ return s_resources;
+ }
+
}
Modified: webservices/muse/trunk/src/examples/interop/src/test/org/apache/ws/muws/interop/client/AbstractWsdmInteropTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/interop/src/test/org/apache/ws/muws/interop/client/AbstractWsdmInteropTestCase.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/interop/src/test/org/apache/ws/muws/interop/client/AbstractWsdmInteropTestCase.java (original)
+++ webservices/muse/trunk/src/examples/interop/src/test/org/apache/ws/muws/interop/client/AbstractWsdmInteropTestCase.java Wed Jul 27 09:16:52 2005
@@ -68,7 +68,7 @@
if ( RUN_AXIS_SERVER )
{
//init jndi from config
- XmlBeanJndiUtils.initializeFromInputStream( Thread.currentThread().getContextClassLoader()
+ XmlBeanJndiUtils.initFromInputStream( Thread.currentThread().getContextClassLoader()
.getResourceAsStream( XmlBeanJndiUtils.JNDI_CONFIG_FILENAME ) );
}
}
Modified: webservices/muse/trunk/src/examples/interop/src/test/org/apache/ws/muws/interop/client/ServiceStub.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/interop/src/test/org/apache/ws/muws/interop/client/ServiceStub.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/interop/src/test/org/apache/ws/muws/interop/client/ServiceStub.java (original)
+++ webservices/muse/trunk/src/examples/interop/src/test/org/apache/ws/muws/interop/client/ServiceStub.java Wed Jul 27 09:16:52 2005
@@ -17,7 +17,6 @@
import org.apache.ws.util.XmlBeanUtils;
import org.apache.ws.util.soap.SoapClient;
-import org.apache.ws.resource.impl.SimpleTypeResourceKey;
import org.apache.ws.resource.example.InteropConstants;
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlException;
Modified: webservices/muse/trunk/src/examples/interop/src/test/org/apache/xmlbeans/FeatureTester.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/interop/src/test/org/apache/xmlbeans/FeatureTester.java?rev=225544&r1=225543&r2=225544&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/interop/src/test/org/apache/xmlbeans/FeatureTester.java (original)
+++ webservices/muse/trunk/src/examples/interop/src/test/org/apache/xmlbeans/FeatureTester.java Wed Jul 27 09:16:52 2005
@@ -16,7 +16,7 @@
package org.apache.xmlbeans;
import junit.framework.TestCase;
-import org.apache.xmlbeans.impl.newstore2.Saaj;
+import org.apache.xmlbeans.impl.store.Saaj;
import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.QueryExpressionDocument;
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-dev-help@ws.apache.org