Author: gnodet
Date: Tue Feb 26 09:17:14 2008
New Revision: 631303
URL: http://svn.apache.org/viewvc?rev=631303&view=rev
Log:
Rename logger to LOGGER, avoid possible NPE when closing the jar and add an
exception log
Modified:
servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
servicemix/smx4/kernel/trunk/pom.xml
Modified:
servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java?rev=631303&r1=631302&r2=631303&view=diff
==============================================================================
---
servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
(original)
+++
servicemix/smx4/kernel/trunk/filemonitor/src/main/java/org/apache/servicemix/kernel/filemonitor/FileMonitor.java
Tue Feb 26 09:17:14 2008
@@ -67,8 +67,11 @@
public final static String DEPLOY_DIR =
"org.apache.servicemix.filemonitor.monitorDir";
public final static String GENERATED_JAR_DIR =
"org.apache.servicemix.filemonitor.generatedJarDir";
public final static String SCAN_INTERVAL =
"org.apache.servicemix.filemonitor.scanInterval";
+
protected static final String ALIAS_KEY = "_alias_factory_pid";
- private static Log logger = LogFactory.getLog(FileMonitor.class);
+
+ private static final Log LOGGER = LogFactory.getLog(FileMonitor.class);
+
private FileMonitorActivator activator;
private File configDir = new File("./etc");
private File deployDir = new File("./deploy");
@@ -130,11 +133,11 @@
}
});
- logger.info("Starting to monitor the deploy directory: " + deployDir +
" every " + scanInterval + " millis");
+ LOGGER.info("Starting to monitor the deploy directory: " + deployDir +
" every " + scanInterval + " millis");
if (configDir != null) {
- logger.info("Config directory is at: " + configDir);
+ LOGGER.info("Config directory is at: " + configDir);
}
- logger.info("Will generate bundles from expanded source directories
to: " + generateDir);
+ LOGGER.info("Will generate bundles from expanded source directories
to: " + generateDir);
scanner.start();
}
@@ -212,7 +215,7 @@
File file = new File(name);
try {
- logger.debug("File changed: " + filename + " with type: " +
filename.getClass().getName());
+ LOGGER.debug("File changed: " + filename + " with type: " +
filename.getClass().getName());
// Handle config files
if (isValidConfigFile(file)) {
@@ -251,7 +254,7 @@
if (file.exists()) {
File f = transformArtifact(file);
if (f == null) {
- logger.warn("Unsupported deployment: " + name);
+ LOGGER.warn("Unsupported deployment: " + name);
reschedule(file);
continue;
}
@@ -277,7 +280,7 @@
}
}
catch (Exception e) {
- logger.warn("Failed to process: " + file + ". Reason: " + e,
e);
+ LOGGER.warn("Failed to process: " + file + ". Reason: " + e,
e);
}
}
refreshPackagesAndStartOrUpdateBundles();
@@ -333,15 +336,17 @@
return file;
}
} catch (Exception e) {
- // Ignore
+ LOGGER.debug("Error transforming artifact", e);
} finally {
- jar.close();
+ if (jar != null) {
+ jar.close();
+ }
}
return null;
}
protected void deployBundle(File file) throws IOException, BundleException
{
- logger.info("Deloying: " + file.getCanonicalPath());
+ LOGGER.info("Deloying: " + file.getCanonicalPath());
InputStream in = new FileInputStream(file);
@@ -364,11 +369,11 @@
}
protected void undeployBundle(File file) throws BundleException,
IOException {
- logger.info("Undeploying: " + file.getCanonicalPath());
+ LOGGER.info("Undeploying: " + file.getCanonicalPath());
Bundle bundle = getBundleForJarFile(file);
if (bundle == null) {
- logger.warn("Could not find Bundle for file: " +
file.getCanonicalPath());
+ LOGGER.warn("Could not find Bundle for file: " +
file.getCanonicalPath());
}
else {
changedBundles.add(bundle);
@@ -394,7 +399,7 @@
ConfigurationAdmin configurationAdmin =
activator.getConfigurationAdmin();
if (configurationAdmin == null) {
if (!loggedConfigAdminWarning) {
- logger.warn("No ConfigurationAdmin so cannot deploy
configurations");
+ LOGGER.warn("No ConfigurationAdmin so cannot deploy
configurations");
loggedConfigAdminWarning = true;
}
}
@@ -492,20 +497,20 @@
for (Bundle bundle : bundlesToUpdate) {
try {
bundle.update();
- logger.info("Updated: " + bundle);
+ LOGGER.info("Updated: " + bundle);
}
catch (BundleException e) {
- logger.warn("Failed to update bundle: " + bundle + ". Reason:
" + e, e);
+ LOGGER.warn("Failed to update bundle: " + bundle + ". Reason:
" + e, e);
}
}
for (Bundle bundle : bundlesToStart) {
try {
bundle.start();
- logger.info("Started: " + bundle);
+ LOGGER.info("Started: " + bundle);
}
catch (BundleException e) {
- logger.warn("Failed to start bundle: " + bundle + ". Reason: "
+ e, e);
+ LOGGER.warn("Failed to start bundle: " + bundle + ". Reason: "
+ e, e);
}
}
}
@@ -518,7 +523,7 @@
undeployBundle(destFile);
destFile.delete();
}
- logger.info("Creating jar: " + destFile + " from dir: " + dir);
+ LOGGER.info("Creating jar: " + destFile + " from dir: " + dir);
jar.setDestFile(destFile);
jar.setManifest(new File(new File(dir, "META-INF"), "MANIFEST.MF"));
jar.setBasedir(dir);
@@ -631,7 +636,7 @@
in.close();
}
catch (IOException e) {
- logger.warn("Failed to close stream. " + e, e);
+ LOGGER.warn("Failed to close stream. " + e, e);
}
}
Modified: servicemix/smx4/kernel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=631303&r1=631302&r2=631303&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Tue Feb 26 09:17:14 2008
@@ -69,7 +69,7 @@
<felix.configadmin.version>0.9.0-r605854</felix.configadmin.version>
<felix.main.version>1.1.0-r605854</felix.main.version>
<felix.plugin.version>1.2.0</felix.plugin.version>
- <felix.framework.version>1.1.0-r605854-patched</felix.framework.version>
+ <felix.framework.version>1.1.0-SNAPSHOT</felix.framework.version>
<felix.osgi.version>1.0.0</felix.osgi.version>
<felix.compendium.version>1.0.0</felix.compendium.version>
<felix.bundlerepository.version>1.1.0-r605854</felix.bundlerepository.version>
