Author: degenaro
Date: Wed Oct 29 10:11:45 2014
New Revision: 1635087
URL: http://svn.apache.org/r1635087
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for
container (system) code.
Fix classloader parent and unit tests.
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/resources/ducc-test.jar
(with props)
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/mkresources.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/JobDriverCollectionReader.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/test/TestDispatcher.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/test/TestSuite.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/resources/ducc-user.jar
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/mkresources.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/mkresources.xml?rev=1635087&r1=1635086&r2=1635087&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/mkresources.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/mkresources.xml Wed Oct 29
10:11:45 2014
@@ -2,23 +2,42 @@
<property name="resources.dir"
value="${basedir}/src/test/resources" />
- <property name="jar.dir"
value="${basedir}/../uima-ducc-user/target/classes" />
- <property name="jar.file" value="ducc-user.jar" />
-
+ <property name="user.jar.dir"
value="${basedir}/../uima-ducc-user/target/classes" />
+ <property name="user.jar.file" value="ducc-user.jar" />
+
+ <property name="test.jar.dir"
value="${basedir}/target/test-classes" />
+ <property name="test.jar.file" value="ducc-test.jar" />
+
<property name="xml.dir"
value="${basedir}/../uima-ducc-user/src/test/resources" />
<property name="xml.file" value="CR100.xml" />
- <target name="all" depends="jar, xml" />
+ <target name="all" depends="user.jar ,test.jar, xml" />
- <target name="jar" depends="rm.jar, mk.jar" />
+ <target name="user.jar" depends="rm.user.jar, mk.user.jar" />
+ <target name="test.jar" depends="rm.test.jar, mk.test.jar" />
<target name="xml" depends="rm.xml, mk.xml" />
+
+ <target name="mk.user.jar">
+ <jar file="${resources.dir}/${user.jar.file}"
basedir="${user.jar.dir}"/>
+ </target>
+
+ <target name="rm.user.jar">
+ <delete file="${resources.dir}/${user.jar.file}"/>
+ </target>
+
+ <target name="mk.test.jar">
+ <jar destfile="${resources.dir}/${test.jar.file}"
+ basedir="${test.jar.dir}"
+ includes="org/**"
+ />
+ </target>
- <target name="mk.jar">
- <jar file="${resources.dir}/${jar.file}" basedir="${jar.dir}"/>
+ <target name="mk.test.jar.old">
+ <jar file="${resources.dir}/${test.jar.file}"
basedir="${test.jar.dir}"/>
</target>
- <target name="rm.jar">
- <delete file="${resources.dir}/${jar.file}"/>
+ <target name="rm.test.jar">
+ <delete file="${resources.dir}/${test.jar.file}"/>
</target>
<target name="mk.xml">
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/JobDriverCollectionReader.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/JobDriverCollectionReader.java?rev=1635087&r1=1635086&r2=1635087&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/JobDriverCollectionReader.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/JobDriverCollectionReader.java
Wed Oct 29 10:11:45 2014
@@ -52,7 +52,7 @@ public class JobDriverCollectionReader {
}
public JobDriverCollectionReader(URL[] classLoaderUrls, String crXml,
String cfCfg) throws JobDriverException {
- URLClassLoader classLoader = new
URLClassLoader(classLoaderUrls);
+ URLClassLoader classLoader = new
URLClassLoader(classLoaderUrls, ClassLoader.getSystemClassLoader().getParent());
construct(classLoader, crXml, cfCfg);
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/test/TestDispatcher.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/test/TestDispatcher.java?rev=1635087&r1=1635086&r2=1635087&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/test/TestDispatcher.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/test/TestDispatcher.java
Wed Oct 29 10:11:45 2014
@@ -117,6 +117,7 @@ public class TestDispatcher {
try {
String[] jarList260 = {
"/ducc-user.jar",
+ "/ducc-test.jar",
"/uimaj-as-core-2.6.0.jar",
"/uimaj-core-2.6.0.jar",
"/xstream-1.3.1.jar"
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/test/TestSuite.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/test/TestSuite.java?rev=1635087&r1=1635086&r2=1635087&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/test/TestSuite.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/test/TestSuite.java
Wed Oct 29 10:11:45 2014
@@ -81,6 +81,7 @@ public class TestSuite {
}
private String[] jarList242 = {
+ "/ducc-test.jar",
"/ducc-user.jar",
"/uimaj-as-core-2.4.2.jar",
"/uimaj-core-2.4.2.jar",
@@ -88,6 +89,7 @@ public class TestSuite {
};
private String[] jarList260 = {
+ "/ducc-test.jar",
"/ducc-user.jar",
"/uimaj-as-core-2.6.0.jar",
"/uimaj-core-2.6.0.jar",
@@ -157,7 +159,7 @@ public class TestSuite {
}
}
- //@Test
+ @Test
public void test_03() {
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
@@ -169,7 +171,7 @@ public class TestSuite {
}
}
- //@Test
+ @Test
public void test_04() {
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
@@ -264,7 +266,7 @@ public class TestSuite {
}
}
- //@Test
+ @Test
public void test_07() {
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
@@ -314,7 +316,7 @@ public class TestSuite {
}
}
- //@Test
+ @Test
public void test_08() {
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
@@ -324,7 +326,7 @@ public class TestSuite {
getMetaCases(jarList260, crXml, crCfg, 0);
}
- //@Test
+ @Test
public void test_09() {
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/resources/ducc-test.jar
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/resources/ducc-test.jar?rev=1635087&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/resources/ducc-test.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/resources/ducc-user.jar
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/resources/ducc-user.jar?rev=1635087&r1=1635086&r2=1635087&view=diff
==============================================================================
Binary files - no diff available.
