Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLazar Kirchev2012-09-10 03:49:50 -0400
committerLazar Kirchev2012-09-10 04:05:36 -0400
commitfc0b09e29de83ef7f298644d85b07b5635a849c3 (patch)
treee34521aae1330d2105628217118c9c2f0b61b28b /org.eclipse.virgo.shell.command
parentadf989625b43d0a4d9f51eac06fe44d625b7ff44 (diff)
parente7afff18213d1ddd79aa022b78b3354d35b4fe59 (diff)
downloadorg.eclipse.virgo.kernel-fc0b09e29de83ef7f298644d85b07b5635a849c3.tar.gz
org.eclipse.virgo.kernel-fc0b09e29de83ef7f298644d85b07b5635a849c3.tar.xz
org.eclipse.virgo.kernel-fc0b09e29de83ef7f298644d85b07b5635a849c3.zip
Merge master with branch shell_bundles_merge_bug388518
Diffstat (limited to 'org.eclipse.virgo.shell.command')
-rw-r--r--org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/commands/ConfigCommandsTests.java6
-rw-r--r--org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/commands/StubAbstractCompositeInstallArtifactBasedCommands.java2
-rw-r--r--org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/completers/ConfigCompleterTests.java6
3 files changed, 10 insertions, 4 deletions
diff --git a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/commands/ConfigCommandsTests.java b/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/commands/ConfigCommandsTests.java
index cb7ec312..8252bd7b 100644
--- a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/commands/ConfigCommandsTests.java
+++ b/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/commands/ConfigCommandsTests.java
@@ -24,14 +24,16 @@ import javax.management.MalformedObjectNameException;
import javax.management.NotCompliantMBeanException;
import javax.management.ObjectName;
-import org.eclipse.virgo.kernel.shell.internal.formatting.StubManageableCompositeArtifact;
+import org.eclipse.virgo.shell.internal.formatting.StubManageableCompositeArtifact;
import org.eclipse.virgo.test.stubs.region.StubRegionDigraph;
-import org.eclipse.virgo.test.stubs.service.cm.StubConfigurationAdmin;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.BundleException;
+import org.eclipse.virgo.shell.internal.commands.ConfigCommands;
+import org.eclipse.virgo.test.stubs.service.cm.StubConfigurationAdmin;
+
public class ConfigCommandsTests {
private static final StubRegionDigraph REGION_DIGRAPH = new StubRegionDigraph();
diff --git a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/commands/StubAbstractCompositeInstallArtifactBasedCommands.java b/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/commands/StubAbstractCompositeInstallArtifactBasedCommands.java
index e0b116e6..b290017c 100644
--- a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/commands/StubAbstractCompositeInstallArtifactBasedCommands.java
+++ b/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/commands/StubAbstractCompositeInstallArtifactBasedCommands.java
@@ -12,7 +12,9 @@
package org.eclipse.virgo.shell.internal.commands;
import org.eclipse.virgo.kernel.model.management.ManageableCompositeArtifact;
+import org.eclipse.virgo.shell.internal.commands.AbstractInstallArtifactBasedCommands;
import org.eclipse.virgo.test.stubs.region.StubRegionDigraph;
+
import org.osgi.framework.BundleException;
final class StubAbstractCompositeInstallArtifactBasedCommands extends AbstractInstallArtifactBasedCommands<ManageableCompositeArtifact> {
diff --git a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/completers/ConfigCompleterTests.java b/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/completers/ConfigCompleterTests.java
index 4a2312b4..5df39958 100644
--- a/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/completers/ConfigCompleterTests.java
+++ b/org.eclipse.virgo.shell.command/src/test/java/org/eclipse/virgo/shell/internal/completers/ConfigCompleterTests.java
@@ -22,9 +22,11 @@ import javax.management.MalformedObjectNameException;
import javax.management.NotCompliantMBeanException;
import javax.management.ObjectName;
-import org.eclipse.virgo.kernel.shell.internal.commands.StubRuntimeArtifactModelObjectNameCreator;
-import org.eclipse.virgo.kernel.shell.internal.formatting.StubManageableCompositeArtifact;
+import org.eclipse.virgo.shell.internal.commands.StubRuntimeArtifactModelObjectNameCreator;
+import org.eclipse.virgo.shell.internal.completers.ConfigCompleter;
+import org.eclipse.virgo.shell.internal.formatting.StubManageableCompositeArtifact;
import org.eclipse.virgo.test.stubs.region.StubRegionDigraph;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

Back to the top