Updated Branches: refs/heads/1.6.x a0232b09b -> 612afd244
fixing jclouds-71 Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/commit/612afd24 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/tree/612afd24 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/diff/612afd24 Branch: refs/heads/1.6.x Commit: 612afd24472f906f7355b64e1ddefb57d142f133 Parents: a0232b0 Author: tangyong <[email protected]> Authored: Fri May 24 12:21:20 2013 +0900 Committer: Ioannis Canellos <[email protected]> Committed: Mon May 27 15:21:46 2013 +0300 ---------------------------------------------------------------------- .../table/internal/PropertyShellTableFactory.java | 2 +- .../OSGI-INF/blueprint/jclouds-commands.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/612afd24/commands/src/main/java/org/jclouds/karaf/commands/table/internal/PropertyShellTableFactory.java ---------------------------------------------------------------------- diff --git a/commands/src/main/java/org/jclouds/karaf/commands/table/internal/PropertyShellTableFactory.java b/commands/src/main/java/org/jclouds/karaf/commands/table/internal/PropertyShellTableFactory.java index 6f1b93b..53b8fd9 100644 --- a/commands/src/main/java/org/jclouds/karaf/commands/table/internal/PropertyShellTableFactory.java +++ b/commands/src/main/java/org/jclouds/karaf/commands/table/internal/PropertyShellTableFactory.java @@ -32,7 +32,7 @@ public class PropertyShellTableFactory extends BasicShellTableFactory implements private static final Logger LOGGER = LoggerFactory.getLogger(PropertyShellTableFactory.class); - private final String PROPERTIES_FILE_PATH = System.getProperty("karaf.home") + File.separatorChar + "etc" + File.separatorChar + "org.jclouds.shell.cfg"; + private final String PROPERTIES_FILE_PATH = System.getProperty("karaf.home") + File.separatorChar + "etc" + File.separatorChar + "org.apache.jclouds.shell.cfg"; public PropertyShellTableFactory() { load(); http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/612afd24/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 7c143ab..7140d7f 100644 --- a/commands/src/main/resources/OSGI-INF/blueprint/jclouds-commands.xml +++ b/commands/src/main/resources/OSGI-INF/blueprint/jclouds-commands.xml @@ -573,7 +573,7 @@ limitations under the License. <value>org.jclouds.karaf.commands.table.ShellTableFactory</value> </interfaces> <service-properties> - <entry key="service.pid" value="org.jclouds.shell"/> + <entry key="service.pid" value="org.apache.jclouds.shell"/> </service-properties> </service>
