Author: cwiklik
Date: Thu May 31 20:54:19 2012
New Revision: 1344905
URL: http://svn.apache.org/viewvc?rev=1344905&view=rev
Log:
UIMA-2417 modified paths to no longer reference artifacts from uima-as projects
Modified:
uima/uima-as/trunk/pom.xml
uima/uima-as/trunk/src/main/assembly/src.xml
uima/uima-as/trunk/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/utils/BaseTestSupport.java
Modified: uima/uima-as/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/pom.xml?rev=1344905&r1=1344904&r2=1344905&view=diff
==============================================================================
--- uima/uima-as/trunk/pom.xml (original)
+++ uima/uima-as/trunk/pom.xml Thu May 31 20:54:19 2012
@@ -389,24 +389,24 @@
</groups>
<!--verbose>true</verbose-->
<sourcepath>
-
../uimaj-as-core/src/main/java:../uimaj-as-activemq/src/main/java:../uimaj-as-camel/src/main/java:../uima-as-jms/src/main/java
+
uimaj-as-core/src/main/java:uimaj-as-activemq/src/main/java:uimaj-as-camel/src/main/java:uima-as-jms/src/main/java
</sourcepath>
<subpackages>org.apache.uima</subpackages>
<excludePackageNames>*.aae.*</excludePackageNames>
<!-- add a few classes
in impl packages that are directly used by user code -->
<additionalparam>
-
${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/BasicUimaJmxMonitorListener.java
-
${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/JmxMonitorListener.java
-
${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/ServiceMetrics.java
-
${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/SingleLineUimaJmxMonitorListener.java
-
${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae/monitor/statistics/AnalysisEnginePerformanceMetrics.java
-
${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaAsynchronousEngine.java
-
${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaAsBaseCallbackListener.java
-
${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaASStatusCallbackListener.java
-
${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaASProcessStatus.java
-
${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae/error/ErrorResult.java
-
${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae/error/ErrorResultComponentPath.java
-
${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae/error/ErrorResultTDs.java
+
${basedir}/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/BasicUimaJmxMonitorListener.java
+
${basedir}/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/JmxMonitorListener.java
+
${basedir}/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/ServiceMetrics.java
+
${basedir}/uimaj-as-core/src/main/java/org/apache/uima/aae/jmx/monitor/SingleLineUimaJmxMonitorListener.java
+
${basedir}/uimaj-as-core/src/main/java/org/apache/uima/aae/monitor/statistics/AnalysisEnginePerformanceMetrics.java
+
${basedir}/uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaAsynchronousEngine.java
+
${basedir}/uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaAsBaseCallbackListener.java
+
${basedir}/uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaASStatusCallbackListener.java
+
${basedir}/uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaASProcessStatus.java
+
${basedir}/uimaj-as-core/src/main/java/org/apache/uima/aae/error/ErrorResult.java
+
${basedir}/uimaj-as-core/src/main/java/org/apache/uima/aae/error/ErrorResultComponentPath.java
+
${basedir}/uimaj-as-core/src/main/java/org/apache/uima/aae/error/ErrorResultTDs.java
</additionalparam>
<!-- Link these to the uimaj javadocs on apache.org -->
<links>
@@ -569,7 +569,7 @@
</profiles>
<modules>
- <module>../uima-as-parent</module>
- <module>../aggregate-uima-as</module>
+ <module>uima-as-parent</module>
+ <module>aggregate-uima-as</module>
</modules>
</project>
Modified: uima/uima-as/trunk/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/src/main/assembly/src.xml?rev=1344905&r1=1344904&r2=1344905&view=diff
==============================================================================
--- uima/uima-as/trunk/src/main/assembly/src.xml (original)
+++ uima/uima-as/trunk/src/main/assembly/src.xml Thu May 31 20:54:19 2012
@@ -169,8 +169,8 @@ under the License.
<fileMode>644</fileMode>
</fileSet>
<fileSet>
- <directory>../uimaj-as</directory>
- <outputDirectory>uimaj-as</outputDirectory>
+ <directory>.</directory>
+ <outputDirectory>.</outputDirectory>
<includes>
<include>pom.xml</include>
<include>eclipse-plugin-superPom/*</include>
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=1344905&r1=1344904&r2=1344905&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
Thu May 31 20:54:19 2012
@@ -123,9 +123,9 @@ public abstract class BaseTestSupport ex
Map<String, Object> appCtx = new HashMap();
appCtx.put(UimaAsynchronousEngine.DD2SpringXsltFilePath,
- "../uima-as/src/main/scripts/dd2spring.xsl".replace('/', FS));
+ "../src/main/scripts/dd2spring.xsl".replace('/', FS));
appCtx.put(UimaAsynchronousEngine.SaxonClasspath,
- "file:../uima-as/src/main/saxon/saxon8.jar".replace('/', FS));
+ "file:../src/main/saxon/saxon8.jar".replace('/', FS));
// appCtx.put(UimaAsynchronousEngine.UimaEeDebug,
UimaAsynchronousEngine.UimaEeDebug);
String containerId = null;
try {
