You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ke...@apache.org on 2005/09/16 01:29:26 UTC
svn commit: r289346 - in /beehive/trunk/controls:
src/api/org/apache/beehive/controls/api/context/
src/runtime/org/apache/beehive/controls/runtime/bean/ test/infra/milton/
test/src/auxilaries/org/apache/beehive/controls/test/controls/interceptor/
test/...
Author: kentam
Date: Thu Sep 15 16:29:16 2005
New Revision: 289346
URL: http://svn.apache.org/viewcvs?rev=289346&view=rev
Log:
Fixed interceptor tests (which were disabled for some unknown reason awhile ago).
Re-order context events and interceptors so that context events occur inside the scope of interceptors.
Fix some Javadoc.
Modified:
beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ResourceContext.java
beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java
beehive/trunk/controls/test/infra/milton/milton.jar
beehive/trunk/controls/test/src/auxilaries/org/apache/beehive/controls/test/controls/interceptor/SampleInterceptor.java
beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/extension/ExtensibleControlImpl.jcs
beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/SubControlTest.java
beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/MiltonControlContext.java
beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/MiltonInterceptorContextImpl.java
Modified: beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ResourceContext.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ResourceContext.java?rev=289346&r1=289345&r2=289346&view=diff
==============================================================================
--- beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ResourceContext.java (original)
+++ beehive/trunk/controls/src/api/org/apache/beehive/controls/api/context/ResourceContext.java Thu Sep 15 16:29:16 2005
@@ -69,16 +69,16 @@
*
* ...
*
- * <sp>@EventHandler(field="resourceContext"
- * eventSet=ResourceContext.Events.class,
+ * <sp>@EventHandler(field="resourceContext",
+ * eventSet=ResourceContext.ResourceEvents.class,
* eventName="onAcquire")
* public void onAcquire()
* {
* // code to obtain connections/sessions/...
* }
*
- * <sp>@EventHandler(field="resourceContext"
- * eventSet=ResourceContext.Events.class,
+ * <sp>@EventHandler(field="resourceContext",
+ * eventSet=ResourceContext.ResourceEvents.class,
* eventName="onRelease")
* public void onRelease()
* {
Modified: beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java?rev=289346&r1=289345&r2=289346&view=diff
==============================================================================
--- beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java (original)
+++ beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/bean/ControlBean.java Thu Sep 15 16:29:16 2005
@@ -421,6 +421,13 @@
{
try
{
+ Vector<InvokeListener> invokeListeners = getInvokeListeners();
+ if (invokeListeners.size() > 0)
+ {
+ for (InvokeListener listener : invokeListeners)
+ listener.postInvoke(retval, t);
+ }
+
//
// Process interceptors
//
@@ -438,13 +445,6 @@
i.postInvoke( this, m, args, retval, t );
}
}
- }
-
- Vector<InvokeListener> invokeListeners = getInvokeListeners();
- if (invokeListeners.size() > 0)
- {
- for (InvokeListener listener : invokeListeners)
- listener.postInvoke(retval, t);
}
}
finally
Modified: beehive/trunk/controls/test/infra/milton/milton.jar
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/infra/milton/milton.jar?rev=289346&r1=289345&r2=289346&view=diff
==============================================================================
Binary files - no diff available.
Modified: beehive/trunk/controls/test/src/auxilaries/org/apache/beehive/controls/test/controls/interceptor/SampleInterceptor.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/auxilaries/org/apache/beehive/controls/test/controls/interceptor/SampleInterceptor.java?rev=289346&r1=289345&r2=289346&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/auxilaries/org/apache/beehive/controls/test/controls/interceptor/SampleInterceptor.java (original)
+++ beehive/trunk/controls/test/src/auxilaries/org/apache/beehive/controls/test/controls/interceptor/SampleInterceptor.java Thu Sep 15 16:29:16 2005
@@ -28,11 +28,13 @@
public void preInvoke( ControlBean cb, Method m, Object [] args)
throws InterceptorPivotException
{
+ System.out.println( "SampleInterceptor.preInvoke() called: bean=" + cb.getControlID() + " m=" + m.getName() );
}
/** Called after a control operation is invoked */
public void postInvoke( ControlBean cb, Method m, Object [] args, Object retval, Throwable t )
{
+ System.out.println( "SampleInterceptor.postInvoke() called: bean=" + cb.getControlID() + " m=" + m.getName() );
}
/** Called before a control event is fired (through a client proxy) */
Modified: beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/extension/ExtensibleControlImpl.jcs
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/extension/ExtensibleControlImpl.jcs?rev=289346&r1=289345&r2=289346&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/extension/ExtensibleControlImpl.jcs (original)
+++ beehive/trunk/controls/test/src/controls/org/apache/beehive/controls/test/controls/extension/ExtensibleControlImpl.jcs Thu Sep 15 16:29:16 2005
@@ -22,8 +22,10 @@
import java.lang.reflect.Method;
import org.apache.beehive.controls.api.context.Context;
import org.apache.beehive.controls.api.context.ControlBeanContext;
+import org.apache.beehive.controls.api.context.ResourceContext;
import org.apache.beehive.controls.api.bean.ControlImplementation;
import org.apache.beehive.controls.api.bean.Extensible;
+import org.apache.beehive.controls.api.events.EventHandler;
/**
* A control impl.
@@ -35,9 +37,27 @@
{
@Context ControlBeanContext context;
+ @Context ResourceContext resourceContext;
+
+ @EventHandler(field="resourceContext",
+ eventSet=ResourceContext.ResourceEvents.class,
+ eventName="onAcquire")
+ public void onAcquire()
+ {
+ System.out.println( "ExtensibleControlImpl.onAcquire()" );
+ }
+
+ @EventHandler(field="resourceContext",
+ eventSet=ResourceContext.ResourceEvents.class,
+ eventName="onRelease")
+ public void onRelease()
+ {
+ System.out.println( "ExtensibleControlImpl.onRelease()" );
+ }
+
public String hello()
{
- return "Hello from super control";
+ return "Hello from super control";
}
public String getLayerByContext()
Modified: beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/SubControlTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/SubControlTest.java?rev=289346&r1=289345&r2=289346&view=diff
==============================================================================
--- beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/SubControlTest.java (original)
+++ beehive/trunk/controls/test/src/units/org/apache/beehive/controls/test/java/extension/SubControlTest.java Thu Sep 15 16:29:16 2005
@@ -77,7 +77,7 @@
/**
* Tests invoking a method inherited by the subcontrol
*/
- @Freq("detailed")
+ @Freq("checkin")
public void testInheritedMethod() throws Exception
{
Report report =new Report();
Modified: beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/MiltonControlContext.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/MiltonControlContext.java?rev=289346&r1=289345&r2=289346&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/MiltonControlContext.java (original)
+++ beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/MiltonControlContext.java Thu Sep 15 16:29:16 2005
@@ -96,9 +96,9 @@
//
addService(org.apache.beehive.test.tools.milton.junit.MiltonControlContext.class, theProvider);
- // Registers a TestInterceptorContext
- /*addService(org.apache.beehive.test.tools.TestInterceptorContext.class,
- org.apache.beehive.controls.test.controls.util.TestInterceptorContextImpl.getProvider() );*/
+ // Registers the test MiltonInterceptorContext
+ addService(org.apache.beehive.test.tools.milton.junit.MiltonInterceptorContext.class,
+ org.apache.beehive.test.tools.milton.junit.MiltonInterceptorContextImpl.getProvider() );
}
/**
Modified: beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/MiltonInterceptorContextImpl.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/MiltonInterceptorContextImpl.java?rev=289346&r1=289345&r2=289346&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/MiltonInterceptorContextImpl.java (original)
+++ beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/junit/MiltonInterceptorContextImpl.java Thu Sep 15 16:29:16 2005
@@ -79,18 +79,25 @@
public void preInvoke( ControlBean cb, Method m, Object [] args)
{
- System.out.println( "***********************" );
- System.out.println( "***********************" );
- System.out.println( "PREINVOKE INTERCEPTOR " );
- System.out.println( "***********************" );
- System.out.println( "***********************" );
+ System.out.println( "MiltonInterceptorContextImpl.preInvoke()" );
}
- public void postInvoke( ControlBean cb, Method m, Object [] args, Object retval, Throwable t) {}
+ public void postInvoke( ControlBean cb, Method m, Object [] args, Object retval, Throwable t)
+ {
+ System.out.println( "MiltonInterceptorContextImpl.postInvoke()" );
+ }
/** Called before a control event is fired (through a client proxy) */
- public void preEvent( ControlBean cb, Class eventSet, Method m, Object [] args) {}
+ public void preEvent( ControlBean cb, Class eventSet, Method m, Object [] args)
+ {
+ System.out.println( "MiltonInterceptorContextImpl.preEvent()" );
+ }
+
/** Called after a control event is fired (through a client proxy) */
- public void postEvent( ControlBean cb, Class eventSet, Method m, Object [] args) {}
+ public void postEvent( ControlBean cb, Class eventSet, Method m, Object [] args)
+ {
+ System.out.println( "MiltonInterceptorContextImpl.postEvent()" );
+ }
+
}