You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2012/06/19 20:39:03 UTC
svn commit: r1351798 - in /uima/uima-as/trunk/uimaj-as-core/src/main:
java/org/apache/uima/resourceSpecifier/factory/
java/org/apache/uima/resourceSpecifier/factory/impl/ xsd/
Author: cwiklik
Date: Tue Jun 19 18:39:02 2012
New Revision: 1351798
URL: http://svn.apache.org/viewvc?rev=1351798&view=rev
Log:
UIMA-2163 Add support for import by name. Modified DD schema
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/Import.java
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/impl/ImportImpl.java
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/impl/TopDescriptorImpl.java
uima/uima-as/trunk/uimaj-as-core/src/main/xsd/uima-as-deployment-descriptor-schema.xsd
Modified: uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/Import.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/Import.java?rev=1351798&r1=1351797&r2=1351798&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/Import.java (original)
+++ uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/Import.java Tue Jun 19 18:39:02 2012
@@ -37,4 +37,19 @@ public interface Import {
* @param location the new location
*/
public void setLocation(String location);
+
+ /**
+ * Gets the name.
+ *
+ * @return the name
+ */
+ public String getByName();
+
+ /**
+ * Sets the location.
+ *
+ * @param location the new location
+ */
+ public void setByName(String name);
+
}
Modified: uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/impl/ImportImpl.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/impl/ImportImpl.java?rev=1351798&r1=1351797&r2=1351798&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/impl/ImportImpl.java (original)
+++ uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/impl/ImportImpl.java Tue Jun 19 18:39:02 2012
@@ -55,5 +55,16 @@ public class ImportImpl implements Impor
Assert.notNull(it);
it.setLocation(location);
}
+
+public String getByName() {
+ Assert.notNull(it);
+ return it.getName();
+}
+
+public void setByName(String name) {
+ Assert.notNull(it);
+ it.setName(name);
+
+}
}
Modified: uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/impl/TopDescriptorImpl.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/impl/TopDescriptorImpl.java?rev=1351798&r1=1351797&r2=1351798&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/impl/TopDescriptorImpl.java (original)
+++ uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/resourceSpecifier/factory/impl/TopDescriptorImpl.java Tue Jun 19 18:39:02 2012
@@ -46,8 +46,11 @@ public class TopDescriptorImpl implement
*/
public TopDescriptorImpl(TopDescriptorType tdt, ServiceContext context) {
this.tdt = tdt;
- getImport().setLocation(context.getDescriptor());
-
+ if ( context.getDescriptor().endsWith("xml")) {
+ getImport().setLocation(context.getDescriptor());
+ } else {
+ getImport().setByName(context.getDescriptor());
+ }
}
/* (non-Javadoc)
@@ -66,7 +69,11 @@ public class TopDescriptorImpl implement
*/
public void setImport(Import imprt) {
resourceImport = imprt;
- getImport().setLocation(imprt.getLocation());
+ if ( resourceImport.getLocation() != null && resourceImport.getLocation().endsWith("xml")) {
+ getImport().setLocation(imprt.getLocation());
+ } else {
+ getImport().setByName(imprt.getByName());
+ }
}
}
Modified: uima/uima-as/trunk/uimaj-as-core/src/main/xsd/uima-as-deployment-descriptor-schema.xsd
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/xsd/uima-as-deployment-descriptor-schema.xsd?rev=1351798&r1=1351797&r2=1351798&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/src/main/xsd/uima-as-deployment-descriptor-schema.xsd (original)
+++ uima/uima-as/trunk/uimaj-as-core/src/main/xsd/uima-as-deployment-descriptor-schema.xsd Tue Jun 19 18:39:02 2012
@@ -46,12 +46,16 @@
<simpleContent>
<extension base="string">
<attribute type="string" name="location"/>
+ <attribute type="string" name="name"/>
</extension>
</simpleContent>
</complexType>
+
<complexType name="topDescriptorType">
<sequence>
+ <choice>
<element type="res:importType" name="import" xmlns:res="http://uima.apache.org/resourceSpecifier"/>
+ </choice>
</sequence>
</complexType>
<complexType name="environmentVariableType">