Modified: uima/uima-as/trunk/uima-as/src/test/resources/deploy/expected/tempQ1.xml URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as/src/test/resources/deploy/expected/tempQ1.xml?rev=1064837&r1=1064836&r2=1064837&view=diff ============================================================================== --- uima/uima-as/trunk/uima-as/src/test/resources/deploy/expected/tempQ1.xml (original) +++ uima/uima-as/trunk/uima-as/src/test/resources/deploy/expected/tempQ1.xml Fri Jan 28 19:40:56 2011 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!--==============================================================================--> <!-- Generated from --> - <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/tempQ1.xml --> + <!-- file:/C:/a/Eclipse/apache/uima-as/src/test/resources/deploy/tempQ1.xml --> <!-- 2 April, 2009, 11:37:56 A.M. --> <!--==============================================================================--> <!DOCTYPE beans @@ -106,7 +106,7 @@ </constructor-arg> <constructor-arg index="1" value="RoomNumberAnnotatorQueue"/> <constructor-arg index="2" - value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> <constructor-arg index="5" ref="delegate_map_RoomNumberAnnotatorQueue_1"/> @@ -456,7 +456,7 @@ <!-- Key name --> <constructor-arg index="1" value="DateTime"/> <constructor-arg index="2" - value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex3/TutorialDateTime.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as/src/test/resources/descriptors/tutorial/ex4/../ex3/TutorialDateTime.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> @@ -477,7 +477,7 @@ <!-- Key name --> <constructor-arg index="1" value="Meeting"/> <constructor-arg index="2" - value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/>
Modified: uima/uima-as/trunk/uima-as/src/test/resources/deploy/expected/var1.xml URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as/src/test/resources/deploy/expected/var1.xml?rev=1064837&r1=1064836&r2=1064837&view=diff ============================================================================== --- uima/uima-as/trunk/uima-as/src/test/resources/deploy/expected/var1.xml (original) +++ uima/uima-as/trunk/uima-as/src/test/resources/deploy/expected/var1.xml Fri Jan 28 19:40:56 2011 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!--============================================================================--> <!-- Generated from --> - <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/var1.xml --> + <!-- file:/C:/a/Eclipse/apache/uima-as/src/test/resources/deploy/var1.xml --> <!-- 2 April, 2009, 11:37:59 A.M. --> <!--============================================================================--> <!DOCTYPE beans @@ -132,7 +132,7 @@ </constructor-arg> <constructor-arg index="1" value="MeetingDetectorTaeQueue"/> <constructor-arg index="2" - value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/cas_multiplier/SegmenterAndTokenizerAE.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as/src/test/resources/descriptors/cas_multiplier/SegmenterAndTokenizerAE.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> <constructor-arg index="5" ref="delegate_map_MeetingDetectorTaeQueue_1"/> @@ -453,7 +453,7 @@ <!-- Key name --> <constructor-arg index="1" value="Tokenizer"/> <constructor-arg index="2" - value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/cas_multiplier/../analysis_engine/SimpleTokenAndSentenceAnnotator.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as/src/test/resources/descriptors/cas_multiplier/../analysis_engine/SimpleTokenAndSentenceAnnotator.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> Modified: uima/uima-as/trunk/uima-as/src/test/resources/deploy/expected/vmBkrBad.xml URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as/src/test/resources/deploy/expected/vmBkrBad.xml?rev=1064837&r1=1064836&r2=1064837&view=diff ============================================================================== --- uima/uima-as/trunk/uima-as/src/test/resources/deploy/expected/vmBkrBad.xml (original) +++ uima/uima-as/trunk/uima-as/src/test/resources/deploy/expected/vmBkrBad.xml Fri Jan 28 19:40:56 2011 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!--================================================================================--> <!-- Generated from --> - <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/vmBkrBad.xml --> + <!-- file:/C:/a/Eclipse/apache/uima-as/src/test/resources/deploy/vmBkrBad.xml --> <!-- 2 April, 2009, 11:38:02 A.M. --> <!--================================================================================--> <!DOCTYPE beans @@ -106,7 +106,7 @@ </constructor-arg> <constructor-arg index="1" value="RoomNumberAnnotatorQueue"/> <constructor-arg index="2" - value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> <constructor-arg index="5" ref="delegate_map_RoomNumberAnnotatorQueue_1"/> @@ -456,7 +456,7 @@ <!-- Key name --> <constructor-arg index="1" value="RoomNumber"/> <constructor-arg index="2" - value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> @@ -477,7 +477,7 @@ <!-- Key name --> <constructor-arg index="1" value="Meeting"/> <constructor-arg index="2" - value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java?rev=1064837&r1=1064836&r2=1064837&view=diff ============================================================================== --- uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java (original) +++ uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java Fri Jan 28 19:40:56 2011 @@ -149,7 +149,7 @@ public class TestUimaASExtended extends System.out .println(" *** To fix, override the classpath with the jar files in and under the"); System.out - .println(" *** apache-uima-as/uima-as-distr/src/main/apache-activemq-X.y.z directory"); + .println(" *** apache-uima-as/uima-as/src/main/apache-activemq-X.y.z directory"); System.out.println(" *** in the apache-uima-as source distribution."); String httpURI = getHttpURI(); Modified: uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/utils/BaseTestSupport.java URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/utils/BaseTestSupport.java?rev=1064837&r1=1064836&r2=1064837&view=diff ============================================================================== --- uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/utils/BaseTestSupport.java (original) +++ uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/utils/BaseTestSupport.java Fri Jan 28 19:40:56 2011 @@ -122,9 +122,9 @@ public abstract class BaseTestSupport ex Map<String, Object> appCtx = new HashMap(); appCtx.put(UimaAsynchronousEngine.DD2SpringXsltFilePath, - "../uima-as-distr/src/main/scripts/dd2spring.xsl".replace('/', FS)); + "../uima-as/src/main/scripts/dd2spring.xsl".replace('/', FS)); appCtx.put(UimaAsynchronousEngine.SaxonClasspath, - "file:../uima-as-distr/src/main/saxon/saxon8.jar".replace('/', FS)); + "file:../uima-as/src/main/saxon/saxon8.jar".replace('/', FS)); // appCtx.put(UimaAsynchronousEngine.UimaEeDebug, UimaAsynchronousEngine.UimaEeDebug); String containerId = null; try { @@ -746,7 +746,7 @@ public abstract class BaseTestSupport ex .println("This is expected using http connector with vanilla AMQ 5.0 release,"); System.out.println("and the test file DoubleByteText.txt contains double byte chars."); System.out - .println("To fix, use uima-as-distr/src/main/lib/optional/activemq-optional-5.0.0.jar"); + .println("To fix, use uima-as/src/main/lib/optional/activemq-optional-5.0.0.jar"); unexpectedException = true; processCountLatch.countDown(); return;
