You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrf-dev@ws.apache.org by ip...@apache.org on 2005/06/17 21:44:12 UTC
svn commit: r191186 - in /incubator/apollo/trunk/src:
java/org/apache/ws/resource/ java/org/apache/ws/resource/impl/
java/org/apache/ws/util/jndi/ site/content/xdocs/
Author: ips
Date: Fri Jun 17 12:44:11 2005
New Revision: 191186
URL: http://svn.apache.org/viewcvs?rev=191186&view=rev
Log:
misc. cleanup
Removed:
incubator/apollo/trunk/src/java/org/apache/ws/resource/PersistenceCallback.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/PersistentResource.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/RemoveCallback.java
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/InvalidResourceKeyException.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/Resource.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java
incubator/apollo/trunk/src/java/org/apache/ws/util/jndi/Initializable.java
incubator/apollo/trunk/src/site/content/xdocs/index.xml
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/InvalidResourceKeyException.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/InvalidResourceKeyException.java?rev=191186&r1=191185&r2=191186&view=diff
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/InvalidResourceKeyException.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/InvalidResourceKeyException.java Fri Jun 17 12:44:11 2005
@@ -15,7 +15,6 @@
*=============================================================================*/
package org.apache.ws.resource;
-
/**
* LOG-DONE
* This exception is raised if the {@link ResourceKey ResourceKey} is in any way invalid.
@@ -61,4 +60,5 @@
{
super( ex );
}
+
}
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/Resource.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/Resource.java?rev=191186&r1=191185&r2=191186&view=diff
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/Resource.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/Resource.java Fri Jun 17 12:44:11 2005
@@ -42,15 +42,15 @@
Object getID( );
/**
- * The WS-RF runtime system ends the lifecycle of a {@link Resource}
- * object by invoking this method.
+ * Called by the resource home to indicate to a resource that the resource is
+ * being taken out of service.
*/
void destroy();
/**
- * The WS-RF runtime system initializes a {@link Resource} object by
- * invoking this method.
- *
+ * Called by the resource home to indicate to a resource that the resource is
+ * being placed into service. A resource can use this method to initialize
+ * its properties or any other state.
*/
void init();
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java?rev=191186&r1=191185&r2=191186&view=diff
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/impl/AbstractResourceHome.java Fri Jun 17 12:44:11 2005
@@ -24,7 +24,8 @@
import org.apache.ws.addressing.XmlBeansEndpointReference;
import org.apache.ws.resource.InvalidResourceKeyException;
import org.apache.ws.resource.JndiConstants;
-import org.apache.ws.resource.PersistenceCallback;
+import org.apache.ws.resource.PersistentResource;
+import org.apache.ws.resource.PropertiesResource;
import org.apache.ws.resource.Resource;
import org.apache.ws.resource.ResourceCreationEvent;
import org.apache.ws.resource.ResourceCreationListener;
@@ -34,7 +35,6 @@
import org.apache.ws.resource.ResourceHome;
import org.apache.ws.resource.ResourceKey;
import org.apache.ws.resource.ResourceUnknownException;
-import org.apache.ws.resource.PropertiesResource;
import org.apache.ws.resource.i18n.Keys;
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.lifetime.ScheduledResourceTerminationResource;
@@ -57,10 +57,10 @@
/**
* LOG-DONE An implementation of the <code>ResourceHome</code> interface. This implementation was designed to work with
- * resources that implement the {@link PersistenceCallback PersistenceCallback} interface as well as memory resident
- * resources. If the resource class implements the {@link PersistenceCallback PersistenceCallback} interface
+ * resources that implement the {@link PersistentResource PersistenceCallback} interface as well as memory resident
+ * resources. If the resource class implements the {@link PersistentResource PersistenceCallback} interface
* <code>SoftReference</code>s will be used to recycle resource objects. The resource class implementation is
- * responsible for saving its state to disk. This implementation will <b>not</b> call {@link PersistenceCallback#store()
+ * responsible for saving its state to disk. This implementation will <b>not</b> call {@link PersistentResource#store()
* PersistenceCallback.store()}. The resource implementation must have a default constructor. <br><br> Configuration
* options: <ul> <li> sweeperDelay - configures how often the resource sweeper runs in msec. By default the resource
* sweeper runs every minute. For example:
@@ -330,10 +330,8 @@
private synchronized Lock getLock( ResourceKey key )
{
- Lock lock;
Object lockKey = getLookupKey( key );
- lock = m_lockManager.getLock( lockKey );
- return lock;
+ return m_lockManager.getLock( lockKey );
}
/**
@@ -349,27 +347,12 @@
{
return;
}
+ Class resourceClass = getResourceClass();
- /*if ( m_resourceKeyClassName == null )
- {
- m_resourceKeyClassName = String.class;
- }
- */
-
-
- if ( m_resourceClassName == null )
+ if ( PersistentResource.class.isAssignableFrom( resourceClass ) )
{
- throw new Exception( MSG.getMessage( Keys.RESOURCE_CLASSNAME_NULL ) );
+ m_resourceIsPersistent = true;
}
-
- /* if ( !Resource.class.isAssignableFrom( m_resourceClassName ) )
- {
- throw new Exception( "invalidResourceType: " + m_resourceClassName.getName() );
- }
- if ( PersistenceCallback.class.isAssignableFrom( m_resourceClassName ) )
- {
- m_resourceIsPersistent = true;
- }*/
Context initialContext = new InitialContext();
initResourceMap( initialContext );
m_lockManager = new LockManager();
@@ -377,7 +360,6 @@
{
initSweeper( initialContext );
}
-
m_initialized = true;
}
@@ -418,9 +400,9 @@
}
Resource removedResource = (Resource) m_resources.remove( getLookupKey( key ) );
- if(removedResource instanceof PropertiesResource)
+ if ( removedResource instanceof PropertiesResource )
{
- notifyResourceDeletedListeners( removedResource);
+ notifyResourceDeletedListeners( removedResource );
}
LOG.debug( MSG.getMessage( Keys.REMOVED_RESOURCE_WITH_KEY, resource.getClass().getName(),
String.valueOf( key ) ) );
@@ -510,7 +492,7 @@
{
Resource resource = createInstance( key );
LOG.debug( MSG.getMessage( Keys.LOADING_RESOURCE_FROM_PERSISTENCE, String.valueOf( key ) ) );
- ( (PersistenceCallback) resource ).load( key );
+ ( (PersistentResource) resource ).load( key );
if ( ResourceSweeper.isExpired( resource ) )
{
throw new ResourceUnknownException( getLookupKey( key ), getServicePortName() );
@@ -535,6 +517,10 @@
{
throw new ResourceException( MSG.getMessage( Keys.RESOURCE_CLASS_NOT_FOUND, m_resourceClassName ) );
}
+ if ( !Resource.class.isAssignableFrom( m_resourceClass ) )
+ {
+ throw new ResourceException( "Specified resource class '" + m_resourceClassName + "' does not implement the " + Resource.class.getName() + " interface." );
+ }
}
return m_resourceClass;
}
@@ -758,7 +744,7 @@
*
* @param resource The EndpointReference for the Resource which was created
*/
- private void notifyResourceDeletedListeners(Resource resource)
+ private void notifyResourceDeletedListeners( Resource resource )
{
for ( int i = 0; i < m_destructionListeners.size(); i++ )
{
Modified: incubator/apollo/trunk/src/java/org/apache/ws/util/jndi/Initializable.java
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/util/jndi/Initializable.java?rev=191186&r1=191185&r2=191186&view=diff
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/util/jndi/Initializable.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/util/jndi/Initializable.java Fri Jun 17 12:44:11 2005
@@ -15,10 +15,9 @@
*=============================================================================*/
package org.apache.ws.util.jndi;
-
/**
- * Used with {@link org.globus.wsrf.jndi.BeanFactory BeanFactory}. The initialize() method will be called if the bean
- * implements this interface.
+ * Used with {@link BeanFactory}.
+ * The init() method will be called if the bean implements this interface.
*/
public interface Initializable
{
Modified: incubator/apollo/trunk/src/site/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/xdocs/index.xml?rev=191186&r1=191185&r2=191186&view=diff
==============================================================================
--- incubator/apollo/trunk/src/site/content/xdocs/index.xml (original)
+++ incubator/apollo/trunk/src/site/content/xdocs/index.xml Fri Jun 17 12:44:11 2005
@@ -6,7 +6,7 @@
<document>
<header>
- <title>Welcome to Apollo!</title>
+ <title>Apache WebServices - Apollo</title>
</header>
<body>
@@ -24,6 +24,13 @@
management of the state through properties associated with the Web service, and to
describe how these mechanisms are extensible to groups of Web services.
</p>
+ </section>
+
+ <section>
+ <title>News</title>
+ <ul>
+ <li>(May 25, 2005) <a href="http://cvs.apache.org/dist/incubator/apollo/1.0-beta/">Apollo 1.0 Beta</a> is now available!</li>
+ </ul>
</section>
<section>
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org