Author: rec
Date: Sat May 4 13:46:21 2013
New Revision: 1479108
URL: http://svn.apache.org/r1479108
Log:
[UIMA-2588] Move internal API into a separate package
- Fix regression: Reset UIMA logging level in logging tests
Added:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/EnhancedClassFile.java
- copied, changed from r1476359,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/EnhancedClassFile.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/ExtendedExternalResourceDescription_impl.java
- copied, changed from r1476359,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/ExtendedExternalResourceDescription_impl.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/ExtendedLogger.java
- copied, changed from r1477999,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/ExtendedLogger.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/LegacySupport.java
- copied, changed from r1476359,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/LegacySupport.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/LegacySupportPlugin.java
- copied, changed from r1476359,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/LegacySupportPlugin.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/MetaDataType.java
- copied, changed from r1476359,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/MetaDataType.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/MetaDataUtil.java
- copied, changed from r1476359,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/MetaDataUtil.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/ReflectionUtil.java
- copied, changed from r1476359,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/ReflectionUtil.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/package-info.java
(with props)
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/GetAsTextStringEditor.java
- copied, changed from r1476359,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/propertyeditors/GetAsTextStringEditor.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/LocaleEditor.java
- copied, changed from r1476359,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/propertyeditors/LocaleEditor.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/PropertyEditorUtil.java
- copied, changed from r1476359,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/propertyeditors/PropertyEditorUtil.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/package-info.java
(with props)
Removed:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/propertyeditors/
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/EnhancedClassFile.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/ExtendedExternalResourceDescription_impl.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/ExtendedLogger.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/LegacySupport.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/LegacySupportPlugin.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/MetaDataType.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/MetaDataUtil.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/ReflectionUtil.java
Modified:
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/LegacySupportPluginImpl.java
uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/EnhanceMojo.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasAnnotator_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasCollectionReader_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasConsumer_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasFlowController_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasMultiplier_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasAnnotator_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasCollectionReader_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasConsumer_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasFlowController_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasMultiplier_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/Resource_ImplBase.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializer.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ExternalResourceInitializer.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/CapabilityFactory.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/ConfigurationParameterFactory.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/ExternalResourceFactory.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/FsIndexFactory.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/ResourceMetaDataFactory.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactory.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/JCasGenPomFriendly.java
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/LoggingTest.java
Modified:
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/LegacySupportPluginImpl.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/LegacySupportPluginImpl.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/LegacySupportPluginImpl.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit-legacy-support/src/main/java/org/apache/uima/fit/legacy/LegacySupportPluginImpl.java
Sat May 4 13:46:21 2013
@@ -23,6 +23,8 @@ import java.lang.reflect.AccessibleObjec
import java.util.HashMap;
import java.util.Map;
+import org.apache.uima.fit.internal.LegacySupportPlugin;
+import org.apache.uima.fit.internal.MetaDataType;
import org.apache.uima.fit.legacy.converter.ConfigurationParameterConverter;
import org.apache.uima.fit.legacy.converter.ExternalResourceConverter;
import org.apache.uima.fit.legacy.converter.FsIndexCollectionConverter;
@@ -32,8 +34,6 @@ import org.apache.uima.fit.legacy.conver
import org.apache.uima.fit.legacy.converter.OperationalPropertiesConverter;
import org.apache.uima.fit.legacy.converter.SofaCapabilityConverter;
import org.apache.uima.fit.legacy.converter.TypeCapabilityConverter;
-import org.apache.uima.fit.util.LegacySupportPlugin;
-import org.apache.uima.fit.util.MetaDataType;
import org.apache.uima.resource.ResourceInitializationException;
import org.uimafit.factory.FsIndexFactory;
import org.uimafit.factory.TypeSystemDescriptionFactory;
Modified:
uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/EnhanceMojo.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/EnhanceMojo.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/EnhanceMojo.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit-maven-plugin/src/main/java/org/apache/uima/fit/maven/EnhanceMojo.java
Sat May 4 13:46:21 2013
@@ -61,8 +61,8 @@ import org.apache.maven.project.MavenPro
import org.apache.uima.fit.descriptor.ResourceMetaData;
import org.apache.uima.fit.factory.ConfigurationParameterFactory;
import org.apache.uima.fit.factory.ResourceMetaDataFactory;
+import org.apache.uima.fit.internal.EnhancedClassFile;
import org.apache.uima.fit.maven.util.Util;
-import org.apache.uima.fit.util.EnhancedClassFile;
import org.apache.uima.resource.metadata.ConfigurationParameter;
import org.codehaus.plexus.util.FileUtils;
import org.sonatype.plexus.build.incremental.BuildContext;
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasAnnotator_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasAnnotator_ImplBase.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasAnnotator_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasAnnotator_ImplBase.java
Sat May 4 13:46:21 2013
@@ -22,7 +22,7 @@ package org.apache.uima.fit.component;
import org.apache.uima.UimaContext;
import
org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
-import org.apache.uima.fit.util.ExtendedLogger;
+import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.resource.ResourceInitializationException;
/**
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasCollectionReader_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasCollectionReader_ImplBase.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasCollectionReader_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasCollectionReader_ImplBase.java
Sat May 4 13:46:21 2013
@@ -25,7 +25,7 @@ import org.apache.uima.collection.Collec
import
org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
import org.apache.uima.fit.descriptor.OperationalProperties;
-import org.apache.uima.fit.util.ExtendedLogger;
+import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.resource.ResourceInitializationException;
/**
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasConsumer_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasConsumer_ImplBase.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasConsumer_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasConsumer_ImplBase.java
Sat May 4 13:46:21 2013
@@ -22,7 +22,7 @@ import org.apache.uima.UimaContext;
import
org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
import org.apache.uima.fit.descriptor.OperationalProperties;
-import org.apache.uima.fit.util.ExtendedLogger;
+import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.resource.ResourceInitializationException;
/**
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasFlowController_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasFlowController_ImplBase.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasFlowController_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasFlowController_ImplBase.java
Sat May 4 13:46:21 2013
@@ -20,7 +20,7 @@ package org.apache.uima.fit.component;
import
org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
-import org.apache.uima.fit.util.ExtendedLogger;
+import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.flow.FlowControllerContext;
import org.apache.uima.resource.ResourceInitializationException;
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasMultiplier_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasMultiplier_ImplBase.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasMultiplier_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/CasMultiplier_ImplBase.java
Sat May 4 13:46:21 2013
@@ -22,7 +22,7 @@ import org.apache.uima.UimaContext;
import
org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
import org.apache.uima.fit.descriptor.OperationalProperties;
-import org.apache.uima.fit.util.ExtendedLogger;
+import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.resource.ResourceInitializationException;
/**
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasAnnotator_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasAnnotator_ImplBase.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasAnnotator_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasAnnotator_ImplBase.java
Sat May 4 13:46:21 2013
@@ -21,7 +21,7 @@ package org.apache.uima.fit.component;
import org.apache.uima.UimaContext;
import
org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
-import org.apache.uima.fit.util.ExtendedLogger;
+import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.resource.ResourceInitializationException;
/**
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasCollectionReader_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasCollectionReader_ImplBase.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasCollectionReader_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasCollectionReader_ImplBase.java
Sat May 4 13:46:21 2013
@@ -28,7 +28,7 @@ import org.apache.uima.collection.Collec
import
org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
import org.apache.uima.fit.descriptor.OperationalProperties;
-import org.apache.uima.fit.util.ExtendedLogger;
+import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ResourceInitializationException;
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasConsumer_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasConsumer_ImplBase.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasConsumer_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasConsumer_ImplBase.java
Sat May 4 13:46:21 2013
@@ -22,7 +22,7 @@ import org.apache.uima.UimaContext;
import
org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
import org.apache.uima.fit.descriptor.OperationalProperties;
-import org.apache.uima.fit.util.ExtendedLogger;
+import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.resource.ResourceInitializationException;
/**
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasFlowController_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasFlowController_ImplBase.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasFlowController_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasFlowController_ImplBase.java
Sat May 4 13:46:21 2013
@@ -20,7 +20,7 @@ package org.apache.uima.fit.component;
import
org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
-import org.apache.uima.fit.util.ExtendedLogger;
+import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.flow.FlowControllerContext;
import org.apache.uima.resource.ResourceInitializationException;
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasMultiplier_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasMultiplier_ImplBase.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasMultiplier_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/JCasMultiplier_ImplBase.java
Sat May 4 13:46:21 2013
@@ -22,7 +22,7 @@ import org.apache.uima.UimaContext;
import
org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
import org.apache.uima.fit.descriptor.OperationalProperties;
-import org.apache.uima.fit.util.ExtendedLogger;
+import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.resource.ResourceInitializationException;
/**
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/Resource_ImplBase.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/Resource_ImplBase.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/Resource_ImplBase.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/Resource_ImplBase.java
Sat May 4 13:46:21 2013
@@ -23,7 +23,7 @@ import java.util.Map;
import
org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.descriptor.ConfigurationParameter;
import org.apache.uima.fit.factory.ExternalResourceFactory;
-import org.apache.uima.fit.util.ExtendedLogger;
+import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.ResourceSpecifier;
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializer.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializer.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializer.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializer.java
Sat May 4 13:46:21 2013
@@ -30,8 +30,8 @@ import org.apache.uima.UimaContext;
import org.apache.uima.UimaContextAdmin;
import org.apache.uima.fit.descriptor.ConfigurationParameter;
import org.apache.uima.fit.factory.ConfigurationParameterFactory;
-import org.apache.uima.fit.propertyeditors.PropertyEditorUtil;
-import org.apache.uima.fit.util.ReflectionUtil;
+import org.apache.uima.fit.internal.ReflectionUtil;
+import org.apache.uima.fit.internal.propertyeditors.PropertyEditorUtil;
import org.apache.uima.resource.ConfigurationManager;
import org.apache.uima.resource.CustomResourceSpecifier;
import org.apache.uima.resource.DataResource;
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ExternalResourceInitializer.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ExternalResourceInitializer.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ExternalResourceInitializer.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/component/initialize/ExternalResourceInitializer.java
Sat May 4 13:46:21 2013
@@ -35,7 +35,7 @@ import org.apache.uima.UimaContextAdmin;
import org.apache.uima.fit.component.ExternalResourceAware;
import org.apache.uima.fit.descriptor.ExternalResource;
import org.apache.uima.fit.descriptor.ExternalResourceLocator;
-import org.apache.uima.fit.util.ReflectionUtil;
+import org.apache.uima.fit.internal.ReflectionUtil;
import org.apache.uima.resource.ExternalResourceDependency;
import org.apache.uima.resource.Resource;
import org.apache.uima.resource.ResourceAccessException;
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java
Sat May 4 13:46:21 2013
@@ -54,7 +54,7 @@ import org.apache.uima.analysis_engine.m
import org.apache.uima.cas.CAS;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
import
org.apache.uima.fit.factory.ConfigurationParameterFactory.ConfigurationData;
-import org.apache.uima.fit.util.ReflectionUtil;
+import org.apache.uima.fit.internal.ReflectionUtil;
import org.apache.uima.flow.FlowControllerDescription;
import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ExternalResourceDependency;
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/CapabilityFactory.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/CapabilityFactory.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/CapabilityFactory.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/CapabilityFactory.java
Sat May 4 13:46:21 2013
@@ -25,7 +25,7 @@ import org.apache.uima.analysis_engine.T
import org.apache.uima.analysis_engine.impl.TypeOrFeature_impl;
import org.apache.uima.fit.descriptor.SofaCapability;
import org.apache.uima.fit.descriptor.TypeCapability;
-import org.apache.uima.fit.util.ReflectionUtil;
+import org.apache.uima.fit.internal.ReflectionUtil;
import org.apache.uima.resource.metadata.Capability;
import org.apache.uima.resource.metadata.impl.Capability_impl;
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/ConfigurationParameterFactory.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/ConfigurationParameterFactory.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/ConfigurationParameterFactory.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/ConfigurationParameterFactory.java
Sat May 4 13:46:21 2013
@@ -29,8 +29,8 @@ import java.util.Map;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.IllegalClassException;
import org.apache.uima.UIMA_IllegalArgumentException;
-import org.apache.uima.fit.propertyeditors.PropertyEditorUtil;
-import org.apache.uima.fit.util.ReflectionUtil;
+import org.apache.uima.fit.internal.ReflectionUtil;
+import org.apache.uima.fit.internal.propertyeditors.PropertyEditorUtil;
import org.apache.uima.resource.ConfigurableDataResourceSpecifier;
import org.apache.uima.resource.CustomResourceSpecifier;
import org.apache.uima.resource.ExternalResourceDescription;
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/ExternalResourceFactory.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/ExternalResourceFactory.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/ExternalResourceFactory.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/ExternalResourceFactory.java
Sat May 4 13:46:21 2013
@@ -39,7 +39,7 @@ import org.apache.uima.analysis_engine.A
import org.apache.uima.collection.CollectionReaderDescription;
import org.apache.uima.fit.descriptor.ExternalResource;
import
org.apache.uima.fit.factory.ConfigurationParameterFactory.ConfigurationData;
-import org.apache.uima.fit.util.ExtendedExternalResourceDescription_impl;
+import org.apache.uima.fit.internal.ExtendedExternalResourceDescription_impl;
import org.apache.uima.resource.ConfigurableDataResourceSpecifier;
import org.apache.uima.resource.CustomResourceSpecifier;
import org.apache.uima.resource.DataResource;
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/FsIndexFactory.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/FsIndexFactory.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/FsIndexFactory.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/FsIndexFactory.java
Sat May 4 13:46:21 2013
@@ -20,8 +20,8 @@ package org.apache.uima.fit.factory;
import static java.util.Arrays.asList;
import static org.apache.uima.UIMAFramework.getXMLParser;
-import static org.apache.uima.fit.util.MetaDataUtil.scanDescriptors;
-import static org.apache.uima.fit.util.ReflectionUtil.getInheritableAnnotation;
+import static org.apache.uima.fit.internal.MetaDataUtil.scanDescriptors;
+import static
org.apache.uima.fit.internal.ReflectionUtil.getInheritableAnnotation;
import java.io.IOException;
import java.util.ArrayList;
@@ -30,7 +30,7 @@ import java.util.List;
import org.apache.commons.logging.LogFactory;
import org.apache.uima.fit.descriptor.FsIndex;
import org.apache.uima.fit.descriptor.FsIndexKey;
-import org.apache.uima.fit.util.MetaDataType;
+import org.apache.uima.fit.internal.MetaDataType;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.metadata.FsIndexCollection;
import org.apache.uima.resource.metadata.FsIndexDescription;
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/ResourceMetaDataFactory.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/ResourceMetaDataFactory.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/ResourceMetaDataFactory.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/ResourceMetaDataFactory.java
Sat May 4 13:46:21 2013
@@ -18,7 +18,7 @@
*/
package org.apache.uima.fit.factory;
-import org.apache.uima.fit.util.ReflectionUtil;
+import org.apache.uima.fit.internal.ReflectionUtil;
import org.apache.uima.resource.metadata.ResourceMetaData;
public final class ResourceMetaDataFactory {
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactory.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactory.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactory.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactory.java
Sat May 4 13:46:21 2013
@@ -19,7 +19,7 @@
package org.apache.uima.fit.factory;
import static org.apache.uima.UIMAFramework.getXMLParser;
-import static org.apache.uima.fit.util.MetaDataUtil.scanDescriptors;
+import static org.apache.uima.fit.internal.MetaDataUtil.scanDescriptors;
import static org.apache.uima.util.CasCreationUtils.mergeTypeSystems;
import java.io.IOException;
@@ -27,7 +27,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.logging.LogFactory;
-import org.apache.uima.fit.util.MetaDataType;
+import org.apache.uima.fit.internal.MetaDataType;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.metadata.Import;
import org.apache.uima.resource.metadata.TypeSystemDescription;
Copied:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/EnhancedClassFile.java
(from r1476359,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/EnhancedClassFile.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/EnhancedClassFile.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/EnhancedClassFile.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/EnhancedClassFile.java&r1=1476359&r2=1479108&rev=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/EnhancedClassFile.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/EnhancedClassFile.java
Sat May 4 13:46:21 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.uima.fit.util;
+package org.apache.uima.fit.internal;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Copied:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/ExtendedExternalResourceDescription_impl.java
(from r1476359,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/ExtendedExternalResourceDescription_impl.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/ExtendedExternalResourceDescription_impl.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/ExtendedExternalResourceDescription_impl.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/ExtendedExternalResourceDescription_impl.java&r1=1476359&r2=1479108&rev=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/ExtendedExternalResourceDescription_impl.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/ExtendedExternalResourceDescription_impl.java
Sat May 4 13:46:21 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.fit.util;
+package org.apache.uima.fit.internal;
import java.util.ArrayList;
import java.util.Collection;
Copied:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/ExtendedLogger.java
(from r1477999,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/ExtendedLogger.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/ExtendedLogger.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/ExtendedLogger.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/ExtendedLogger.java&r1=1477999&r2=1479108&rev=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/ExtendedLogger.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/ExtendedLogger.java
Sat May 4 13:46:21 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.fit.util;
+package org.apache.uima.fit.internal;
import java.io.OutputStream;
import java.io.PrintStream;
@@ -24,6 +24,7 @@ import org.apache.uima.UimaContext;
import org.apache.uima.resource.ResourceManager;
import org.apache.uima.util.Level;
import org.apache.uima.util.Logger;
+import org.apache.uima.util.impl.JSR47Logger_impl;
/**
* INTERNAL API - Wrapper for the UIMA {@link Logger} offering a more
convenient API similar to that
@@ -271,6 +272,10 @@ public class ExtendedLogger implements L
if (context != null) {
Logger logger = context.getLogger();
if (logger != null) {
+ if (context.getLogger() instanceof JSR47Logger_impl) {
+ JSR47Logger_impl impl = (JSR47Logger_impl) context.getLogger();
+ System.out.println(impl.isLoggable(Level.INFO));
+ }
context.getLogger()
.log(getClass().getName(), Level.INFO,
String.valueOf(paramObject), null);
}
Copied:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/LegacySupport.java
(from r1476359,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/LegacySupport.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/LegacySupport.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/LegacySupport.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/LegacySupport.java&r1=1476359&r2=1479108&rev=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/LegacySupport.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/LegacySupport.java
Sat May 4 13:46:21 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.fit.util;
+package org.apache.uima.fit.internal;
import java.lang.annotation.Annotation;
import java.lang.reflect.AccessibleObject;
Copied:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/LegacySupportPlugin.java
(from r1476359,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/LegacySupportPlugin.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/LegacySupportPlugin.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/LegacySupportPlugin.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/LegacySupportPlugin.java&r1=1476359&r2=1479108&rev=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/LegacySupportPlugin.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/LegacySupportPlugin.java
Sat May 4 13:46:21 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.fit.util;
+package org.apache.uima.fit.internal;
import java.lang.annotation.Annotation;
import java.lang.reflect.AccessibleObject;
Copied:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/MetaDataType.java
(from r1476359,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/MetaDataType.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/MetaDataType.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/MetaDataType.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/MetaDataType.java&r1=1476359&r2=1479108&rev=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/MetaDataType.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/MetaDataType.java
Sat May 4 13:46:21 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.fit.util;
+package org.apache.uima.fit.internal;
/**
* INTERNAL API - Kinds of meta data uimaFIT uses.
Copied:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/MetaDataUtil.java
(from r1476359,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/MetaDataUtil.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/MetaDataUtil.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/MetaDataUtil.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/MetaDataUtil.java&r1=1476359&r2=1479108&rev=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/MetaDataUtil.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/MetaDataUtil.java
Sat May 4 13:46:21 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.fit.util;
+package org.apache.uima.fit.internal;
import java.io.IOException;
import java.io.InputStream;
Copied:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/ReflectionUtil.java
(from r1476359,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/ReflectionUtil.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/ReflectionUtil.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/ReflectionUtil.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/ReflectionUtil.java&r1=1476359&r2=1479108&rev=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/ReflectionUtil.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/ReflectionUtil.java
Sat May 4 13:46:21 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.fit.util;
+package org.apache.uima.fit.internal;
import java.lang.annotation.Annotation;
import java.lang.reflect.AccessibleObject;
@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+
/**
* INTERNAL API - Utility methods to access Java annotations.
*/
Added:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/package-info.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/package-info.java?rev=1479108&view=auto
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/package-info.java
(added)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/package-info.java
Sat May 4 13:46:21 2013
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/**
+ * INTERNAL API - May change without further notice.
+ */
+package org.apache.uima.fit.internal;
\ No newline at end of file
Propchange:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/GetAsTextStringEditor.java
(from r1476359,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/propertyeditors/GetAsTextStringEditor.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/GetAsTextStringEditor.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/GetAsTextStringEditor.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/propertyeditors/GetAsTextStringEditor.java&r1=1476359&r2=1479108&rev=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/propertyeditors/GetAsTextStringEditor.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/GetAsTextStringEditor.java
Sat May 4 13:46:21 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.fit.propertyeditors;
+package org.apache.uima.fit.internal.propertyeditors;
import java.beans.PropertyEditor;
import java.beans.PropertyEditorSupport;
@@ -25,9 +25,10 @@ import org.springframework.beans.Propert
import org.springframework.beans.PropertyEditorRegistrySupport;
/**
+ * INTERNAL API
+ *
* Custom property editor that tries to look convert and value to a string by
checking if there is a
* registered property editor for the source value.
- *
*/
public class GetAsTextStringEditor extends PropertyEditorSupport {
private final PropertyEditorRegistry editorRegistry;
Copied:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/LocaleEditor.java
(from r1476359,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/propertyeditors/LocaleEditor.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/LocaleEditor.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/LocaleEditor.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/propertyeditors/LocaleEditor.java&r1=1476359&r2=1479108&rev=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/propertyeditors/LocaleEditor.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/LocaleEditor.java
Sat May 4 13:46:21 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.fit.propertyeditors;
+package org.apache.uima.fit.internal.propertyeditors;
import java.beans.PropertyEditorSupport;
import java.util.Locale;
@@ -24,10 +24,11 @@ import java.util.Locale;
import org.apache.uima.fit.util.LocaleUtil;
/**
+ * INTERNAL API
+ *
* Custom property editor for {@link Locale} that supports "-" as separator
and sets the default
* locale when {@code null} or {@code ""} is passed. This is used to be
backwards-compatible with
* previous uimaFIT behavior.
- *
*/
public class LocaleEditor extends PropertyEditorSupport {
Copied:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/PropertyEditorUtil.java
(from r1476359,
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/propertyeditors/PropertyEditorUtil.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/PropertyEditorUtil.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/PropertyEditorUtil.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/propertyeditors/PropertyEditorUtil.java&r1=1476359&r2=1479108&rev=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/propertyeditors/PropertyEditorUtil.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/PropertyEditorUtil.java
Sat May 4 13:46:21 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.fit.propertyeditors;
+package org.apache.uima.fit.internal.propertyeditors;
import java.util.LinkedList;
import java.util.Locale;
@@ -25,6 +25,7 @@ import org.springframework.beans.Propert
import org.springframework.beans.propertyeditors.CustomCollectionEditor;
/**
+ * INTERNAL API
*/
public final class PropertyEditorUtil {
Added:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/package-info.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/package-info.java?rev=1479108&view=auto
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/package-info.java
(added)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/package-info.java
Sat May 4 13:46:21 2013
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/**
+ * INTERNAL API - May change without further notice.
+ */
+package org.apache.uima.fit.internal.propertyeditors;
\ No newline at end of file
Propchange:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/internal/propertyeditors/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/JCasGenPomFriendly.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/JCasGenPomFriendly.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/JCasGenPomFriendly.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/util/JCasGenPomFriendly.java
Sat May 4 13:46:21 2013
@@ -24,6 +24,7 @@ import java.io.IOException;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.fit.internal.MetaDataUtil;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.tools.jcasgen.Jg;
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/LoggingTest.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/LoggingTest.java?rev=1479108&r1=1479107&r2=1479108&view=diff
==============================================================================
---
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/LoggingTest.java
(original)
+++
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/LoggingTest.java
Sat May 4 13:46:21 2013
@@ -37,6 +37,7 @@ import org.apache.log4j.BasicConfigurato
import org.apache.log4j.Logger;
import org.apache.log4j.spi.LocationInfo;
import org.apache.log4j.spi.LoggingEvent;
+import org.apache.uima.UIMAFramework;
import org.apache.uima.UimaContextAdmin;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.AbstractCas;
@@ -53,7 +54,7 @@ import org.apache.uima.fit.component.JCa
import org.apache.uima.fit.component.JCasFlowController_ImplBase;
import org.apache.uima.fit.component.JCasMultiplier_ImplBase;
import org.apache.uima.fit.component.Resource_ImplBase;
-import org.apache.uima.fit.util.ExtendedLogger;
+import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.flow.Flow;
import org.apache.uima.impl.RootUimaContext_impl;
import org.apache.uima.jcas.JCas;
@@ -83,6 +84,8 @@ public class LoggingTest {
}
});
+ UIMAFramework.getLogger().setLevel(org.apache.uima.util.Level.INFO);
+
try {
UimaContextAdmin ctx = new RootUimaContext_impl();
ctx.setLogger(JSR47Logger_impl.getInstance());
@@ -188,6 +191,7 @@ public class LoggingTest {
@Test
public void testAllKindsOfComponents() throws Exception {
+ System.out.println("=== testAllKindsOfComponents ===");
final List<LogRecord> records = new ArrayList<LogRecord>();
// Tell the logger to log everything
@@ -195,12 +199,16 @@ public class LoggingTest {
.getHandlers()[0];
java.util.logging.Level oldLevel = handler.getLevel();
handler.setLevel(Level.ALL);
+ // Capture the logging output without actually logging it
handler.setFilter(new Filter() {
public boolean isLoggable(LogRecord record) {
records.add(record);
- return true;
+ System.out.printf("[%s] %s%n", record.getSourceClassName(),
record.getMessage());
+ return false;
}
});
+
+ UIMAFramework.getLogger().setLevel(org.apache.uima.util.Level.INFO);
try {
JCas jcas = JCasFactory.createJCas();
