marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sschaff...@apache.org
Subject [37/37] git commit: renamed some messages that mentioned LMF or Linked Media Framework to Apache Marmotta
Date Fri, 22 Feb 2013 15:21:36 GMT
Updated Branches:
  refs/heads/master 963a6140d -> f0d864154


renamed some messages that mentioned LMF or Linked Media Framework to Apache Marmotta


Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/f0d86415
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/f0d86415
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/f0d86415

Branch: refs/heads/master
Commit: f0d8641548708b1d942dbb72555e001037e4e044
Parents: 69cbd57
Author: Sebastian Schaffert <sschaffert@apache.org>
Authored: Fri Feb 22 16:18:28 2013 +0100
Committer: Sebastian Schaffert <sschaffert@apache.org>
Committed: Fri Feb 22 16:18:28 2013 +0100

----------------------------------------------------------------------
 .../lmf/client/clients/ConfigurationClient.java    |    2 +-
 .../lmf/client/clients/ImportClient.java           |    2 +-
 .../lmf/client/clients/ResourceClient.java         |    2 +-
 .../lmf/client/model/content/Content.java          |    2 +-
 .../lmf/splash/SplashContextListener.java          |    2 +-
 .../newmedialab/lmf/systray/SystrayListener.java   |    4 +-
 .../core/api/config/ConfigurationService.java      |    4 +-
 .../platform/core/filters/LMFServerNameFilter.java |    2 +-
 .../platform/core/jndi/LMFContextFactory.java      |    2 +-
 .../platform/core/jndi/LMFInitialContext.java      |    4 +-
 .../platform/core/jndi/LMFJndiListener.java        |    2 +-
 .../core/services/cache/CachingServiceImpl.java    |    6 +-
 .../services/config/ConfigurationServiceImpl.java  |   22 +++++-----
 .../services/content/FileSystemContentReader.java  |    2 +-
 .../services/content/FileSystemContentWriter.java  |    4 +-
 .../core/services/http/HttpClientServiceImpl.java  |    2 +-
 .../services/importer/rdf/RDFImporterImpl.java     |    8 ++--
 .../core/services/io/LMFIOServiceImpl.java         |    2 +-
 .../services/modules/LMFResourceServiceImpl.java   |    2 +-
 .../core/services/modules/ModuleServiceImpl.java   |    2 +-
 .../platform/core/services/prefix/PrefixCC.java    |    2 +-
 .../services/statistics/StatisticsServiceImpl.java |    2 +-
 .../services/triplestore/ContextServiceImpl.java   |    4 +-
 .../services/triplestore/SesameServiceImpl.java    |   10 ++--
 .../core/servlet/KiWiPostStartupFilter.java        |    4 +-
 .../core/servlet/KiWiPreStartupFilter.java         |    4 +-
 .../core/servlet/KiWiPreStartupListener.java       |    2 +-
 .../platform/core/servlet/KiWiResourceFilter.java  |    2 +-
 .../platform/core/servlet/LMFOptionsFilter.java    |    2 +-
 .../platform/core/startup/LMFStartupService.java   |   30 +++++++-------
 .../config/ConfigurationWebService.java            |    2 +-
 .../core/webservices/io/ExportWebService.java      |    6 +-
 .../security/filters/LMFAccessControlFilter.java   |    2 +-
 .../user/filters/LMFAuthenticationFilter.java      |    2 +-
 34 files changed, 76 insertions(+), 76 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/client/marmotta-client-java/src/main/java/at/newmedialab/lmf/client/clients/ConfigurationClient.java
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/src/main/java/at/newmedialab/lmf/client/clients/ConfigurationClient.java b/client/marmotta-client-java/src/main/java/at/newmedialab/lmf/client/clients/ConfigurationClient.java
index 1d5dd5a..93033de 100644
--- a/client/marmotta-client-java/src/main/java/at/newmedialab/lmf/client/clients/ConfigurationClient.java
+++ b/client/marmotta-client-java/src/main/java/at/newmedialab/lmf/client/clients/ConfigurationClient.java
@@ -42,7 +42,7 @@ import java.util.Map;
 import java.util.Set;
 
 /**
- * A client that supports accessing the configuration webservice of the Linked Media Framework. May be used for
+ * A client that supports accessing the configuration webservice of the Apache Marmotta. May be used for
  * retrieving as well as changing properties.
  *
  * <p/>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/client/marmotta-client-java/src/main/java/at/newmedialab/lmf/client/clients/ImportClient.java
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/src/main/java/at/newmedialab/lmf/client/clients/ImportClient.java b/client/marmotta-client-java/src/main/java/at/newmedialab/lmf/client/clients/ImportClient.java
index e389e5d..9ca1047 100644
--- a/client/marmotta-client-java/src/main/java/at/newmedialab/lmf/client/clients/ImportClient.java
+++ b/client/marmotta-client-java/src/main/java/at/newmedialab/lmf/client/clients/ImportClient.java
@@ -41,7 +41,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 /**
- * This client class provides support for importing ontologies in various formats into the Linked Media Framework.
+ * This client class provides support for importing ontologies in various formats into the Apache Marmotta.
  * 
  * Author: Sebastian Schaffert
  */

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/client/marmotta-client-java/src/main/java/at/newmedialab/lmf/client/clients/ResourceClient.java
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/src/main/java/at/newmedialab/lmf/client/clients/ResourceClient.java b/client/marmotta-client-java/src/main/java/at/newmedialab/lmf/client/clients/ResourceClient.java
index 616be9d..06cf32a 100644
--- a/client/marmotta-client-java/src/main/java/at/newmedialab/lmf/client/clients/ResourceClient.java
+++ b/client/marmotta-client-java/src/main/java/at/newmedialab/lmf/client/clients/ResourceClient.java
@@ -185,7 +185,7 @@ public class ResourceClient {
 
     /**
      * Update (overwrite) the metadata of the resource identified by the given uri. The metadata will be serialised to
-     * application/json and sent to the Linked Media Framework server. The given metadata will override any metadata
+     * application/json and sent to the Apache Marmotta server. The given metadata will override any metadata
      * for the resource already existing on the server. The resource has to exist or be created before updating, otherwise
      * the method will throw a NotFoundException.
      *

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/client/marmotta-client-java/src/main/java/at/newmedialab/lmf/client/model/content/Content.java
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/src/main/java/at/newmedialab/lmf/client/model/content/Content.java b/client/marmotta-client-java/src/main/java/at/newmedialab/lmf/client/model/content/Content.java
index 3c6029d..049dcdd 100644
--- a/client/marmotta-client-java/src/main/java/at/newmedialab/lmf/client/model/content/Content.java
+++ b/client/marmotta-client-java/src/main/java/at/newmedialab/lmf/client/model/content/Content.java
@@ -18,7 +18,7 @@ package at.newmedialab.lmf.client.model.content;
 import java.io.InputStream;
 
 /**
- * Representation of media content returned by the Linked Media Framework. Provides an InputStream for
+ * Representation of media content returned by the Apache Marmotta. Provides an InputStream for
  * reading the media data. Optionally, supports reading all content into a byte array.
  *
  * <p/>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/launchers/marmotta-splash/src/main/java/at/newmedialab/lmf/splash/SplashContextListener.java
----------------------------------------------------------------------
diff --git a/launchers/marmotta-splash/src/main/java/at/newmedialab/lmf/splash/SplashContextListener.java b/launchers/marmotta-splash/src/main/java/at/newmedialab/lmf/splash/SplashContextListener.java
index 046ac8d..8ebe2b8 100644
--- a/launchers/marmotta-splash/src/main/java/at/newmedialab/lmf/splash/SplashContextListener.java
+++ b/launchers/marmotta-splash/src/main/java/at/newmedialab/lmf/splash/SplashContextListener.java
@@ -32,7 +32,7 @@ public class SplashContextListener extends SplashScreenUpdaterBase implements Li
 
     private static Map<String,String> appNames = new HashMap<String, String>();
     static {
-        appNames.put("/LMF","Linked Media Framework");
+        appNames.put("/LMF","Apache Marmotta");
         appNames.put("/refine", "Google Refine");
         appNames.put("/stanbol", "Apache Stanbol");
     }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/launchers/marmotta-splash/src/main/java/at/newmedialab/lmf/systray/SystrayListener.java
----------------------------------------------------------------------
diff --git a/launchers/marmotta-splash/src/main/java/at/newmedialab/lmf/systray/SystrayListener.java b/launchers/marmotta-splash/src/main/java/at/newmedialab/lmf/systray/SystrayListener.java
index c3bc35d..ef30410 100644
--- a/launchers/marmotta-splash/src/main/java/at/newmedialab/lmf/systray/SystrayListener.java
+++ b/launchers/marmotta-splash/src/main/java/at/newmedialab/lmf/systray/SystrayListener.java
@@ -187,7 +187,7 @@ public class SystrayListener implements LifecycleListener {
                 @Override
                 public void actionPerformed(ActionEvent e) {
                     TaskDialogs.inform(null,
-                            "About Linked Media Framework",
+                            "About Apache Marmotta",
                             "LMF 2.3.1-SNAPSHOT, (c)2012 Salzburg NewMediaLab \n" +
                             "Visit http://code.google.com/p/lmf/ for details");
                 }
@@ -207,7 +207,7 @@ public class SystrayListener implements LifecycleListener {
             // load icon image
             try {
                 Image image = ImageIO.read(SystrayListener.class.getResource("lmf1.png"));
-                icon = new TrayIcon(image,"Linked Media Framework",popup);
+                icon = new TrayIcon(image,"Apache Marmotta",popup);
                 icon.setImageAutoSize(true);
                 tray.add(icon);
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/config/ConfigurationService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/config/ConfigurationService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/config/ConfigurationService.java
index c25cbdd..0b2e526 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/config/ConfigurationService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/config/ConfigurationService.java
@@ -62,7 +62,7 @@ public interface ConfigurationService {
 
     /**
      * Get the base URI of the system.
-     * The base URI is used by the LMF to create local resource URIs. In this way, all LMF resources
+     * The base URI is used by the LMF to create local resource URIs. In this way, all Apache Marmotta resources
      * are "Linked Open Data" compatible.
      * 
      * The base URI is calculated based on the request URI given by the user.
@@ -457,7 +457,7 @@ public interface ConfigurationService {
     ServletContext getServletContext();
 
     /**
-     * Get a string describing the type and version of the application server running the LMF.
+     * Get a string describing the type and version of the application server running the Apache Marmotta.
      *
      * @return
      */

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/filters/LMFServerNameFilter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/filters/LMFServerNameFilter.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/filters/LMFServerNameFilter.java
index eaff5ec..0bc7afa 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/filters/LMFServerNameFilter.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/filters/LMFServerNameFilter.java
@@ -97,7 +97,7 @@ public class LMFServerNameFilter implements LMFHttpFilter {
     @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
         HttpServletResponse resp = (HttpServletResponse)response;
-        resp.setHeader("Server","Linked Media Framework/"+moduleConfiguration.getModuleVersion() + " (build "+moduleConfiguration.getBuildRevisionNumber()+")");
+        resp.setHeader("Server","Apache Marmotta/"+moduleConfiguration.getModuleVersion() + " (build "+moduleConfiguration.getBuildRevisionNumber()+")");
 
         chain.doFilter(request,response);
     }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/LMFContextFactory.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/LMFContextFactory.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/LMFContextFactory.java
index 7bfe21f..503f0bb 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/LMFContextFactory.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/LMFContextFactory.java
@@ -37,7 +37,7 @@ public class LMFContextFactory implements InitialContextFactory {
     private static LMFContextFactory instance;
 
     public LMFContextFactory() {
-        log.info("JNDI: initialising LMF Context Factory ...");
+        log.info("JNDI: initialising Apache Marmotta Context Factory ...");
 
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/LMFInitialContext.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/LMFInitialContext.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/LMFInitialContext.java
index 2b965c2..00353ea 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/LMFInitialContext.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/LMFInitialContext.java
@@ -47,7 +47,7 @@ public class LMFInitialContext extends LMFContext {
     public LMFInitialContext(Hashtable<Object, Object> env) {
         super(env);
 
-        log.info("JNDI: creating LMF Initial Context ...");
+        log.info("JNDI: creating Apache Marmotta Initial Context ...");
 
         try {
             Context ctx_java = this.createSubcontext("java:comp");
@@ -57,7 +57,7 @@ public class LMFInitialContext extends LMFContext {
             registerSolrHome(ctx_env);
 
         } catch (NamingException e) {
-            log.error("error while initialising LMF JNDI context",e);
+            log.error("error while initialising Apache Marmotta JNDI context",e);
         }
 
         KiWiContext.showJndiContext(this,"java:", "");

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/LMFJndiListener.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/LMFJndiListener.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/LMFJndiListener.java
index fc7f532..6f39912 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/LMFJndiListener.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/jndi/LMFJndiListener.java
@@ -41,7 +41,7 @@ public class LMFJndiListener implements ServletContextListener {
      */
     @Override
     public void contextInitialized(ServletContextEvent sce) {
-        log.info("JNDI: registering LMF JNDI implementation ...");
+        log.info("JNDI: registering Apache Marmotta JNDI implementation ...");
         try {
             NamingManager.setInitialContextFactoryBuilder(new LMFInitialContextFactoryBuilder());
         } catch (NamingException e) {

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/cache/CachingServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/cache/CachingServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/cache/CachingServiceImpl.java
index b546208..7a215ab 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/cache/CachingServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/cache/CachingServiceImpl.java
@@ -56,7 +56,7 @@ public class CachingServiceImpl implements CachingService {
     public void initialize() {
         URL url = this.getClass().getClassLoader().getResource("ehcache-lmf.xml");
 
-        log.info("LMF Caching Service starting up (configuration at {}) ...",url);
+        log.info("Apache Marmotta Caching Service starting up (configuration at {}) ...",url);
         manager = CacheManager.create(url);
     }
 
@@ -125,7 +125,7 @@ public class CachingServiceImpl implements CachingService {
 
     @PreDestroy
     public void destroy() {
-        log.info("LMF Caching Service shutting down ...");
+        log.info("Apache Marmotta Caching Service shutting down ...");
         /*
         for(String cacheName : manager.getCacheNames()) {
             log.info("Disposing cache {} ...",cacheName);
@@ -134,6 +134,6 @@ public class CachingServiceImpl implements CachingService {
         }
          */
         manager.shutdown();
-        log.info("LMF Caching Service shut down successfully.");
+        log.info("Apache Marmotta Caching Service shut down successfully.");
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
index a6d1a40..e2bd89f 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/config/ConfigurationServiceImpl.java
@@ -124,18 +124,18 @@ public class ConfigurationServiceImpl implements ConfigurationService {
     public void initialize(String lmfHome, Configuration override) {
         initialising = true;
 
-        log.info("LMF Configuration Service starting up ...");
+        log.info("Apache Marmotta Configuration Service starting up ...");
 
         if(isTomcat7()) {
-            log.info("LMF running on Apache Tomcat 7.x");
+            log.info("Apache Marmotta running on Apache Tomcat 7.x");
         } else if(isTomcat6()) {
-            log.info("LMF running on Apache Tomcat <= 6.x");
+            log.info("Apache Marmotta running on Apache Tomcat <= 6.x");
         } else if(isJetty7()) {
-            log.info("LMF running on Jetty 7.x");
+            log.info("Apache Marmotta running on Jetty 7.x");
         } else if(isJetty6()) {
-            log.info("LMF running on Jetty <= 6.x");
+            log.info("Apache Marmotta running on Jetty <= 6.x");
         } else {
-            log.info("LMF running on an unknown servlet container");
+            log.info("Apache Marmotta running on an unknown servlet container");
         }
 
 
@@ -257,7 +257,7 @@ public class ConfigurationServiceImpl implements ConfigurationService {
 
         save();
 
-        log.info("LMF Configuration Service: initialisation completed");
+        log.info("Apache Marmotta Configuration Service: initialisation completed");
 
         configurationInitEvent.fire(new ConfigurationServiceInitEvent());
 
@@ -266,10 +266,10 @@ public class ConfigurationServiceImpl implements ConfigurationService {
     }
 
     /**
-     * Initialise the LMF Logging Configuration.
+     * Initialise the Apache Marmotta Logging Configuration.
      * <ul>
      * <li>if the logback.xml file does not yet exist, create it based on the logback-template.xml resource</li>
-     * <li>reiniaialise the logging framework using the logback.xml file from LMF Home, overwriting the basic logging configured on startup</li>
+     * <li>reiniaialise the logging framework using the logback.xml file from Apache Marmotta Home, overwriting the basic logging configured on startup</li>
      * <li>in case debug.enabled = true, set the root logger level to debug, otherwise set it to info</li>
      * </ul>
      */
@@ -291,7 +291,7 @@ public class ConfigurationServiceImpl implements ConfigurationService {
             }
         }
 
-        log.warn("LOGGING: Switching to LMF logging configuration; further output will be found in {}/log/*.log", getWorkDir());
+        log.warn("LOGGING: Switching to Apache Marmotta logging configuration; further output will be found in {}/log/*.log", getWorkDir());
         LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
         try {
             JoranConfigurator configurator = new JoranConfigurator();
@@ -314,7 +314,7 @@ public class ConfigurationServiceImpl implements ConfigurationService {
 
     private void initDatabaseConfiguration() {
         if (!config.getBoolean("kiwi.setup.database")) {
-            log.info("SETUP: Setting up initial LMF database configuration ...");
+            log.info("SETUP: Setting up initial Apache Marmotta database configuration ...");
             String db_type = config.getString("database.type", "h2");
             config.setProperty("database.h2.url", "jdbc:h2:" + getWorkDir() + "/db/lmf;MVCC=true;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=10");
             if (db_type.equals("h2")) {

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/FileSystemContentReader.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/FileSystemContentReader.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/FileSystemContentReader.java
index b1af141..296e849 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/FileSystemContentReader.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/FileSystemContentReader.java
@@ -147,7 +147,7 @@ public class FileSystemContentReader implements ContentReader {
                             log.warn("accessing file {}, which is outside the default directory; this is a potential security risk; " +
                                     "enable the option content.filesystem.secure in the configuration",path);
                         } else {
-                            throw new FileNotFoundException("the file "+path+" is outside the LMF default directory location; access denied");
+                            throw new FileNotFoundException("the file "+path+" is outside the Apache Marmotta default directory location; access denied");
                         }
                     }
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/FileSystemContentWriter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/FileSystemContentWriter.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/FileSystemContentWriter.java
index 78b7519..d8089d4 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/FileSystemContentWriter.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/content/FileSystemContentWriter.java
@@ -100,7 +100,7 @@ public class FileSystemContentWriter implements ContentWriter {
                             log.warn("accessing file {}, which is outside the default directory; this is a potential security risk; " +
                                     "enable the option content.filesystem.secure in the configuration",path);
                         } else {
-                            throw new FileNotFoundException("the file "+path+" is outside the LMF default directory location; access denied");
+                            throw new FileNotFoundException("the file "+path+" is outside the Apache Marmotta default directory location; access denied");
                         }
                     }
 
@@ -197,7 +197,7 @@ public class FileSystemContentWriter implements ContentWriter {
                             log.warn("accessing file {}, which is outside the default directory; this is a potential security risk; " +
                                     "enable the option content.filesystem.secure in the configuration",path);
                         } else {
-                            throw new FileNotFoundException("the file "+path+" is outside the LMF default directory location; access denied");
+                            throw new FileNotFoundException("the file "+path+" is outside the Apache Marmotta default directory location; access denied");
                         }
                     }
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/HttpClientServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/HttpClientServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/HttpClientServiceImpl.java
index 19a33cc..82784e2 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/HttpClientServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/http/HttpClientServiceImpl.java
@@ -275,7 +275,7 @@ public class HttpClientServiceImpl implements HttpClientService {
 
             httpParams = new BasicHttpParams();
             String userAgentString =
-                    "LMF/" + configurationService.getStringConfiguration("kiwi.version") +
+                    "Apache Marmotta/" + configurationService.getStringConfiguration("kiwi.version") +
                     " (running at " + configurationService.getServerUri() + ")" +
                     " lmf-core/" + configurationService.getStringConfiguration("kiwi.version");
             userAgentString = configurationService.getStringConfiguration("core.http.user_agent", userAgentString);

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/importer/rdf/RDFImporterImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/importer/rdf/RDFImporterImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/importer/rdf/RDFImporterImpl.java
index 2b6c2f5..04c2bdf 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/importer/rdf/RDFImporterImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/importer/rdf/RDFImporterImpl.java
@@ -164,7 +164,7 @@ public class RDFImporterImpl implements Importer {
 
         final String taskName = String.format("RDF Importer Task %d (%s)", ++taskCounter, f.getName());
         Task task = taskManagerService.createSubTask(taskName,"Importer");
-        task.updateMessage("importing data into LMF repository");
+        task.updateMessage("importing data into Apache Marmotta repository");
         task.updateDetailMessage("format", f.getDefaultMIMEType());
         task.updateDetailMessage("baseUri", baseUri);
 
@@ -194,7 +194,7 @@ public class RDFImporterImpl implements Importer {
                     c_import.commit();
                     c_import.close();
                 }
-                log.debug("imported data into LMF repository ({} ms)", System.currentTimeMillis() - timer);
+                log.debug("imported data into Apache Marmotta repository ({} ms)", System.currentTimeMillis() - timer);
 
             } else {
                 log.error("could not load ontology; InputStream was null");
@@ -229,7 +229,7 @@ public class RDFImporterImpl implements Importer {
         String baseUri = configurationService.getBaseUri() + "resource/";
         final String taskName = String.format("RDF Importer Task %d (%s)", ++taskCounter, f.getName());
         Task task = taskManagerService.createSubTask(taskName, "Importer");
-        task.updateMessage("importing data into LMF repository");
+        task.updateMessage("importing data into Apache Marmotta repository");
         task.updateDetailMessage("format", f.getDefaultMIMEType());
         task.updateDetailMessage("baseURI", baseUri);
 
@@ -260,7 +260,7 @@ public class RDFImporterImpl implements Importer {
                     c_import.close();
                 }
 
-                log.info("imported data into LMF repository ({} ms)", System.currentTimeMillis() - timer);
+                log.info("imported data into Apache Marmotta repository ({} ms)", System.currentTimeMillis() - timer);
 
             } else {
                 log.error("could not load ontology; InputStream was null");

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/io/LMFIOServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/io/LMFIOServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/io/LMFIOServiceImpl.java
index 6a74ffd..c98abff 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/io/LMFIOServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/io/LMFIOServiceImpl.java
@@ -46,7 +46,7 @@ public class LMFIOServiceImpl implements LMFIOService {
 
     @PostConstruct
     public void initialise() {
-        log.info("initialising LMF I/O service ...");
+        log.info("initialising Apache Marmotta I/O service ...");
 
         parserRegistry = RDFParserRegistry.getInstance();
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/LMFResourceServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/LMFResourceServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/LMFResourceServiceImpl.java
index f3e00a1..be04cfd 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/LMFResourceServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/LMFResourceServiceImpl.java
@@ -41,7 +41,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * A service for resolving and accessing resources contained in the LMF modules. The resource service takes care
+ * A service for resolving and accessing resources contained in the Apache Marmotta modules. The resource service takes care
  * of retrieving, caching and refreshing resources from the appropriate locations.
  * <p/>
  * Note that the resource service is not to be confused with the RDF resources maintained by the server. It is

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/ModuleServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/ModuleServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/ModuleServiceImpl.java
index 4eef08e..8a1306c 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/ModuleServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/modules/ModuleServiceImpl.java
@@ -223,7 +223,7 @@ public class ModuleServiceImpl implements ModuleService {
     }
 
     /**
-     * Get the path relative to the LMF base URL where the web contents of this URL can be found
+     * Get the path relative to the Apache Marmotta base URL where the web contents of this URL can be found
      *
      * @param moduleName
      * @return

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/prefix/PrefixCC.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/prefix/PrefixCC.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/prefix/PrefixCC.java
index d96728d..9971e81 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/prefix/PrefixCC.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/prefix/PrefixCC.java
@@ -44,7 +44,7 @@ import java.io.IOException;
 public class PrefixCC implements PrefixProvider {
 
     private static final String URI = "http://prefix.cc/";
-    private static final String USER_AGENT = "LMF Prefix";
+    private static final String USER_AGENT = "Apache Marmotta Prefix";
 
     @Inject
     private Logger log;

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/statistics/StatisticsServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/statistics/StatisticsServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/statistics/StatisticsServiceImpl.java
index f536622..e50d74b 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/statistics/StatisticsServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/statistics/StatisticsServiceImpl.java
@@ -57,7 +57,7 @@ public class StatisticsServiceImpl implements StatisticsService {
      */
     @Inject
     protected void initModules(@Any Instance<StatisticsModule> modules) {
-        log.info("LMF StatisticsService starting up ...");
+        log.info("Apache Marmotta StatisticsService starting up ...");
 
         this.modules = new LinkedHashMap<String,StatisticsModule>();
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/ContextServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/ContextServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/ContextServiceImpl.java
index 16514d8..d4f4b8e 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/ContextServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/ContextServiceImpl.java
@@ -47,8 +47,8 @@ import java.util.List;
 import java.util.Set;
 
 /**
- * The context (named graphs in LMF, formerly "knowledge space" in KiWi) service offers convenience
- * functions for working with LMF Contexts. Low level manipulation of contexts is offered by
+ * The context (named graphs in Apache Marmotta, formerly "knowledge space" in KiWi) service offers convenience
+ * functions for working with Apache Marmotta Contexts. Low level manipulation of contexts is offered by
  * TripleStore.
  * <p/>
  * A context or (other name) named graph represent a own graph for a separation of the whole

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/SesameServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/SesameServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/SesameServiceImpl.java
index 36f7c68..27adf8f 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/SesameServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/triplestore/SesameServiceImpl.java
@@ -48,7 +48,7 @@ import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
 
 /**
- * Offers access to the Sesame repository underlying this LMF instance. The activation/deactivation methods
+ * Offers access to the Sesame repository underlying this Apache Marmotta instance. The activation/deactivation methods
  * of this service make sure the repository is properly initialised and shut down.
  * <p/>
  * Usage: to access the triple store properly through Sesame, you should follow the following
@@ -120,7 +120,7 @@ public class SesameServiceImpl implements SesameService {
      */
     @Override
     public synchronized void initialise() {
-        log.info("LMF Sesame Repository Service starting up ...");
+        log.info("Apache Marmotta Sesame Repository Service starting up ...");
 
         if(repository != null) {
             log.warn("RDF repository has already been initialized");
@@ -186,7 +186,7 @@ public class SesameServiceImpl implements SesameService {
         try {
             repository.initialize();
         } catch (RepositoryException e) {
-            log.error("error while initialising LMF Sesame repository",e);
+            log.error("error while initialising Apache Marmotta Sesame repository",e);
         }
     }
 
@@ -197,11 +197,11 @@ public class SesameServiceImpl implements SesameService {
     @PreDestroy
     public synchronized void shutdown() {
         if(repository != null) {
-            log.info("LMF Sesame Repository Service shutting down ...");
+            log.info("Apache Marmotta Sesame Repository Service shutting down ...");
             try {
                 repository.shutDown();
             } catch (RepositoryException e) {
-                log.error("error while shutting down LMF Sesame repository",e);
+                log.error("error while shutting down Apache Marmotta Sesame repository",e);
             }
             repository = null;
         }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/KiWiPostStartupFilter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/KiWiPostStartupFilter.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/KiWiPostStartupFilter.java
index de546c1..f9a2e4f 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/KiWiPostStartupFilter.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/KiWiPostStartupFilter.java
@@ -74,9 +74,9 @@ public class KiWiPostStartupFilter implements Filter {
         }
 
         if(moduleConfiguration.hasBuildInfo()) {
-            log.warn("LMF Core Version {} has started up successfully!", moduleConfiguration.getModuleVersion());
+            log.warn("Apache Marmotta Core Version {} has started up successfully!", moduleConfiguration.getModuleVersion());
         } else {
-            log.warn("LMF Core (Development Version) has started up successfully!");
+            log.warn("Apache Marmotta Core (Development Version) has started up successfully!");
         }
 
         log.warn("You can access the system now at the URL {}", "http://"+configurationService.getServerName()+":"+configurationService.getServerPort()+configurationService.getServerContext()+"/");

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/KiWiPreStartupFilter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/KiWiPreStartupFilter.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/KiWiPreStartupFilter.java
index 1fd6e91..580c6a9 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/KiWiPreStartupFilter.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/KiWiPreStartupFilter.java
@@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 
 /**
- * This filter is evaluated when the LMF system is accessed for the very first time using an HTTP client (e.g. a
+ * This filter is evaluated when the Apache Marmotta system is accessed for the very first time using an HTTP client (e.g. a
  * browser). Its purpose is to set configuration variables that cannot be determined when the server is starting
  * up because they need information how the server is accessed. In particular, it will set the following
  * configuration variables in case the system has not yet been configured:
@@ -100,7 +100,7 @@ public class KiWiPreStartupFilter implements Filter {
                 if(baseUrl != null) {
                     startupService.startupHost(baseUrl, baseUrl);
                 } else {
-                    log.error("could not determine host name; cannot startup LMF");
+                    log.error("could not determine host name; cannot startup Apache Marmotta");
                 }
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/KiWiPreStartupListener.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/KiWiPreStartupListener.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/KiWiPreStartupListener.java
index aea9026..f8da8a5 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/KiWiPreStartupListener.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/KiWiPreStartupListener.java
@@ -22,7 +22,7 @@ import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
 /**
- * This filter is executed first in the startup chain. It initialises the LMF system variables if necessary and
+ * This filter is executed first in the startup chain. It initialises the Apache Marmotta system variables if necessary and
  * starts up the configuration service.
  */
 public class KiWiPreStartupListener implements ServletContextListener {

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/KiWiResourceFilter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/KiWiResourceFilter.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/KiWiResourceFilter.java
index 39c71b8..a3d25fe 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/KiWiResourceFilter.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/KiWiResourceFilter.java
@@ -76,7 +76,7 @@ public class KiWiResourceFilter implements Filter {
      */
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
-        log.info("LMF Resource Filter {} starting up ... ", configurationService.getConfiguration("kiwi.version"));
+        log.info("Apache Marmotta Resource Filter {} starting up ... ", configurationService.getConfiguration("kiwi.version"));
 
 
         // initialise filter chain and sort it according to priority

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/LMFOptionsFilter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/LMFOptionsFilter.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/LMFOptionsFilter.java
index 808b8e0..8ca8ea1 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/LMFOptionsFilter.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/LMFOptionsFilter.java
@@ -38,7 +38,7 @@ import java.util.Arrays;
 /**
  * This filter checks for OPTIONS requests. If the response returned by the other filters throws an exception
  * org.jboss.resteasy.spi.DefaultOptionsMethodException, the filter writes to the response the default options
- * of the LMF system, in particular the following headers:
+ * of the Apache Marmotta system, in particular the following headers:
  *
  * Access-Control-Allow-Origin: * (or as configured in config.properties)
  * Access-Control-Allow-Methods: POST, PUT, GET, DELETE, HEAD, OPTIONS

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/startup/LMFStartupService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/startup/LMFStartupService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/startup/LMFStartupService.java
index f9088bb..ab1ca26 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/startup/LMFStartupService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/startup/LMFStartupService.java
@@ -41,9 +41,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * This service unifies the different steps in the LMF startup. It offers several methods
+ * This service unifies the different steps in the Apache Marmotta startup. It offers several methods
  * for triggering the different startup sequences and can be used e.g. by web applications or
- * embedded applications to initiate LMF startup. Note that the LMF Startup requires a running
+ * embedded applications to initiate Apache Marmotta startup. Note that the Apache Marmotta Startup requires a running
  * CDI/Weld environment before being used.
  * <p/>
  * Author: Sebastian Schaffert
@@ -79,14 +79,14 @@ public class LMFStartupService {
     }
 
     /**
-     * Startup the LMF Configuration. This method ensures that the LMF home directory is created and the
+     * Startup the Apache Marmotta Configuration. This method ensures that the Apache Marmotta home directory is created and the
      * ConfigurationService is properly initialised. It must be called first in the startup sequence.
      * The parameters lmfHome and configurationOverride can be used to override the default settings
-     * of the LMF.
+     * of the Apache Marmotta.
      *
-     * @param lmfHome                 home directory of the LMF instance (may be null, in which case the default will be used)
+     * @param lmfHome                 home directory of the Apache Marmotta instance (may be null, in which case the default will be used)
      * @param configurationOverride   configuration options that should override the default values from default-config.properties (may be null)
-     * @param context                 the servlet context the LMF is running in (may be null)
+     * @param context                 the servlet context the Apache Marmotta is running in (may be null)
      */
     public void startupConfiguration(String lmfHome, Configuration configurationOverride, ServletContext context) {
         lock.lock();
@@ -96,14 +96,14 @@ public class LMFStartupService {
 
         try {
             if(configurationStarted) {
-                log.warn("LMF Startup: configuration already started; ignoring second request");
+                log.warn("Apache Marmotta Startup: configuration already started; ignoring second request");
                 return;
             }
 
             ModuleConfiguration coreConfiguration = moduleService.getModuleConfiguration(this.getClass());
 
             if(coreConfiguration.hasBuildInfo()) {
-                log.info("LMF Core Version {} starting up ... ", coreConfiguration.getModuleVersion());
+                log.info("Apache Marmotta Core Version {} starting up ... ", coreConfiguration.getModuleVersion());
                 log.info("Build Information:");
                 log.info(" - Build User: {}", coreConfiguration.getBuildUser());
                 log.info(" - Build Host: {}", coreConfiguration.getBuildHost());
@@ -112,7 +112,7 @@ public class LMFStartupService {
                 log.info(" - Revision:   {}:{}", coreConfiguration.getBuildRevisionNumber(), coreConfiguration.getBuildRevisionHash());
                 versionNumber = coreConfiguration.getModuleVersion();
             } else {
-                log.info("LMF Core (Development Version) starting up ... ");
+                log.info("Apache Marmotta Core (Development Version) starting up ... ");
             }
 
             String kiwiHome = lmfHome;
@@ -138,7 +138,7 @@ public class LMFStartupService {
                                 log.info("Configured working directory {} from servlet context parameter kiwi.home",kiwiHome);
                             }
                         } else {
-                            log.error("could not determine LMF home directory, please set the environment variable LMF_HOME");
+                            log.error("could not determine Apache Marmotta home directory, please set the environment variable LMF_HOME");
                         }
                     }
                 }
@@ -184,15 +184,15 @@ public class LMFStartupService {
 
 
     /**
-     * Start up the LMF server environment. This method ensures that the base URL for the host (used by the
+     * Start up the Apache Marmotta server environment. This method ensures that the base URL for the host (used by the
      * web interface) and the context (used for creating local Linked Data URIs) is properly set and thus
      * the services depending on this configuration can start up. This method must be called in the second
-     * phase of LMF startup, i.e. when the configuration service is already configured.
+     * phase of Apache Marmotta startup, i.e. when the configuration service is already configured.
      * <p/>
      * The method expects a host URL and a context URL to be given. In case the context URL is not given,
      * it will be the same as the host URL.
      *
-     * @param hostUrl     the URL of the host, used as based URL for building the LMF web interface
+     * @param hostUrl     the URL of the host, used as based URL for building the Apache Marmotta web interface
      * @param contextUrl  the base URL used to construct Linked Data resources
      */
     public void startupHost(String hostUrl, String contextUrl) {
@@ -200,7 +200,7 @@ public class LMFStartupService {
 
         try {
             if(hostStarted) {
-                log.warn("LMF Startup: host already started; ignoring subsequent startup requests");
+                log.warn("Apache Marmotta Startup: host already started; ignoring subsequent startup requests");
                 return;
             }
  
@@ -238,7 +238,7 @@ public class LMFStartupService {
     }
 
     public void shutdown() {
-        log.info("LMF Core shutting down ...");
+        log.info("Apache Marmotta Core shutting down ...");
     }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java
index fa6c560..0baff7f 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/config/ConfigurationWebService.java
@@ -44,7 +44,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- *  Manage the system configuration of the LMF Server. Provides methods for displaying and updating the configuration
+ *  Manage the system configuration of the Apache Marmotta Server. Provides methods for displaying and updating the configuration
  *  values.
  */
 @ApplicationScoped

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/io/ExportWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/io/ExportWebService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/io/ExportWebService.java
index e9f8384..2e372ac 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/io/ExportWebService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/io/ExportWebService.java
@@ -44,7 +44,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * A web service for exporting data from the LMF triple store
+ * A web service for exporting data from the Apache Marmotta triple store
  * <p/>
  * Author: Sebastian Schaffert
  */
@@ -77,7 +77,7 @@ public class ExportWebService {
 
     /**
      * Download the triple data contained in the (optional) context (named graph) in the format specified by the Accept
-     * header of the request. If the context parameter is not given, all triples contained in this LMF installation will
+     * header of the request. If the context parameter is not given, all triples contained in this Apache Marmotta installation will
      * be written to the response.
      *
      * @param types          list of MIME types the client accepts
@@ -88,7 +88,7 @@ public class ExportWebService {
      *
      * @HTTP 200 in case the triples were written to the output stream correctly
      * @HTTP 404 in case the context passed as argument could not be found
-     * @HTTP 406 in case the LMF could not find any matching serializer for the MIME types in the Accept header
+     * @HTTP 406 in case the Apache Marmotta could not find any matching serializer for the MIME types in the Accept header
      */
     @GET
     @Path("/download")

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-security/src/main/java/org/apache/marmotta/platform/security/filters/LMFAccessControlFilter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-security/src/main/java/org/apache/marmotta/platform/security/filters/LMFAccessControlFilter.java b/platform/marmotta-security/src/main/java/org/apache/marmotta/platform/security/filters/LMFAccessControlFilter.java
index 21f79a9..343ec85 100644
--- a/platform/marmotta-security/src/main/java/org/apache/marmotta/platform/security/filters/LMFAccessControlFilter.java
+++ b/platform/marmotta-security/src/main/java/org/apache/marmotta/platform/security/filters/LMFAccessControlFilter.java
@@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 
 /**
- * A filter providing basic access control for the Linked Media Framework. Makes use of container-managed
+ * A filter providing basic access control for the Apache Marmotta. Makes use of container-managed
  * user authentication and security roles as provided e.g. by the {@link org.apache.marmotta.platform.user.filters.LMFAuthenticationFilter}.
  * <p/>
  * Whenever an HTTP request is received, the filter runs through the configured security constraints and checks

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f0d86415/platform/marmotta-user/src/main/java/org/apache/marmotta/platform/user/filters/LMFAuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/src/main/java/org/apache/marmotta/platform/user/filters/LMFAuthenticationFilter.java b/platform/marmotta-user/src/main/java/org/apache/marmotta/platform/user/filters/LMFAuthenticationFilter.java
index 78b0043..09e1180 100644
--- a/platform/marmotta-user/src/main/java/org/apache/marmotta/platform/user/filters/LMFAuthenticationFilter.java
+++ b/platform/marmotta-user/src/main/java/org/apache/marmotta/platform/user/filters/LMFAuthenticationFilter.java
@@ -186,7 +186,7 @@ public class LMFAuthenticationFilter implements LMFHttpFilter {
             //                } else if("DIGEST".equalsIgnoreCase(configurationService.getStringConfiguration("security.method"))) {
             //                    authMethod = "Digest";
         }
-        String authRealm  = configurationService.getStringConfiguration("security.realm","Linked Media Framework");
+        String authRealm  = configurationService.getStringConfiguration("security.realm","Apache Marmotta");
 
         httpResponse.setHeader("WWW-Authenticate",authMethod + " realm=\""+authRealm+"\"");
     }


Mime
View raw message