You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by da...@apache.org on 2006/08/20 20:48:16 UTC
svn commit: r433004 - in /webservices/muse/trunk/modules/muse-core: schemas/
src/org/apache/muse/core/ src/org/apache/muse/core/descriptor/
src/org/apache/muse/core/routing/
Author: danj
Date: Sun Aug 20 11:48:15 2006
New Revision: 433004
URL: http://svn.apache.org/viewvc?rev=433004&view=rev
Log:
Updated muse.xml schema to allow for 'use-router-persistence' flag on <resource-type/>. This is the
implementation of MUSE-60. Resource types must now "opt-in" to the router persistence so that the EPRs
of the resource instances will be saved and reloaded. Opt-in is done by setting the use-router-persistence
attribute on <resource-type/> to 'true' (default = 'false'). This allows for the auto-creation of some
resources, which may in turn handle the creation of other resource types as part of their implementation.
Modified:
webservices/muse/trunk/modules/muse-core/schemas/muse-descriptor.xsd
webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/ResourceManager.java
webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/SimpleResourceManager.java
webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/DescriptorConstants.java
webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/ResourceDefinition.java
webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/SimpleResourceDescriptor.java
webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/routing/RouterFilePersistence.java
Modified: webservices/muse/trunk/modules/muse-core/schemas/muse-descriptor.xsd
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/schemas/muse-descriptor.xsd?rev=433004&r1=433003&r2=433004&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-core/schemas/muse-descriptor.xsd (original)
+++ webservices/muse/trunk/modules/muse-core/schemas/muse-descriptor.xsd Sun Aug 20 11:48:15 2006
@@ -126,6 +126,7 @@
<xs:element ref="tns:capability" minOccurs="0" maxOccurs="unbounded"/>
<xs:element ref="tns:init-param" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
+ <xs:attribute name="use-router-persistence" type="xs:boolean" default="false"/>
</xs:complexType>
</xs:element>
Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/ResourceManager.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/ResourceManager.java?rev=433004&r1=433003&r2=433004&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/ResourceManager.java (original)
+++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/ResourceManager.java Sun Aug 20 11:48:15 2006
@@ -142,6 +142,16 @@
*
*/
Iterator getResourceEPRs();
+
+ /**
+ *
+ * @param contextPath
+ *
+ * @return True if the resource type was specified with the use-router-persistence
+ * flag set to 'true' in muse.xml.
+ *
+ */
+ boolean isUsingPersistence(String contextPath);
void removeListener(ResourceManagerListener listener);
Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/SimpleResourceManager.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/SimpleResourceManager.java?rev=433004&r1=433003&r2=433004&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/SimpleResourceManager.java (original)
+++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/SimpleResourceManager.java Sun Aug 20 11:48:15 2006
@@ -324,6 +324,11 @@
_hasBeenInitialized = true;
}
+ public boolean isUsingPersistence(String contextPath)
+ {
+ return getResourceDefinition(contextPath).isUsingPersistence();
+ }
+
public synchronized void removeListener(ResourceManagerListener listener)
{
_listeners.remove(listener);
Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/DescriptorConstants.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/DescriptorConstants.java?rev=433004&r1=433003&r2=433004&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/DescriptorConstants.java (original)
+++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/DescriptorConstants.java Sun Aug 20 11:48:15 2006
@@ -120,4 +120,6 @@
public static final QName CONTEXT_PATH_QNAME =
new QName(NAMESPACE_URI, "context-path", PREFIX);
+
+ public static final String USE_ROUTER_PERSISTENCE = "use-router-persistence";
}
Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/ResourceDefinition.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/ResourceDefinition.java?rev=433004&r1=433003&r2=433004&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/ResourceDefinition.java (original)
+++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/ResourceDefinition.java Sun Aug 20 11:48:15 2006
@@ -63,6 +63,8 @@
private ResourceIdFactory _idFactory = null;
+ private boolean _isUsingPersistence = false;
+
private Logger _log = null;
private Map _parameters = null;
@@ -165,6 +167,11 @@
return _wsdl;
}
+ public boolean isUsingPersistence()
+ {
+ return _isUsingPersistence;
+ }
+
public void setCapabilityDefinitions(Collection capabilities)
{
_capabilities = capabilities;
@@ -196,6 +203,11 @@
public void setResourceClass(Class resourceClass)
{
_resourceClass = resourceClass;
+ }
+
+ public void setUsingPersistence(boolean isUsingPersistence)
+ {
+ _isUsingPersistence = isUsingPersistence;
}
public void setWsdlConfig(WsdlConfig wsdl)
Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/SimpleResourceDescriptor.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/SimpleResourceDescriptor.java?rev=433004&r1=433003&r2=433004&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/SimpleResourceDescriptor.java (original)
+++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/descriptor/SimpleResourceDescriptor.java Sun Aug 20 11:48:15 2006
@@ -78,6 +78,7 @@
if (environment == null)
throw new NullPointerException(_MESSAGES.get("NullEnvironment"));
+ boolean isUsingPersistence = createUsingPersistence(xml);
String contextPath = createContextPath(xml);
WsdlConfig wsdl = createWSDL(xml);
ResourceIdFactory idFactory = createResourceIdFactory(xml, environment);
@@ -90,6 +91,7 @@
_definition = new ResourceDefinition();
_definition.setEnvironment(environment);
+ _definition.setUsingPersistence(isUsingPersistence);
_definition.setContextPath(contextPath);
_definition.setWsdlConfig(wsdl);
_definition.setResourceIdFactory(idFactory);
@@ -341,6 +343,15 @@
}
return (ResourceIdFactory)ReflectUtils.newInstance(theClass);
+ }
+
+ protected boolean createUsingPersistence(Element xml)
+ {
+ //
+ // if there's a null/empty value, Boolean.valueOf() returns 'false'
+ //
+ String attr = xml.getAttribute(DescriptorConstants.USE_ROUTER_PERSISTENCE);
+ return Boolean.valueOf(attr).booleanValue();
}
protected WsdlConfig createWSDL(Element xml)
Modified: webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/routing/RouterFilePersistence.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/routing/RouterFilePersistence.java?rev=433004&r1=433003&r2=433004&view=diff
==============================================================================
--- webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/routing/RouterFilePersistence.java (original)
+++ webservices/muse/trunk/modules/muse-core/src/org/apache/muse/core/routing/RouterFilePersistence.java Sun Aug 20 11:48:15 2006
@@ -116,12 +116,18 @@
public void resourceAdded(EndpointReference epr, Resource resource)
throws SoapFault
{
- createResourceFile(epr, resource);
+ String contextPath = resource.getContextPath();
+
+ if (getResourceManager().isUsingPersistence(contextPath))
+ createResourceFile(epr, resource);
}
public void resourceRemoved(EndpointReference epr)
throws SoapFault
{
- destroyResourceFile(epr);
+ String contextPath = getContextPath(epr);
+
+ if (getResourceManager().isUsingPersistence(contextPath))
+ destroyResourceFile(epr);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org