Author: tommaso
Date: Sun Dec 30 15:52:07 2012
New Revision: 1426958
URL: http://svn.apache.org/viewvc?rev=1426958&view=rev
Log:
[CLEREZZA-695] - added UIMAExecutor as an interface
Added:
incubator/clerezza/trunk/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/UIMAExecutor.java
(with props)
Modified:
incubator/clerezza/trunk/uima/uima.concept-tagging/src/main/java/org/apache/clerezza/uima/concept/UIMARemoteResourceTaggerService.java
incubator/clerezza/trunk/uima/uima.samples/src/main/java/org/apache/clerezza/uima/samples/services/OpenNLPNERAOService.java
incubator/clerezza/trunk/uima/uima.samples/src/main/java/org/apache/clerezza/uima/samples/services/OpenNLPService.java
incubator/clerezza/trunk/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/ExternalServicesFacade.java
incubator/clerezza/trunk/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/InMemoryUIMAExecutor.java
Modified:
incubator/clerezza/trunk/uima/uima.concept-tagging/src/main/java/org/apache/clerezza/uima/concept/UIMARemoteResourceTaggerService.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.concept-tagging/src/main/java/org/apache/clerezza/uima/concept/UIMARemoteResourceTaggerService.java?rev=1426958&r1=1426957&r2=1426958&view=diff
==============================================================================
---
incubator/clerezza/trunk/uima/uima.concept-tagging/src/main/java/org/apache/clerezza/uima/concept/UIMARemoteResourceTaggerService.java
(original)
+++
incubator/clerezza/trunk/uima/uima.concept-tagging/src/main/java/org/apache/clerezza/uima/concept/UIMARemoteResourceTaggerService.java
Sun Dec 30 15:52:07 2012
@@ -21,7 +21,7 @@ package org.apache.clerezza.uima.concept
import org.apache.clerezza.rdf.core.Graph;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.clerezza.uima.utils.InMemoryUIMAExecutor;
+import org.apache.clerezza.uima.utils.UIMAExecutor;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
@@ -48,7 +48,7 @@ public class UIMARemoteResourceTaggerSer
private static final String ALCHEMYKEY = "alchemykey";
@Reference
- private InMemoryUIMAExecutor executor;
+ private UIMAExecutor executor;
@GET
@Path("tag")
Modified:
incubator/clerezza/trunk/uima/uima.samples/src/main/java/org/apache/clerezza/uima/samples/services/OpenNLPNERAOService.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.samples/src/main/java/org/apache/clerezza/uima/samples/services/OpenNLPNERAOService.java?rev=1426958&r1=1426957&r2=1426958&view=diff
==============================================================================
---
incubator/clerezza/trunk/uima/uima.samples/src/main/java/org/apache/clerezza/uima/samples/services/OpenNLPNERAOService.java
(original)
+++
incubator/clerezza/trunk/uima/uima.samples/src/main/java/org/apache/clerezza/uima/samples/services/OpenNLPNERAOService.java
Sun Dec 30 15:52:07 2012
@@ -21,7 +21,7 @@ package org.apache.clerezza.uima.samples
import org.apache.clerezza.rdf.core.Graph;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.clerezza.uima.utils.InMemoryUIMAExecutor;
+import org.apache.clerezza.uima.utils.UIMAExecutor;
import org.apache.commons.io.IOUtils;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
@@ -50,7 +50,7 @@ public class OpenNLPNERAOService impleme
private static final String OUTPUTGRAPH = "outputgraph";
@Reference
- private InMemoryUIMAExecutor executor;
+ private UIMAExecutor executor;
@POST
@Path("opennlp/person")
Modified:
incubator/clerezza/trunk/uima/uima.samples/src/main/java/org/apache/clerezza/uima/samples/services/OpenNLPService.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.samples/src/main/java/org/apache/clerezza/uima/samples/services/OpenNLPService.java?rev=1426958&r1=1426957&r2=1426958&view=diff
==============================================================================
---
incubator/clerezza/trunk/uima/uima.samples/src/main/java/org/apache/clerezza/uima/samples/services/OpenNLPService.java
(original)
+++
incubator/clerezza/trunk/uima/uima.samples/src/main/java/org/apache/clerezza/uima/samples/services/OpenNLPService.java
Sun Dec 30 15:52:07 2012
@@ -1,11 +1,27 @@
+/*
+ * 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.
+ */
package org.apache.clerezza.uima.samples.services;
-import javax.ws.rs.FormParam;
-
import org.apache.clerezza.rdf.core.Graph;
/**
- * Add javadoc here
+ * Interface for OpenNLP based services
*/
public interface OpenNLPService {
Modified:
incubator/clerezza/trunk/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/ExternalServicesFacade.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/ExternalServicesFacade.java?rev=1426958&r1=1426957&r2=1426958&view=diff
==============================================================================
---
incubator/clerezza/trunk/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/ExternalServicesFacade.java
(original)
+++
incubator/clerezza/trunk/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/ExternalServicesFacade.java
Sun Dec 30 15:52:07 2012
@@ -42,7 +42,7 @@ import java.util.Map;
public class ExternalServicesFacade implements UIMAServicesFacade {
@Reference
- private InMemoryUIMAExecutor uimaExecutor;
+ private UIMAExecutor uimaExecutor;
private Map<String, Object> parameterSetting = new HashMap<String, Object>();
Modified:
incubator/clerezza/trunk/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/InMemoryUIMAExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/InMemoryUIMAExecutor.java?rev=1426958&r1=1426957&r2=1426958&view=diff
==============================================================================
---
incubator/clerezza/trunk/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/InMemoryUIMAExecutor.java
(original)
+++
incubator/clerezza/trunk/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/InMemoryUIMAExecutor.java
Sun Dec 30 15:52:07 2012
@@ -32,41 +32,27 @@ import java.util.Map;
* Executes UIMA pipelines collecting results in a {@link JCas}
*/
@Service
-public class InMemoryUIMAExecutor {
+public class InMemoryUIMAExecutor implements UIMAExecutor {
@Reference
private AEProvider aeProvider;
/**
- * analyze a text document using the default Analysis Engine
- *
- * @param doc
- * @throws AnalysisEngineProcessException
+ * {@inheritDoc}
*/
public JCas analyzeDocument(String doc) throws
AnalysisEngineProcessException, ResourceInitializationException {
return executeAE(aeProvider.getDefaultAE(),doc);
}
/**
- * analyze a text document specifying a different Analysis Engine descriptor
path
- *
- * @param doc
- * @param xmlPath
- * @throws AnalysisEngineProcessException,
- * ResourceInitializationException
+ * {@inheritDoc}
*/
public JCas analyzeDocument(String doc, String xmlPath) throws
AnalysisEngineProcessException, ResourceInitializationException {
return executeAE(aeProvider.getAE(xmlPath), doc);
}
/**
- * analyze a text document specifying a different Analysis Engine descriptor
path and specific Analysis Engine parameter settings
- *
- * @param doc
- * @param xmlInputSource
- * @param aeParameterSettings
- * @throws AnalysisEngineProcessException,
- * ResourceInitializationException
+ * {@inheritDoc}
*/
public JCas analyzeDocument(String doc, XMLInputSource xmlInputSource,
Map<String, Object> aeParameterSettings) throws AnalysisEngineProcessException,
ResourceInitializationException {
AnalysisEngine engine = aeProvider.getAEFromSource(xmlInputSource,
aeParameterSettings);
Added:
incubator/clerezza/trunk/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/UIMAExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/UIMAExecutor.java?rev=1426958&view=auto
==============================================================================
---
incubator/clerezza/trunk/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/UIMAExecutor.java
(added)
+++
incubator/clerezza/trunk/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/UIMAExecutor.java
Sun Dec 30 15:52:07 2012
@@ -0,0 +1,43 @@
+package org.apache.clerezza.uima.utils;
+
+import java.util.Map;
+
+import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.resource.ResourceInitializationException;
+import org.apache.uima.util.XMLInputSource;
+
+/**
+ * Enables execution of UIMA pipelines / AEs
+ */
+public interface UIMAExecutor {
+
+ /**
+ * analyze a text document using the default Analysis Engine
+ *
+ * @param doc
+ * @throws org.apache.uima.analysis_engine.AnalysisEngineProcessException
+ */
+ public JCas analyzeDocument(String doc) throws
AnalysisEngineProcessException, ResourceInitializationException;
+
+ /**
+ * analyze a text document specifying a different Analysis Engine
descriptor path
+ *
+ * @param doc
+ * @param xmlPath
+ * @throws AnalysisEngineProcessException,
+ * ResourceInitializationException
+ */
+ public JCas analyzeDocument(String doc, String xmlPath) throws
AnalysisEngineProcessException, ResourceInitializationException;
+
+ /**
+ * analyze a text document specifying a different Analysis Engine
descriptor path and specific Analysis Engine parameter settings
+ *
+ * @param doc
+ * @param xmlInputSource
+ * @param aeParameterSettings
+ * @throws AnalysisEngineProcessException,
+ * ResourceInitializationException
+ */
+ public JCas analyzeDocument(String doc, XMLInputSource xmlInputSource,
Map<String, Object> aeParameterSettings) throws AnalysisEngineProcessException,
ResourceInitializationException;
+}
Propchange:
incubator/clerezza/trunk/uima/uima.utils/src/main/java/org/apache/clerezza/uima/utils/UIMAExecutor.java
------------------------------------------------------------------------------
svn:eol-style = native
