null if it is unknown.
* @since 2.0.2.0
* @see JanusConfig#BOOT_AGENT_ID
- * @see #startJanus(Class, Class, Object...)
+ * @see #startJanus(Class, Object...)
*/
public static UUID getBootAgentIdentifier() {
final String id = JanusConfig.getSystemProperty(JanusConfig.BOOT_AGENT_ID);
@@ -821,6 +821,31 @@ public static UUID getBootAgentIdentifier() {
return null;
}
+ /**
+ * Launch the Janus kernel and the first agent in the kernel.
+ *
+ * Thus function does not parse the command line. See {@link #main(String[])} for the command line management. When this + * function is called, it is assumed that all the system's properties are correctly set. + * + *
The platformModule parameter permits to specify the injection module to use. The injection module is in change of + * creating/injecting all the components of the platform. The default injection module is retreived from the system property + * with the name stored in {@link JanusConfig#INJECTION_MODULE_NAME}. The default type for the injection module is stored in + * the constant {@link JanusConfig#INJECTION_MODULE_NAME_VALUE}. + * + *
The function {@link #getBootAgentIdentifier()} permits to retreive the identifier of the launched agent. + * + * @param agentCls - type of the first agent to launch. + * @param params - parameters to pass to the agent as its initliazation parameters. + * @return the kernel that was launched. + * @throws Exception - if it is impossible to start the platform. + * @see #main(String[]) + * @see #getBootAgentIdentifier() + */ + public static Kernel startJanus(Class agentCls, Object... params) + throws Exception { + return startJanusWithModuleType(null, agentCls, params); + } + /** * Launch the Janus kernel and the first agent in the kernel. * @@ -840,10 +865,11 @@ public static UUID getBootAgentIdentifier() { * @param params - parameters to pass to the agent as its initliazation parameters. * @return the kernel that was launched. * @throws Exception - if it is impossible to start the platform. + * @since 0.5 * @see #main(String[]) * @see #getBootAgentIdentifier() */ - public static Kernel startJanus(Class platformModule, Class agentCls, Object... params) + public static Kernel startJanusWithModuleType(Class platformModule, Class agentCls, Object... params) throws Exception { Class startupModule = platformModule; if (startupModule == null) { @@ -851,7 +877,7 @@ public static Kernel startJanus(Class platformModule, Class platformModule, Class agentCls, Object... params) throws Exception { + public static Kernel startJanusWithModule(Module startupModule, Class agentCls, Object... params) throws Exception { // Set the boot agent classname System.setProperty(JanusConfig.BOOT_AGENT, agentCls.getName()); // Get the start-up injection module diff --git a/sre/io.janusproject/io.janusproject.tests/src/io/janusproject/tests/BootTest.java b/sre/io.janusproject/io.janusproject.tests/src/io/janusproject/tests/BootTest.java index 49dd1895a3..0f89f0252f 100644 --- a/sre/io.janusproject/io.janusproject.tests/src/io/janusproject/tests/BootTest.java +++ b/sre/io.janusproject/io.janusproject.tests/src/io/janusproject/tests/BootTest.java @@ -1042,7 +1042,7 @@ public static class StartTests extends AbstractJanusTest { @Test public void startJanus() throws Exception { - Kernel kernel = Boot.startJanus(TestModule.class, AgentMock.class, "param1", "param2", "param3"); + Kernel kernel = Boot.startJanusWithModuleType(TestModule.class, AgentMock.class, "param1", "param2", "param3"); assertNotNull(kernel); @@ -1075,13 +1075,13 @@ public void getBootAgentIdentifier_notStarted() throws Exception { @Test public void getBootAgentIdentifier_started() throws Exception { - Boot.startJanus(TestModule.class, AgentMock.class); + Boot.startJanusWithModuleType(TestModule.class, AgentMock.class); assertEquals(ID, Boot.getBootAgentIdentifier()); } @Test public void getBootAgentIdentifier_startedAgain() throws Exception { - Boot.startJanus(TestModule.class, AgentMock.class); + Boot.startJanusWithModuleType(TestModule.class, AgentMock.class); assertEquals(ID, Boot.getBootAgentIdentifier()); assertEquals(ID, Boot.getBootAgentIdentifier()); } diff --git a/sre/io.janusproject/io.janusproject.tests/src/io/janusproject/tests/testutils/AbstractJanusRunTest.java b/sre/io.janusproject/io.janusproject.tests/src/io/janusproject/tests/testutils/AbstractJanusRunTest.java index 868fa63bb7..5cde844e8c 100644 --- a/sre/io.janusproject/io.janusproject.tests/src/io/janusproject/tests/testutils/AbstractJanusRunTest.java +++ b/sre/io.janusproject/io.janusproject.tests/src/io/janusproject/tests/testutils/AbstractJanusRunTest.java @@ -265,7 +265,7 @@ public void write(byte[] b, int off, int len) throws IOException { module = Modules.override(new StandardJanusPlatformModule()).with(new ErrorLogTestingModule(this.results)); } Boot.setOffline(offline); - this.janusKernel = Boot.startJanus(module, type, getAgentInitializationParameters()); + this.janusKernel = Boot.startJanusWithModule(module, type, getAgentInitializationParameters()); Logger current = this.janusKernel.getLogger(); while (current.getParent() != null && current.getParent() != current) { current = current.getParent();