Repository: jclouds-karaf Updated Branches: refs/heads/master df7d4de36 -> ed2a6b470
JCLOUDS-1172: Fix OSGiScriptEngineManager package and logs Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/ed2a6b47 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/ed2a6b47 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/ed2a6b47 Branch: refs/heads/master Commit: ed2a6b470743db5b035ab6db786d9ec0999d63b3 Parents: df7d4de Author: Ignasi Barrera <n...@apache.org> Authored: Sat Sep 17 00:57:30 2016 +0200 Committer: Ignasi Barrera <n...@apache.org> Committed: Sat Sep 17 22:36:34 2016 +0200 ---------------------------------------------------------------------- .../karaf/commands/table/internal/ScriptEngineShellTable.java | 2 +- .../src/main/resources/OSGI-INF/blueprint/jclouds-commands.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/ed2a6b47/commands/src/main/java/org/jclouds/karaf/commands/table/internal/ScriptEngineShellTable.java ---------------------------------------------------------------------- diff --git a/commands/src/main/java/org/jclouds/karaf/commands/table/internal/ScriptEngineShellTable.java b/commands/src/main/java/org/jclouds/karaf/commands/table/internal/ScriptEngineShellTable.java index e3a3ac9..f7c0811 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/table/internal/ScriptEngineShellTable.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/table/internal/ScriptEngineShellTable.java @@ -55,7 +55,7 @@ public class ScriptEngineShellTable<D extends Object> extends BasicShellTable<D> scriptEngine.put(getType(), obj); result = String.valueOf(scriptEngine.eval(expression)); } catch (Exception exception) { - LOGGER.warn("Unable to evaluate expression %s due to: %s. Please check your shell confugration", + LOGGER.warn("Unable to evaluate expression {} due to: {}. Please check your shell confugration", expression, exception.getMessage()); result = "<evalution error - see log>"; } http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/ed2a6b47/commands/src/main/resources/OSGI-INF/blueprint/jclouds-commands.xml ---------------------------------------------------------------------- diff --git a/commands/src/main/resources/OSGI-INF/blueprint/jclouds-commands.xml b/commands/src/main/resources/OSGI-INF/blueprint/jclouds-commands.xml index 092740e..e96431d 100644 --- a/commands/src/main/resources/OSGI-INF/blueprint/jclouds-commands.xml +++ b/commands/src/main/resources/OSGI-INF/blueprint/jclouds-commands.xml @@ -566,7 +566,7 @@ limitations under the License. <bean id="osFamilyCompleter" class="org.jclouds.karaf.commands.compute.completer.OsFamilyCompleter"/> - <bean id="osgiScriptEngineManager" class="org.jclouds.karaf.commands.table.internal.OSGiScriptEngineManager"> + <bean id="osgiScriptEngineManager" class="org.jclouds.karaf.commands.table.internal.osgi.OSGiScriptEngineManager"> <argument ref="blueprintBundleContext"/> </bean>
