You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by tw...@apache.org on 2008/03/11 18:07:53 UTC
svn commit: r636009 - in /incubator/uima/sandbox/trunk/SimpleServer: lib/
src/main/java/org/apache/uima/simpleserver/
src/main/java/org/apache/uima/simpleserver/config/
src/main/java/org/apache/uima/simpleserver/config/impl/
src/main/resources/schemaor...
Author: twgoetz
Date: Tue Mar 11 10:07:32 2008
New Revision: 636009
URL: http://svn.apache.org/viewvc?rev=636009&view=rev
Log:
Jira UIMA-884: add default capabilities in config.
http://issues.apache.org/jira/browse/UIMA-884
Added:
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/element/
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/element/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/element/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/uimaSimpleServerSpec.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/And.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/FilterOperator.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/FilterType.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/Or.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/OutputType.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/SimpleFilterType.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/TypeElementType/
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/TypeElementType.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/TypeElementType/Filters.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/TypeElementType/Outputs.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/UimaSimpleServerSpecDocument/
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/UimaSimpleServerSpecDocument.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/UimaSimpleServerSpecDocument/UimaSimpleServerSpec.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/namespace/
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/namespace/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/namespace/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/xmlns.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/src/
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/src/SimpleServerConfig.xsd
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/TypeSystemHolder.class (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/anda1bftype.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/filteroperator18c8type.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/filterscf53elemtype.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/filtertype72f2type.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/index.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/orbec1type.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/outputs169celemtype.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/outputtypea2c9type.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/simplefiltertypef020type.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/typeelementtype4adatype.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/uimasimpleserverspec9ffcdoctype.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/uimasimpleserverspecelement.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/uimasimpleserverspecf1d0elemtype.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/TypeElementType.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/and.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/filterOperator.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/filterType.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/or.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/outputType.xsb (with props)
incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/simpleFilterType.xsb (with props)
Removed:
incubator/uima/sandbox/trunk/SimpleServer/lib/config-xml.jar
Modified:
incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/ResultExtractor.java
incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/Service.java
incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/ConfigFactory.java
incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/ServerSpec.java
incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/TypeMap.java
incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/impl/ServerSpecImpl.java
incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/impl/TypeMapImpl.java
incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/impl/XmlConfigReader.java
incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec1.xml
incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec2.xml
incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec3.xml
incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec4.xml
incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec5.xml
incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec6.xml
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/ResultExtractor.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/ResultExtractor.java?rev=636009&r1=636008&r2=636009&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/ResultExtractor.java (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/ResultExtractor.java Tue Mar 11 10:07:32 2008
@@ -20,7 +20,10 @@
package org.apache.uima.simpleserver;
import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.FSIterator;
@@ -31,6 +34,7 @@
import org.apache.uima.cas.impl.LowLevelCAS;
import org.apache.uima.cas.impl.TypeSystemUtils;
import org.apache.uima.cas.text.AnnotationFS;
+import org.apache.uima.simpleserver.config.ConfigFactory;
import org.apache.uima.simpleserver.config.Filter;
import org.apache.uima.simpleserver.config.Output;
import org.apache.uima.simpleserver.config.ServerSpec;
@@ -46,6 +50,48 @@
*/
public class ResultExtractor {
+ private static class DefaultTypeMap {
+
+ private final Map<Type, TypeMap> typeMap = new HashMap<Type, TypeMap>();
+
+ @SuppressWarnings("unchecked")
+ private void initialize(TypeSystem ts) {
+ Type annotationType = ts.getType(CAS.TYPE_NAME_ANNOTATION);
+ List annotationTypes = ts.getProperlySubsumedTypes(annotationType);
+ annotationTypes.add(annotationType);
+ Iterator it = annotationTypes.iterator();
+ while (it.hasNext()) {
+ Type type = (Type) it.next();
+ createMapForType(type);
+ }
+ }
+
+ private void createMapForType(Type type) {
+ TypeMap tm = ConfigFactory.newTypeMap(type.getName(), null, type.getShortName(), true);
+ Iterator<?> featureIt = type.getFeatures().iterator();
+ while (featureIt.hasNext()) {
+ Feature feat = (Feature) featureIt.next();
+ if (feat.getRange().isPrimitive()) {
+ ArrayList<String> path = new ArrayList<String>(1);
+ path.add(feat.getShortName());
+ Output out = ConfigFactory.newOutput(path, feat.getShortName(),
+ "No description provided", "No description provided");
+ tm.addOutput(out);
+ }
+ }
+ this.typeMap.put(type, tm);
+ }
+
+ private TypeMap get(Type type) {
+ return this.typeMap.get(type);
+ }
+
+ }
+
+ private TypeSystem ts = null;
+
+ private DefaultTypeMap defaultTypeMap = null;
+
/**
* Extract a set of results from a CAS and a result specification.
*
@@ -54,13 +100,17 @@
* @param resultSpec
* The result specification.
*/
- public static Result getResult(CAS cas, ServerSpec resultSpec) {
+ public Result getResult(CAS cas, ServerSpec resultSpec) {
List<ResultEntry> resultEntries = new ArrayList<ResultEntry>();
processTypes(cas, resultSpec, resultEntries);
return new ResultImpl(resultEntries, cas.getDocumentText());
}
- private static void processTypes(CAS cas, ServerSpec rspec, List<ResultEntry> resultEntries) {
+ private void processTypes(CAS cas, ServerSpec rspec, List<ResultEntry> resultEntries) {
+ if (rspec.getOutputAll()) {
+ outputAll(cas, resultEntries);
+ return;
+ }
Type annotationType = cas.getTypeSystem().getType(CAS.TYPE_NAME_ANNOTATION);
for (TypeMap tspec : rspec.getTypeSpecs()) {
TypeSystem typeSystem = cas.getTypeSystem();
@@ -87,6 +137,38 @@
}
}
+ }
+
+ // TODO: create test case for this
+ private void outputAll(CAS cas, List<ResultEntry> resultEntries) {
+ checkCreateDefaultMap(cas.getTypeSystem());
+ // Output everything except the document annotation.
+ Type docAnnotationType = cas.getTypeSystem().getType(CAS.TYPE_NAME_DOCUMENT_ANNOTATION);
+ FSIterator it = cas.getAnnotationIndex().iterator();
+ for (it.moveToFirst(); it.isValid(); it.moveToNext()) {
+ AnnotationFS annot = (AnnotationFS) it.get();
+ if (annot.getType().equals(docAnnotationType)) {
+ // Skip the document annotation
+ continue;
+ }
+ TypeMap typeMap = this.defaultTypeMap.get(annot.getType());
+ // Create a new result entry, fill with attributes and add result set.
+ ResultEntryImpl resultEntry = new ResultEntryImpl(typeMap.getOutputTag(), annot.getBegin(),
+ annot.getEnd());
+ makeOutputs(resultEntry, annot, typeMap);
+ resultEntries.add(resultEntry);
+ }
+ }
+
+ private final void checkCreateDefaultMap(TypeSystem typeSystem) {
+ assert(typeSystem != null);
+ if (typeSystem == this.ts) {
+ return;
+ }
+ this.ts = typeSystem;
+ DefaultTypeMap dtm = new DefaultTypeMap();
+ dtm.initialize(typeSystem);
+ this.defaultTypeMap = dtm;
}
public static void makeOutputs(ResultEntryImpl resultEntry, AnnotationFS annotation, TypeMap tspec) {
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/Service.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/Service.java?rev=636009&r1=636008&r2=636009&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/Service.java (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/Service.java Tue Mar 11 10:07:32 2008
@@ -72,6 +72,8 @@
private CAS cas = null;
private ServerSpec serviceSpec = null;
+
+ private ResultExtractor resultExtractor = null;
private volatile boolean initialized = false;
@@ -80,6 +82,7 @@
*/
public Service() {
super();
+ this.resultExtractor = new ResultExtractor();
}
public static Logger getLogger() {
@@ -150,6 +153,7 @@
}
private final void logInitializationError() {
+ //TODO: log which service could not be initialized!!!!!!!!!!!!!!!!!
SimpleServerException e = new SimpleServerException(
SimpleServerException.service_state_exception, new Object[] {});
getLogger().log(Level.SEVERE, "", e);
@@ -248,7 +252,7 @@
getLogger().log(Level.SEVERE, "", e);
return null;
}
- return ResultExtractor.getResult(this.cas, this.serviceSpec);
+ return this.resultExtractor.getResult(this.cas, this.serviceSpec);
}
public Result process(String text) {
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/ConfigFactory.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/ConfigFactory.java?rev=636009&r1=636008&r2=636009&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/ConfigFactory.java (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/ConfigFactory.java Tue Mar 11 10:07:32 2008
@@ -42,10 +42,13 @@
* Short description of service.
* @param longDescription
* Verbose description of service.
+ * @param doOutputAll
+ * Output all types, regardless of individual type maps.
* @return A new service config object.
*/
- public static ServerSpec newServerSpec(String shortDescription, String longDescription) {
- return new ServerSpecImpl(shortDescription, longDescription);
+ public static ServerSpec newServerSpec(String shortDescription, String longDescription,
+ boolean doOutputAll) {
+ return new ServerSpecImpl(shortDescription, longDescription, doOutputAll);
}
/**
@@ -61,7 +64,7 @@
*/
public static TypeMap newTypeMap(String typeName, Filter filter, String outputTag,
boolean coveredText) {
- return new TypeMapImpl(typeName, filter, outputTag, coveredText, null, null);
+ return new TypeMapImpl(typeName, filter, outputTag, coveredText, false, null, null);
}
/**
@@ -80,22 +83,22 @@
* @return A new type map object. Can be added to a server spec.
*/
public static TypeMap newTypeMap(String typeName, Filter filter, String outputTag,
- boolean coveredText, String shortDescription, String longDescription) {
- return new TypeMapImpl(typeName, filter, outputTag, coveredText, shortDescription,
+ boolean coveredText, boolean outputAll, String shortDescription, String longDescription) {
+ return new TypeMapImpl(typeName, filter, outputTag, coveredText, outputAll, shortDescription,
longDescription);
}
-
+
/**
* Create a new output mapping.
*
* @param path
- * Feature path whose value will be output.
+ * Feature path whose value will be output.
* @param attribute
- * XML attribute that will contain the output.
+ * XML attribute that will contain the output.
* @param shortDescription
- * A short description of the output mapping.
+ * A short description of the output mapping.
* @param longDescription
- * A verbose description of the output mapping.
+ * A verbose description of the output mapping.
* @return A new output mapping. Can be added to a type map.
*/
public static Output newOutput(List<String> path, String attribute, String shortDescription,
@@ -107,9 +110,9 @@
* Create a new Filter.
*
* @param featurePath
- * Feature path whose value the filter operates on. Must not be null.
+ * Feature path whose value the filter operates on. Must not be null.
* @param condition
- * The condition the path's value must satisfy.
+ * The condition the path's value must satisfy.
* @return A new Filter.
*/
public static SimpleFilter newSimpleFilter(List<String> featurePath, Condition condition) {
@@ -118,20 +121,22 @@
/**
* Create a new filter conjunction.
+ *
* @return A new filter conjunction.
*/
public static AndFilter newAndFilter() {
return new AndFilterImpl();
}
-
+
/**
* Create a new filter disjunction.
+ *
* @return A new filter disjunction.
*/
public static OrFilter newOrFilter() {
return new OrFilterImpl();
}
-
+
/**
* Create new Condition.
*
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/ServerSpec.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/ServerSpec.java?rev=636009&r1=636008&r2=636009&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/ServerSpec.java (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/ServerSpec.java Tue Mar 11 10:07:32 2008
@@ -35,6 +35,13 @@
public static final char PATH_SEPARATOR = '/';
/**
+ * Check setting to output all types. If this returns true, individual type maps are ignored.
+ * Defaults to <code>false</code>.
+ * @return <code>true</code> iff output of all types is enabled.
+ */
+ public boolean getOutputAll();
+
+ /**
* @return A list of type specifications. Each type specification represents output specifications
* for a single CAS type.
*/
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/TypeMap.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/TypeMap.java?rev=636009&r1=636008&r2=636009&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/TypeMap.java (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/TypeMap.java Tue Mar 11 10:07:32 2008
@@ -28,36 +28,50 @@
/**
* Get the filter for this map.
+ *
* @return This map's filter; may be <code>null</code>.
*/
public Filter getFilter();
-
+
+ /**
+ * Get the "output all" switch. If this is set to true, output all simple-valued features of the
+ * given type. Defaults to <code>false</code>.
+ *
+ * @return The "output all" switch.
+ */
+ public boolean getOutputAll();
+
/**
* Get list of output specs.
+ *
* @return This map's output specs.
*/
public List<Output> getOutputs();
-
+
/**
* Add an output spec.
+ *
* @param output
*/
public void addOutput(Output output);
/**
* Get the output tag that the type name is mapped to.
+ *
* @return This type map's output tag.
*/
public String getOutputTag();
/**
* Get the type name.
+ *
* @return This map's type name; objects of this type will be considered for output.
*/
public String getTypeName();
/**
* Get the switch for covered text.
+ *
* @return Whether this map outputs the covered text for each annotation.
*/
public boolean isOutputCoveredText();
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/impl/ServerSpecImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/impl/ServerSpecImpl.java?rev=636009&r1=636008&r2=636009&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/impl/ServerSpecImpl.java (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/impl/ServerSpecImpl.java Tue Mar 11 10:07:32 2008
@@ -44,13 +44,21 @@
private final String shortDescription;
private final String longDescription;
+
+ private final boolean doOutputAll;
private final List<TypeMap> typeMaps = new ArrayList<TypeMap>();
- public ServerSpecImpl(String shortDesc, String longDesc) {
+ public ServerSpecImpl(String shortDesc, String longDesc, boolean doOutputAll) {
super();
this.shortDescription = shortDesc;
this.longDescription = longDesc;
+ this.doOutputAll = doOutputAll;
+ }
+
+ public ServerSpecImpl(String shortDesc, String longDesc) {
+ // Default doOutputAll to false;
+ this(shortDesc, longDesc, false);
}
public void addTypeMap(TypeMap typeMap) {
@@ -138,5 +146,9 @@
for (Filter filter : filters) {
checkFilter(filter, type, exc);
}
+ }
+
+ public boolean getOutputAll() {
+ return this.doOutputAll;
}
}
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/impl/TypeMapImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/impl/TypeMapImpl.java?rev=636009&r1=636008&r2=636009&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/impl/TypeMapImpl.java (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/impl/TypeMapImpl.java Tue Mar 11 10:07:32 2008
@@ -28,9 +28,8 @@
import org.apache.uima.simpleserver.config.TypeMap;
/*
- * Implementation of the TypeSpecification interface.
- * Just a simple bean-like class without any logic,
- * exept for constructor method.
+ * Implementation of the TypeSpecification interface. Just a simple bean-like class without any
+ * logic, exept for constructor method.
*/
public class TypeMapImpl implements TypeMap {
@@ -40,6 +39,8 @@
private boolean outputCoveredText;
+ private boolean outputAll;
+
private final Filter filter;
private final List<Output> outputs = new ArrayList<Output>();
@@ -49,12 +50,13 @@
private final String longDescription;
public TypeMapImpl(String typeName, Filter filter, String outputTag, boolean outputCoveredText,
- String shortDescription, String longDescription) {
+ boolean outputAll, String shortDescription, String longDescription) {
super();
this.typeName = typeName;
this.filter = filter;
this.outputTag = outputTag;
this.outputCoveredText = outputCoveredText;
+ this.outputAll = outputAll;
this.shortDescription = shortDescription;
this.longDescription = longDescription;
}
@@ -89,6 +91,10 @@
public void addOutput(Output output) {
this.outputs.add(output);
+ }
+
+ public boolean getOutputAll() {
+ return this.outputAll;
}
}
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/impl/XmlConfigReader.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/impl/XmlConfigReader.java?rev=636009&r1=636008&r2=636009&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/impl/XmlConfigReader.java (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/main/java/org/apache/uima/simpleserver/config/impl/XmlConfigReader.java Tue Mar 11 10:07:32 2008
@@ -28,17 +28,6 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.incubator.uima.simpleserver.config.xml.And;
-import org.apache.incubator.uima.simpleserver.config.xml.FilterOperator;
-import org.apache.incubator.uima.simpleserver.config.xml.FilterType;
-import org.apache.incubator.uima.simpleserver.config.xml.Or;
-import org.apache.incubator.uima.simpleserver.config.xml.OutputType;
-import org.apache.incubator.uima.simpleserver.config.xml.SimpleFilterType;
-import org.apache.incubator.uima.simpleserver.config.xml.TypeElementType;
-import org.apache.incubator.uima.simpleserver.config.xml.UimaSimpleServerSpecDocument;
-import org.apache.incubator.uima.simpleserver.config.xml.TypeElementType.Filters;
-import org.apache.incubator.uima.simpleserver.config.xml.TypeElementType.Outputs;
-import org.apache.incubator.uima.simpleserver.config.xml.UimaSimpleServerSpecDocument.UimaSimpleServerSpec;
import org.apache.uima.cas.impl.TypeSystemUtils;
import org.apache.uima.simpleserver.SimpleServerException;
import org.apache.uima.simpleserver.config.AndFilter;
@@ -51,6 +40,17 @@
import org.apache.uima.simpleserver.config.ServerSpec;
import org.apache.uima.simpleserver.config.SimpleFilter;
import org.apache.uima.simpleserver.config.TypeMap;
+import org.apache.uima.simpleserver.config.xml.And;
+import org.apache.uima.simpleserver.config.xml.FilterOperator;
+import org.apache.uima.simpleserver.config.xml.FilterType;
+import org.apache.uima.simpleserver.config.xml.Or;
+import org.apache.uima.simpleserver.config.xml.OutputType;
+import org.apache.uima.simpleserver.config.xml.SimpleFilterType;
+import org.apache.uima.simpleserver.config.xml.TypeElementType;
+import org.apache.uima.simpleserver.config.xml.UimaSimpleServerSpecDocument;
+import org.apache.uima.simpleserver.config.xml.TypeElementType.Filters;
+import org.apache.uima.simpleserver.config.xml.TypeElementType.Outputs;
+import org.apache.uima.simpleserver.config.xml.UimaSimpleServerSpecDocument.UimaSimpleServerSpec;
import org.apache.xmlbeans.XmlError;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlOptions;
@@ -123,9 +123,15 @@
}
}
+ // TODO: recompile XML beans code from XSD. While doing this: check if the number of jars for
+ // xml parsing (3) can be reduced. This is all Apache code, so legally this should be ok.
+ // Also create ant build script for this.
+ // TEMPORARY:
+ final boolean doOutputAll = false;
+
// Create new server spec from XML beans.
ServerSpec spec = ConfigFactory.newServerSpec(specBean.getShortDescription(), specBean
- .getLongDescription());
+ .getLongDescription(), doOutputAll);
TypeElementType[] typeMaps = specBean.getTypeArray();
for (int i = 0; i < typeMaps.length; i++) {
spec.addTypeMap(readTypeMap(typeMaps[i]));
@@ -148,10 +154,11 @@
filter = readFilter(filterBean.getFilter());
}
}
-
- //create a type map with the given information
+
+ // create a type map with the given information
TypeMap typeMap = ConfigFactory.newTypeMap(typeBean.getName(), filter, typeBean.getOutputTag(),
- coveredText, typeBean.getShortDescription(), typeBean.getLongDescription());
+ coveredText, typeBean.getOutputAll(), typeBean.getShortDescription(), typeBean
+ .getLongDescription());
// check if for the current type output features are mapped
if (typeBean.getOutputs() != null) {
@@ -269,8 +276,7 @@
private static final void valueMustNotBeNull(FilterOp op, String value)
throws SimpleServerException {
if (value == null) {
- throw new SimpleServerException(SimpleServerException.value_must_be_set, new Object[] {
- op});
+ throw new SimpleServerException(SimpleServerException.value_must_be_set, new Object[] { op });
}
}
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/element/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/uimaSimpleServerSpec.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/element/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/uimaSimpleServerSpec.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/element/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/uimaSimpleServerSpec.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/And.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/And.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/And.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/FilterOperator.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/FilterOperator.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/FilterOperator.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/FilterType.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/FilterType.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/FilterType.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/Or.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/Or.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/Or.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/OutputType.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/OutputType.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/OutputType.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/SimpleFilterType.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/SimpleFilterType.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/SimpleFilterType.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/TypeElementType.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/TypeElementType.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/TypeElementType.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/TypeElementType/Filters.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/TypeElementType/Filters.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/TypeElementType/Filters.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/TypeElementType/Outputs.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/TypeElementType/Outputs.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/TypeElementType/Outputs.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/UimaSimpleServerSpecDocument.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/UimaSimpleServerSpecDocument.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/UimaSimpleServerSpecDocument.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/UimaSimpleServerSpecDocument/UimaSimpleServerSpec.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/UimaSimpleServerSpecDocument/UimaSimpleServerSpec.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/javaname/org/apache/uima/simpleserver/config/xml/UimaSimpleServerSpecDocument/UimaSimpleServerSpec.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/namespace/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/xmlns.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/namespace/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/xmlns.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/namespace/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/xmlns.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/src/SimpleServerConfig.xsd
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/src/SimpleServerConfig.xsd?rev=636009&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/src/SimpleServerConfig.xsd (added)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/src/SimpleServerConfig.xsd Tue Mar 11 10:07:32 2008
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+<xsd:schema elementFormDefault="qualified"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:uima="http://uima.apache.org/simpleserver/config/xml"
+ targetNamespace="http://uima.apache.org/simpleserver/config/xml">
+ <!-- Top level element -->
+ <xsd:element name="uimaSimpleServerSpec">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="shortDescription" type="xsd:string"
+ minOccurs="0" maxOccurs="1">
+ </xsd:element>
+ <xsd:element name="longDescription" type="xsd:string"
+ minOccurs="0" maxOccurs="1">
+ </xsd:element>
+ <xsd:element name="type" type="uima:TypeElementType"
+ maxOccurs="unbounded" minOccurs="1">
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="outputAll" type="xsd:boolean"
+ default="false" use="optional" />
+ </xsd:complexType>
+ </xsd:element>
+
+ <!-- Type element -->
+ <xsd:complexType name="TypeElementType">
+ <xsd:sequence>
+ <xsd:element name="shortDescription" type="xsd:string"
+ minOccurs="0" maxOccurs="1">
+ </xsd:element>
+ <xsd:element name="longDescription" type="xsd:string"
+ minOccurs="0" maxOccurs="1">
+ </xsd:element>
+ <!-- Filters: either a single filter, a conjunction or disjunction -->
+ <xsd:element name="filters" minOccurs="0" maxOccurs="1">
+ <xsd:complexType>
+ <xsd:choice minOccurs="0" maxOccurs="1">
+ <xsd:element type="uima:simpleFilterType"
+ name="filter">
+ </xsd:element>
+ <xsd:element type="uima:or" name="or"></xsd:element>
+ <xsd:element type="uima:and" name="and"></xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="outputs" minOccurs="0" maxOccurs="1">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="output"
+ type="uima:outputType" maxOccurs="unbounded" minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ <xsd:attribute name="outputTag" type="xsd:string"
+ use="required" />
+ <xsd:attribute name="outputCoveredText" type="xsd:boolean"
+ use="optional" />
+ <xsd:attribute name="outputAll" type="xsd:boolean"
+ default="false" use="optional" />
+ </xsd:complexType>
+
+ <xsd:complexType name="filterType" abstract="true">
+ </xsd:complexType>
+
+ <!-- A single constraint on output -->
+ <xsd:complexType name="simpleFilterType">
+ <xsd:complexContent>
+ <xsd:extension base="uima:filterType">
+ <xsd:attribute name="featurePath" type="xsd:string"
+ use="required">
+ </xsd:attribute>
+ <xsd:attribute name="operator"
+ type="uima:filterOperator" use="required">
+ </xsd:attribute>
+ <xsd:attribute name="value" type="xsd:string"
+ use="optional">
+ </xsd:attribute>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+
+ <xsd:simpleType name="filterOperator">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="null" />
+ <xsd:enumeration value="!null" />
+ <xsd:enumeration value="=" />
+ <xsd:enumeration value="!=" />
+ <xsd:enumeration value=">" />
+ <xsd:enumeration value="<" />
+ <xsd:enumeration value=">=" />
+ <xsd:enumeration value="<=" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <!-- A conjunction of output constraints; must contain at least 2 subelements -->
+ <xsd:complexType name="and">
+ <xsd:complexContent>
+ <xsd:extension base="uima:filterType">
+ <xsd:choice minOccurs="2" maxOccurs="unbounded">
+ <xsd:element type="uima:simpleFilterType"
+ name="filter">
+ </xsd:element>
+ <xsd:element type="uima:or" name="or"></xsd:element>
+ <xsd:element type="uima:and" name="and"></xsd:element>
+ </xsd:choice>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+
+ <!-- A disjunction of output constraints; must contain at least 2 subelements -->
+ <xsd:complexType name="or">
+ <xsd:complexContent>
+ <xsd:extension base="uima:filterType">
+ <xsd:choice minOccurs="2" maxOccurs="unbounded">
+ <xsd:element type="uima:simpleFilterType"
+ name="filter">
+ </xsd:element>
+ <xsd:element type="uima:or" name="or"></xsd:element>
+ <xsd:element type="uima:and" name="and"></xsd:element>
+ </xsd:choice>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+
+ <!-- Output feature path/attribute mapping -->
+ <xsd:complexType name="outputType">
+ <xsd:sequence>
+ <xsd:element name="shortDescription" type="xsd:string"
+ minOccurs="0" maxOccurs="1">
+ </xsd:element>
+ <xsd:element name="longDescription" type="xsd:string"
+ minOccurs="0" maxOccurs="1">
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="featurePath" type="xsd:string"
+ use="required">
+ </xsd:attribute>
+ <xsd:attribute name="outputAttribute" type="xsd:string"
+ use="required">
+ </xsd:attribute>
+ </xsd:complexType>
+
+</xsd:schema>
\ No newline at end of file
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/TypeSystemHolder.class
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/TypeSystemHolder.class?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/TypeSystemHolder.class
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/anda1bftype.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/anda1bftype.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/anda1bftype.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/filteroperator18c8type.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/filteroperator18c8type.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/filteroperator18c8type.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/filterscf53elemtype.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/filterscf53elemtype.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/filterscf53elemtype.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/filtertype72f2type.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/filtertype72f2type.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/filtertype72f2type.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/index.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/index.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/index.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/orbec1type.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/orbec1type.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/orbec1type.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/outputs169celemtype.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/outputs169celemtype.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/outputs169celemtype.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/outputtypea2c9type.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/outputtypea2c9type.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/outputtypea2c9type.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/simplefiltertypef020type.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/simplefiltertypef020type.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/simplefiltertypef020type.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/typeelementtype4adatype.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/typeelementtype4adatype.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/typeelementtype4adatype.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/uimasimpleserverspec9ffcdoctype.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/uimasimpleserverspec9ffcdoctype.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/uimasimpleserverspec9ffcdoctype.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/uimasimpleserverspecelement.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/uimasimpleserverspecelement.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/uimasimpleserverspecelement.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/uimasimpleserverspecf1d0elemtype.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/uimasimpleserverspecf1d0elemtype.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/system/sD8360DFF7E1263139EC462A6BFD0672D/uimasimpleserverspecf1d0elemtype.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/TypeElementType.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/TypeElementType.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/TypeElementType.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/and.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/and.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/and.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/filterOperator.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/filterOperator.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/filterOperator.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/filterType.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/filterType.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/filterType.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/or.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/or.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/or.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/outputType.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/outputType.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/outputType.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/simpleFilterType.xsb
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/simpleFilterType.xsb?rev=636009&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/uima/sandbox/trunk/SimpleServer/src/main/resources/schemaorg_apache_xmlbeans/type/http_3A_2F_2Fuima_2Eapache_2Eorg_2Fsimpleserver_2Fconfig_2Fxml/simpleFilterType.xsb
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec1.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec1.xml?rev=636009&r1=636008&r2=636009&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec1.xml (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec1.xml Tue Mar 11 10:07:32 2008
@@ -19,7 +19,7 @@
-->
<uimaSimpleServerSpec
- xmlns="http://incubator.apache.org/uima/simpleserver/config/xml"
+ xmlns="http://uima.apache.org/simpleserver/config/xml"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="file:///SimpleServerConfig.xsd">
<shortDescription>Recognize stuff</shortDescription>
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec2.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec2.xml?rev=636009&r1=636008&r2=636009&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec2.xml (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec2.xml Tue Mar 11 10:07:32 2008
@@ -19,7 +19,7 @@
-->
<uimaSimpleServerSpec
- xmlns="http://incubator.apache.org/uima/simpleserver/config/xml"
+ xmlns="http://uima.apache.org/simpleserver/config/xml"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="file:///SimpleServerConfig.xsd">
<shortDescription>Recognize stuff</shortDescription>
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec3.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec3.xml?rev=636009&r1=636008&r2=636009&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec3.xml (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec3.xml Tue Mar 11 10:07:32 2008
@@ -19,7 +19,7 @@
-->
<uimaSimpleServerSpec
- xmlns="http://incubator.apache.org/uima/simpleserver/config/xml"
+ xmlns="http://uima.apache.org/simpleserver/config/xml"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="file:///SimpleServerConfig.xsd">
<shortDescription>Recognize stuff</shortDescription>
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec4.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec4.xml?rev=636009&r1=636008&r2=636009&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec4.xml (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec4.xml Tue Mar 11 10:07:32 2008
@@ -19,7 +19,7 @@
-->
<uimaSimpleServerSpec
- xmlns="http://incubator.apache.org/uima/simpleserver/config/xml"
+ xmlns="http://uima.apache.org/simpleserver/config/xml"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="file:///SimpleServerConfig.xsd">
<shortDescription>Recognize stuff</shortDescription>
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec5.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec5.xml?rev=636009&r1=636008&r2=636009&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec5.xml (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec5.xml Tue Mar 11 10:07:32 2008
@@ -19,7 +19,7 @@
-->
<uimaSimpleServerSpec
- xmlns="http://incubator.apache.org/uima/simpleserver/config/xml"
+ xmlns="http://uima.apache.org/simpleserver/config/xml"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="file:///SimpleServerConfig.xsd">
<shortDescription>Recognize stuff</shortDescription>
Modified: incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec6.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec6.xml?rev=636009&r1=636008&r2=636009&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec6.xml (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/test/resources/serverspec/spec6.xml Tue Mar 11 10:07:32 2008
@@ -19,7 +19,7 @@
-->
<uimaSimpleServerSpec
- xmlns="http://incubator.apache.org/uima/simpleserver/config/xml"
+ xmlns="http://uima.apache.org/simpleserver/config/xml"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="file:///SimpleServerConfig.xsd">
<shortDescription>Recognize stuff</shortDescription>