Merge pull request #96 from elvisisking/TEIIDDES-1581-1582

TEIIDDES-1581 & 1582 fixes.
Teiid-Designer · Feb 6, 2013 · e13fa15 · e13fa15
2 parents 9ca7092 + e1422bb
commit e13fa15
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/komodo-repository/src/main/java/org/komodo/repository/SoaRepositories.java b/komodo-repository/src/main/java/org/komodo/repository/SoaRepositories.java
@@ -49,7 +49,7 @@ public SoaRepository get(final String url,
             this.providers = new ConcurrentHashMap<String, RepositoryProvider>();
 
             // load repository providers
-            for (final RepositoryProvider provider : ServiceLoader.load(RepositoryProvider.class)) {
+            for (final RepositoryProvider provider : ServiceLoader.load(RepositoryProvider.class, getClass().getClassLoader())) {
                 this.providers.putIfAbsent(provider.getType(), provider);
                 LOGGER.debug("Added repository provider with type '{}' and class '{}'", provider.getType(), provider.getClass()); //$NON-NLS-1$
             }

diff --git a/...overlord.sramp.shell.ShellCommandProvider → ...lord.sramp.shell.api.ShellCommandProvider b/...overlord.sramp.shell.ShellCommandProvider → ...lord.sramp.shell.api.ShellCommandProvider
diff --git a/komodo-shell/src/main/resources/org/komodo/shell/ShellI18n.properties b/komodo-shell/src/main/resources/org/komodo/shell/ShellI18n.properties
@@ -1,4 +1,4 @@
-addVdbCommandHelp = The 'addVdb' command adds a VDB to the Komodo repository.\nExample usage:\n>  komodo:addVdb [path-to-vdb]
+addVdbCommandHelp = The 'addVdb' command adds a VDB to the Komodo repository.\nExample usage:\n>  komodo:addVdb /Users/elvis/myvdb.xml
 addVdbCommandUsage = komodo:addVdb [path-to-vdb]
 
 # 1 = command name
@@ -11,10 +11,12 @@ connectKomodoCommandUsage = komodo:connect [server-url]
 # 1 = file name
 failedToOpenStream = A stream at '%s' could not be opened.
 
-getVdbCommandHelp = The 'connectKomodo' queries for a VDB and version in a Komodo repository.\nExample usage:\n>  komodo:getVdb [vdb-name] [vdb-version]
-getVdbCommandUsage = komodo:connectKomodo [endpoint-url]
+getVdbCommandHelp = The 'getVdb' queries for a VDB and version in a Komodo repository.\nExample usage:\n>  komodo:getVdb MyVdb 1
+getVdbCommandUsage = komodo:getVdb [vdb-name] [vdb-version]
 
+# 1 = number of VDBs found, 2 = VDB name, 3 = version
 matchingVdbsFoundInRepository = There are '%s' VDBs with a name of '%s' and version of '%s' found in the repository.
+
 # 1 = VDB name, 2 = VDB version
 noMatchingVdbsFoundInRepository = There are no matching VDBs with a name of '%s' and version of '%s' found in the repository.