svn commit: r952339 - /uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/spi/transport/vm/UimaVmMessageDispatcher.java
Author: cwiklik
Date: Mon Jun 7 17:20:00 2010
New Revision: 952339
URL: http://svn.apache.org/viewvc?rev=952339&view=rev
Log:
UIMA-1800 Reverted to code that is not using BlockingExecutor
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/spi/transport/vm/UimaVmMessageDispatcher.java
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/spi/transport/vm/UimaVmMessageDispatcher.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/spi/transport/vm/UimaVmMessageDispatcher.java?rev=952339&r1=952338&r2=952339&view=diff
==
---
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/spi/transport/vm/UimaVmMessageDispatcher.java
(original)
+++
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/spi/transport/vm/UimaVmMessageDispatcher.java
Mon Jun 7 17:20:00 2010
@@ -23,7 +23,6 @@ import java.util.concurrent.ThreadPoolEx
import org.apache.uima.UIMAFramework;
import org.apache.uima.aae.UIMAEE_Constants;
-import org.apache.uima.aae.UimaBlockingExecutor;
import org.apache.uima.aae.controller.AggregateAnalysisEngineController_impl;
import org.apache.uima.aae.spi.transport.UimaMessage;
import org.apache.uima.aae.spi.transport.UimaMessageDispatcher;
@@ -40,15 +39,16 @@ import org.apache.uima.util.Level;
public class UimaVmMessageDispatcher implements UimaMessageDispatcher {
private static final Class CLASS_NAME = UimaVmMessageDispatcher.class;
- private UimaBlockingExecutor blockingExecutor;
+ private ThreadPoolExecutor executor = null;
+
// Message listener which will receive a new message
private final UimaMessageListener targetListener;
private String delegateKey;
- public UimaVmMessageDispatcher(UimaBlockingExecutor anExecutor,
UimaMessageListener aListener,
+ public UimaVmMessageDispatcher(ThreadPoolExecutor anExecutor,
UimaMessageListener aListener,
String aKey) {
-blockingExecutor = anExecutor;
+executor = anExecutor;
delegateKey = aKey;
targetListener = aListener;
}
@@ -59,37 +59,33 @@ public class UimaVmMessageDispatcher imp
* the Executor.
*/
public void dispatch(final UimaMessage message) {
-if ( !blockingExecutor.isReady() ) {
+if (executor.isShutdown() || executor.isTerminating() ||
executor.isShutdown()) {
return;
}
-try {
- blockingExecutor.submitTask(new Runnable() {
-public void run() {
- try {
-if (targetListener instanceof UimaVmMessageListener) {
- ((UimaVmMessageListener) targetListener).onMessage(message);
-} else {
- System.out.println("!!! Wrong Type of UimaListener");
-}
- } catch (Exception e) {
-if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.WARNING))
{
- UIMAFramework.getLogger(CLASS_NAME).logrb(Level.WARNING,
getClass().getName(),
- "run", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
- "UIMAEE_exception__WARNING", e);
-}
+executor.execute(new Runnable() {
+ public void run() {
+
+try {
+ if (targetListener instanceof UimaVmMessageListener) {
+((UimaVmMessageListener) targetListener).onMessage(message);
+ } else {
+System.out.println("!!! Wrong Type of UimaListener");
+ }
+} catch (Exception e) {
+ if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.WARNING)) {
+UIMAFramework.getLogger(CLASS_NAME).logrb(Level.WARNING,
getClass().getName(),
+"run", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
+"UIMAEE_exception__WARNING", e);
}
}
- });
-} catch( Exception e) {
- UIMAFramework.getLogger(CLASS_NAME).logrb(Level.WARNING,
getClass().getName(),
- "run", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
- "UIMAEE_exception__WARNING", e);
-}
+ }
+});
}
public void stop() {
-if (blockingExecutor != null) {
- blockingExecutor.stop();
+if (executor != null) {
+ executor.purge();
+ executor.shutdownNow();
}
}
}
svn commit: r952340 - /uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/spi/transport/vm/VmTransport.java
Author: cwiklik
Date: Mon Jun 7 17:20:13 2010
New Revision: 952340
URL: http://svn.apache.org/viewvc?rev=952340&view=rev
Log:
UIMA-1800 Reverted to code that is not using BlockingExecutor
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/spi/transport/vm/VmTransport.java
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/spi/transport/vm/VmTransport.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/spi/transport/vm/VmTransport.java?rev=952340&r1=952339&r2=952340&view=diff
==
---
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/spi/transport/vm/VmTransport.java
(original)
+++
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/spi/transport/vm/VmTransport.java
Mon Jun 7 17:20:13 2010
@@ -36,7 +36,6 @@ import org.apache.uima.aae.UIDGenerator;
import org.apache.uima.aae.UIMAEE_Constants;
import org.apache.uima.aae.UimaAsContext;
import org.apache.uima.aae.UimaAsThreadFactory;
-import org.apache.uima.aae.UimaBlockingExecutor;
import org.apache.uima.aae.controller.AggregateAnalysisEngineController;
import org.apache.uima.aae.controller.AnalysisEngineController;
import org.apache.uima.aae.controller.BaseAnalysisEngineController;
@@ -67,8 +66,6 @@ public class VmTransport implements Uima
private ThreadPoolExecutor executor = null;
- private UimaBlockingExecutor blockingExecutor;
-
private ThreadGroup threadGroup = null;
// Create a queue for work items. The queue has a JMX wrapper to expose the
@@ -123,7 +120,7 @@ public class VmTransport implements Uima
}
public void startIt() throws UimaSpiException {
-dispatcher = new UimaVmMessageDispatcher(blockingExecutor, null, (String)
context.get("EndpointName"));
+dispatcher = new UimaVmMessageDispatcher(executor, null, (String)
context.get("EndpointName"));
}
public synchronized void stopIt() throws UimaSpiException {
@@ -133,9 +130,7 @@ public class VmTransport implements Uima
stopping.set(true);
executor.purge();
executor.shutdownNow();
-
workQueue.clear();
-blockingExecutor.stop();
Set> set = dispatchers.entrySet();
for (Entry entry : set) {
UimaVmMessageDispatcher dispatcher = entry.getValue();
@@ -177,13 +172,10 @@ public class VmTransport implements Uima
}
}
- protected UimaBlockingExecutor getExecutorInstance() {
+ protected ThreadPoolExecutor getExecutorInstance() {
if (executor == null) {
int concurrentConsumerCount = context.getConcurrentConsumerCount();
-
- // Create an unbounded queue.
- workQueue = new UimaVmQueue();
-
+ workQueue = new UimaVmQueue();
// Create a ThreadPoolExecutor with as many threads as needed. The pool
has
// a fixed number of threads that never expire and are never passivated.
executor = new ThreadPoolExecutor(concurrentConsumerCount,
concurrentConsumerCount,
@@ -193,16 +185,10 @@ public class VmTransport implements Uima
(PrimitiveAnalysisEngineController) controller);
executor.setThreadFactory(tf);
}
-
executor.prestartAllCoreThreads();
- // instantiate a blocking executor with a maximum number of concurrent
threads.
- // Internally the executor uses a Semaphore bounded by a max number of
permits to
- // throttle requests. If number of requests exceeds number of available
permits,
- // the submitting thread hangs until a permit becomes available.
- blockingExecutor = new UimaBlockingExecutor(executor,
concurrentConsumerCount);
controller.changeState(ServiceState.RUNNING);
}
-return blockingExecutor;
+return executor;
}
public void registerWithJMX(AnalysisEngineController aController, String
queueKind ) {
svn commit: r952343 - /uima/build/trunk/parent-poms/pom.xml
Author: schor
Date: Mon Jun 7 17:40:41 2010
New Revision: 952343
URL: http://svn.apache.org/viewvc?rev=952343&view=rev
Log:
[UIMA-1806] don't include the uima-docbook-olink project in the aggregate - it
is not released
Modified:
uima/build/trunk/parent-poms/pom.xml
Modified: uima/build/trunk/parent-poms/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/pom.xml?rev=952343&r1=952342&r2=952343&view=diff
==
--- uima/build/trunk/parent-poms/pom.xml (original)
+++ uima/build/trunk/parent-poms/pom.xml Mon Jun 7 17:40:41 2010
@@ -61,7 +61,7 @@
uimaj
${project.artifactId}
-
+
parent-pom-top
parent-pom-docbook
@@ -74,7 +74,7 @@
parent-pom-annotator
parent-pom-single-project
../uima-build-helper-maven-plugin
-../uima-docbook-olink
+
../uima-docbook-resource-bundle
../uima-jar-resource-bundle
svn commit: r952347 - /uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
Author: schor
Date: Mon Jun 7 17:44:18 2010
New Revision: 952347
URL: http://svn.apache.org/viewvc?rev=952347&view=rev
Log:
[UIMA-1806] move olink properties to top so uima-docbook-olink build doesn't
need to depend on uima-docbook (as a parent). Remove dependency on
uima-docbook-olink, because you can't release with a dependency on a -SNAPSHOT.
Remove commented out "enforcer" experiment.
Modified:
uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml?rev=952347&r1=952346&r2=952347&view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml Mon Jun 7 17:44:18
2010
@@ -73,17 +73,7 @@
build
-parent-poms/${project.artifactId}
-
-
-
-uima-docbook-olink
-olink
-
${settings.localRepository}/org/apache/uima/${dolArtifactId}/1-SNAPSHOT
-${dolArtifactId}-1-SNAPSHOT-${dolClassifier}.zip
-${dolRepo}/docbook-olink
-${project.build.directory}/
-
${project.build.directory}/${dolZip}
+parent-poms/${project.artifactId}
@@ -98,8 +88,9 @@
src/docbook
-
-
+
+
+
@@ -137,36 +128,6 @@
-
org.apache.uima
uima-build-helper-maven-plugin
svn commit: r952349 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Mon Jun 7 17:46:34 2010
New Revision: 952349
URL: http://svn.apache.org/viewvc?rev=952349&view=rev
Log:
[UIMA-1806] follow conventions for site id naming. Set the website
distribution url as a property. Move the docbook olink property names here so
they can be shared by docbook and olink poms.
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=952349&r1=952348&r2=952349&view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Mon Jun 7 17:46:34 2010
@@ -150,12 +150,13 @@
https://repository.apache.org/service/local/staging/deploy/maven2
and for snapshots:
https://repository.apache.org/content/repositories/snapshots -->
-
+
- uima-website
+ uima.apache.org
UIMA Website
- ${uimaWebsiteDistributionUrl}
+ ${uimaWebsiteDistributionUrl}
@@ -163,16 +164,28 @@
http://uima.apache.org
build
parent-poms/${project.artifactId}
+
scp://people.apache.org/www/uima.apache.org/
yyMMdd_HHmm
${maven.build.timestamp}
${settings.localRepository}/org/apache/uima/${project.artifactId}/${project.version}
-
- ${project.artifactId}-${project.version}
-
-
+${project.artifactId}-${project.version}
+
+
+
+uima-docbook-olink
+olink
+
${settings.localRepository}/org/apache/uima/${dolArtifactId}/${project.version}
+${dolArtifactId}-${project.version}-${dolClassifier}.zip
+${dolRepo}/docbook-olink
+${project.build.directory}/
+
${project.build.directory}/${dolZip}
svn commit: r952350 - /uima/build/trunk/uima-docbook-olink/pom.xml
Author: schor
Date: Mon Jun 7 17:48:27 2010
New Revision: 952350
URL: http://svn.apache.org/viewvc?rev=952350&view=rev
Log:
[UIMA-1806] change parent to top. Change zip build to build in target; install
will copy to repo.
Modified:
uima/build/trunk/uima-docbook-olink/pom.xml
Modified: uima/build/trunk/uima-docbook-olink/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-docbook-olink/pom.xml?rev=952350&r1=952349&r2=952350&view=diff
==
--- uima/build/trunk/uima-docbook-olink/pom.xml (original)
+++ uima/build/trunk/uima-docbook-olink/pom.xml Mon Jun 7 17:48:27 2010
@@ -20,7 +20,7 @@
http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
4.0.0
-parent-pom-docbook
+parent-pom-top
org.apache.uima
1-SNAPSHOT
@@ -78,9 +78,17 @@
build
${project.artifactId}
+
+
@@ -110,8 +118,9 @@
to update any repo-newer items without overwriting
existing unzipped-newer items -->
-
+
org.apache.maven.plugins
maven-dependency-plugin
@@ -177,7 +186,7 @@
package
-
@@ -197,7 +206,7 @@
- ${dolRepo}/${dolZip}
+ ${project.build.directory}/${dolZip}
zip
${dolClassifier}
svn commit: r952351 - /uima/build/trunk/uima-jar-resource-bundle/src/main/resources/assemblies/multimodule-source-release.xml
Author: schor
Date: Mon Jun 7 17:49:20 2010
New Revision: 952351
URL: http://svn.apache.org/viewvc?rev=952351&view=rev
Log:
[UIMA-1806] correct assembly descriptor to include filesets/fileset under
moduleSet/sources. Otherwise get dupl artifacts inside assemblies.
Modified:
uima/build/trunk/uima-jar-resource-bundle/src/main/resources/assemblies/multimodule-source-release.xml
Modified:
uima/build/trunk/uima-jar-resource-bundle/src/main/resources/assemblies/multimodule-source-release.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-jar-resource-bundle/src/main/resources/assemblies/multimodule-source-release.xml?rev=952351&r1=952350&r2=952351&view=diff
==
---
uima/build/trunk/uima-jar-resource-bundle/src/main/resources/assemblies/multimodule-source-release.xml
(original)
+++
uima/build/trunk/uima-jar-resource-bundle/src/main/resources/assemblies/multimodule-source-release.xml
Mon Jun 7 17:49:20 2010
@@ -29,43 +29,47 @@
-/
-true
-
-
-
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]
-
-
-
-
-
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]
-
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]
-
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]
-
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]
-
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]
-
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]
-
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]
-
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]
-
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]
-
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]
-
-
-
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]
-
-
-
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]
-
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]
-
+
+
+/
+true
+
+
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]
+
+
+
+
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]
+
+
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]
+
+
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]
+
+
+
svn commit: r952360 - /uima/build/trunk/uima-assembly-single-project/
Author: schor Date: Mon Jun 7 18:23:06 2010 New Revision: 952360 URL: http://svn.apache.org/viewvc?rev=952360&view=rev Log: no jira add .classpath and .settings to svn ignore Modified: uima/build/trunk/uima-assembly-single-project/ (props changed) Propchange: uima/build/trunk/uima-assembly-single-project/ -- --- svn:ignore (original) +++ svn:ignore Mon Jun 7 18:23:06 2010 @@ -1,2 +1,4 @@ target .project +.settings +.classpath
svn commit: r952362 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor Date: Mon Jun 7 18:44:02 2010 New Revision: 952362 URL: http://svn.apache.org/viewvc?rev=952362&view=rev Log: [UIMA-1806] add release.properties to RAT excludes - a generated file, part of release Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=952362&r1=952361&r2=952362&view=diff == --- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Mon Jun 7 18:44:02 2010 @@ -509,6 +509,11 @@ default-cli + + +release.properties + +
svn commit: r952363 - /uima/build/trunk/parent-poms/pom.xml
Author: schor Date: Mon Jun 7 18:45:33 2010 New Revision: 952363 URL: http://svn.apache.org/viewvc?rev=952363&view=rev Log: [UIMA-1806] add missing proj uima-assembly-single-project Modified: uima/build/trunk/parent-poms/pom.xml Modified: uima/build/trunk/parent-poms/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/pom.xml?rev=952363&r1=952362&r2=952363&view=diff == --- uima/build/trunk/parent-poms/pom.xml (original) +++ uima/build/trunk/parent-poms/pom.xml Mon Jun 7 18:45:33 2010 @@ -73,6 +73,7 @@ parent-pom-annotator parent-pom-single-project +../uima-assembly-single-project ../uima-build-helper-maven-plugin ../uima-docbook-resource-bundle
svn commit: r952372 - /uima/build/trunk/parent-poms/pom.xml
Author: schor Date: Mon Jun 7 19:13:47 2010 New Revision: 952372 URL: http://svn.apache.org/viewvc?rev=952372&view=rev Log: [UIMA-1806] omit the top, because this pom depends on it (release:prepare fails) Modified: uima/build/trunk/parent-poms/pom.xml Modified: uima/build/trunk/parent-poms/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/pom.xml?rev=952372&r1=952371&r2=952372&view=diff == --- uima/build/trunk/parent-poms/pom.xml (original) +++ uima/build/trunk/parent-poms/pom.xml Mon Jun 7 19:13:47 2010 @@ -63,7 +63,8 @@ -parent-pom-top + + parent-pom-docbook parent-pom-ibm-notice parent-pom-eclipse-plugins
svn commit: r952373 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Mon Jun 7 19:15:18 2010
New Revision: 952373
URL: http://svn.apache.org/viewvc?rev=952373&view=rev
Log:
[maven-release-plugin] prepare release parent-pom-top-1
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=952373&r1=952372&r2=952373&view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Mon Jun 7 19:15:18 2010
@@ -43,19 +43,19 @@
It contains one build step to set the build time stamp
-->
-http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
4.0.0
apache
org.apache
7
-
+
org.apache.uima
parent-pom-top
- 1-SNAPSHOT
+ 1
pom
UIMA ${project.artifactId}
@@ -121,13 +121,13 @@
-
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-1
-
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-1
- http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ http://svn.apache.org/viewvc/uima/build/tags/parent-pom-top-1
@@ -141,8 +141,8 @@
+
@@ -554,7 +554,7 @@
attach-sources
-
+
svn commit: r952375 - /uima/build/tags/
Author: schor Date: Mon Jun 7 19:17:20 2010 New Revision: 952375 URL: http://svn.apache.org/viewvc?rev=952375&view=rev Log: [UIMA-1806] release prepare fails if tag folder not there Added: uima/build/tags/
svn commit: r952376 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Mon Jun 7 19:17:51 2010
New Revision: 952376
URL: http://svn.apache.org/viewvc?rev=952376&view=rev
Log:
[maven-release-plugin] rollback the release of parent-pom-top-1
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=952376&r1=952375&r2=952376&view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Mon Jun 7 19:17:51 2010
@@ -43,19 +43,19 @@
It contains one build step to set the build time stamp
-->
-http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
4.0.0
apache
org.apache
7
-
+
org.apache.uima
parent-pom-top
- 1
+ 1-SNAPSHOT
pom
UIMA ${project.artifactId}
@@ -121,13 +121,13 @@
- scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-1
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
- scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-1
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
- http://svn.apache.org/viewvc/uima/build/tags/parent-pom-top-1
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
@@ -141,8 +141,8 @@
+
@@ -554,7 +554,7 @@
attach-sources
-
+
svn commit: r952377 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Mon Jun 7 19:18:41 2010
New Revision: 952377
URL: http://svn.apache.org/viewvc?rev=952377&view=rev
Log:
[maven-release-plugin] prepare release parent-pom-top-1
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=952377&r1=952376&r2=952377&view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Mon Jun 7 19:18:41 2010
@@ -43,19 +43,19 @@
It contains one build step to set the build time stamp
-->
-http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
4.0.0
apache
org.apache
7
-
+
org.apache.uima
parent-pom-top
- 1-SNAPSHOT
+ 1
pom
UIMA ${project.artifactId}
@@ -121,13 +121,13 @@
-
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-1
-
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-1
- http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ http://svn.apache.org/viewvc/uima/build/tags/parent-pom-top-1
@@ -141,8 +141,8 @@
+
@@ -554,7 +554,7 @@
attach-sources
-
+
svn commit: r952378 - /uima/build/tags/parent-pom-top-1/
Author: schor Date: Mon Jun 7 19:18:52 2010 New Revision: 952378 URL: http://svn.apache.org/viewvc?rev=952378&view=rev Log: [maven-scm] copy for tag parent-pom-top-1 Added: uima/build/tags/parent-pom-top-1/ - copied from r952377, uima/build/trunk/parent-poms/parent-pom-top/
svn commit: r952379 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Mon Jun 7 19:18:55 2010
New Revision: 952379
URL: http://svn.apache.org/viewvc?rev=952379&view=rev
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=952379&r1=952378&r2=952379&view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Mon Jun 7 19:18:55 2010
@@ -55,7 +55,7 @@
org.apache.uima
parent-pom-top
- 1
+ 2-SNAPSHOT
pom
UIMA ${project.artifactId}
@@ -121,13 +121,13 @@
- scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-1
+
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
- scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-1
+
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
- http://svn.apache.org/viewvc/uima/build/tags/parent-pom-top-1
+ http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top
svn commit: r952494 - /uima/uima-as/trunk/uima-as-docbooks/src/docbook/async.overview.xml
Author: schor Date: Tue Jun 8 01:32:51 2010 New Revision: 952494 URL: http://svn.apache.org/viewvc?rev=952494&view=rev Log: [UIMA-1794] add documentation for new parameters for JMS Service descriptor Modified: uima/uima-as/trunk/uima-as-docbooks/src/docbook/async.overview.xml Modified: uima/uima-as/trunk/uima-as-docbooks/src/docbook/async.overview.xml URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-docbooks/src/docbook/async.overview.xml?rev=952494&r1=952493&r2=952494&view=diff == --- uima/uima-as/trunk/uima-as-docbooks/src/docbook/async.overview.xml (original) +++ uima/uima-as/trunk/uima-as-docbooks/src/docbook/async.overview.xml Tue Jun 8 01:32:51 2010 @@ -1049,6 +1049,28 @@ under the License. which processes one CAS at a time, so it will not take advantage of the scalability that UIMA AS provides. To process more than one CAS at a time, you must use the Asynchronous UIMA AS Client API . + +Other parameters may be specified: + + + binary_serialization + +Set to true to specify binary serialization (faster, but requires that the service + have exactly the same type system as the client). + + + + + ignore_process_errors + +Set to true to specify that any processing errors should be ignored. In order for this + to be reasonable, your calling environment must be able to continue somehow, + if the service fails. + + + + + For more information on the customResourceSpecifier see .
svn commit: r952495 - /uima/build/tags/parent-pom-top-1/
Author: schor Date: Tue Jun 8 01:35:58 2010 New Revision: 952495 URL: http://svn.apache.org/viewvc?rev=952495&view=rev Log: [UIMA-1809] cancelled first release attempt Removed: uima/build/tags/parent-pom-top-1/
svn commit: r952498 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Tue Jun 8 01:46:59 2010
New Revision: 952498
URL: http://svn.apache.org/viewvc?rev=952498&view=rev
Log:
[UIMA-1809] roll back to version 1-SNAPSHOT and remove docbook olink version
dependencies on current project version - replace with 1-SNAPSHOT
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=952498&r1=952497&r2=952498&view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Tue Jun 8 01:46:59 2010
@@ -55,7 +55,7 @@
org.apache.uima
parent-pom-top
- 2-SNAPSHOT
+ 1-SNAPSHOT
pom
UIMA ${project.artifactId}
@@ -167,11 +167,6 @@
scp://people.apache.org/www/uima.apache.org/
yyMMdd_HHmm
${maven.build.timestamp}
-
-
-
${settings.localRepository}/org/apache/uima/${project.artifactId}/${project.version}
-
-${project.artifactId}-${project.version}
uima-docbook-olink
olink
-
${settings.localRepository}/org/apache/uima/${dolArtifactId}/${project.version}
-${dolArtifactId}-${project.version}-${dolClassifier}.zip
+
${settings.localRepository}/org/apache/uima/${dolArtifactId}/1-SNAPSHOT
+${dolArtifactId}-1-SNAPSHOT-${dolClassifier}.zip
${dolRepo}/docbook-olink
${project.build.directory}/
${project.build.directory}/${dolZip}
svn commit: r952499 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Tue Jun 8 01:49:47 2010
New Revision: 952499
URL: http://svn.apache.org/viewvc?rev=952499&view=rev
Log:
[maven-release-plugin] prepare release 1-rc2
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=952499&r1=952498&r2=952499&view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Tue Jun 8 01:49:47 2010
@@ -55,7 +55,7 @@
org.apache.uima
parent-pom-top
- 1-SNAPSHOT
+ 1
pom
UIMA ${project.artifactId}
@@ -121,13 +121,13 @@
-
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
+ scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/1-rc2
-
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
+ scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/1-rc2
- http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top
+ http://svn.apache.org/viewvc/uima/build/tags/1-rc2
svn commit: r952500 - /uima/build/tags/1-rc2/
Author: schor Date: Tue Jun 8 01:49:53 2010 New Revision: 952500 URL: http://svn.apache.org/viewvc?rev=952500&view=rev Log: [maven-scm] copy for tag 1-rc2 Added: uima/build/tags/1-rc2/ - copied from r952499, uima/build/trunk/parent-poms/parent-pom-top/
svn commit: r952501 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Tue Jun 8 01:49:56 2010
New Revision: 952501
URL: http://svn.apache.org/viewvc?rev=952501&view=rev
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=952501&r1=952500&r2=952501&view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Tue Jun 8 01:49:56 2010
@@ -55,7 +55,7 @@
org.apache.uima
parent-pom-top
- 1
+ 2-SNAPSHOT
pom
UIMA ${project.artifactId}
@@ -121,13 +121,13 @@
- scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/1-rc2
+
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
- scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/1-rc2
+
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
- http://svn.apache.org/viewvc/uima/build/tags/1-rc2
+ http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top
svn commit: r952502 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Tue Jun 8 01:50:45 2010
New Revision: 952502
URL: http://svn.apache.org/viewvc?rev=952502&view=rev
Log:
[maven-release-plugin] rollback the release of 1-rc2
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=952502&r1=952501&r2=952502&view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Tue Jun 8 01:50:45 2010
@@ -55,7 +55,7 @@
org.apache.uima
parent-pom-top
- 2-SNAPSHOT
+ 1-SNAPSHOT
pom
UIMA ${project.artifactId}
svn commit: r952503 - /uima/build/tags/1-rc2/
Author: schor Date: Tue Jun 8 01:52:22 2010 New Revision: 952503 URL: http://svn.apache.org/viewvc?rev=952503&view=rev Log: [UIMA-1809] named the rc incorretly, try again Removed: uima/build/tags/1-rc2/
svn commit: r952504 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Tue Jun 8 01:53:04 2010
New Revision: 952504
URL: http://svn.apache.org/viewvc?rev=952504&view=rev
Log:
[maven-release-plugin] prepare release parent-pom-top-1-rc2
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=952504&r1=952503&r2=952504&view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Tue Jun 8 01:53:04 2010
@@ -55,7 +55,7 @@
org.apache.uima
parent-pom-top
- 1-SNAPSHOT
+ 1
pom
UIMA ${project.artifactId}
@@ -121,13 +121,13 @@
-
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
+
scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-1-rc2
-
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
+
scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-1-rc2
- http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top
+ http://svn.apache.org/viewvc/uima/build/tags/parent-pom-top-1-rc2
svn commit: r952505 - /uima/build/tags/parent-pom-top-1-rc2/
Author: schor Date: Tue Jun 8 01:53:09 2010 New Revision: 952505 URL: http://svn.apache.org/viewvc?rev=952505&view=rev Log: [maven-scm] copy for tag parent-pom-top-1-rc2 Added: uima/build/tags/parent-pom-top-1-rc2/ - copied from r952504, uima/build/trunk/parent-poms/parent-pom-top/
svn commit: r952506 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Tue Jun 8 01:53:12 2010
New Revision: 952506
URL: http://svn.apache.org/viewvc?rev=952506&view=rev
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=952506&r1=952505&r2=952506&view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Tue Jun 8 01:53:12 2010
@@ -55,7 +55,7 @@
org.apache.uima
parent-pom-top
- 1
+ 2-SNAPSHOT
pom
UIMA ${project.artifactId}
@@ -121,13 +121,13 @@
-
scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-1-rc2
+
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
-
scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/parent-pom-top-1-rc2
+
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
- http://svn.apache.org/viewvc/uima/build/tags/parent-pom-top-1-rc2
+ http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top
