You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2008/03/20 21:15:43 UTC

svn commit: r639436 - /incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/SpringContainerDeployer.java

Author: schor
Date: Thu Mar 20 13:15:43 2008
New Revision: 639436

URL: http://svn.apache.org/viewvc?rev=639436&view=rev
Log:
[UIMA-922] add file: to file path arg for FileSystemXmlApplicationContext to make work on Linux.

Modified:
    incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/SpringContainerDeployer.java

Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/SpringContainerDeployer.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/SpringContainerDeployer.java?rev=639436&r1=639435&r2=639436&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/SpringContainerDeployer.java (original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/SpringContainerDeployer.java Thu Mar 20 13:15:43 2008
@@ -194,6 +194,9 @@
 			// synchronous ( one bean at a time), some beans run in a separate
 			// threads. The completion of container deployment doesnt
 			// necessarily mean that all beans have initialized completely.
+		    if (!springContextFile.startsWith("file:")) {
+		      springContextFile = "file:" + springContextFile;
+		    }
 			ApplicationContext ctx = new FileSystemXmlApplicationContext(springContextFile);
 			return initializeContainer(ctx);
 		} catch (ResourceInitializationException e) {
@@ -213,8 +216,10 @@
 		}
 		//	Log context files
 		for (int i = 0; i < springContextFiles.length; i++) {
-			springContextFiles[i] = "file:" + springContextFiles[i];
-			UIMAFramework.getLogger(CLASS_NAME).logrb(Level.CONFIG, CLASS_NAME.getName(), "deploySpringContainer", JmsConstants.JMS_LOG_RESOURCE_BUNDLE, "UIMAJMS_deploy_container__CONFIG", new Object[] { springContextFiles[i] });
+          if (!springContextFiles[i].startsWith("file:")) {
+            springContextFiles[i] = "file:" + springContextFiles[i];
+          }
+		  UIMAFramework.getLogger(CLASS_NAME).logrb(Level.CONFIG, CLASS_NAME.getName(), "deploySpringContainer", JmsConstants.JMS_LOG_RESOURCE_BUNDLE, "UIMAJMS_deploy_container__CONFIG", new Object[] { springContextFiles[i] });
 		}
 		try {
 			// Deploy beans in the Spring container. Although the deployment is