some code cleanning while debugging an issue on an external launcher
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/43d5235c Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/43d5235c Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/43d5235c Branch: refs/heads/master Commit: 43d5235c4dddf87c93c1db29bd858bffbf27f51b Parents: da254a7 Author: Sergio Fernández <[email protected]> Authored: Wed Nov 26 15:26:39 2014 +0100 Committer: Sergio Fernández <[email protected]> Committed: Wed Nov 26 15:26:47 2014 +0100 ---------------------------------------------------------------------- .../core/startup/MarmottaStartupService.java | 61 ++++++++++---------- .../marmotta/platform/core/util/CDIContext.java | 10 ++-- .../platform/core/test/base/JettyMarmotta.java | 7 ++- 3 files changed, 39 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/43d5235c/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/startup/MarmottaStartupService.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/startup/MarmottaStartupService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/startup/MarmottaStartupService.java index 6929501..f45c4c6 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/startup/MarmottaStartupService.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/startup/MarmottaStartupService.java @@ -118,6 +118,7 @@ public class MarmottaStartupService { log.info("Apache Marmotta Core (Development Version) starting up ... "); } + //TODO: refactor this code if(StringUtils.isBlank(home)) { home = System.getProperty("marmotta.home"); if(StringUtils.isNotBlank(home)) { @@ -131,48 +132,48 @@ public class MarmottaStartupService { if(StringUtils.isNotBlank(home)) { log.info("Configured working directory {} from system property kiwi.home", home); } else { - home = System.getenv("MARMOTTA_HOME"); - if(StringUtils.isNotBlank(home)) { - log.info("Configured working directory {} from environment variable MARMOTTA_HOME", home); - } else { - home = System.getenv("LMF_HOME"); - if(StringUtils.isNotBlank(home)) { - log.info("Configured working directory {} from environment variable LMF_HOME", home); - } else { - home = System.getenv("KIWI_HOME"); - if(StringUtils.isNotBlank(home)) { - log.info("Configured working directory {} from environment variable KIWI_HOME", home); - } else { - if (context != null) { - home = context.getInitParameter("marmotta.home"); - if(StringUtils.isNotBlank(home)) { - log.info("Configured working directory {} from servlet context parameter marmotta.home", home); - } - } else { - log.error("could not determine Apache Marmotta home directory, please set the environment variable MARMOTTA_HOME"); - } - } - } - } + home = System.getenv("MARMOTTA_HOME"); + if(StringUtils.isNotBlank(home)) { + log.info("Configured working directory {} from environment variable MARMOTTA_HOME", home); + } else { + home = System.getenv("LMF_HOME"); + if(StringUtils.isNotBlank(home)) { + log.info("Configured working directory {} from environment variable LMF_HOME", home); + } else { + home = System.getenv("KIWI_HOME"); + if(StringUtils.isNotBlank(home)) { + log.info("Configured working directory {} from environment variable KIWI_HOME", home); + } else { + if (context != null) { + home = context.getInitParameter("marmotta.home"); + if(StringUtils.isNotBlank(home)) { + log.info("Configured working directory {} from servlet context parameter marmotta.home", home); + } + } else { + log.error("could not determine Apache Marmotta home directory, please set the environment variable MARMOTTA_HOME"); + } + } + } + } } } } } if(StringUtils.isNotBlank(home)) { - if (home.startsWith("~" + File.separator)) { - home = System.getProperty("user.home") + home.substring(1); - } + if (home.startsWith("~" + File.separator)) { + home = System.getProperty("user.home") + home.substring(1); + } configurationService.setHome(home); } else { - log.error("home directory not properly initialized!!!"); + log.error("home directory not properly initialized!!!"); } if(context != null) { configurationService.setServletContext(context); } - configurationService.initialize(home,configurationOverride); + configurationService.initialize(home, configurationOverride); configurationService.setConfiguration("kiwi.version", versionNumber); @@ -181,8 +182,8 @@ public class MarmottaStartupService { configurationService.setConfiguration("kiwi.path", context.getContextPath()); // register the systray links provided by the different components - Map<String, String> demoLinks = new HashMap<String, String>(); - Map<String, String> adminLinks = new HashMap<String, String>(); + Map<String, String> demoLinks = new HashMap<>(); + Map<String, String> adminLinks = new HashMap<>(); for(MarmottaSystrayLink link : CDIContext.getInstances(MarmottaSystrayLink.class)) { if(link.getSection() == MarmottaSystrayLink.Section.DEMO) { http://git-wip-us.apache.org/repos/asf/marmotta/blob/43d5235c/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/CDIContext.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/CDIContext.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/CDIContext.java index c35e570..3ad71ac 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/CDIContext.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/CDIContext.java @@ -32,11 +32,12 @@ import java.util.ArrayList; import java.util.List; /** - * KiWi (LMF) Content Util + * Marmotta CDI Context Util * * @author Sebastian Schaffert */ public class CDIContext { + private static BeanManager beanManager; private static final List<String> beanManagerLocations; @@ -44,7 +45,7 @@ public class CDIContext { private static Logger log = LoggerFactory.getLogger(CDIContext.class); static { - beanManagerLocations = new ArrayList<String>(); + beanManagerLocations = new ArrayList<>(); beanManagerLocations.add("java:comp/env/BeanManager"); beanManagerLocations.add("java:comp/BeanManager"); beanManagerLocations.add("java:app/BeanManager"); @@ -52,8 +53,7 @@ public class CDIContext { protected static BeanManager getBeanManager() { - if (beanManager == null) - { + if (beanManager == null) { beanManager = lookupBeanManager(); } return beanManager; @@ -85,7 +85,6 @@ public class CDIContext { @SuppressWarnings("unchecked") public static <T> T getInstance(Class<T> type) { - BeanManager beanManager = getBeanManager(); Bean<T> bean = (Bean<T>) beanManager.getBeans(type).iterator().next(); CreationalContext<T> context = beanManager.createCreationalContext(bean); @@ -172,5 +171,4 @@ public class CDIContext { }catch ( NamingException ex ) {} } - } http://git-wip-us.apache.org/repos/asf/marmotta/blob/43d5235c/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java index b4de8b3..b818c71 100644 --- a/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java +++ b/platform/marmotta-core/src/test/java/org/apache/marmotta/platform/core/test/base/JettyMarmotta.java @@ -55,9 +55,9 @@ public class JettyMarmotta extends AbstractMarmotta { private Server jetty; - private int port; + private final int port; - private String context; + private final String context; public JettyMarmotta(String context) { this(context, getRandomPort()); @@ -80,7 +80,7 @@ public class JettyMarmotta extends AbstractMarmotta { } public JettyMarmotta(String context, int port, Class<?>... webservices) { - this(context,port, new HashSet<Class<?>>(Arrays.asList(webservices))); + this(context,port, new HashSet<>(Arrays.asList(webservices))); } public JettyMarmotta(Configuration override, String context, Set<Class<?>> webservices) { @@ -171,6 +171,7 @@ public class JettyMarmotta extends AbstractMarmotta { @Override public void shutdown() { + container = null; try { jetty.stop(); } catch (Exception e) {
