You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by io...@apache.org on 2013/05/27 14:22:10 UTC

git commit: fixing jclouds-71

Updated Branches:
  refs/heads/master 0832905c5 -> af2d1b884


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/af2d1b88
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/tree/af2d1b88
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/diff/af2d1b88

Branch: refs/heads/master
Commit: af2d1b884a63a00e7332a81e041b483a9670c0a5
Parents: 0832905
Author: tangyong <ta...@cn.fujitsu.com>
Authored: Fri May 24 12:21:20 2013 +0900
Committer: Ioannis Canellos <io...@apache.org>
Committed: Mon May 27 15:20:47 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/af2d1b88/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/af2d1b88/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>