svn commit: r935745 - /uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/
Author: schor Date: Mon Apr 19 21:01:12 2010 New Revision: 935745 URL: http://svn.apache.org/viewvc?rev=935745&view=rev Log: no Jira - svn ignore the target folder Modified: uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/ (props changed) Propchange: uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/ -- --- svn:ignore (added) +++ svn:ignore Mon Apr 19 21:01:12 2010 @@ -0,0 +1 @@ +target
svn commit: r935744 - in /uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins: ./ pom.xml
Author: schor
Date: Mon Apr 19 21:00:39 2010
New Revision: 935744
URL: http://svn.apache.org/viewvc?rev=935744&view=rev
Log:
[UIMA-1756] add common parent pom for eclipse plugins.
Added:
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/
uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml
Added: uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml?rev=935744&view=auto
==
--- uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml
(added)
+++ uima/build/trunk/parent-poms/parent-pom-uimaj-eclipse-plugins/pom.xml Mon
Apr 19 21:00:39 2010
@@ -0,0 +1,120 @@
+
+
+
+
+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
+
+
+org.apache.uima
+parent-pom-uimaj
+1-SNAPSHOT
+
+
+
+ org.apache.uima
+ parent-pom-uimaj-eclipse-plugins
+ 1-SNAPSHOT
+ pom
+
+ Apache UIMA Java SDK common Eclipse plugin settings
+ Holds common, factored out settings for eclipse
plugins
+
+
+
+
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+
+
+build
+
parent-poms/parent-pom-uimaj-eclipse-plugins
+
+Portions of UIMA were originally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant License Agreement", informally known as the
+"IBM UIMA License Agreement".
+Copyright (c) 2003, 2006 IBM Corporation.
+
+
+
+
+
+
+
+
+
+.
+
+ plugin.xml
+ icons/*.*
+
+
+
+
+src/main/resources
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-eclipse-plugin
+2.4
+
+ .ignore
+ true
+
+ false
+
+
+
+
+
+
\ No newline at end of file
svn commit: r935743 - /uima/build/trunk/parent-poms/parent-pom-uimaj-ibm-notice/pom.xml
Author: schor Date: Mon Apr 19 20:58:39 2010 New Revision: 935743 URL: http://svn.apache.org/viewvc?rev=935743&view=rev Log: [UIMA-1756] move the Notices override for remote-resources to the top pom, so any pom can use it (needed for eclipse-plugins, for instance). Modified: uima/build/trunk/parent-poms/parent-pom-uimaj-ibm-notice/pom.xml Modified: uima/build/trunk/parent-poms/parent-pom-uimaj-ibm-notice/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-uimaj-ibm-notice/pom.xml?rev=935743&r1=935742&r2=935743&view=diff == --- uima/build/trunk/parent-poms/parent-pom-uimaj-ibm-notice/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-uimaj-ibm-notice/pom.xml Mon Apr 19 20:58:39 2010 @@ -70,26 +70,7 @@ licensed to the Apache Software Foundati Copyright (c) 2003, 2006 IBM Corporation. - - - - -org.apache.maven.plugins -maven-remote-resources-plugin - - -process - - - org.apache.uima:uima-jar-resource-bundle:1-SNAPSHOT - - - - - - - - +
svn commit: r935742 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor Date: Mon Apr 19 20:58:04 2010 New Revision: 935742 URL: http://svn.apache.org/viewvc?rev=935742&view=rev Log: [UIMA-1756] move the Notices override for remote-resources here, so any pom can use it (needed for eclipse-plugins, for instance). Add an field so both it and the base remote-resources run (to have the base one do the other files). 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=935742&r1=935741&r2=935742&view=diff == --- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Mon Apr 19 20:58:04 2010 @@ -305,6 +305,24 @@ + + +org.apache.maven.plugins +maven-remote-resources-plugin + + +uima-notice +process + + + org.apache.uima:uima-jar-resource-bundle:1-SNAPSHOT + + + + +
svn commit: r935699 - /uima/build/trunk/parent-poms/parent-pom-uimaj-ibm-notice/pom.xml
Author: schor
Date: Mon Apr 19 18:38:51 2010
New Revision: 935699
URL: http://svn.apache.org/viewvc?rev=935699&view=rev
Log:
fix up scm entry to be uniform
Modified:
uima/build/trunk/parent-poms/parent-pom-uimaj-ibm-notice/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-uimaj-ibm-notice/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-uimaj-ibm-notice/pom.xml?rev=935699&r1=935698&r2=935699&view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-uimaj-ibm-notice/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-uimaj-ibm-notice/pom.xml Mon Apr 19
18:38:51 2010
@@ -38,25 +38,37 @@
Apache UIMA Java SDK Parent with IBM copyright in the Notice
Adds the IBM Copyright to the Notice file for selected source
files
+
-
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-uimaj-ibm-notice
-
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-uimaj-ibm-notice
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
-
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-uimaj-ibm-notice
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
-
+build
+parent-poms/parent-pom-uimaj-ibm-notice
+
Portions of UIMA were originally developed by
International Business Machines Corporation and are
licensed to the Apache Software Foundation under the
"Software Grant License Agreement", informally known as the
"IBM UIMA License Agreement".
Copyright (c) 2003, 2006 IBM Corporation.
-
+
svn commit: r935698 - /uima/build/trunk/parent-poms/parent-pom-uimaj/pom.xml
Author: schor
Date: Mon Apr 19 18:38:27 2010
New Revision: 935698
URL: http://svn.apache.org/viewvc?rev=935698&view=rev
Log:
fix up scm entry to be uniform
Modified:
uima/build/trunk/parent-poms/parent-pom-uimaj/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-uimaj/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-uimaj/pom.xml?rev=935698&r1=935697&r2=935698&view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-uimaj/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-uimaj/pom.xml Mon Apr 19 18:38:27
2010
@@ -37,16 +37,31 @@
Apache UIMA Java SDK Parent
UIMA Parent Pom for the Java SDK - the main Java based part of
the UIMA framework.
-
+
+
-
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-uimaj
-
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-uimaj
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
-
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-uimaj
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+
+
+
+build
+parent-poms/parent-pom-uimaj
+
svn commit: r935697 - /uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Author: schor
Date: Mon Apr 19 18:37:42 2010
New Revision: 935697
URL: http://svn.apache.org/viewvc?rev=935697&view=rev
Log:
[UIMA-1756] point the to the top uima website, always, including the
http:// prefix. Be careful about using ${project.url} in child projects,
because the inheritance (if not defined in the child project) constructs the
url by appending the parent pom artifact names. Because of this, change the
use of ${project.url} in the Jar configuration to instead use the fixed
top-level uima website.
Change the scm configuration to make it identical for this and all other poms
in the project. Note that it cannot be inherited, though, because the
inheritance makes assumptions that are not true for our project layout. But
with this form, you can cut/paste it into every project.
Add properties for the top uima website url, and the scm root and scm directory
(project) names. The project is usually the artifact name, but not always
(e.g., artifact name = jVinci, scm = jvinci (different "case").
Put back the Project-Title manifestEntry in built Jars.
Remove (comment out for now) ant dependency for ant-contrib:1.0b3 - causing ant
problems if ant is used.
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=935697&r1=935696&r2=935697&view=diff
==
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Mon Apr 19 18:37:42 2010
@@ -62,7 +62,7 @@
it provides for externalized declaration of type systems,
component configuration, aggregation, and more,
supports scalablity, and provides tooling.
- uima.apache.org
+ ${uimaWebsiteUrl}
2006
@@ -118,13 +118,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/${uimaScmRoot}/trunk/${uimaScmProject}
-
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/${uimaScmRoot}/trunk/${uimaScmProject}
- http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
@@ -145,7 +145,11 @@
and for snapshots:
https://repository.apache.org/content/repositories/snapshots -->
-
+
+http://uima.apache.org
+build
+parent-poms/parent-pom-top
+
@@ -222,13 +226,13 @@
-
+Apache UIMA
-${project.url}
+${uimaWebsiteUrl}
http://www.apache.org/licenses/LICENSE-2.0.txt
${buildNumber}
@@ -242,14 +246,14 @@
org.apache.maven.plugins
maven-antrun-plugin
-
-
- ant-contrib
+
+
svn commit: r935655 - /uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/ProcessCasErrorHandler.java
Author: cwiklik
Date: Mon Apr 19 16:20:13 2010
New Revision: 935655
URL: http://svn.apache.org/viewvc?rev=935655&view=rev
Log:
UIMA-1766 Modified to call dropStats() after a message is dispatched to a
collocated component. Fixes a memory leak.
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/ProcessCasErrorHandler.java
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/ProcessCasErrorHandler.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/ProcessCasErrorHandler.java?rev=935655&r1=935654&r2=935655&view=diff
==
---
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/ProcessCasErrorHandler.java
(original)
+++
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/error/handler/ProcessCasErrorHandler.java
Mon Apr 19 16:20:13 2010
@@ -131,6 +131,7 @@ public class ProcessCasErrorHandler exte
}
if (!aController.isStopped()) {
vmTransport.getUimaMessageDispatcher(anEndpoint.getEndpoint()).dispatch(message);
+aController.dropStats(aCasReferenceId, aController.getName());
}
} else {
CasStateEntry stateEntry = null;
svn commit: r935654 - /uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
Author: cwiklik
Date: Mon Apr 19 16:19:25 2010
New Revision: 935654
URL: http://svn.apache.org/viewvc?rev=935654&view=rev
Log:
UIMA-1766 Modified to call dropStats() after a message is dispatched to a
collocated component. Fixes a memory leak.
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java?rev=935654&r1=935653&r2=935654&view=diff
==
---
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
(original)
+++
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/PrimitiveAnalysisEngineController_impl.java
Mon Apr 19 16:19:25 2010
@@ -623,6 +623,7 @@ public class PrimitiveAnalysisEngineCont
message.addLongProperty(AsynchAEMessage.IdleTime, iT);
if (!stopped) {
transport.getUimaMessageDispatcher(anEndpoint.getEndpoint()).dispatch(message);
+dropStats(newEntry.getCasReferenceId(), getName());
}
} else {
// Send generated CAS to the client
@@ -680,6 +681,7 @@ public class PrimitiveAnalysisEngineCont
// Send reply back to the client. Use internal (non-jms) transport
if (!stopped) {
transport.getUimaMessageDispatcher(anEndpoint.getEndpoint()).dispatch(message);
+ dropStats(aCasReferenceId, getName());
}
} else {
if (!stopped) {
svn commit: r935652 - /uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java
Author: cwiklik
Date: Mon Apr 19 16:18:43 2010
New Revision: 935652
URL: http://svn.apache.org/viewvc?rev=935652&view=rev
Log:
UIMA-1766 Removed idleTimeMap, mBeanMap, and timeSnapshotMap and method
operating on them. These maps were not used.
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java?rev=935652&r1=935651&r2=935652&view=diff
==
---
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java
(original)
+++
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java
Mon Apr 19 16:18:43 2010
@@ -111,7 +111,7 @@ public abstract class BaseAnalysisEngine
protected volatile ControllerLatch latch = new ControllerLatch(this);
- protected ConcurrentHashMap statsMap = new ConcurrentHashMap();
+ protected ConcurrentHashMap statsMap = new
ConcurrentHashMap();
protected Monitor monitor = new MonitorBaseImpl();
@@ -143,8 +143,6 @@ public abstract class BaseAnalysisEngine
protected ConcurrentHashMap inputChannelMap = new ConcurrentHashMap();
- protected ConcurrentHashMap idleTimeMap = new ConcurrentHashMap();
-
private UimaEEAdminContext adminContext;
protected int componentCasPoolSize = 0;
@@ -159,14 +157,10 @@ public abstract class BaseAnalysisEngine
protected String jmxContext = "";
- protected ConcurrentHashMap mBeanMap = new ConcurrentHashMap();
-
protected ServicePerformance servicePerformance = null;
protected ServiceErrors serviceErrors = null;
- protected ConcurrentHashMap timeSnapshotMap = new ConcurrentHashMap();
-
private String deploymentDescriptor = "";
private JmxManagement jmxManagement = null;
@@ -925,14 +919,6 @@ public abstract class BaseAnalysisEngine
return getComponentName();
}
- public void addTimeSnapshot(long snapshot, String aKey) {
-if (timeSnapshotMap.containsKey(aKey)) {
- timeSnapshotMap.remove(aKey);
-}
-timeSnapshotMap.put(aKey, snapshot);
-
- }
-
public void addServiceInfo(ServiceInfo aServiceInfo) {
ServiceInfo sInfo = null;
@@ -955,17 +941,6 @@ public abstract class BaseAnalysisEngine
}
- public long getTimeSnapshot(String aKey) {
-if (timeSnapshotMap.containsKey(aKey)) {
- Object value = timeSnapshotMap.get(aKey);
- if (value != null) {
-return ((Long) value).longValue();
- }
-}
-return 0;
-
- }
-
public ServicePerformance getServicePerformance() {
return servicePerformance;
}
@@ -1305,7 +1280,6 @@ public abstract class BaseAnalysisEngine
perCasStatistics.remove(aCasReferenceId);
}
}
-
public synchronized void saveTime(long aTime, String aCasReferenceId, String
anEndpointName) {
String key = aCasReferenceId + anEndpointName;
if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.FINE)) {
@@ -1421,12 +1395,6 @@ public abstract class BaseAnalysisEngine
return adminContext;
}
- protected void dropIdleTime(String aKey) {
-if (idleTimeMap.containsKey(aKey)) {
- idleTimeMap.remove(aKey);
-}
- }
-
private void dropStats(String aKey) {
if (aKey != null && statsMap.containsKey(aKey)) {
statsMap.remove(aKey);
@@ -1831,18 +1799,10 @@ public abstract class BaseAnalysisEngine
inputChannelList.clear();
}
inputChannel = null;
-if (idleTimeMap != null) {
- idleTimeMap.clear();
-}
+
if (serviceErrorMap != null) {
serviceErrorMap.clear();
}
-if (mBeanMap != null) {
- mBeanMap.clear();
-}
-if (timeSnapshotMap != null) {
- timeSnapshotMap.clear();
-}
// TODO any reason this list needs to be cleared on Stop???
if (unregisteredDelegateList != null) {
unregisteredDelegateList.clear();
svn commit: r935650 - /uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AnalysisEngineController.java
Author: cwiklik Date: Mon Apr 19 16:15:54 2010 New Revision: 935650 URL: http://svn.apache.org/viewvc?rev=935650&view=rev Log: UIMA-1766 Removed unused methods addTimeSnapshot() and getTimeSnapshot() Modified: uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AnalysisEngineController.java Modified: uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AnalysisEngineController.java URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AnalysisEngineController.java?rev=935650&r1=935649&r2=935650&view=diff == --- uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AnalysisEngineController.java (original) +++ uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AnalysisEngineController.java Mon Apr 19 16:15:54 2010 @@ -144,14 +144,10 @@ public interface AnalysisEngineControlle public String getJmxContext(); - public void addTimeSnapshot(long snapshot, String aKey); - public ServicePerformance getServicePerformance(); public ServiceInfo getServiceInfo(); - public long getTimeSnapshot(String aKey); - public void addServiceInfo(ServiceInfo aServiceInfo); public ServiceErrors getServiceErrors(); @@ -223,4 +219,5 @@ public interface AnalysisEngineControlle public void changeState(ServiceState state); public ServiceState getState(); + }
svn commit: r935649 - /uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
Author: cwiklik Date: Mon Apr 19 16:14:45 2010 New Revision: 935649 URL: http://svn.apache.org/viewvc?rev=935649&view=rev Log: UIMA-1766 Modified to call dropStats() after a message is dispatched to a collocated component. Fixes a memory leak. Modified: uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java Modified: uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java?rev=935649&r1=935648&r2=935649&view=diff == --- uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java (original) +++ uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java Mon Apr 19 16:14:45 2010 @@ -1876,6 +1876,7 @@ public class AggregateAnalysisEngineCont message.addObjectProperty(AsynchAEMessage.Cargo, wrapper); } vmTransport.getUimaMessageDispatcher(replyEndpoint.getEndpoint()).dispatch(message); + dropStats(casStateEntry.getCasReferenceId(),getName()); } } @@ -2075,6 +2076,8 @@ public class AggregateAnalysisEngineCont message.addLongProperty(AsynchAEMessage.IdleTime, iT); // Send reply back to the client. Use internal (non-jms) transport transport.getUimaMessageDispatcher(endpoint.getEndpoint()).dispatch(message); +dropStats(cacheEntry.getCasReferenceId(), getName()); + } private Endpoint getReplyEndpoint(CacheEntry cacheEntry, CasStateEntry casStateEntry)
svn commit: r935499 - /uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaEEAdminSpringContext.java
Author: joern
Date: Mon Apr 19 09:48:29 2010
New Revision: 935499
URL: http://svn.apache.org/viewvc?rev=935499&view=rev
Log:
No Jira, added generic type parameters to a map
Modified:
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaEEAdminSpringContext.java
Modified:
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaEEAdminSpringContext.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaEEAdminSpringContext.java?rev=935499&r1=935498&r2=935499&view=diff
==
---
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaEEAdminSpringContext.java
(original)
+++
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/UimaEEAdminSpringContext.java
Mon Apr 19 09:48:29 2010
@@ -40,7 +40,7 @@ public class UimaEEAdminSpringContext im
private boolean isShutdown;
- private ConcurrentHashMap listenerMap = new ConcurrentHashMap();
+ private ConcurrentHashMap listenerMap = new
ConcurrentHashMap();
public UimaEEAdminSpringContext(FileSystemXmlApplicationContext
aSpringContainer) {
springContainer = aSpringContainer;
