svn commit: r1394434 - in /river/jtsk/trunk/src-extra/org/apache/river/extra/helpers: ConfigHelper.java JiniComponent.java

[sijskes]

Author: sijskes
Date: Fri Oct  5 10:25:13 2012
New Revision: 1394434

URL: http://svn.apache.org/viewvc?rev=1394434&view=rev
Log:
Used com.sun.jini.config.Component instead.

Removed:
    river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/JiniComponent.java
Modified:
    river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ConfigHelper.java

Modified: 
river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ConfigHelper.java
URL: 
http://svn.apache.org/viewvc/river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ConfigHelper.java?rev=1394434&r1=1394433&r2=1394434&view=diff
==============================================================================
--- river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ConfigHelper.java 
(original)
+++ river/jtsk/trunk/src-extra/org/apache/river/extra/helpers/ConfigHelper.java 
Fri Oct  5 10:25:13 2012
@@ -18,6 +18,7 @@
 
 package org.apache.river.extra.helpers;
 
+import com.sun.jini.config.Component;
 import java.lang.reflect.Proxy;
 import java.net.URL;
 import java.rmi.Remote;
@@ -62,13 +63,13 @@ public abstract class ConfigHelper
         return new ProxyHelper(configuration);
     }
 
-    private JiniComponent findJiniComponent( Class cls )
+    private Component findJiniComponent( Class cls )
     {
         if( !Remote.class.isAssignableFrom(cls) ) {
             return null ;
         }
 
-        JiniComponent jc;
+        Component jc;
 
         if( Proxy.isProxyClass(cls) ) {
             Class[] ifs = cls.getInterfaces();
@@ -81,7 +82,7 @@ public abstract class ConfigHelper
             return null ;
         }
 
-        jc = (JiniComponent) cls.getAnnotation(JiniComponent.class);
+        jc = (Component) cls.getAnnotation(Component.class);
         if( jc != null ) {
             return jc ;
         }
@@ -98,7 +99,7 @@ public abstract class ConfigHelper
 
     protected String getComponent( Class cls )
     {
-        JiniComponent jc = findJiniComponent(cls);
+        Component jc = findJiniComponent(cls);
 
         if (jc != null) {
             String comp = jc.value();