Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2011-05-20 11:55:11 -0400
committerChristopher Frost2011-05-20 11:55:11 -0400
commitbf1122c74bba6941fbfeb609c4f5d7ae3cab7035 (patch)
tree36be16820a700d7686cb1801f10f5b70de5a1d0b
parent9d3e5889fee6bcf40ca870fec70d833974bab4ac (diff)
downloadorg.eclipse.virgo.kernel-bf1122c74bba6941fbfeb609c4f5d7ae3cab7035.tar.gz
org.eclipse.virgo.kernel-bf1122c74bba6941fbfeb609c4f5d7ae3cab7035.tar.xz
org.eclipse.virgo.kernel-bf1122c74bba6941fbfeb609c4f5d7ae3cab7035.zip
Updating the shell to lookup beans from the ArtifactModel
-rw-r--r--org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/deployer/model/internal/StandardRuntimeArtifactModel.java2
-rw-r--r--org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/bundle/NativeBundleArtifact.java2
-rw-r--r--org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerBundleArtifact.java2
-rw-r--r--org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/model/helper/StandardRamAccessorHelper.java2
4 files changed, 3 insertions, 5 deletions
diff --git a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/deployer/model/internal/StandardRuntimeArtifactModel.java b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/deployer/model/internal/StandardRuntimeArtifactModel.java
index b3d44644..856bb7d4 100644
--- a/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/deployer/model/internal/StandardRuntimeArtifactModel.java
+++ b/org.eclipse.virgo.kernel.deployer/src/main/java/org/eclipse/virgo/kernel/deployer/model/internal/StandardRuntimeArtifactModel.java
@@ -12,9 +12,7 @@
package org.eclipse.virgo.kernel.deployer.model.internal;
import java.io.File;
-import java.io.IOException;
import java.net.URI;
-import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
diff --git a/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/bundle/NativeBundleArtifact.java b/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/bundle/NativeBundleArtifact.java
index 7f18e1fa..1be99ac1 100644
--- a/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/bundle/NativeBundleArtifact.java
+++ b/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/bundle/NativeBundleArtifact.java
@@ -69,7 +69,7 @@ final class NativeBundleArtifact extends AbstractArtifact {
*/
public Map<String, String> getProperties() {
Map<String, String> properties = new HashMap<String, String>();
- properties.put("BundleId", String.valueOf(this.bundle.getBundleId()));
+ properties.put("Bundle Id", String.valueOf(this.bundle.getBundleId()));
properties.put("Spring", String.valueOf(this.springContextAccessor.isSpringPowered(bundle)));
return Collections.unmodifiableMap(properties);
}
diff --git a/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerBundleArtifact.java b/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerBundleArtifact.java
index 9baea5f1..eb32618d 100644
--- a/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerBundleArtifact.java
+++ b/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/deployer/DeployerBundleArtifact.java
@@ -58,7 +58,7 @@ final class DeployerBundleArtifact extends DeployerArtifact implements BundleArt
Map<String, String> properties = new HashMap<String, String>();
properties.putAll(parentProperties);
Bundle bundle = this.installArtifact.getBundle();
- properties.put("BundleId", String.valueOf(bundle.getBundleId()));
+ properties.put("Bundle Id", String.valueOf(bundle.getBundleId()));
properties.put("Spring", String.valueOf(this.springContextAccessor.isSpringPowered(bundle)));
return Collections.unmodifiableMap(properties);
}
diff --git a/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/model/helper/StandardRamAccessorHelper.java b/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/model/helper/StandardRamAccessorHelper.java
index 650051a9..f65f14e6 100644
--- a/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/model/helper/StandardRamAccessorHelper.java
+++ b/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/model/helper/StandardRamAccessorHelper.java
@@ -66,7 +66,7 @@ final public class StandardRamAccessorHelper implements RamAccessorHelper {
private static final String ARTIFACT_MBEAN_QUERY = "org.eclipse.virgo.kernel:type=Model,artifact-type=%s,name=%s,version=%s";
- private static final String REGION_ARTIFACT_MBEAN_QUERY = "org.eclipse.virgo.kernel:type=KernelModel,artifact-type=%s,name=%s,version=%s,region=%s";
+ private static final String REGION_ARTIFACT_MBEAN_QUERY = "org.eclipse.virgo.kernel:type=ArtifactModel,artifact-type=%s,name=%s,version=%s,region=%s";
public StandardRamAccessorHelper() {
}

Back to the top