You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2014/03/03 14:45:17 UTC
git commit: LMF is gone...
Repository: marmotta
Updated Branches:
refs/heads/develop e2e23ef74 -> dd004d325
LMF is gone...
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/dd004d32
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/dd004d32
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/dd004d32
Branch: refs/heads/develop
Commit: dd004d325462a61ebd89a36717da37338e1839ce
Parents: e2e23ef
Author: Jakob Frank <ja...@apache.org>
Authored: Mon Mar 3 14:44:48 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Mon Mar 3 14:44:48 2014 +0100
----------------------------------------------------------------------
platform/backends/marmotta-backend-http/pom.xml | 2 +-
.../platform/core/servlet/MarmottaPreStartupListener.java | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/dd004d32/platform/backends/marmotta-backend-http/pom.xml
----------------------------------------------------------------------
diff --git a/platform/backends/marmotta-backend-http/pom.xml b/platform/backends/marmotta-backend-http/pom.xml
index 338e126..1087c20 100644
--- a/platform/backends/marmotta-backend-http/pom.xml
+++ b/platform/backends/marmotta-backend-http/pom.xml
@@ -97,7 +97,7 @@
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<name>REST API</name>
- <description>REST API for LMF Webservices</description>
+ <description>REST API for Marmotta Webservices</description>
<outputDirectory>${project.build.outputDirectory}/doc</outputDirectory>
<reportOutputDirectory>${project.build.outputDirectory}/web/doc</reportOutputDirectory>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/dd004d32/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaPreStartupListener.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaPreStartupListener.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaPreStartupListener.java
index 85a8662..ba7bc47 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaPreStartupListener.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaPreStartupListener.java
@@ -37,7 +37,7 @@ public class MarmottaPreStartupListener implements ServletContextListener {
private static Logger log = LoggerFactory.getLogger(MarmottaPreStartupListener.class);
- private MarmottaStartupService lmfStartupService;
+ private MarmottaStartupService startupService;
/**
* * Notification that the web application initialization
@@ -49,8 +49,8 @@ public class MarmottaPreStartupListener implements ServletContextListener {
@Override
public void contextInitialized(ServletContextEvent sce) {
- if(lmfStartupService == null) {
- lmfStartupService = CDIContext.getInstance(MarmottaStartupService.class);
+ if(startupService == null) {
+ startupService = CDIContext.getInstance(MarmottaStartupService.class);
}
// we check for the presence of the configuration.override init parameter; if it exists, we load this
@@ -65,7 +65,7 @@ public class MarmottaPreStartupListener implements ServletContextListener {
}
}
- lmfStartupService.startupConfiguration(null,override,sce.getServletContext());
+ startupService.startupConfiguration(null, override, sce.getServletContext());
}
@@ -77,7 +77,7 @@ public class MarmottaPreStartupListener implements ServletContextListener {
*/
@Override
public void contextDestroyed(ServletContextEvent sce) {
- lmfStartupService.shutdown();
+ startupService.shutdown();
}
}