Fix misspelt property. (FELIX-4701)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1640343 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/main/src/main/java/org/apache/felix/main/AutoProcessor.java b/main/src/main/java/org/apache/felix/main/AutoProcessor.java
index f934400..6c00972 100644
--- a/main/src/main/java/org/apache/felix/main/AutoProcessor.java
+++ b/main/src/main/java/org/apache/felix/main/AutoProcessor.java
@@ -6,9 +6,9 @@
* 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
@@ -27,21 +27,36 @@
{
/**
* The property name used for the bundle directory.
+ * @deprecated use {@link AutoProcessor#AUTO_DEPLOY_DIR_PROPERTY}
**/
public static final String AUTO_DEPLOY_DIR_PROPERY = "felix.auto.deploy.dir";
/**
+ * The property name used for the bundle directory.
+ **/
+ public static final String AUTO_DEPLOY_DIR_PROPERTY = "felix.auto.deploy.dir";
+ /**
* The default name used for the bundle directory.
**/
public static final String AUTO_DEPLOY_DIR_VALUE = "bundle";
/**
* The property name used to specify auto-deploy actions.
+ * @deprecated use {@link AutoProcessor#AUTO_DEPLOY_ACTION_PROPERTY}
**/
public static final String AUTO_DEPLOY_ACTION_PROPERY = "felix.auto.deploy.action";
/**
+ * The property name used to specify auto-deploy actions.
+ **/
+ public static final String AUTO_DEPLOY_ACTION_PROPERTY = "felix.auto.deploy.action";
+ /**
* The property name used to specify auto-deploy start level.
+ * @deprecated use {@link AutoProcessor#AUTO_DEPLOY_STARTLEVEL_PROPERTY}
**/
public static final String AUTO_DEPLOY_STARTLEVEL_PROPERY = "felix.auto.deploy.startlevel";
/**
+ * The property name used to specify auto-deploy start level.
+ **/
+ public static final String AUTO_DEPLOY_STARTLEVEL_PROPERTY = "felix.auto.deploy.startlevel";
+ /**
* The name used for the auto-deploy install action.
**/
public static final String AUTO_DEPLOY_INSTALL_VALUE = "install";
@@ -88,7 +103,7 @@
private static void processAutoDeploy(Map configMap, BundleContext context)
{
// Determine if auto deploy actions to perform.
- String action = (String) configMap.get(AUTO_DEPLOY_ACTION_PROPERY);
+ String action = (String) configMap.get(AUTO_DEPLOY_ACTION_PROPERTY);
action = (action == null) ? "" : action;
List actionList = new ArrayList();
StringTokenizer st = new StringTokenizer(action, ",");
@@ -114,12 +129,12 @@
// Get start level for auto-deploy bundles.
int startLevel = sl.getInitialBundleStartLevel();
- if (configMap.get(AUTO_DEPLOY_STARTLEVEL_PROPERY) != null)
+ if (configMap.get(AUTO_DEPLOY_STARTLEVEL_PROPERTY) != null)
{
try
{
startLevel = Integer.parseInt(
- configMap.get(AUTO_DEPLOY_STARTLEVEL_PROPERY).toString());
+ configMap.get(AUTO_DEPLOY_STARTLEVEL_PROPERTY).toString());
}
catch (NumberFormatException ex)
{
@@ -136,7 +151,7 @@
}
// Get the auto deploy directory.
- String autoDir = (String) configMap.get(AUTO_DEPLOY_DIR_PROPERY);
+ String autoDir = (String) configMap.get(AUTO_DEPLOY_DIR_PROPERTY);
autoDir = (autoDir == null) ? AUTO_DEPLOY_DIR_VALUE : autoDir;
// Look in the specified bundle directory to create a list
// of all JAR files to install.
diff --git a/main/src/main/java/org/apache/felix/main/Main.java b/main/src/main/java/org/apache/felix/main/Main.java
index c142fe9..056c425 100644
--- a/main/src/main/java/org/apache/felix/main/Main.java
+++ b/main/src/main/java/org/apache/felix/main/Main.java
@@ -246,7 +246,7 @@
// that overwrites anything in the config file.
if (bundleDir != null)
{
- configProps.put(AutoProcessor.AUTO_DEPLOY_DIR_PROPERY, bundleDir);
+ configProps.put(AutoProcessor.AUTO_DEPLOY_DIR_PROPERTY, bundleDir);
}
// If there is a passed in bundle cache directory, then