Spring/spring-shell
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor code per Mark comments, remove some system commands per Jun comments.

Browse Source
This commit is contained in:
Jarred Li
2012-04-13 12:11:20 +08:00
parent 270c6d1e17
commit 34e4c23e1f
11 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/springframework/shell/Bootstrap.java
View File

@@ -148,7 +148,7 @@ public class Bootstrap {
* @return new ApplicationContext in the plugin with core spring shell's context as parent
*/
private ConfigurableApplicationContext initPluginApplicationContext(AnnotationConfigApplicationContext annctx) {
ClassPathXmlApplicationContext subContext = new ClassPathXmlApplicationContext("spring-shell-beans.xml");
ClassPathXmlApplicationContext subContext = new ClassPathXmlApplicationContext("classpath*:/META-INF/spring/spring-shell-plugin.xml");
subContext.setParent(annctx);
return subContext;
}
@@ -189,7 +189,6 @@ public class Bootstrap {
exitShellRequest = ExitShellRequest.NORMAL_EXIT;
}
} else {
//shell.promptLoop();
exitShellRequest = shell.getExitShellRequest();
if (exitShellRequest == null) {
// shouldn't really happen, but we'll fallback to this anyway