From uima-commits-returnjenniferbrown@example.org Wed Apr 01 07:08:48 2009 Return-Path: <uima-commits-returnjenniferbrown@example.org> Delivered-To: jenniferbrown@example.org Received: (qmail 9579 invoked from network); 1 Apr 2009 07:08:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2009 07:08:48 -0000 Received: (qmail 88872 invoked by uid 500); 1 Apr 2009 07:08:48 -0000 Delivered-To: jenniferbrown@example.org Received: (qmail 88841 invoked by uid 500); 1 Apr 2009 07:08:48 -0000 Mailing-List: contact jenniferbrown@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jenniferbrown@example.org> List-Unsubscribe: <mailto:jenniferbrown@example.org> List-Post: <mailto:jenniferbrown@example.org> List-Id: <uima-commits.incubator.apache.org> Reply-To: jenniferbrown@example.org Delivered-To: mailing list jenniferbrown@example.org Received: (qmail 88832 invoked by uid 99); 1 Apr 2009 07:08:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2009 07:08:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2009 07:08:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C09EF2388970; Wed, 1 Apr 2009 07:08:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r760794 - /incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/pom.xml Date: Wed, 01 Apr 2009 07:08:24 -0000 To: jenniferbrown@example.org From: jenniferbrown@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jenniferbrown@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: joern Date: Wed Apr 1 07:08:22 2009 New Revision: 760794 URL: http://svn.apache.org/viewvc?rev=760794&view=rev Log: UIMA-1307 Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/pom.xml Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/pom.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/pom.xml?rev=760794&r1=760793&r2=760794&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/pom.xml (original) +++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/pom.xml Wed Apr 1 07:08:22 2009 @@ -136,6 +136,13 @@ <build> <finalName>org.apache.uima.caseditor_${uimaj-release-eclipse-version}</finalName> + <resources> + <resource> + <targetPath>icons</targetPath> + <directory>${basedir}/icons</directory> + </resource> + </resources> + <plugins> <plugin> <groupId>org.apache.felix</groupId> @@ -163,12 +170,19 @@ org.apache.uima.caseditor.editor.util </Export-Package> <Import-Package>org.eclipse.core.runtime.jobs, - org.eclipse.core.commands.common, org.eclipse.core.runtime.content, + org.eclipse.core.resources, + org.eclipse.core.commands.common, org.eclipse.swt, org.eclipse.swt.layout, org.eclipse.ui.progress, org.eclipse.jface.layout, + org.eclipse.jface.resource, + org.eclipse.ui.plugin, + org.osgi.framework, + org.eclipse.ui.texteditor, + org.eclipse.ui.views.contentoutline, + org.eclipse.jface.window, *</Import-Package> </instructions> </configuration> From uima-commits-returnjenniferbrown@example.org Wed Apr 01 13:28:53 2009 Return-Path: <uima-commits-returnjenniferbrown@example.org> Delivered-To: jenniferbrown@example.org Received: (qmail 27312 invoked from network); 1 Apr 2009 13:28:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2009 13:28:53 -0000 Received: (qmail 98889 invoked by uid 500); 1 Apr 2009 13:28:52 -0000 Delivered-To: jenniferbrown@example.org Received: (qmail 98849 invoked by uid 500); 1 Apr 2009 13:28:51 -0000 Mailing-List: contact jenniferbrown@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jenniferbrown@example.org> List-Unsubscribe: <mailto:jenniferbrown@example.org> List-Post: <mailto:jenniferbrown@example.org> List-Id: <uima-commits.incubator.apache.org> Reply-To: jenniferbrown@example.org Delivered-To: mailing list jenniferbrown@example.org Received: (qmail 98840 invoked by uid 99); 1 Apr 2009 13:28:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2009 13:28:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2009 13:28:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E8FE02388970; Wed, 1 Apr 2009 13:28:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r760885 - /incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/pom.xml Date: Wed, 01 Apr 2009 13:28:30 -0000 To: jenniferbrown@example.org From: jenniferbrown@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jenniferbrown@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: joern Date: Wed Apr 1 13:28:30 2009 New Revision: 760885 URL: http://svn.apache.org/viewvc?rev=760885&view=rev Log: UIMA-1308 Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/pom.xml Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/pom.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/pom.xml?rev=760885&r1=760884&r2=760885&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/pom.xml (original) +++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/pom.xml Wed Apr 1 13:28:30 2009 @@ -141,6 +141,10 @@ <targetPath>icons</targetPath> <directory>${basedir}/icons</directory> </resource> + <resource> + <directory>${basedir}</directory> + <includes><include>plugin.xml</include></includes> + </resource> </resources> <plugins> From uima-commits-returnjenniferbrown@example.org Thu Apr 02 14:11:30 2009 Return-Path: <uima-commits-returnjenniferbrown@example.org> Delivered-To: jenniferbrown@example.org Received: (qmail 53138 invoked from network); 2 Apr 2009 14:11:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Apr 2009 14:11:30 -0000 Received: (qmail 33711 invoked by uid 500); 2 Apr 2009 14:11:30 -0000 Delivered-To: jenniferbrown@example.org Received: (qmail 33682 invoked by uid 500); 2 Apr 2009 14:11:30 -0000 Mailing-List: contact jenniferbrown@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jenniferbrown@example.org> List-Unsubscribe: <mailto:jenniferbrown@example.org> List-Post: <mailto:jenniferbrown@example.org> List-Id: <uima-commits.incubator.apache.org> Reply-To: jenniferbrown@example.org Delivered-To: mailing list jenniferbrown@example.org Received: (qmail 33673 invoked by uid 99); 2 Apr 2009 14:11:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 14:11:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 14:11:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4E7812388A04; Thu, 2 Apr 2009 14:11:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r761302 - /incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java Date: Thu, 02 Apr 2009 14:11:07 -0000 To: jenniferbrown@example.org From: jenniferbrown@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jenniferbrown@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cwiklik Date: Thu Apr 2 14:11:06 2009 New Revision: 761302 URL: http://svn.apache.org/viewvc?rev=761302&view=rev Log: UIMA-1309 testPrimitiveServiceProcessPingFailure() testcase to ignore ResourceInitializationException Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java?rev=761302&r1=761301&r2=761302&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java (original) +++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java Thu Apr 2 14:11:06 2009 @@ -480,6 +480,7 @@ try { // RuntimeException is expected due to failure + super.addExceptionToignore(ResourceInitializationException.class); runTest(appCtx,eeUimaEngine,String.valueOf(broker.getMasterConnectorURI()),"PersonTitleAnnotatorQueue", 500, EXCEPTION_LATCH); } catch( RuntimeException e) {} From uima-commits-returnjenniferbrown@example.org Thu Apr 02 14:21:31 2009 Return-Path: <uima-commits-returnjenniferbrown@example.org> Delivered-To: jenniferbrown@example.org Received: (qmail 61433 invoked from network); 2 Apr 2009 14:21:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Apr 2009 14:21:30 -0000 Received: (qmail 61396 invoked by uid 500); 2 Apr 2009 14:21:30 -0000 Delivered-To: jenniferbrown@example.org Received: (qmail 61363 invoked by uid 500); 2 Apr 2009 14:21:30 -0000 Mailing-List: contact jenniferbrown@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jenniferbrown@example.org> List-Unsubscribe: <mailto:jenniferbrown@example.org> List-Post: <mailto:jenniferbrown@example.org> List-Id: <uima-commits.incubator.apache.org> Reply-To: jenniferbrown@example.org Delivered-To: mailing list jenniferbrown@example.org Received: (qmail 61354 invoked by uid 99); 2 Apr 2009 14:21:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 14:21:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 14:21:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C01B42388A13; Thu, 2 Apr 2009 14:21:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r761306 - /incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java Date: Thu, 02 Apr 2009 14:21:09 -0000 To: jenniferbrown@example.org From: jenniferbrown@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jenniferbrown@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cwiklik Date: Thu Apr 2 14:21:09 2009 New Revision: 761306 URL: http://svn.apache.org/viewvc?rev=761306&view=rev Log: UIMA-1310 Fixed memory leak caused by a hung thread Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java?rev=761306&r1=761305&r2=761306&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java (original) +++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java Thu Apr 2 14:21:09 2009 @@ -428,6 +428,11 @@ listeners.clear(); clientCache.clear(); threadQueue.clear(); + // Add empty CasQueueEntry object to the queue so that we wake up a reader thread which + // may be sitting in the threadQueue.take() method. The reader will + // first check the state of the 'running' flag and find it false which + // will cause the reader to exit run() method + threadQueue.add(new CasQueueEntry()); threadRegistrar.clear(); } catch (Exception e) From uima-commits-returnjenniferbrown@example.org Thu Apr 02 14:37:37 2009 Return-Path: <uima-commits-returnjenniferbrown@example.org> Delivered-To: jenniferbrown@example.org Received: (qmail 73800 invoked from network); 2 Apr 2009 14:37:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Apr 2009 14:37:37 -0000 Received: (qmail 13606 invoked by uid 500); 2 Apr 2009 14:37:37 -0000 Delivered-To: jenniferbrown@example.org Received: (qmail 13574 invoked by uid 500); 2 Apr 2009 14:37:37 -0000 Mailing-List: contact jenniferbrown@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jenniferbrown@example.org> List-Unsubscribe: <mailto:jenniferbrown@example.org> List-Post: <mailto:jenniferbrown@example.org> List-Id: <uima-commits.incubator.apache.org> Reply-To: jenniferbrown@example.org Delivered-To: mailing list jenniferbrown@example.org Received: (qmail 13564 invoked by uid 99); 2 Apr 2009 14:37:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 14:37:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 14:37:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 97D072388A04; Thu, 2 Apr 2009 14:37:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r761309 - /incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java Date: Thu, 02 Apr 2009 14:37:05 -0000 To: jenniferbrown@example.org From: jenniferbrown@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jenniferbrown@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cwiklik Date: Thu Apr 2 14:37:05 2009 New Revision: 761309 URL: http://svn.apache.org/viewvc?rev=761309&view=rev Log: UIMA-1311 Log runtime environment on top level service startup Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java?rev=761309&r1=761308&r2=761309&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java (original) +++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/BaseAnalysisEngineController.java Thu Apr 2 14:37:05 2009 @@ -21,7 +21,12 @@ import java.io.ByteArrayOutputStream; import java.lang.management.ManagementFactory; +import java.lang.management.MemoryMXBean; +import java.lang.management.OperatingSystemMXBean; +import java.lang.management.RuntimeMXBean; import java.lang.management.ThreadMXBean; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -212,6 +217,7 @@ protected ConcurrentHashMap<String, String> abortedCasesMap = new ConcurrentHashMap<String, String>(); + protected String processPid = ""; public BaseAnalysisEngineController(AnalysisEngineController aParentController, int aComponentCasPoolSize, String anEndpointName, String aDescriptor, AsynchAECasManager aCasManager, InProcessCache anInProcessCache) throws Exception { this(aParentController, aComponentCasPoolSize, 0, anEndpointName, aDescriptor, aCasManager, anInProcessCache, null, null); @@ -277,21 +283,22 @@ endpointName = endpoint.getEndpoint(); } - if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO)) { - UIMAFramework.getLogger(CLASS_NAME).logrb(Level.INFO, CLASS_NAME.getName(), - "BaseAnalysisEngineController", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE, "UIMAEE_service_id_INFO", - new Object[] { endpointName }); - } resourceSpecifier = UimaClassFactory.produceResourceSpecifier(aDescriptor); if ( isTopLevelComponent()) { - System.out.println("************** Initializing Component:"+getComponentName()); + logPlatformInfo(getComponentName()); +// System.out.println("************** Initializing Component:"+getComponentName()); } else { - System.out.println("************** Initializing Component:"+getComponentName()+" Parent Controller:"+parentController.getComponentName()); + System.out.println("************** Initializing Collocated Component:"+getComponentName()+" Parent Controller:"+parentController.getComponentName()); + if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.INFO)) { + UIMAFramework.getLogger(CLASS_NAME).logrb(Level.INFO, CLASS_NAME.getName(), + "BaseAnalysisEngineController", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE, "UIMAEE_service_id_INFO", + new Object[] { endpointName }); + } } // Is this service a CAS Multiplier? @@ -407,10 +414,56 @@ } } } - + if ( isTopLevelComponent() ) { + Controller controller = new Controller(this); + String jmxName = getManagementInterface().getJmxDomain()+"name="+"Controller"; + registerWithAgent( controller, jmxName); + } } + private void logPlatformInfo(String serviceName ) { + if ( ManagementFactory.getPlatformMBeanServer() != null ) + { + RuntimeMXBean bean = ManagementFactory.getRuntimeMXBean(); + MemoryMXBean memoryBean = ManagementFactory.getMemoryMXBean(); + OperatingSystemMXBean osBean = ManagementFactory.getOperatingSystemMXBean(); + // bean.getName() should return a string that looks like this: PID@HOSTNAME + // where PID is the process id and the HOSTNAME is the name of the machine + processPid = bean.getName(); + if ( processPid != null && processPid.trim().length() > 0 ) { + int endPos = processPid.indexOf("@"); // find the position where the PID ends + if ( endPos > -1 ) { + processPid = processPid.substring(0, endPos); + } + } + + DateFormat df = new SimpleDateFormat("dd MMM yyyy HH:mm:ss "); + + StringBuffer platformInfo = new StringBuffer(); + platformInfo.append("\n+------------------------------------------------------------------"); + platformInfo.append("\n Starting UIMA AS Service - PID:"+processPid); + platformInfo.append("\n+------------------------------------------------------------------"); + platformInfo.append("\n+ Service Name:"+serviceName); + platformInfo.append("\n+ Service Queue Name:"+endpointName); + platformInfo.append("\n+ Service Start Time:"+df.format(bean.getStartTime())); + platformInfo.append("\n+ OS Name:"+osBean.getName()); + platformInfo.append("\n+ OS Version:"+osBean.getVersion()); + platformInfo.append("\n+ OS Architecture:"+osBean.getArch()); + platformInfo.append("\n+ OS CPU Count:"+osBean.getAvailableProcessors()); + platformInfo.append("\n+ JVM Vendor:"+bean.getVmVendor()); + platformInfo.append("\n+ JVM Name:"+bean.getVmName()); + platformInfo.append("\n+ JVM Version:"+bean.getVmVersion()); + platformInfo.append("\n+ JVM Input Args:"+bean.getInputArguments()); + platformInfo.append("\n+ JVM Classpath:"+bean.getClassPath()); + platformInfo.append("\n+ JVM LIB_PATH:"+bean.getLibraryPath()); + platformInfo.append("\n+------------------------------------------------------------------"); + System.out.println(platformInfo.toString()); + UIMAFramework.getLogger(CLASS_NAME).logrb(Level.INFO, CLASS_NAME.getName(), + "logPlatformInfo", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE, "UIMAEE_show_platform_info__INFO", + new Object[] { platformInfo.toString() }); + } + } public AnalysisEngineController getParentController() { return parentController; } From uima-commits-returnjenniferbrown@example.org Thu Apr 02 14:38:03 2009 Return-Path: <uima-commits-returnjenniferbrown@example.org> Delivered-To: jenniferbrown@example.org Received: (qmail 74070 invoked from network); 2 Apr 2009 14:38:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Apr 2009 14:38:02 -0000 Received: (qmail 14218 invoked by uid 500); 2 Apr 2009 14:38:02 -0000 Delivered-To: jenniferbrown@example.org Received: (qmail 14185 invoked by uid 500); 2 Apr 2009 14:38:02 -0000 Mailing-List: contact jenniferbrown@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jenniferbrown@example.org> List-Unsubscribe: <mailto:jenniferbrown@example.org> List-Post: <mailto:jenniferbrown@example.org> List-Id: <uima-commits.incubator.apache.org> Reply-To: jenniferbrown@example.org Delivered-To: mailing list jenniferbrown@example.org Received: (qmail 14172 invoked by uid 99); 2 Apr 2009 14:37:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 14:37:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 14:37:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6D2222388A13; Thu, 2 Apr 2009 14:37:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r761310 - /incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/resources/uimaee_messages.properties Date: Thu, 02 Apr 2009 14:37:35 -0000 To: jenniferbrown@example.org From: jenniferbrown@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jenniferbrown@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cwiklik Date: Thu Apr 2 14:37:35 2009 New Revision: 761310 URL: http://svn.apache.org/viewvc?rev=761310&view=rev Log: UIMA-1311 Add new message to support logging runtime environment on top level service startup Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/resources/uimaee_messages.properties Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/resources/uimaee_messages.properties URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/resources/uimaee_messages.properties?rev=761310&r1=761309&r2=761310&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/resources/uimaee_messages.properties (original) +++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-core/src/main/resources/uimaee_messages.properties Thu Apr 2 14:37:35 2009 @@ -203,4 +203,5 @@ UIMAEE_override_serialization__WARNING = \n\t***** WARNING: Controller: {0} Overriding Delegate: {1} Serialization. Binary Serialization Not Supported. Defaulting to xmi\n UIMAEE_stopping_collocated_cm_INFO = Controller: {0} Stopping Collocated Delegate Cas Multiplier: {1} UIMAEE_stopping_collocated_cm_INFO = Controller: {0} Stopping Remote Delegate Cas Multiplier: {1} -UIMAEE_stopped_producing_new_cases__INFO = Thread:{0} Controller: {1} Cas Multiplier Stopped Generating CASes from Input CAS: {2} \ No newline at end of file +UIMAEE_stopped_producing_new_cases__INFO = Thread:{0} Controller: {1} Cas Multiplier Stopped Generating CASes from Input CAS: {2} +UIMAEE_show_platform_info__INFO = {0} \ No newline at end of file From uima-commits-returnjenniferbrown@example.org Thu Apr 02 14:46:06 2009 Return-Path: <uima-commits-returnjenniferbrown@example.org> Delivered-To: jenniferbrown@example.org Received: (qmail 77817 invoked from network); 2 Apr 2009 14:46:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Apr 2009 14:46:06 -0000 Received: (qmail 40019 invoked by uid 500); 2 Apr 2009 14:46:06 -0000 Delivered-To: jenniferbrown@example.org Received: (qmail 39995 invoked by uid 500); 2 Apr 2009 14:46:06 -0000 Mailing-List: contact jenniferbrown@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jenniferbrown@example.org> List-Unsubscribe: <mailto:jenniferbrown@example.org> List-Post: <mailto:jenniferbrown@example.org> List-Id: <uima-commits.incubator.apache.org> Reply-To: jenniferbrown@example.org Delivered-To: mailing list jenniferbrown@example.org Received: (qmail 39986 invoked by uid 99); 2 Apr 2009 14:46:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 14:46:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 14:46:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 703F02388A04; Thu, 2 Apr 2009 14:45:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r761315 - /incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/pom.xml Date: Thu, 02 Apr 2009 14:45:43 -0000 To: jenniferbrown@example.org From: jenniferbrown@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jenniferbrown@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: joern Date: Thu Apr 2 14:45:43 2009 New Revision: 761315 URL: http://svn.apache.org/viewvc?rev=761315&view=rev Log: UIMA-1312 Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/pom.xml Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/pom.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/pom.xml?rev=761315&r1=761314&r2=761315&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/pom.xml (original) +++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/pom.xml Thu Apr 2 14:45:43 2009 @@ -162,16 +162,7 @@ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment> <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy> <Export-Package> - org.apache.uima.caseditor.editor, - org.apache.uima.caseditor.editor.action, - org.apache.uima.caseditor.editor.annotation, - org.apache.uima.caseditor.editor.context, - org.apache.uima.caseditor.editor.contextmenu, - org.apache.uima.caseditor.editor.editview, - org.apache.uima.caseditor.editor.editview.validator, - org.apache.uima.caseditor.editor.fsview, - org.apache.uima.caseditor.editor.outline, - org.apache.uima.caseditor.editor.util + org.apache.uima.caseditor.* </Export-Package> <Import-Package>org.eclipse.core.runtime.jobs, org.eclipse.core.runtime.content, From uima-commits-returnjenniferbrown@example.org Thu Apr 02 16:40:55 2009 Return-Path: <uima-commits-returnjenniferbrown@example.org> Delivered-To: jenniferbrown@example.org Received: (qmail 42191 invoked from network); 2 Apr 2009 16:40:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Apr 2009 16:40:55 -0000 Received: (qmail 90254 invoked by uid 500); 2 Apr 2009 16:40:55 -0000 Delivered-To: jenniferbrown@example.org Received: (qmail 90220 invoked by uid 500); 2 Apr 2009 16:40:55 -0000 Mailing-List: contact jenniferbrown@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jenniferbrown@example.org> List-Unsubscribe: <mailto:jenniferbrown@example.org> List-Post: <mailto:jenniferbrown@example.org> List-Id: <uima-commits.incubator.apache.org> Reply-To: jenniferbrown@example.org Delivered-To: mailing list jenniferbrown@example.org Received: (qmail 90211 invoked by uid 99); 2 Apr 2009 16:40:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 16:40:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 16:40:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5A59D2388A04; Thu, 2 Apr 2009 16:40:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r761340 - /incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java Date: Thu, 02 Apr 2009 16:40:34 -0000 To: jenniferbrown@example.org From: jenniferbrown@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jenniferbrown@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cwiklik Date: Thu Apr 2 16:40:33 2009 New Revision: 761340 URL: http://svn.apache.org/viewvc?rev=761340&view=rev Log: UIMA-1288 Added new test case to test Spring place holder replacement logic Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java?rev=761340&r1=761339&r2=761340&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java (original) +++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/java/org/apache/uima/ee/test/TestUimaASExtended.java Thu Apr 2 16:40:33 2009 @@ -161,6 +161,61 @@ super.setExpectingServiceShutdown(); runTest(null,eeUimaEngine,String.valueOf(broker.getMasterConnectorURI()),"TopLevelTaeQueue", 0, PROCESS_LATCH); } + /** + * Tests a simple Aggregate with one remote Delegate and collocated Cas Multiplier + * + * @throws Exception + */ + public void testDeployAggregateServiceWithBrokerPlaceholder() throws Exception + { + System.out.println("-------------- testDeployAggregateServiceWithBrokerPlaceholder -------------"); + final BaseUIMAAsynchronousEngine_impl eeUimaEngine = new BaseUIMAAsynchronousEngine_impl(); + super.setExpectingServiceShutdown(); + System.setProperty(JmsConstants.SessionTimeoutOverride, "2500000"); + System.setProperty("AggregateBroker", "tcp://localhost:8120"); + System.setProperty("NoOpBroker","tcp://localhost:8120"); + + try { + Thread t = new Thread() { + public void run() + { + BrokerService bs = null; + try { + // at this point the top level service should show a connection error + synchronized( this ) { + this.wait(5000); // wait for 5 secs + } + // Create a new broker that runs a different port that the rest of testcases + bs = createBroker(8120, false); + bs.start(); + deployService(eeUimaEngine, relativePath+"/Deploy_NoOpAnnotatorUsingPlaceholder.xml"); + deployService(eeUimaEngine, relativePath+"/Deploy_AggregateAnnotatorUsingPlaceholder.xml"); + // Start the uima AS client. It connects to the top level service and sends + // 10 messages + runTest(null,eeUimaEngine,System.getProperty("AggregateBroker"),"TopLevelTaeQueue", 1, PROCESS_LATCH); + } catch( InterruptedException e ) { + } catch( Exception e) { + e.printStackTrace(); + fail(e.getMessage()); + } + finally { + if ( bs != null ) { + try { + bs.stop(); + } catch( Exception e) { + e.printStackTrace(); + } + } + } + } + }; + t.start(); + t.join(); + } catch( Exception e) { + e.printStackTrace(); + } +// runTest(null,eeUimaEngine,String.valueOf(broker.getMasterConnectorURI()),"TopLevelTaeQueue", 1, PROCESS_LATCH); + } /** * Tests missing broker on service startup. The service listener on input queue recovers from * this by silently attempting reconnect at 5 second intervals. The test first launches the From uima-commits-returnjenniferbrown@example.org Thu Apr 02 16:41:33 2009 Return-Path: <uima-commits-returnjenniferbrown@example.org> Delivered-To: jenniferbrown@example.org Received: (qmail 42291 invoked from network); 2 Apr 2009 16:41:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Apr 2009 16:41:33 -0000 Received: (qmail 90404 invoked by uid 500); 2 Apr 2009 16:41:33 -0000 Delivered-To: jenniferbrown@example.org Received: (qmail 90371 invoked by uid 500); 2 Apr 2009 16:41:33 -0000 Mailing-List: contact jenniferbrown@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jenniferbrown@example.org> List-Unsubscribe: <mailto:jenniferbrown@example.org> List-Post: <mailto:jenniferbrown@example.org> List-Id: <uima-commits.incubator.apache.org> Reply-To: jenniferbrown@example.org Delivered-To: mailing list jenniferbrown@example.org Received: (qmail 90358 invoked by uid 99); 2 Apr 2009 16:41:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 16:41:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 16:41:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 730E42388ABD; Thu, 2 Apr 2009 16:41:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r761341 - /incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorUsingPlaceholder.xml Date: Thu, 02 Apr 2009 16:41:04 -0000 To: jenniferbrown@example.org From: jenniferbrown@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jenniferbrown@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cwiklik Date: Thu Apr 2 16:41:03 2009 New Revision: 761341 URL: http://svn.apache.org/viewvc?rev=761341&view=rev Log: UIMA-1288 Tests Spring place holder replacement logic Added: incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorUsingPlaceholder.xml Added: incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorUsingPlaceholder.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorUsingPlaceholder.xml?rev=761341&view=auto ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorUsingPlaceholder.xml (added) +++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/resources/deployment/Deploy_AggregateAnnotatorUsingPlaceholder.xml Thu Apr 2 16:41:03 2009 @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> + + <!-- + *************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + *************************************************************** + --> + +<analysisEngineDeploymentDescription xmlns="http://uima.apache.org/resourceSpecifier"> + + <name>Top Level TAE</name> + <description></description> + + <deployment protocol="jms" provider="activemq"> + <casPool numberOfCASes="5"/> + <service> + <inputQueue endpoint="TopLevelTaeQueue" brokerURL="${AggregateBroker}" prefetch="1"/> + <topDescriptor> + <import location="../descriptors/analysis_engine/SimpleTestAggregate.xml"/> + </topDescriptor> + <analysisEngine> + <delegates> + + <analysisEngine key="TestMultiplier"> + <casMultiplier poolSize="5"/> + </analysisEngine> + + <remoteAnalysisEngine key="NoOp"> + <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${NoOpBroker}"/> + <serializer method="xmi"/> + <asyncAggregateErrorConfiguration> + <getMetadataErrors maxRetries="3" timeout="5000" errorAction="continue" /> + <processCasErrors maxRetries="0" timeout="5000" thresholdCount="1" thresholdAction="terminate" /> + </asyncAggregateErrorConfiguration> + </remoteAnalysisEngine> + + </delegates> + </analysisEngine> + </service> + </deployment> + +</analysisEngineDeploymentDescription> \ No newline at end of file From uima-commits-returnjenniferbrown@example.org Thu Apr 02 16:41:51 2009 Return-Path: <uima-commits-returnjenniferbrown@example.org> Delivered-To: jenniferbrown@example.org Received: (qmail 42333 invoked from network); 2 Apr 2009 16:41:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Apr 2009 16:41:51 -0000 Received: (qmail 90471 invoked by uid 500); 2 Apr 2009 16:41:50 -0000 Delivered-To: jenniferbrown@example.org Received: (qmail 90437 invoked by uid 500); 2 Apr 2009 16:41:50 -0000 Mailing-List: contact jenniferbrown@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jenniferbrown@example.org> List-Unsubscribe: <mailto:jenniferbrown@example.org> List-Post: <mailto:jenniferbrown@example.org> List-Id: <uima-commits.incubator.apache.org> Reply-To: jenniferbrown@example.org Delivered-To: mailing list jenniferbrown@example.org Received: (qmail 90428 invoked by uid 99); 2 Apr 2009 16:41:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 16:41:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 16:41:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 676D62388A04; Thu, 2 Apr 2009 16:41:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r761342 - /incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotatorUsingPlaceholder.xml Date: Thu, 02 Apr 2009 16:41:29 -0000 To: jenniferbrown@example.org From: jenniferbrown@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jenniferbrown@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cwiklik Date: Thu Apr 2 16:41:29 2009 New Revision: 761342 URL: http://svn.apache.org/viewvc?rev=761342&view=rev Log: UIMA-1288 Tests Spring place holder replacement logic Added: incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotatorUsingPlaceholder.xml Added: incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotatorUsingPlaceholder.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotatorUsingPlaceholder.xml?rev=761342&view=auto ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotatorUsingPlaceholder.xml (added) +++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/test/resources/deployment/Deploy_NoOpAnnotatorUsingPlaceholder.xml Thu Apr 2 16:41:29 2009 @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> + + <!-- + *************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + *************************************************************** + --> + +<analysisEngineDeploymentDescription + xmlns="http://uima.apache.org/resourceSpecifier"> + + <name>NoOp Annotator</name> + <description>Deploys the NoOp Annotator Primitive AE</description> + + <deployment protocol="jms" provider="activemq"> + <casPool numberOfCASes="5"/> + <service> + <inputQueue endpoint="NoOpAnnotatorQueue" brokerURL="${NoOpBroker}" prefetch="1"/> + <topDescriptor> + <import location="../descriptors/analysis_engine/NoOpAnnotator.xml"/> + </topDescriptor> + <analysisEngine> + <asyncPrimitiveErrorConfiguration> + <!-- <processCasErrors thresholdCount="4" thresholdWindow="10" thresholdAction="terminate" /> --> + <collectionProcessCompleteErrors additionalErrorAction="terminate" /> + </asyncPrimitiveErrorConfiguration> + </analysisEngine> + + + </service> + </deployment> + +</analysisEngineDeploymentDescription> From uima-commits-returnjenniferbrown@example.org Thu Apr 02 18:28:25 2009 Return-Path: <uima-commits-returnjenniferbrown@example.org> Delivered-To: jenniferbrown@example.org Received: (qmail 7664 invoked from network); 2 Apr 2009 18:28:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Apr 2009 18:28:25 -0000 Received: (qmail 83374 invoked by uid 500); 2 Apr 2009 18:28:25 -0000 Delivered-To: jenniferbrown@example.org Received: (qmail 83347 invoked by uid 500); 2 Apr 2009 18:28:25 -0000 Mailing-List: contact jenniferbrown@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jenniferbrown@example.org> List-Unsubscribe: <mailto:jenniferbrown@example.org> List-Post: <mailto:jenniferbrown@example.org> List-Id: <uima-commits.incubator.apache.org> Reply-To: jenniferbrown@example.org Delivered-To: mailing list jenniferbrown@example.org Received: (qmail 83338 invoked by uid 99); 2 Apr 2009 18:28:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 18:28:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 18:28:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A10EA2388970; Thu, 2 Apr 2009 18:28:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r761369 - /incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/plugin.xml Date: Thu, 02 Apr 2009 18:28:02 -0000 To: jenniferbrown@example.org From: jenniferbrown@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jenniferbrown@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: joern Date: Thu Apr 2 18:28:02 2009 New Revision: 761369 URL: http://svn.apache.org/viewvc?rev=761369&view=rev Log: UIMA-1276 Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/plugin.xml Modified: incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/plugin.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/plugin.xml?rev=761369&r1=761368&r2=761369&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/plugin.xml (original) +++ incubator/uima/sandbox/trunk/CasEditorEclipsePlugin/plugin.xml Thu Apr 2 18:28:02 2009 @@ -50,7 +50,9 @@ class="org.apache.uima.caseditor.editor.AnnotationEditor" name="Annotation Editor" contributorClass="org.apache.uima.caseditor.editor.AnnotationEditorActionContributor" - id="org.apache.uima.caseditor.editor" extensions="xcas,xmi"> + id="org.apache.uima.caseditor.editor" + default="true" + extensions="xcas,xmi"> </editor> </extension> @@ -264,13 +266,4 @@ class="org.apache.uima.caseditor.editor.DefaultCasDocumentProvider"> </provider> </extension> - - <extension point="org.eclipse.ui.perspectives"> - <perspective - class="org.apache.uima.caseditor.ui.NlpPerspectiveFactory" - fixed="true" icon="icons/svgicons/corpus.png" - id="org.apache.uima.caseditor.perspective.NLP" name="NLP"> - </perspective> - </extension> - </plugin> \ No newline at end of file From uima-commits-returnjenniferbrown@example.org Thu Apr 02 20:12:12 2009 Return-Path: <uima-commits-returnjenniferbrown@example.org> Delivered-To: jenniferbrown@example.org Received: (qmail 38756 invoked from network); 2 Apr 2009 20:12:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Apr 2009 20:12:12 -0000 Received: (qmail 33777 invoked by uid 500); 2 Apr 2009 20:12:12 -0000 Delivered-To: jenniferbrown@example.org Received: (qmail 33756 invoked by uid 500); 2 Apr 2009 20:12:12 -0000 Mailing-List: contact jenniferbrown@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jenniferbrown@example.org> List-Unsubscribe: <mailto:jenniferbrown@example.org> List-Post: <mailto:jenniferbrown@example.org> List-Id: <uima-commits.incubator.apache.org> Reply-To: jenniferbrown@example.org Delivered-To: mailing list jenniferbrown@example.org Received: (qmail 33747 invoked by uid 99); 2 Apr 2009 20:12:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 20:12:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 20:12:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4BDF523889FD; Thu, 2 Apr 2009 20:11:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r761408 [1/2] - in /incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src: main/scripts/ test/java/org/apache/uima/as/dd/ test/resources/deploy/ test/resources/deploy/expected/ test/resources/deploy/expected/envVar/ Date: Thu, 02 Apr 2009 20:11:43 -0000 To: jenniferbrown@example.org From: jenniferbrown@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jenniferbrown@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: schor Date: Thu Apr 2 20:11:42 2009 New Revision: 761408 URL: http://svn.apache.org/viewvc?rev=761408&view=rev Log: [UIMA-1288] made use of vm://localhost specified by a user explicitly generate an ERROR. Added provision to support the syntax ${xxxxx} for names of brokers, and added the Spring bean needed to resolve this. Removed the beans not needed for vm://localhost. Jerry Cwiklik tested - seems OK. Redid the test cases to account for these changes. Added: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/var1.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/var1.xml Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/dd2spring.xsl incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/java/org/apache/uima/as/dd/Dd2SpringTest.java incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_AggregateUsingRemoteTempQueue.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_CMAggregateWithCollocatedCM.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_ComplexAggregateWithInnerAggregateCM.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_MeetingFinder.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/coLocatedCasMultiplier.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAE.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAEaggr.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAEaggrAsync.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingPrimAEMultInstance.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPP.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPP1.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPPwrongProtocol.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarNotCPP.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq1AE.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AE.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AEg.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AEg2.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq3.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/remoteCasMultiplier.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/remoteSerializer.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/tempQ1.xml incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/vmBkrBad.xml Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/dd2spring.xsl URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/dd2spring.xsl?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/dd2spring.xsl (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/scripts/dd2spring.xsl Thu Apr 2 20:11:42 2009 @@ -98,7 +98,7 @@ <!-- collect unique instances of queue brokers where we need generate a broker factory. - Omit vm://localBroker ones - those use a common factory for this node + obsolete ->> Jira UIMA-1288 Omit vm://localBroker ones - those use a common factory for this node Include remotes if the replyQueue is "remote" --> @@ -120,7 +120,7 @@ --> <xsl:for-each-group group-by="@brokerURL" select="$ddd//u:inputQueue - [ @brokerURL ne 'vm://localhost' ]"> + [ @brokerURL ne 'vm://localhost' ]"> <!--xsl:message select="('*** ', ..)"/--> <xsl:sequence select="."/> </xsl:for-each-group> @@ -1264,13 +1264,14 @@ <xsl:template name="generateStandardBeans"> - <!-- need an internal broker if any of the following are true --> + <!-- no longer true need an internal broker if any of the following are true --> <!-- A service is async = true (implies aggregate) or The service specifies its input queue as "vm:..." --> <!-- only generate for inputq = localhost. async=true handled with Java queue --> <!-- removed: boolean(u:service/u:analysisEngine[@async eq 'true']) or --> + <!-- next removed per Jira UIMA-1288 <xsl:if test="boolean(u:service/u:inputQueue[@brokerURL='vm://localhost'])"> @@ -1282,8 +1283,10 @@ <property name="prefetchPolicy" ref="prefetchPolicy"/> </bean> </xsl:if> + --> <!-- no longer for async=true, only for inputq = localhost --> + <!-- next removed per Jira UIMA-1288 <xsl:if test="boolean(u:service/u:inputQueue[@brokerURL='vm://localhost'])"> <xsl:sequence select="f:generateLineComment('Deploys a co-located broker',3)"/> <bean id="brokerDeployerService" class="org.apache.uima.adapter.jms.activemq.BrokerDeployer"> @@ -1291,6 +1294,7 @@ </bean> </xsl:if> + --> <!-- <xsl:message select="$uniqueInputQueueBrokers"/> <xsl:message select="name($uniqueInputQueueBrokers/u:inputQueue)"/> @@ -1342,6 +1346,11 @@ </xsl:if> </bean> + <!-- create bean to do placeholder substitution Jira UIMA-1288 --> + <bean id="placeholderSubstitution" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/> + </bean> + <!-- Creates a Shared Cache --> <xsl:sequence select="f:generateLineComment('Creates a Shared Cache',3)"/> <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache" /> @@ -1503,7 +1512,8 @@ <xsl:choose> <xsl:when test="u:inputQueue"> - <xsl:if test="not(starts-with(u:inputQueue/@brokerURL, 'tcp://'))"> + <xsl:if test="not(starts-with(u:inputQueue/@brokerURL, 'tcp://')) and + not(starts-with(u:inputQueue/@brokerURL, '${'))"> <xsl:sequence select="f:msgWithLineNumber( 'ERROR', 'top level input Queue broker protocol must be tcp:// for a top level C++ component', @@ -1585,6 +1595,12 @@ <!--xsl:message select="'ERROR: missing endpoint name in inputQueue element'"/--> <xsl:message select="."/> </xsl:if> + <xsl:if test="@brokerURL eq 'vm://localhost'"> + <xsl:sequence select="f:msgWithLineNumber( + 'ERROR', + 'broker protocol of vm://localhost not supported', + .)"/> + </xsl:if> <xsl:choose> <xsl:when test="../../u:remoteAnalysisEngine"> <xsl:choose> @@ -2486,13 +2502,23 @@ <xsl:function name="f:getQbrokerID"> <xsl:param name="inputQueue"/> - <xsl:variable name="u" select= - "replace( - replace( - replace($inputQueue/@brokerURL,':','_c_') - ,'//','_ss_') - ,'/', '_s_')"/> - + <xsl:variable name="u"> + <xsl:choose> + <xsl:when test="starts-with($inputQueue/@brokerURL, '${')"> + <xsl:sequence select= + "replace(replace($inputQueue/@brokerURL, '\$\{', ''), '\}', '')"/> + </xsl:when> + <xsl:otherwise> + <xsl:sequence select= + "replace( + replace( + replace($inputQueue/@brokerURL,':','_c_') + ,'//','_ss_') + ,'/', '_s_')"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + <xsl:sequence select="concat('qBroker_',$u)"/> </xsl:function> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/java/org/apache/uima/as/dd/Dd2SpringTest.java URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/java/org/apache/uima/as/dd/Dd2SpringTest.java?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/java/org/apache/uima/as/dd/Dd2SpringTest.java (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/java/org/apache/uima/as/dd/Dd2SpringTest.java Thu Apr 2 20:11:42 2009 @@ -90,6 +90,10 @@ } + public void testDd2Spring_var1() throws Exception { + checkDd2Spring("var1.xml"); + } + public void testDd2Spring_CMAggregateWithCollocatedCM() throws Exception { checkDd2Spring("Deploy_CMAggregateWithCollocatedCM.xml"); } @@ -177,7 +181,8 @@ public void testDd2Spring_CPPwrongProtocol() throws Exception { checkDd2SpringErrMsg( "envVar/envVarCPPwrongProtocol.xml", - "running test envVar/envVarCPPwrongProtocol.xml: \n *** ERROR: line-number: 28 top level input Queue broker protocol must be tcp:// for a top level C++ component"); + "running test envVar/envVarCPPwrongProtocol.xml: \n *** ERROR: line-number: 28 top level input Queue broker protocol must be tcp:// for a top level C++ component" + + "\n *** ERROR: line-number: 31 broker protocol of vm://localhost not supported"); } Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_AggregateUsingRemoteTempQueue.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_AggregateUsingRemoteTempQueue.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_AggregateUsingRemoteTempQueue.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_AggregateUsingRemoteTempQueue.xml Thu Apr 2 20:11:42 2009 @@ -2,7 +2,7 @@ <!--==================================================================================--> <!-- Generated from --> <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/Deploy_AggregateUsingRemoteTempQueue.xml --> - <!-- 26 March, 2009, 4:18:34 P.M. --> + <!-- 2 April, 2009, 11:37:31 A.M. --> <!--==================================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> @@ -40,6 +40,10 @@ <!-- Initial heap size for CASes --> <property name="initialFsHeapSize" value="2000000"/> </bean> + <bean id="placeholderSubstitution" + class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/> + </bean> <!-- Creates a Shared Cache --> <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/> @@ -216,7 +220,7 @@ <!-- Queue name used for replies, on the remote broker --> <property name="replyToEndpoint" - value="rmtRtrnQ_TopLevelTaeQueue_1_NoOp_83.161.120.155-4dec76eb:120446f1dde:-8000"/> + value="rmtRtrnQ_TopLevelTaeQueue_1_NoOp_83.161.120.155-74792c12:120677a5611:-8000"/> <!-- Timeouts --> <property name="metadataRequestTimeout" value="4000"/> @@ -281,7 +285,7 @@ <bean id="rmtRtrnQ_TopLevelTaeQueue_1_NoOp" class="org.apache.activemq.command.ActiveMQQueue"> <constructor-arg index="0" - value="rmtRtrnQ_TopLevelTaeQueue_1_NoOp_83.161.120.155-4dec76eb:120446f1dde:-8000"/> + value="rmtRtrnQ_TopLevelTaeQueue_1_NoOp_83.161.120.155-74792c12:120677a5611:-8000"/> </bean> <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_CMAggregateWithCollocatedCM.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_CMAggregateWithCollocatedCM.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_CMAggregateWithCollocatedCM.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_CMAggregateWithCollocatedCM.xml Thu Apr 2 20:11:42 2009 @@ -2,7 +2,7 @@ <!--==================================================================================--> <!-- Generated from --> <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/Deploy_CMAggregateWithCollocatedCM.xml --> - <!-- 26 March, 2009, 4:03:55 P.M. --> + <!-- 2 April, 2009, 11:37:33 A.M. --> <!--==================================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> @@ -40,6 +40,10 @@ <!-- Initial heap size for CASes --> <property name="initialFsHeapSize" value="2000000"/> </bean> + <bean id="placeholderSubstitution" + class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/> + </bean> <!-- Creates a Shared Cache --> <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/> @@ -244,7 +248,7 @@ <!-- Queue name used for replies, on the remote broker --> <property name="replyToEndpoint" - value="rmtRtrnQ_InnerAggregateQueue_1_RemoteNoOp_83.161.120.155-2fa7c25b:1204461b724:-8000"/> + value="rmtRtrnQ_InnerAggregateQueue_1_RemoteNoOp_83.161.120.155-13e17b06:120677a5eeb:-8000"/> <!-- Timeouts --> <property name="metadataRequestTimeout" value="0"/> @@ -330,7 +334,7 @@ <bean id="rmtRtrnQ_InnerAggregateQueue_1_RemoteNoOp" class="org.apache.activemq.command.ActiveMQQueue"> <constructor-arg index="0" - value="rmtRtrnQ_InnerAggregateQueue_1_RemoteNoOp_83.161.120.155-2fa7c25b:1204461b724:-8000"/> + value="rmtRtrnQ_InnerAggregateQueue_1_RemoteNoOp_83.161.120.155-13e17b06:120677a5eeb:-8000"/> </bean> <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_ComplexAggregateWithInnerAggregateCM.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_ComplexAggregateWithInnerAggregateCM.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_ComplexAggregateWithInnerAggregateCM.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_ComplexAggregateWithInnerAggregateCM.xml Thu Apr 2 20:11:42 2009 @@ -2,7 +2,7 @@ <!--==================================================================================--> <!-- Generated from --> <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/Deploy_ComplexAggregateWithInnerAggregateCM.xml --> - <!-- 26 March, 2009, 4:03:56 P.M. --> + <!-- 2 April, 2009, 11:37:36 A.M. --> <!--==================================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> @@ -40,6 +40,10 @@ <!-- Initial heap size for CASes --> <property name="initialFsHeapSize" value="2000000"/> </bean> + <bean id="placeholderSubstitution" + class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/> + </bean> <!-- Creates a Shared Cache --> <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_MeetingFinder.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_MeetingFinder.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_MeetingFinder.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/Deploy_MeetingFinder.xml Thu Apr 2 20:11:42 2009 @@ -2,7 +2,7 @@ <!--==================================================================================--> <!-- Generated from --> <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/Deploy_MeetingFinder.xml --> - <!-- 26 March, 2009, 4:19:06 P.M. --> + <!-- 2 April, 2009, 11:37:38 A.M. --> <!--==================================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> @@ -40,6 +40,10 @@ <!-- Initial heap size for CASes --> <property name="initialFsHeapSize" value="2000000"/> </bean> + <bean id="placeholderSubstitution" + class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/> + </bean> <!-- Creates a Shared Cache --> <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/aggrRmtConcurrentReply.xml Thu Apr 2 20:11:42 2009 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!--==================================================================================--> - <!-- Generated from --> - <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/aggrRmtConcurrentReply.xml --> - <!-- 9 January, 2009, 1:45:24 P.M. --> + <!-- Generated from --> + <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/aggrRmtConcurrentReply.xml --> + <!-- 2 April, 2009, 11:37:11 A.M. --> <!--==================================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> @@ -56,6 +56,10 @@ <!-- Initial heap size for CASes --> <property name="initialFsHeapSize" value="2000000"/> </bean> + <bean id="placeholderSubstitution" + class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/> + </bean> <!-- Creates a Shared Cache --> <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/> @@ -118,7 +122,7 @@ </constructor-arg> <constructor-arg index="1" value="RoomNumberAnnotatorQueue"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/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"/> @@ -215,7 +219,7 @@ <!-- Queue name used for replies, on the remote broker --> <property name="replyToEndpoint" - value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_83.161.120.155-628e130c:11ebcb68398:-8000"/> + value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_83.161.120.15559f0db9f:120677a067a:-8000"/> <!-- Timeouts --> <property name="metadataRequestTimeout" value="60000"/> @@ -304,7 +308,7 @@ <bean id="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime" class="org.apache.activemq.command.ActiveMQQueue"> <constructor-arg index="0" - value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_83.161.120.155-628e130c:11ebcb68398:-8000"/> + value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_83.161.120.15559f0db9f:120677a067a:-8000"/> </bean> <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> @@ -468,7 +472,7 @@ <!-- Key name --> <constructor-arg index="1" value="RoomNumber"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> @@ -489,7 +493,7 @@ <!-- Key name --> <constructor-arg index="1" value="Meeting"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/coLocatedCasMultiplier.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/coLocatedCasMultiplier.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/coLocatedCasMultiplier.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/coLocatedCasMultiplier.xml Thu Apr 2 20:11:42 2009 @@ -2,7 +2,7 @@ <!--==================================================================================--> <!-- Generated from --> <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/coLocatedCasMultiplier.xml --> - <!-- 26 March, 2009, 4:03:49 P.M. --> + <!-- 2 April, 2009, 11:37:13 A.M. --> <!--==================================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> @@ -40,6 +40,10 @@ <!-- Initial heap size for CASes --> <property name="initialFsHeapSize" value="2000000"/> </bean> + <bean id="placeholderSubstitution" + class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/> + </bean> <!-- Creates a Shared Cache --> <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAE.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAE.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAE.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAE.xml Thu Apr 2 20:11:42 2009 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--==========================================================================--> - <!-- Generated from --> - <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/defaultingAE.xml --> - <!-- 9 January, 2009, 1:45:37 P.M. --> - <!--==========================================================================--> +<!--==================================================================================--> + <!-- Generated from --> + <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/defaultingAE.xml --> + <!-- 2 April, 2009, 11:37:20 A.M. --> + <!--==================================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> <beans> @@ -40,6 +40,10 @@ <!-- Initial heap size for CASes --> <property name="initialFsHeapSize" value="2000000"/> </bean> + <bean id="placeholderSubstitution" + class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/> + </bean> <!-- Creates a Shared Cache --> <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/> @@ -87,7 +91,7 @@ <!-- Key name --> <constructor-arg index="1" value="RoomNumberAnnotatorQueue"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAEaggr.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAEaggr.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAEaggr.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAEaggr.xml Thu Apr 2 20:11:42 2009 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--==============================================================================--> - <!-- Generated from --> - <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/defaultingAEaggr.xml --> - <!-- 9 January, 2009, 1:45:40 P.M. --> - <!--==============================================================================--> +<!--==================================================================================--> + <!-- Generated from --> + <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/defaultingAEaggr.xml --> + <!-- 2 April, 2009, 11:37:24 A.M. --> + <!--==================================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> <beans> @@ -40,6 +40,10 @@ <!-- Initial heap size for CASes --> <property name="initialFsHeapSize" value="2000000"/> </bean> + <bean id="placeholderSubstitution" + class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/> + </bean> <!-- Creates a Shared Cache --> <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/> @@ -87,7 +91,7 @@ <!-- Key name --> <constructor-arg index="1" value="RoomNumberAnnotatorQueue"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAEaggrAsync.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAEaggrAsync.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAEaggrAsync.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingAEaggrAsync.xml Thu Apr 2 20:11:42 2009 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!--==================================================================================--> - <!-- Generated from --> - <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/defaultingAEaggrAsync.xml --> - <!-- 9 January, 2009, 1:45:44 P.M. --> + <!-- Generated from --> + <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/defaultingAEaggrAsync.xml --> + <!-- 2 April, 2009, 11:37:27 A.M. --> <!--==================================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> @@ -40,6 +40,10 @@ <!-- Initial heap size for CASes --> <property name="initialFsHeapSize" value="2000000"/> </bean> + <bean id="placeholderSubstitution" + class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/> + </bean> <!-- Creates a Shared Cache --> <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/> @@ -102,7 +106,7 @@ </constructor-arg> <constructor-arg index="1" value="RoomNumberAnnotatorQueue"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/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"/> @@ -367,7 +371,7 @@ <!-- Key name --> <constructor-arg index="1" value="RoomNumber"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> @@ -388,7 +392,7 @@ <!-- Key name --> <constructor-arg index="1" value="DateTime"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex3/TutorialDateTime.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex3/TutorialDateTime.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> @@ -409,7 +413,7 @@ <!-- Key name --> <constructor-arg index="1" value="Meeting"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingPrimAEMultInstance.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingPrimAEMultInstance.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingPrimAEMultInstance.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/defaultingPrimAEMultInstance.xml Thu Apr 2 20:11:42 2009 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!--==================================================================================--> - <!-- Generated from --> - <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/defaultingPrimAEMultInstance.xml --> - <!-- 9 January, 2009, 1:45:47 P.M. --> + <!-- Generated from --> + <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/defaultingPrimAEMultInstance.xml --> + <!-- 2 April, 2009, 11:37:29 A.M. --> <!--==================================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> @@ -40,6 +40,10 @@ <!-- Initial heap size for CASes --> <property name="initialFsHeapSize" value="2000000"/> </bean> + <bean id="placeholderSubstitution" + class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/> + </bean> <!-- Creates a Shared Cache --> <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/> @@ -87,7 +91,7 @@ <!-- Key name --> <constructor-arg index="1" value="RoomNumberAnnotatorQueue"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPP.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPP.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPP.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPP.xml Thu Apr 2 20:11:42 2009 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--==============================================================================--> - <!-- Generated from --> - <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/envVar/envVarCPP.xml --> - <!-- 9 January, 2009, 1:45:11 P.M. --> - <!--==============================================================================--> +<!--==================================================================================--> + <!-- Generated from --> + <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/envVar/envVarCPP.xml --> + <!-- 2 April, 2009, 11:37:01 A.M. --> + <!--==================================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> <beans> @@ -15,7 +15,7 @@ <!-- path to top level descriptor --> <constructor-arg index="0" - value="file:/C:/apache/uima-as-distr/src/test/resources/deploy/envVar/cppDescr.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/envVar/cppDescr.xml"/> <!-- input q name --> <constructor-arg index="1" value="MeetingDetectorTaeQueue"/> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPP1.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPP1.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPP1.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPP1.xml Thu Apr 2 20:11:42 2009 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--===============================================================================--> - <!-- Generated from --> - <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/envVar/envVarCPP1.xml --> - <!-- 9 January, 2009, 1:45:14 P.M. --> - <!--===============================================================================--> +<!--==================================================================================--> + <!-- Generated from --> + <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/envVar/envVarCPP1.xml --> + <!-- 2 April, 2009, 11:37:05 A.M. --> + <!--==================================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> <beans> @@ -18,7 +18,7 @@ <!-- path to top level descriptor --> <constructor-arg index="0" - value="file:/C:/apache/uima-as-distr/src/test/resources/deploy/envVar/cppDescr.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/envVar/cppDescr.xml"/> <!-- input q name --> <constructor-arg index="1" value="MeetingDetectorTaeQueue"/> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPPwrongProtocol.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPPwrongProtocol.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPPwrongProtocol.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarCPPwrongProtocol.xml Thu Apr 2 20:11:42 2009 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!--==================================================================================--> - <!-- Generated from --> - <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/envVar/envVarCPPwrongProtocol.xml --> - <!-- 9 January, 2009, 1:45:17 P.M. --> + <!-- Generated from --> + <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/envVar/envVarCPPwrongProtocol.xml --> + <!-- 2 April, 2009, 11:43:02 A.M. --> <!--==================================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> @@ -15,7 +15,7 @@ <!-- path to top level descriptor --> <constructor-arg index="0" - value="file:/C:/apache/uima-as-distr/src/test/resources/deploy/envVar/cppDescr.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/envVar/cppDescr.xml"/> <!-- input q name --> <constructor-arg index="1" value="MeetingDetectorTaeQueue"/> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarNotCPP.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarNotCPP.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarNotCPP.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/envVar/envVarNotCPP.xml Thu Apr 2 20:11:42 2009 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--=================================================================================--> - <!-- Generated from --> - <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/envVar/envVarNotCPP.xml --> - <!-- 9 January, 2009, 1:45:21 P.M. --> - <!--=================================================================================--> +<!--==================================================================================--> + <!-- Generated from --> + <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/envVar/envVarNotCPP.xml --> + <!-- 2 April, 2009, 11:37:09 A.M. --> + <!--==================================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> <beans> @@ -40,6 +40,10 @@ <!-- Initial heap size for CASes --> <property name="initialFsHeapSize" value="2000000"/> </bean> + <bean id="placeholderSubstitution" + class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/> + </bean> <!-- Creates a Shared Cache --> <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/> @@ -87,7 +91,7 @@ <!-- Key name --> <constructor-arg index="1" value="MeetingDetectorTaeQueue"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq1AE.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq1AE.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq1AE.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq1AE.xml Thu Apr 2 20:11:42 2009 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--===================================================================--> - <!-- Generated from --> - <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/iq1AE.xml --> - <!-- 9 January, 2009, 1:45:57 P.M. --> - <!--===================================================================--> +<!--=============================================================================--> + <!-- Generated from --> + <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/iq1AE.xml --> + <!-- 2 April, 2009, 11:37:40 A.M. --> + <!--=============================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> <beans> @@ -40,6 +40,10 @@ <!-- Initial heap size for CASes --> <property name="initialFsHeapSize" value="2000000"/> </bean> + <bean id="placeholderSubstitution" + class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/> + </bean> <!-- Creates a Shared Cache --> <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/> @@ -87,7 +91,7 @@ <!-- Key name --> <constructor-arg index="1" value="RoomNumberAnnotatorQueue"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AE.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AE.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AE.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AE.xml Thu Apr 2 20:11:42 2009 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--===================================================================--> - <!-- Generated from --> - <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/iq2AE.xml --> - <!-- 9 January, 2009, 1:46:00 P.M. --> - <!--===================================================================--> +<!--=============================================================================--> + <!-- Generated from --> + <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/iq2AE.xml --> + <!-- 2 April, 2009, 11:37:42 A.M. --> + <!--=============================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> <beans> @@ -40,6 +40,10 @@ <!-- Initial heap size for CASes --> <property name="initialFsHeapSize" value="2000000"/> </bean> + <bean id="placeholderSubstitution" + class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/> + </bean> <!-- Creates a Shared Cache --> <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/> @@ -87,7 +91,7 @@ <!-- Key name --> <constructor-arg index="1" value="RoomNumberAnnotatorQueue"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex2/RoomNumberAnnotator.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AEg.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AEg.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AEg.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AEg.xml Thu Apr 2 20:11:42 2009 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--====================================================================--> - <!-- Generated from --> - <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/iq2AEg.xml --> - <!-- 9 January, 2009, 1:46:03 P.M. --> - <!--====================================================================--> +<!--==============================================================================--> + <!-- Generated from --> + <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/iq2AEg.xml --> + <!-- 2 April, 2009, 11:37:43 A.M. --> + <!--==============================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> <beans> @@ -40,6 +40,10 @@ <!-- Initial heap size for CASes --> <property name="initialFsHeapSize" value="2000000"/> </bean> + <bean id="placeholderSubstitution" + class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/> + </bean> <!-- Creates a Shared Cache --> <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/> @@ -102,7 +106,7 @@ </constructor-arg> <constructor-arg index="1" value="RoomNumberAnnotatorQueue"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/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"/> @@ -367,7 +371,7 @@ <!-- Key name --> <constructor-arg index="1" value="RoomNumber"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> @@ -388,7 +392,7 @@ <!-- Key name --> <constructor-arg index="1" value="DateTime"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex3/TutorialDateTime.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex3/TutorialDateTime.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> @@ -409,7 +413,7 @@ <!-- Key name --> <constructor-arg index="1" value="Meeting"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AEg2.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AEg2.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AEg2.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq2AEg2.xml Thu Apr 2 20:11:42 2009 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--=====================================================================--> - <!-- Generated from --> - <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/iq2AEg2.xml --> - <!-- 9 January, 2009, 1:46:07 P.M. --> - <!--=====================================================================--> +<!--===============================================================================--> + <!-- Generated from --> + <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/iq2AEg2.xml --> + <!-- 2 April, 2009, 11:37:47 A.M. --> + <!--===============================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> <beans> @@ -40,6 +40,10 @@ <!-- Initial heap size for CASes --> <property name="initialFsHeapSize" value="2000000"/> </bean> + <bean id="placeholderSubstitution" + class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/> + </bean> <!-- Creates a Shared Cache --> <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/> @@ -102,7 +106,7 @@ </constructor-arg> <constructor-arg index="1" value="RoomNumberAnnotatorQueue"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/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"/> @@ -367,7 +371,7 @@ <!-- Key name --> <constructor-arg index="1" value="RoomNumber"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> @@ -388,7 +392,7 @@ <!-- Key name --> <constructor-arg index="1" value="DateTime"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex3/TutorialDateTime.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex3/TutorialDateTime.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> @@ -409,7 +413,7 @@ <!-- Key name --> <constructor-arg index="1" value="Meeting"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq3.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq3.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq3.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/iq3.xml Thu Apr 2 20:11:42 2009 @@ -2,7 +2,7 @@ <!--===========================================================================--> <!-- Generated from --> <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/iq3.xml --> - <!-- 26 March, 2009, 4:04:02 P.M. --> + <!-- 2 April, 2009, 11:37:49 A.M. --> <!--===========================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> @@ -56,6 +56,10 @@ <!-- Initial heap size for CASes --> <property name="initialFsHeapSize" value="2000000"/> </bean> + <bean id="placeholderSubstitution" + class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/> + </bean> <!-- Creates a Shared Cache --> <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/> @@ -206,7 +210,7 @@ <!-- Queue name used for replies, on the remote broker --> <property name="replyToEndpoint" - value="rmtRtrnQ_MeetingDetectorTaeQueue_1_Segmenter_83.161.120.1551beb7ed1:1204461cf8e:-8000"/> + value="rmtRtrnQ_MeetingDetectorTaeQueue_1_Segmenter_83.161.120.1554ba097ee:120677a9b96:-8000"/> <property name="shadowCasPoolSize" value="7"/> <property name="initialFsHeapSize" value="999"/> <property name="processParentLast" value="false"/> @@ -298,7 +302,7 @@ <bean id="rmtRtrnQ_MeetingDetectorTaeQueue_1_Segmenter" class="org.apache.activemq.command.ActiveMQQueue"> <constructor-arg index="0" - value="rmtRtrnQ_MeetingDetectorTaeQueue_1_Segmenter_83.161.120.1551beb7ed1:1204461cf8e:-8000"/> + value="rmtRtrnQ_MeetingDetectorTaeQueue_1_Segmenter_83.161.120.1554ba097ee:120677a9b96:-8000"/> </bean> <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/remoteCasMultiplier.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/remoteCasMultiplier.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/remoteCasMultiplier.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/remoteCasMultiplier.xml Thu Apr 2 20:11:42 2009 @@ -2,7 +2,7 @@ <!--==================================================================================--> <!-- Generated from --> <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/remoteCasMultiplier.xml --> - <!-- 26 March, 2009, 4:04:02 P.M. --> + <!-- 2 April, 2009, 11:37:51 A.M. --> <!--==================================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> @@ -40,6 +40,10 @@ <!-- Initial heap size for CASes --> <property name="initialFsHeapSize" value="2000000"/> </bean> + <bean id="placeholderSubstitution" + class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/> + </bean> <!-- Creates a Shared Cache --> <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/> @@ -190,7 +194,7 @@ <!-- Queue name used for replies, on the remote broker --> <property name="replyToEndpoint" - value="rmtRtrnQ_MeetingDetectorTaeQueue_1_Segmenter_83.161.120.1557ff8661c:1204461d2f9:-8000"/> + value="rmtRtrnQ_MeetingDetectorTaeQueue_1_Segmenter_83.161.120.1556053bc13:120677aa4fd:-8000"/> <property name="shadowCasPoolSize" value="7"/> <property name="initialFsHeapSize" value="999"/> <property name="processParentLast" value="false"/> @@ -282,7 +286,7 @@ <bean id="rmtRtrnQ_MeetingDetectorTaeQueue_1_Segmenter" class="org.apache.activemq.command.ActiveMQQueue"> <constructor-arg index="0" - value="rmtRtrnQ_MeetingDetectorTaeQueue_1_Segmenter_83.161.120.1557ff8661c:1204461d2f9:-8000"/> + value="rmtRtrnQ_MeetingDetectorTaeQueue_1_Segmenter_83.161.120.1556053bc13:120677aa4fd:-8000"/> </bean> <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/remoteSerializer.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/remoteSerializer.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/remoteSerializer.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/remoteSerializer.xml Thu Apr 2 20:11:42 2009 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--==============================================================================--> - <!-- Generated from --> - <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/remoteSerializer.xml --> - <!-- 9 January, 2009, 1:46:17 P.M. --> - <!--==============================================================================--> +<!--==================================================================================--> + <!-- Generated from --> + <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/remoteSerializer.xml --> + <!-- 2 April, 2009, 11:37:54 A.M. --> + <!--==================================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> <beans> @@ -56,6 +56,10 @@ <!-- Initial heap size for CASes --> <property name="initialFsHeapSize" value="2000000"/> </bean> + <bean id="placeholderSubstitution" + class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/> + </bean> <!-- Creates a Shared Cache --> <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/> @@ -118,7 +122,7 @@ </constructor-arg> <constructor-arg index="1" value="RoomNumberAnnotatorQueue"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/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"/> @@ -215,7 +219,7 @@ <!-- Queue name used for replies, on the remote broker --> <property name="replyToEndpoint" - value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_83.161.120.1551c3252cf:11ebcb7531e:-8000"/> + value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_83.161.120.155-719c910d:120677aae72:-8000"/> <!-- Timeouts --> <property name="metadataRequestTimeout" value="60000"/> @@ -304,7 +308,7 @@ <bean id="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime" class="org.apache.activemq.command.ActiveMQQueue"> <constructor-arg index="0" - value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_83.161.120.1551c3252cf:11ebcb7531e:-8000"/> + value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_DateTime_83.161.120.155-719c910d:120677aae72:-8000"/> </bean> <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> @@ -468,7 +472,7 @@ <!-- Key name --> <constructor-arg index="1" value="RoomNumber"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex2/RoomNumberAnnotator.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> @@ -489,7 +493,7 @@ <!-- Key name --> <constructor-arg index="1" value="Meeting"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/tempQ1.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/tempQ1.xml?rev=761408&r1=761407&r2=761408&view=diff ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/tempQ1.xml (original) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/tempQ1.xml Thu Apr 2 20:11:42 2009 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--====================================================================--> - <!-- Generated from --> - <!-- file:/C:/apache/uima-as-distr/src/test/resources/deploy/tempQ1.xml --> - <!-- 9 January, 2009, 1:46:20 P.M. --> - <!--====================================================================--> +<!--==============================================================================--> + <!-- Generated from --> + <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/tempQ1.xml --> + <!-- 2 April, 2009, 11:37:56 A.M. --> + <!--==============================================================================--> <!DOCTYPE beans PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> <beans> @@ -40,6 +40,10 @@ <!-- Initial heap size for CASes --> <property name="initialFsHeapSize" value="2000000"/> </bean> + <bean id="placeholderSubstitution" + class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"> + <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/> + </bean> <!-- Creates a Shared Cache --> <bean id="inProcessCache" class="org.apache.uima.aae.InProcessCache"/> @@ -102,7 +106,7 @@ </constructor-arg> <constructor-arg index="1" value="RoomNumberAnnotatorQueue"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingDetectorTAE.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/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"/> @@ -179,7 +183,7 @@ <!-- Queue name used for replies, on the remote broker --> <property name="replyToEndpoint" - value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_RoomNumber_83.161.120.155-6cf4c2e2:11ebcb7602d:-8000"/> + value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_RoomNumber_83.161.120.1555aba5165:120677ab77b:-8000"/> <!-- Timeouts --> <property name="metadataRequestTimeout" value="60000"/> @@ -288,7 +292,7 @@ <bean id="rmtRtrnQ_RoomNumberAnnotatorQueue_1_RoomNumber" class="org.apache.activemq.command.ActiveMQQueue"> <constructor-arg index="0" - value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_RoomNumber_83.161.120.155-6cf4c2e2:11ebcb7602d:-8000"/> + value="rmtRtrnQ_RoomNumberAnnotatorQueue_1_RoomNumber_83.161.120.1555aba5165:120677ab77b:-8000"/> </bean> <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> @@ -452,7 +456,7 @@ <!-- Key name --> <constructor-arg index="1" value="DateTime"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex3/TutorialDateTime.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/../ex3/TutorialDateTime.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> @@ -473,7 +477,7 @@ <!-- Key name --> <constructor-arg index="1" value="Meeting"/> <constructor-arg index="2" - value="file:/C:/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/> + value="file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/descriptors/tutorial/ex4/MeetingAnnotator.xml"/> <constructor-arg index="3" ref="casManager"/> <constructor-arg index="4" ref="inProcessCache"/> From uima-commits-returnjenniferbrown@example.org Thu Apr 02 20:12:14 2009 Return-Path: <uima-commits-returnjenniferbrown@example.org> Delivered-To: jenniferbrown@example.org Received: (qmail 38800 invoked from network); 2 Apr 2009 20:12:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Apr 2009 20:12:14 -0000 Received: (qmail 33837 invoked by uid 500); 2 Apr 2009 20:12:14 -0000 Delivered-To: jenniferbrown@example.org Received: (qmail 33820 invoked by uid 500); 2 Apr 2009 20:12:14 -0000 Mailing-List: contact jenniferbrown@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:jenniferbrown@example.org> List-Unsubscribe: <mailto:jenniferbrown@example.org> List-Post: <mailto:jenniferbrown@example.org> List-Id: <uima-commits.incubator.apache.org> Reply-To: jenniferbrown@example.org Delivered-To: mailing list jenniferbrown@example.org Received: (qmail 33811 invoked by uid 99); 2 Apr 2009 20:12:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 20:12:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 20:12:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 53F732388A76; Thu, 2 Apr 2009 20:11:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r761408 [2/2] - in /incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src: main/scripts/ test/java/org/apache/uima/as/dd/ test/resources/deploy/ test/resources/deploy/expected/ test/resources/deploy/expected/envVar/ Date: Thu, 02 Apr 2009 20:11:43 -0000 To: jenniferbrown@example.org From: jenniferbrown@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <jenniferbrown@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Added: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/var1.xml URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/var1.xml?rev=761408&view=auto ============================================================================== --- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/var1.xml (added) +++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/test/resources/deploy/expected/var1.xml Thu Apr 2 20:11:42 2009 @@ -0,0 +1,466 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--============================================================================--> + <!-- Generated from --> + <!-- file:/C:/a/Eclipse/apache/uima-as-distr/src/test/resources/deploy/var1.xml --> + <!-- 2 April, 2009, 11:37:59 A.M. --> + <!--============================================================================--> + <!DOCTYPE beans + PUBLIC "-//Spring//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> +<beans> + + <!-- Factory for specific external queue broker: --> + <!-- ${someVarName} --> + <bean id="qBroker_someVarName" class="org.apache.activemq.ActiveMQConnectionFactory"> + <property name="brokerURL" value="${someVarName}"/> + <property name="prefetchPolicy" ref="prefetchPolicy"/> + </bean> + + <!-- Factory for specific external queue broker: --> + <!-- ${someInnerVarName} --> + <bean id="qBroker_someInnerVarName" + class="org.apache.activemq.ActiveMQConnectionFactory"> + <property name="brokerURL" value="${someInnerVarName}"/> + <property name="prefetchPolicy" ref="prefetchPolicy"/> + </bean> + + <!-- Factory for specific external queue broker: --> + <!-- ${someVarName} --> + <bean id="qBroker_someVarName-reply" + class="org.apache.activemq.ActiveMQConnectionFactory"> + <property name="brokerURL" value="${someVarName}"/> + <property name="prefetchPolicy" ref="prefetchPolicy-reply"/> + </bean> + + <!-- Factory for specific external queue broker: --> + <!-- ${someInnerVarName} --> + <bean id="qBroker_someInnerVarName-reply" + class="org.apache.activemq.ActiveMQConnectionFactory"> + <property name="brokerURL" value="${someInnerVarName}"/> + <property name="prefetchPolicy" ref="prefetchPolicy-reply"/> + </bean> +
{'source': 'Apache Software Foundation Public Mail Archives'}