You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by al...@apache.org on 2006/11/28 23:22:44 UTC
svn commit: r480243 [4/13] - in /incubator/uima/uimaj/trunk/uimaj-cpe/src:
main/java/org/apache/uima/cas_data/impl/vinci/
main/java/org/apache/uima/collection/impl/
main/java/org/apache/uima/collection/impl/base_cpm/container/
main/java/org/apache/uima...
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/CPEDeployerDefaultImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/CPEDeployerDefaultImpl.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/CPEDeployerDefaultImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/CPEDeployerDefaultImpl.java Tue Nov 28 14:22:38 2006
@@ -79,7 +79,7 @@
* @return - ProcessingContainer containing pool of CasProcessors
*/
public ProcessingContainer deployCasProcessor(List aCasProcessorList, CPMEngine aEngine,
- boolean redeploy) throws ResourceConfigurationException {
+ boolean redeploy) throws ResourceConfigurationException {
engine = aEngine;
return deployCasProcessor(aCasProcessorList, redeploy);
}
@@ -97,7 +97,7 @@
* @return - ProcessingContainer containing pool of CasProcessors
*/
public ProcessingContainer deployCasProcessor(List aCasProcessorList, boolean redeploy)
- throws ResourceConfigurationException {
+ throws ResourceConfigurationException {
String name = null;
CasProcessor casProcessor = null;
CasProcessorConfiguration casProcessorConfig = null;
@@ -122,7 +122,7 @@
ProcessingResourceMetaData metaData = casProcessor.getProcessingResourceMetaData();
CpeCasProcessor cpeCasProcessor = (CpeCasProcessor) cpeFactory.casProcessorConfigMap
- .get(metaData.getName());
+ .get(metaData.getName());
if (engine != null) {
boolean parallelizable = engine.isParallizable(casProcessor, metaData.getName());
cpeCasProcessor.setIsParallelizable(parallelizable);
@@ -133,48 +133,41 @@
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(
- Level.FINEST,
- this.getClass().getName(),
- "initialize",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_cp_checkpoint__FINEST",
- new Object[] { Thread.currentThread().getName(),
- String.valueOf(casProcessorConfig.getBatchSize()) });// Checkpoint().getBatch())});
+ Level.FINEST,
+ this.getClass().getName(),
+ "initialize",
+ CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_cp_checkpoint__FINEST",
+ new Object[] { Thread.currentThread().getName(),
+ String.valueOf(casProcessorConfig.getBatchSize()) });// Checkpoint().getBatch())});
}
// Associate CasProcessor configuration from CPE descriptor with this container
processingContainer = new ProcessingContainer_Impl(casProcessorConfig, metaData,
- casProcessorPool);
+ casProcessorPool);
// Determine deployment model for this CasProcessor
deployModel = casProcessorConfig.getDeploymentType();
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
- "initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_cp_deployment__FINEST",
- new Object[] { Thread.currentThread().getName(), deployModel });
+ "initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_cp_deployment__FINEST",
+ new Object[] { Thread.currentThread().getName(), deployModel });
}
// Each CasProcessor must have a name
name = casProcessorConfig.getName();
if (name == null) {
if (UIMAFramework.getLogger().isLoggable(Level.SEVERE)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.SEVERE,
- this.getClass().getName(), "initialize",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_cp_no_name__SEVERE",
- new Object[] { Thread.currentThread().getName() });
+ this.getClass().getName(), "initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_cp_no_name__SEVERE",
+ new Object[] { Thread.currentThread().getName() });
}
throw new ResourceConfigurationException(
- InvalidXMLException.REQUIRED_ATTRIBUTE_MISSING,
- new Object[] { "name", "casProcessor" },
- new Exception(
- CpmLocalizedMessage
- .getLocalizedMessage(
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_EXP_missing_attribute_from_xml_element__WARNING",
- new Object[] {
- Thread
- .currentThread()
- .getName(),
- "n/a", "name",
- "casProcessor" })));
+ InvalidXMLException.REQUIRED_ATTRIBUTE_MISSING, new Object[] { "name",
+ "casProcessor" }, new Exception(CpmLocalizedMessage.getLocalizedMessage(
+ CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_EXP_missing_attribute_from_xml_element__WARNING",
+ new Object[] { Thread.currentThread().getName(), "n/a", "name",
+ "casProcessor" })));
}
} else {
// Assumption is that the container already exists and it contains CasProcessor
@@ -182,11 +175,11 @@
casProcessorConfig = processingContainer.getCasProcessorConfiguration();
if (casProcessorConfig == null) {
throw new ResourceConfigurationException(InvalidXMLException.ELEMENT_NOT_FOUND,
- new Object[] { "<casProcessor>", "<casProcessors>" },
- new Exception(CpmLocalizedMessage.getLocalizedMessage(
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_EXP_bad_cpe_descriptor_no_cp__WARNING",
- new Object[] { Thread.currentThread().getName() })));
+ new Object[] { "<casProcessor>", "<casProcessors>" }, new Exception(
+ CpmLocalizedMessage.getLocalizedMessage(
+ CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_EXP_bad_cpe_descriptor_no_cp__WARNING",
+ new Object[] { Thread.currentThread().getName() })));
}
}
// Add CasProcess to the instance pool
@@ -194,9 +187,8 @@
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
- "initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_deploying_cp__FINEST",
- new Object[] { Thread.currentThread().getName(), name });
+ "initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_deploying_cp__FINEST",
+ new Object[] { Thread.currentThread().getName(), name });
}
}
@@ -206,7 +198,7 @@
} catch (Exception e) {
e.printStackTrace();
throw new ResourceConfigurationException(ResourceServiceException.RESOURCE_UNAVAILABLE,
- new Object[] {}, e);
+ new Object[] {}, e);
}
return processingContainer;
}
@@ -219,16 +211,15 @@
* container managing Cas Processor
*/
public void deployCasProcessor(ProcessingContainer aProcessingContainer)
- throws ResourceConfigurationException {
+ throws ResourceConfigurationException {
try {
CasProcessorConfiguration casProcessorConfig = aProcessingContainer
- .getCasProcessorConfiguration();
+ .getCasProcessorConfiguration();
String name = casProcessorConfig.getName();
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
- "initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_redeploying_cp__FINEST",
- new Object[] { Thread.currentThread().getName(), name });
+ "initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_redeploying_cp__FINEST",
+ new Object[] { Thread.currentThread().getName(), name });
}
CasProcessor casProcessor = produceIntegratedCasProcessor(casProcessorConfig.getDescriptor());
casProcessorPool.addCasProcessor(casProcessor);
@@ -238,7 +229,7 @@
} catch (Exception e) {
e.printStackTrace();
throw new ResourceConfigurationException(ResourceServiceException.RESOURCE_UNAVAILABLE,
- new Object[] {}, e);
+ new Object[] {}, e);
}
}
@@ -252,7 +243,7 @@
* @throws ResourceConfigurationException
*/
private CasProcessor produceIntegratedCasProcessor(String aDescriptor)
- throws ResourceConfigurationException {
+ throws ResourceConfigurationException {
CasProcessor casProcessor = null;
try {
if (aDescriptor != null) {
@@ -260,41 +251,38 @@
if (resourceSpecifier instanceof AnalysisEngineDescription) {
casProcessor = UIMAFramework.produceAnalysisEngine(resourceSpecifier, this.cpeFactory
- .getResourceManager(), null);
+ .getResourceManager(), null);
// casProcessor.
} else if (resourceSpecifier instanceof CasConsumerDescription) {
if (cpeFactory.isDefinitionInstanceOf(CasConsumer.class, resourceSpecifier, aDescriptor)) {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST,
- this.getClass().getName(), "initialize",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_producing_cas_consumer__FINEST",
- new Object[] { Thread.currentThread().getName() });
+ this.getClass().getName(), "initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_producing_cas_consumer__FINEST",
+ new Object[] { Thread.currentThread().getName() });
}
casProcessor = UIMAFramework.produceCasConsumer(resourceSpecifier, this.cpeFactory
- .getResourceManager(), null);
+ .getResourceManager(), null);
} else if (cpeFactory.isDefinitionInstanceOf(CasProcessor.class, resourceSpecifier,
- aDescriptor)) {
+ aDescriptor)) {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST,
- this.getClass().getName(), "initialize",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_producing_cas_data_consumer__FINEST",
- new Object[] { Thread.currentThread().getName() });
+ this.getClass().getName(), "initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_producing_cas_data_consumer__FINEST",
+ new Object[] { Thread.currentThread().getName() });
}
casProcessor = cpeFactory.produceCasDataConsumer(CasProcessor.class, resourceSpecifier,
- null);
+ null);
}
}
// Check if CasProcesser has been instantiated
if (casProcessor == null) {
throw new ResourceConfigurationException(ResourceServiceException.RESOURCE_UNAVAILABLE,
- new Object[] {}, new Exception(CpmLocalizedMessage.getLocalizedMessage(
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_EXP_instantiation_exception__WARNING",
- new Object[] { Thread.currentThread().getName(),
- "Integrated Cas Processor" })));
+ new Object[] {}, new Exception(CpmLocalizedMessage.getLocalizedMessage(
+ CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_EXP_instantiation_exception__WARNING", new Object[] {
+ Thread.currentThread().getName(), "Integrated Cas Processor" })));
}
}
} catch (ResourceConfigurationException e) {
@@ -302,11 +290,10 @@
} catch (Exception e) {
e.printStackTrace();
throw new ResourceConfigurationException(ResourceServiceException.RESOURCE_UNAVAILABLE,
- new Object[] {}, new Exception(CpmLocalizedMessage.getLocalizedMessage(
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_EXP_instantiation_exception__WARNING",
- new Object[] { Thread.currentThread().getName(),
- "Integrated Cas Processor" })));
+ new Object[] {}, new Exception(CpmLocalizedMessage.getLocalizedMessage(
+ CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_EXP_instantiation_exception__WARNING", new Object[] {
+ Thread.currentThread().getName(), "Integrated Cas Processor" })));
}
return casProcessor;
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/DeployFactory.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/DeployFactory.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/DeployFactory.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/DeployFactory.java Tue Nov 28 14:22:38 2006
@@ -62,8 +62,8 @@
*/
public static CasProcessorDeployer getDeployer(CPEFactory aCpeFactory,
- CpeCasProcessor aCasProcessorConfig, ProcessControllerAdapter aPca)
- throws ResourceConfigurationException {
+ CpeCasProcessor aCasProcessorConfig, ProcessControllerAdapter aPca)
+ throws ResourceConfigurationException {
String deployMode = aCasProcessorConfig.getDeployment();
if (Constants.DEPLOYMENT_LOCAL.equals(deployMode)) {
@@ -72,18 +72,17 @@
String protocol = getProtocol(aCasProcessorConfig);
if (protocol == null || protocol.trim().length() == 0) {
throw new ResourceConfigurationException(CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_invalid_service_descriptor__SEVERE", new Object[] {
- Thread.currentThread().getName(), "<uriSpecifier>", "<protocol>" },
- new Exception(CpmLocalizedMessage.getLocalizedMessage(
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_EXP_invalid_service_descriptor__WARNING",
- new Object[] { Thread.currentThread().getName(),
- aCasProcessorConfig.getName() })));
+ "UIMA_CPM_invalid_service_descriptor__SEVERE", new Object[] {
+ Thread.currentThread().getName(), "<uriSpecifier>", "<protocol>" },
+ new Exception(CpmLocalizedMessage.getLocalizedMessage(
+ CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_EXP_invalid_service_descriptor__WARNING", new Object[] {
+ Thread.currentThread().getName(), aCasProcessorConfig.getName() })));
} else if (Constants.SOCKET_PROTOCOL.equalsIgnoreCase(protocol)) {
if (aPca == null) {
throw new ResourceConfigurationException(
- ResourceInitializationException.CONFIG_SETTING_ABSENT,
- new Object[] { "ProcessControllerAdapter" });
+ ResourceInitializationException.CONFIG_SETTING_ABSENT,
+ new Object[] { "ProcessControllerAdapter" });
}
return new SocketCasProcessorDeployer(aPca, aCpeFactory);
} else {
@@ -94,12 +93,11 @@
return new CPEDeployerDefaultImpl(aCpeFactory);
}
throw new ResourceConfigurationException(InvalidXMLException.REQUIRED_ATTRIBUTE_MISSING,
- new Object[] { "deployment", "casProcessor" },
- new Exception(CpmLocalizedMessage.getLocalizedMessage(
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_Exception_invalid_deployment__WARNING", new Object[] {
- Thread.currentThread().getName(),
- aCasProcessorConfig.getName(), deployMode })));
+ new Object[] { "deployment", "casProcessor" }, new Exception(CpmLocalizedMessage
+ .getLocalizedMessage(CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_Exception_invalid_deployment__WARNING", new Object[] {
+ Thread.currentThread().getName(), aCasProcessorConfig.getName(),
+ deployMode })));
}
/**
@@ -112,14 +110,14 @@
* @throws ResourceConfigurationException
*/
public static String getProtocol(CpeCasProcessor aCasProcessorConfig)
- throws ResourceConfigurationException {
+ throws ResourceConfigurationException {
try {
String clientServiceDescriptor = aCasProcessorConfig.getDescriptor();
clientServiceDescriptor = CPMUtils.convertToAbsolutePath(System.getProperty("CPM_HOME"),
- CPEFactory.CPM_HOME, clientServiceDescriptor);
+ CPEFactory.CPM_HOME, clientServiceDescriptor);
ResourceSpecifier resourceSpecifier = UIMAFramework.getXMLParser().parseResourceSpecifier(
- new XMLInputSource(clientServiceDescriptor));
+ new XMLInputSource(clientServiceDescriptor));
if (resourceSpecifier instanceof URISpecifier) {
return ((URISpecifier) resourceSpecifier).getProtocol();
}
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/FencedProcessReaper.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/FencedProcessReaper.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/FencedProcessReaper.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/FencedProcessReaper.java Tue Nov 28 14:22:38 2006
@@ -49,18 +49,17 @@
if (System.getProperty("os.name").equalsIgnoreCase("linux")) {
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
- "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_killing_process__FINEST",
- new Object[] { Thread.currentThread().getName(), aPid });
+ "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_killing_process__FINEST",
+ new Object[] { Thread.currentThread().getName(), aPid });
}
Runtime.getRuntime().exec(cmd);
}
} catch (Exception e) {
// non-fatal exception
UIMAFramework.getLogger(this.getClass()).logrb(Level.WARNING, this.getClass().getName(),
- "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_killing_process_failed__WARNING",
- new Object[] { Thread.currentThread().getName(), aPid, e });
+ "process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_killing_process_failed__WARNING",
+ new Object[] { Thread.currentThread().getName(), aPid, e });
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/JavaApplication.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/JavaApplication.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/JavaApplication.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/JavaApplication.java Tue Nov 28 14:22:38 2006
@@ -50,7 +50,7 @@
* @throws ResourceConfigurationException
*/
public JavaApplication(CasProcessorConfiguration aCasProcessorConfiguration,
- CpeCasProcessor aJaxbCasProcessorConfig) throws ResourceConfigurationException {
+ CpeCasProcessor aJaxbCasProcessorConfig) throws ResourceConfigurationException {
addApplicationInfo(aCasProcessorConfiguration, aJaxbCasProcessorConfig); // aJaxbCasProcessorConfig,
// aDescriptor,aDeploymentParameters
// );
@@ -66,10 +66,10 @@
* @throws ResourceConfigurationException
*/
protected void addApplicationInfo(CasProcessorConfiguration aCasProcessorConfiguration,
- CpeCasProcessor aCasProcessor) throws ResourceConfigurationException {
+ CpeCasProcessor aCasProcessor) throws ResourceConfigurationException {
super.addApplicationInfo(aCasProcessorConfiguration, aCasProcessor);
String[] cmdLine = addApplicationCmdLineArguments(aCasProcessorConfiguration, argList,
- executable);
+ executable);
exec.setCmdLine(cmdLine);
}
@@ -87,8 +87,7 @@
* @return - complete command line ready for use
*/
protected String[] addApplicationCmdLineArguments(
- CasProcessorConfiguration aCasProcessorConfiguration, List argList,
- String aExecutable) {
+ CasProcessorConfiguration aCasProcessorConfiguration, List argList, String aExecutable) {
ArrayList cmdArgs = new ArrayList();
// build commandline
cmdArgs.add(aExecutable);
@@ -117,15 +116,14 @@
continue; // ignore
}
if (argValue == null || argValue.trim().length() == 0 || argValue.startsWith("-DVNS_HOST")
- || argValue.startsWith("-DVNS_PORT")) {
+ || argValue.startsWith("-DVNS_PORT")) {
continue; // skip
}
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
- "initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_show_cmd_arg__FINEST",
- new Object[] { Thread.currentThread().getName(), String.valueOf(i), arg });
+ "initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_show_cmd_arg__FINEST",
+ new Object[] { Thread.currentThread().getName(), String.valueOf(i), arg });
}
// Special case: if arg=-cp <classpath> we need to split this string into 2 due to the way
// Java Runtime
@@ -148,18 +146,18 @@
argList.add(i + 1, classpath + System.getProperty("path.separator") + systemClasspath);
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
- "initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_show_cmd_classpath__FINEST",
- new Object[] { Thread.currentThread().getName(), classpath });
+ "initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_show_cmd_classpath__FINEST",
+ new Object[] { Thread.currentThread().getName(), classpath });
}
continue; // next iteration will copy the classpath into cmdArgs
}
if ("${descriptor}".equals(argValue.trim())) {
String descriptor = CPMUtils.convertToAbsolutePath(System.getProperty("CPM_HOME"),
- CPEFactory.CPM_HOME, aCasProcessorConfiguration.getDescriptor());
+ CPEFactory.CPM_HOME, aCasProcessorConfiguration.getDescriptor());
if (System.getProperty("os.name") != null
- && System.getProperty("os.name").toLowerCase().startsWith("linux")) {
+ && System.getProperty("os.name").toLowerCase().startsWith("linux")) {
cmdArgs.add(descriptor);
} else {
cmdArgs.add("\"" + descriptor + "\"");
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/NonJavaApplication.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/NonJavaApplication.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/NonJavaApplication.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/NonJavaApplication.java Tue Nov 28 14:22:38 2006
@@ -42,7 +42,7 @@
public class NonJavaApplication extends RunnableApplication {
public NonJavaApplication(CasProcessorConfiguration aCasProcessorConfiguration,
- CpeCasProcessor aCasProcessorConfig) throws ResourceConfigurationException {
+ CpeCasProcessor aCasProcessorConfig) throws ResourceConfigurationException {
addApplicationInfo(aCasProcessorConfiguration, aCasProcessorConfig);
}
@@ -56,11 +56,11 @@
* @throws ResourceConfigurationException
*/
protected void addApplicationInfo(CasProcessorConfiguration aCasProcessorConfiguration,
- CpeCasProcessor aCasProcessor) throws ResourceConfigurationException {
+ CpeCasProcessor aCasProcessor) throws ResourceConfigurationException {
super.addApplicationInfo(aCasProcessorConfiguration, aCasProcessor);
if ("local".equals(aCasProcessor.getDeployment())) {
String[] cmdLine = addApplicationCmdLineArguments(aCasProcessorConfiguration, argList,
- executable);
+ executable);
exec.setCmdLine(cmdLine);
}
@@ -78,8 +78,11 @@
* @return - command line as array of Strings
*/
protected String[] addApplicationCmdLineArguments(
- CasProcessorConfiguration aCasProcessorConfiguration, List argList,
- String aExecutable) // String[] cmdLine) //, String aDescriptor,List
+ CasProcessorConfiguration aCasProcessorConfiguration, List argList, String aExecutable) // String[]
+ // cmdLine)
+ // //,
+ // String
+ // aDescriptor,List
// aDeploymentParameters )
{
ArrayList cmdArgs = new ArrayList();
@@ -91,13 +94,12 @@
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
- "initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_show_cmd_arg__FINEST",
- new Object[] { Thread.currentThread().getName(), String.valueOf(i), arg });
+ "initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_show_cmd_arg__FINEST",
+ new Object[] { Thread.currentThread().getName(), String.valueOf(i), arg });
}
if ("${descriptor}".equals(arg.trim())) {
String descriptor = CPMUtils.convertToAbsolutePath(System.getProperty("CPM_HOME"),
- CPEFactory.CPM_HOME, aCasProcessorConfiguration.getDescriptor());
+ CPEFactory.CPM_HOME, aCasProcessorConfiguration.getDescriptor());
cmdArgs.add("\"" + descriptor + "\"");
} else {
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java?view=diff&rev=480243&r1=480242&r2=480243
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/deployer/RunnableApplication.java Tue Nov 28 14:22:38 2006
@@ -56,22 +56,22 @@
* @throws ResourceConfigurationException
*/
protected void addApplicationInfo(CasProcessorConfiguration aCasProcessorConfiguration,
- CpeCasProcessor aCasProcessor) throws ResourceConfigurationException {
+ CpeCasProcessor aCasProcessor) throws ResourceConfigurationException {
try {
if (aCasProcessor instanceof CpeLocalCasProcessor) {
CasProcessorRunInSeperateProcess rip = ((CpeLocalCasProcessor) aCasProcessor)
- .getRunInSeperateProcess();
+ .getRunInSeperateProcess();
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
UIMAFramework.getLogger(this.getClass()).log(Level.FINEST,
- "+++++++++++++++++++++++++++++++++++++++++++++++++");
+ "+++++++++++++++++++++++++++++++++++++++++++++++++");
UIMAFramework.getLogger(this.getClass()).log(Level.FINEST,
- "+++++++++++++++++++++++++++++++++++++++++++++++++");
+ "+++++++++++++++++++++++++++++++++++++++++++++++++");
UIMAFramework.getLogger(this.getClass()).log(Level.FINEST,
- "Operating System is::::" + System.getProperty("os.name"));
+ "Operating System is::::" + System.getProperty("os.name"));
UIMAFramework.getLogger(this.getClass()).log(Level.FINEST,
- "+++++++++++++++++++++++++++++++++++++++++++++++++");
+ "+++++++++++++++++++++++++++++++++++++++++++++++++");
UIMAFramework.getLogger(this.getClass()).log(Level.FINEST,
- "+++++++++++++++++++++++++++++++++++++++++++++++++");
+ "+++++++++++++++++++++++++++++++++++++++++++++++++");
}
executable = rip.getExecutable().getExecutable();
List envList = rip.getExecutable().getEnvs();
@@ -115,7 +115,7 @@
String classpath = getEnvVarValue(key);
if (classpath != null) {
environment.add(key + "=" + value + System.getProperty("path.separator")
- + classpath);
+ + classpath);
} else {
environment.add(key + "=" + value + System.getProperty("path.separator"));
}
@@ -164,14 +164,10 @@
while (sysKeys.hasMoreElements()) {
String key = (String) sysKeys.nextElement();
if (UIMAFramework.getLogger().isLoggable(Level.FINEST)) {
- UIMAFramework.getLogger(this.getClass()).logrb(
- Level.FINEST,
- this.getClass().getName(),
- "initialize",
- CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
- "UIMA_CPM_launching_with_service_env__FINEST",
- new Object[] { Thread.currentThread().getName(), key,
- sysEnv.getProperty(key) });
+ UIMAFramework.getLogger(this.getClass()).logrb(Level.FINEST, this.getClass().getName(),
+ "initialize", CPMUtils.CPM_LOG_RESOURCE_BUNDLE,
+ "UIMA_CPM_launching_with_service_env__FINEST",
+ new Object[] { Thread.currentThread().getName(), key, sysEnv.getProperty(key) });
}
}
} catch (Throwable e) {