385314 wip
diff --git a/org.eclipse.virgo.nano.authentication/.springBeans b/org.eclipse.virgo.nano.authentication/.springBeans
deleted file mode 100644
index 55e47c5..0000000
--- a/org.eclipse.virgo.nano.authentication/.springBeans
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
- <version>1</version>
- <pluginVersion><![CDATA[2.5.0.201010141000-RC1]]></pluginVersion>
- <configSuffixes>
- <configSuffix><![CDATA[xml]]></configSuffix>
- </configSuffixes>
- <enableImports><![CDATA[false]]></enableImports>
- <configs>
- </configs>
- <configSets>
- </configSets>
-</beansProjectDescription>
diff --git a/org.eclipse.virgo.nano.core/.classpath b/org.eclipse.virgo.nano.core/.classpath
index de99f70..b919b69 100644
--- a/org.eclipse.virgo.nano.core/.classpath
+++ b/org.eclipse.virgo.nano.core/.classpath
@@ -37,7 +37,7 @@
<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120807142340/org.eclipse.virgo.medic.test-3.6.0.D-20120807142340.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.1.0.D-20111205152504/org.eclipse.virgo.medic.test-sources-3.1.0.D-20111205152504.jar"/>
<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.D-20120807142340/org.eclipse.virgo.medic.core-3.6.0.D-20120807142340.jar"/>
<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/1.2.100.v20111010-1614/org.eclipse.equinox.event-1.2.100.v20111010-1614.jar"/>
- <classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar"/>
+ <classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi.source-3.8.0.v20120508-2119.jar"/>
<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar"/>
<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.region/1.1.0.v20120319-1602/org.eclipse.equinox.region-1.1.0.v20120319-1602.jar"/>
<classpathentry kind="var" path="NANO_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.4.v20120130-2120/org.slf4j.api-1.6.4.v20120130-2120.jar"/>
diff --git a/org.eclipse.virgo.nano.core/.springBeans b/org.eclipse.virgo.nano.core/.springBeans
deleted file mode 100644
index a5d0619..0000000
--- a/org.eclipse.virgo.nano.core/.springBeans
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
- <version>1</version>
- <pluginVersion><![CDATA[2.2.4.RELEASE]]></pluginVersion>
- <configSuffixes>
- <configSuffix><![CDATA[xml]]></configSuffix>
- </configSuffixes>
- <enableImports><![CDATA[false]]></enableImports>
- <configs>
- </configs>
- <configSets>
- <configSet>
- <name><![CDATA[org.eclipse.virgo.kernel.config]]></name>
- <allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
- <incomplete>false</incomplete>
- <configs>
- </configs>
- </configSet>
- </configSets>
-</beansProjectDescription>
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/KernelConfigurationPropertiesSource.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/KernelConfigurationPropertiesSource.java
index 98f767f..bdcb164 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/KernelConfigurationPropertiesSource.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/config/internal/KernelConfigurationPropertiesSource.java
@@ -34,9 +34,9 @@
static final String PROPERTY_DOMAIN = "domain";
- static final String KERNEL_CONFIGURATION_PID = "org.eclipse.virgo.nano";
+ static final String KERNEL_CONFIGURATION_PID = "org.eclipse.virgo.kernel";
- static final String PROPERTY_KERNEL_STARTUP_WAIT_LIMIT = "org.eclipse.virgo.nano.startup.wait.limit";
+ static final String PROPERTY_KERNEL_STARTUP_WAIT_LIMIT = "org.eclipse.virgo.kernel.startup.wait.limit";
private final KernelConfiguration kernelConfiguration;
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/CoreBundleActivator.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/CoreBundleActivator.java
index acaad4e..715875a 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/CoreBundleActivator.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/CoreBundleActivator.java
@@ -69,7 +69,6 @@
private static final String EVENT_TOPIC_BLUEPRINT_CONTAINER = "org/osgi/service/blueprint/container/*";
- //TODO this isn't the name of the kernel region
private static final String EVENT_TOPIC_REGION = "org/eclipse/virgo/kernel/region/*";
private static final String MBEAN_VALUE_SHUTDOWN = "Shutdown";
diff --git a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/StartupTracker.java b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/StartupTracker.java
index e7b1390..f10a4d8 100644
--- a/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/StartupTracker.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/org/eclipse/virgo/nano/core/internal/StartupTracker.java
@@ -65,7 +65,9 @@
private static final String KERNEL_EVENT_START_FAILED = KERNEL_EVENT_TOPIC + "START_FAILED";
- private static final String KERNEL_BSN_PREFIX = "org.eclipse.virgo.nano";
+ private static final String KERNEL_BSN_PREFIX = "org.eclipse.virgo.kernel";
+
+ private static final String NANO_BSN_PREFIX = "org.eclipse.virgo.nano";
private static final Logger LOGGER = LoggerFactory.getLogger(StartupTracker.class);
@@ -217,7 +219,7 @@
private boolean isKernelBundle(Bundle bundle) {
String symbolicName = bundle.getSymbolicName();
- return symbolicName != null && symbolicName.startsWith(KERNEL_BSN_PREFIX);
+ return symbolicName != null && (symbolicName.startsWith(KERNEL_BSN_PREFIX) || symbolicName.startsWith(NANO_BSN_PREFIX));
}
private void kernelStarting() {
diff --git a/org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/nano_config.xml b/org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/org.eclipse.virgo.nano.config.xml
similarity index 77%
rename from org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/nano_config.xml
rename to org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/org.eclipse.virgo.nano.config.xml
index a0c6ad0..bd47c5d 100644
--- a/org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/nano_config.xml
+++ b/org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/org.eclipse.virgo.nano.config.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.eclipse.virgo.nano" configuration-policy="require">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.eclipse.virgo.kernel" configuration-policy="require">
<implementation class="org.eclipse.virgo.nano.config.internal.StandardKernelConfig" />
+
<service>
<provide interface="org.eclipse.virgo.nano.core.KernelConfig" />
</service>
-</scr:component>
\ No newline at end of file
+
+</scr:component>
diff --git a/org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/nanocore.xml b/org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/org.eclipse.virgo.nano.core.xml
similarity index 80%
rename from org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/nanocore.xml
rename to org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/org.eclipse.virgo.nano.core.xml
index d6162a2..174e8c5 100644
--- a/org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/nanocore.xml
+++ b/org.eclipse.virgo.nano.core/src/main/resources/OSGI-INF/org.eclipse.virgo.nano.core.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<component name="kernelcore" immediate="true" xmlns:src="http://www.osgi.org/xmlns/src/v1.1.0">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.virgo.nano.core" immediate="true">
<implementation class="org.eclipse.virgo.nano.core.internal.CoreBundleActivator"/>
<reference name="EventLogger"
@@ -18,4 +18,4 @@
interface="org.osgi.service.event.EventAdmin"
policy="static"/>
-</component>
\ No newline at end of file
+</scr:component>
diff --git a/org.eclipse.virgo.nano.core/template.mf b/org.eclipse.virgo.nano.core/template.mf
index 8205f7d..127e5b4 100644
--- a/org.eclipse.virgo.nano.core/template.mf
+++ b/org.eclipse.virgo.nano.core/template.mf
@@ -3,7 +3,7 @@
Bundle-Name: Virgo Nano Core
Bundle-SymbolicName: org.eclipse.virgo.nano.core
Bundle-Version: ${version}
-Service-Component: OSGI-INF/nano_config.xml,OSGI-INF/nanocore.xml
+Service-Component: OSGI-INF/org.eclipse.virgo.nano.config.xml,OSGI-INF/org.eclipse.virgo.nano.core.xml
Import-Template:
org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
diff --git a/org.eclipse.virgo.nano.deployer.api/.springBeans b/org.eclipse.virgo.nano.deployer.api/.springBeans
deleted file mode 100644
index 4dbe37b..0000000
--- a/org.eclipse.virgo.nano.deployer.api/.springBeans
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
- <version>1</version>
- <pluginVersion><![CDATA[2.2.7.200910202224-RELEASE]]></pluginVersion>
- <configSuffixes>
- <configSuffix><![CDATA[xml]]></configSuffix>
- </configSuffixes>
- <enableImports><![CDATA[false]]></enableImports>
- <configs>
- </configs>
- <configSets>
- </configSets>
-</beansProjectDescription>
diff --git a/org.eclipse.virgo.nano.deployer.api/src/main/resources/.gitignore b/org.eclipse.virgo.nano.deployer.api/src/main/resources/.gitignore
deleted file mode 100644
index e69de29..0000000
--- a/org.eclipse.virgo.nano.deployer.api/src/main/resources/.gitignore
+++ /dev/null
diff --git a/org.eclipse.virgo.nano.deployer.hot/src/main/resources/.gitignore b/org.eclipse.virgo.nano.deployer.hot/src/main/resources/.gitignore
deleted file mode 100644
index e69de29..0000000
--- a/org.eclipse.virgo.nano.deployer.hot/src/main/resources/.gitignore
+++ /dev/null
diff --git a/org.eclipse.virgo.nano.deployer/.springBeans b/org.eclipse.virgo.nano.deployer/.springBeans
deleted file mode 100644
index 4dbe37b..0000000
--- a/org.eclipse.virgo.nano.deployer/.springBeans
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
- <version>1</version>
- <pluginVersion><![CDATA[2.2.7.200910202224-RELEASE]]></pluginVersion>
- <configSuffixes>
- <configSuffix><![CDATA[xml]]></configSuffix>
- </configSuffixes>
- <enableImports><![CDATA[false]]></enableImports>
- <configs>
- </configs>
- <configSets>
- </configSets>
-</beansProjectDescription>
diff --git a/org.eclipse.virgo.nano.deployer/src/main/resources/OSGI-INF/virgo.nano.deployer.component.xml b/org.eclipse.virgo.nano.deployer/src/main/resources/OSGI-INF/org.eclipse.virgo.nano.deployer.xml
similarity index 86%
rename from org.eclipse.virgo.nano.deployer/src/main/resources/OSGI-INF/virgo.nano.deployer.component.xml
rename to org.eclipse.virgo.nano.deployer/src/main/resources/OSGI-INF/org.eclipse.virgo.nano.deployer.xml
index 50b31c1..d05cd57 100644
--- a/org.eclipse.virgo.nano.deployer/src/main/resources/OSGI-INF/virgo.nano.deployer.component.xml
+++ b/org.eclipse.virgo.nano.deployer/src/main/resources/OSGI-INF/org.eclipse.virgo.nano.deployer.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<component name="virgo.nano.deployer.component" immediate="true" xmlns:src="http://www.osgi.org/xmlns/src/v1.1.0">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.virgo.nano.deployer" immediate="true">
<implementation class="org.eclipse.virgo.nano.deployer.internal.StandardApplicationDeployer"/>
<reference name="EventLogger"
@@ -30,4 +30,4 @@
bind="bindSimpleDeployer"
unbind="unbindSimpleDeployer"/>
-</component>
+</scr:component>
diff --git a/org.eclipse.virgo.nano.deployer/template.mf b/org.eclipse.virgo.nano.deployer/template.mf
index aaf352e..57d1a6a 100644
--- a/org.eclipse.virgo.nano.deployer/template.mf
+++ b/org.eclipse.virgo.nano.deployer/template.mf
@@ -3,7 +3,7 @@
Bundle-Name: Virgo Nano Deployer
Bundle-SymbolicName: org.eclipse.virgo.nano.deployer
Bundle-Version: ${version}
-Service-Component: OSGI-INF/virgo.nano.deployer.component.xml
+Service-Component: OSGI-INF/org.eclipse.virgo.nano.deployer.xml
Import-Template:
org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
diff --git a/org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/nano/shutdown/ShutdownCommand.java b/org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/nano/shutdown/ShutdownCommand.java
index cfb7e49..eb8a170 100644
--- a/org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/nano/shutdown/ShutdownCommand.java
+++ b/org.eclipse.virgo.nano.shutdown/src/main/java/org/eclipse/virgo/nano/shutdown/ShutdownCommand.java
@@ -22,7 +22,7 @@
*/
final class ShutdownCommand {
- private static final String DEFAULT_DOMAIN = "org.eclipse.virgo.nano";
+ private static final String DEFAULT_DOMAIN = "org.eclipse.virgo.kernel";
private static final int DEFAULT_PORT = 9875;
diff --git a/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/nano/shutdown/ShutdownClientTests.java b/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/nano/shutdown/ShutdownClientTests.java
index 632803f..2ce03c8 100644
--- a/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/nano/shutdown/ShutdownClientTests.java
+++ b/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/nano/shutdown/ShutdownClientTests.java
@@ -112,7 +112,7 @@
UnitTestShutdown shutdown = new UnitTestShutdown();
- ObjectInstance shutdownMBean = registerShutdownMBean(shutdown, "org.eclipse.virgo.nano");
+ ObjectInstance shutdownMBean = registerShutdownMBean(shutdown, "org.eclipse.virgo.kernel");
try {
client.doShutdown(command);
@@ -139,7 +139,7 @@
UnitTestShutdown shutdown = new UnitTestShutdown();
- ObjectInstance shutdownMBean = registerShutdownMBean(shutdown, "org.eclipse.virgo.nano");
+ ObjectInstance shutdownMBean = registerShutdownMBean(shutdown, "org.eclipse.virgo.kernel");
try {
client.doShutdown(command);
diff --git a/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/nano/shutdown/ShutdownCommandParserTests.java b/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/nano/shutdown/ShutdownCommandParserTests.java
index 03de75c..d0c68df 100644
--- a/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/nano/shutdown/ShutdownCommandParserTests.java
+++ b/org.eclipse.virgo.nano.shutdown/src/test/java/org/eclipse/virgo/nano/shutdown/ShutdownCommandParserTests.java
@@ -58,7 +58,7 @@
ShutdownCommand command = ShutdownCommandParser.parse();
assertNotNull(command);
- assertEquals("org.eclipse.virgo.nano", command.getDomain());
+ assertEquals("org.eclipse.virgo.kernel", command.getDomain());
assertNull(command.getPassword());
assertEquals(9875, command.getPort());
assertNull(command.getUsername());
diff --git a/org.eclipse.virgo.nano.war.deployer/.springBeans b/org.eclipse.virgo.nano.war.deployer/.springBeans
deleted file mode 100644
index 4dbe37b..0000000
--- a/org.eclipse.virgo.nano.war.deployer/.springBeans
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
- <version>1</version>
- <pluginVersion><![CDATA[2.2.7.200910202224-RELEASE]]></pluginVersion>
- <configSuffixes>
- <configSuffix><![CDATA[xml]]></configSuffix>
- </configSuffixes>
- <enableImports><![CDATA[false]]></enableImports>
- <configs>
- </configs>
- <configSets>
- </configSets>
-</beansProjectDescription>
