svn commit: r1204444 - in /incubator/clerezza/trunk/parent/uima: uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ uima.utils/src/main/java/org/apache/clerezza/uima/utils/ uima.utils/src/main/java/org/apache/clerezza/uima/utils/cl/

[to...@apache.org]

Author: tommaso
Date: Mon Nov 21 10:54:52 2011
New Revision: 1204444

URL: http://svn.apache.org/viewvc?rev=1204444&view=rev
Log:
[CLEREZZA-657] - AnalysisComponentClassLoaderRepository renamed as UIMAResourcesClassLoaderRepository, added registerResource method

Added:
    incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/cl/UIMAResourcesClassLoaderRepository.java
      - copied, changed from r1202611, incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/cl/AnalysisComponentsClassLoaderRepository.java
Removed:
    incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/cl/AnalysisComponentsClassLoaderRepository.java
Modified:
    incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ClerezzaCASConsumerActivator.java
    incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/AEProvider.java
    incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/UIMAUtilsBundleActivator.java
    incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/cl/ClerezzaUIMAExtensionClassLoader.java

Modified: incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ClerezzaCASConsumerActivator.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ClerezzaCASConsumerActivator.java?rev=1204444&r1=1204443&r2=1204444&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ClerezzaCASConsumerActivator.java (original)
+++ incubator/clerezza/trunk/parent/uima/uima.casconsumer/src/main/java/org/apache/clerezza/uima/casconsumer/ClerezzaCASConsumerActivator.java Mon Nov 21 10:54:52 2011
@@ -18,8 +18,8 @@
  */
 package org.apache.clerezza.uima.casconsumer;
 
-import org.apache.clerezza.uima.utils.cl.AnalysisComponentsClassLoaderRepository;
 import org.apache.clerezza.uima.utils.UIMABundleActivator;
+import org.apache.clerezza.uima.utils.cl.UIMAResourcesClassLoaderRepository;
 
 /**
  * {@link UIMABundleActivator} to register {@link ClerezzaCASConsumer} component
@@ -27,6 +27,6 @@ import org.apache.clerezza.uima.utils.UI
 public class ClerezzaCASConsumerActivator extends UIMABundleActivator {
   @Override
   protected void classRegistered() {
-    AnalysisComponentsClassLoaderRepository.registerComponent(ClerezzaCASConsumer.class);
+    UIMAResourcesClassLoaderRepository.registerComponent(ClerezzaCASConsumer.class);
   }
 }

Modified: incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/AEProvider.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/AEProvider.java?rev=1204444&r1=1204443&r2=1204444&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/AEProvider.java (original)
+++ incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/AEProvider.java Mon Nov 21 10:54:52 2011
@@ -18,8 +18,8 @@
  */
 package org.apache.clerezza.uima.utils;
 
-import org.apache.clerezza.uima.utils.cl.AnalysisComponentsClassLoaderRepository;
 import org.apache.clerezza.uima.utils.cl.ClerezzaUIMAExtensionClassLoader;
+import org.apache.clerezza.uima.utils.cl.UIMAResourcesClassLoaderRepository;
 import org.apache.uima.UIMAFramework;
 import org.apache.uima.analysis_engine.AnalysisEngine;
 import org.apache.uima.analysis_engine.AnalysisEngineDescription;
@@ -95,7 +95,7 @@ public class AEProvider {
     // try classpath
     URL url = getClass().getResource(filePath);
     if (url == null) {
-      for (ClassLoader c : AnalysisComponentsClassLoaderRepository.getComponents()) {
+      for (ClassLoader c : UIMAResourcesClassLoaderRepository.getComponents()) {
         url = c.getResource(filePath);
         if (url != null)
           break;

Modified: incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/UIMAUtilsBundleActivator.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/UIMAUtilsBundleActivator.java?rev=1204444&r1=1204443&r2=1204444&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/UIMAUtilsBundleActivator.java (original)
+++ incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/UIMAUtilsBundleActivator.java Mon Nov 21 10:54:52 2011
@@ -18,7 +18,7 @@
  */
 package org.apache.clerezza.uima.utils;
 
-import org.apache.clerezza.uima.utils.cl.AnalysisComponentsClassLoaderRepository;
+import org.apache.clerezza.uima.utils.cl.UIMAResourcesClassLoaderRepository;
 import org.apache.uima.alchemy.annotator.TextRankedNamedEntityExtractionAnnotator;
 import org.apache.uima.annotator.calais.OpenCalaisAnnotator;
 
@@ -28,7 +28,7 @@ import org.apache.uima.annotator.calais.
 public class UIMAUtilsBundleActivator extends UIMABundleActivator {
   @Override
   protected void classRegistered() {
-    AnalysisComponentsClassLoaderRepository.registerComponent(TextRankedNamedEntityExtractionAnnotator.class);
-    AnalysisComponentsClassLoaderRepository.registerComponent(OpenCalaisAnnotator.class);
+    UIMAResourcesClassLoaderRepository.registerComponent(TextRankedNamedEntityExtractionAnnotator.class);
+    UIMAResourcesClassLoaderRepository.registerComponent(OpenCalaisAnnotator.class);
   }
 }

Modified: incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/cl/ClerezzaUIMAExtensionClassLoader.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/cl/ClerezzaUIMAExtensionClassLoader.java?rev=1204444&r1=1204443&r2=1204444&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/cl/ClerezzaUIMAExtensionClassLoader.java (original)
+++ incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/cl/ClerezzaUIMAExtensionClassLoader.java Mon Nov 21 10:54:52 2011
@@ -41,7 +41,7 @@ public class ClerezzaUIMAExtensionClassL
 
   public ClerezzaUIMAExtensionClassLoader(ClassLoader parent) {
     super(parent);
-    this.delegateClassLoaders = AnalysisComponentsClassLoaderRepository.getComponents();
+    this.delegateClassLoaders = UIMAResourcesClassLoaderRepository.getComponents();
     this.byteReader = new ResourceByteReader();
   }
 

Copied: incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/cl/UIMAResourcesClassLoaderRepository.java (from r1202611, incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/cl/AnalysisComponentsClassLoaderRepository.java)
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/cl/UIMAResourcesClassLoaderRepository.java?p2=incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/cl/UIMAResourcesClassLoaderRepository.java&p1=incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/cl/AnalysisComponentsClassLoaderRepository.java&r1=1202611&r2=1204444&rev=1204444&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/cl/AnalysisComponentsClassLoaderRepository.java (original)
+++ incubator/clerezza/trunk/parent/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/cl/UIMAResourcesClassLoaderRepository.java Mon Nov 21 10:54:52 2011
@@ -19,6 +19,7 @@
 package org.apache.clerezza.uima.utils.cl;
 
 import org.apache.uima.analysis_component.AnalysisComponent;
+import org.apache.uima.resource.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,8 +30,8 @@ import java.util.Set;
 /**
  * Repository for UIMA {@link AnalysisComponent}s' {@link ClassLoader}s
  */
-public class AnalysisComponentsClassLoaderRepository {
-  private final static Logger log = LoggerFactory.getLogger(AnalysisComponentsClassLoaderRepository.class);
+public class UIMAResourcesClassLoaderRepository {
+  private final static Logger log = LoggerFactory.getLogger(UIMAResourcesClassLoaderRepository.class);
 
   private final static Set<ClassLoader> registeredComponents = new HashSet<ClassLoader>();
 
@@ -39,6 +40,11 @@ public class AnalysisComponentsClassLoad
     registeredComponents.add(component.getClassLoader());
   }
 
+  public static <R extends Resource> void registerResource(Class<R> component) {
+    log.info(new StringBuilder("Component ").append(component.getName()).append(" registered").toString());
+    registeredComponents.add(component.getClassLoader());
+  }
+
   public static Collection<ClassLoader> getComponents() {
     return registeredComponents;
   }