You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2014/07/21 15:38:11 UTC
[15/16] git commit: lmf cleanup
lmf cleanup
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/c39ac731
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/c39ac731
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/c39ac731
Branch: refs/heads/ldp
Commit: c39ac7316a274dc7111334a1317786e714063aed
Parents: 5d2675f
Author: Sergio Fernández <wi...@apache.org>
Authored: Tue Jul 15 14:04:24 2014 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Jul 15 14:04:24 2014 +0200
----------------------------------------------------------------------
.../platform/core/servlet/MarmottaResourceFilter.java | 2 +-
.../platform/user/filters/MarmottaAuthenticationFilter.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/c39ac731/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaResourceFilter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaResourceFilter.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaResourceFilter.java
index 7e0d81b..559b3cb 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaResourceFilter.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/servlet/MarmottaResourceFilter.java
@@ -154,7 +154,7 @@ public class MarmottaResourceFilter implements Filter {
}
/**
- * A special filter chain that implements the LMFHttpFilter calls
+ * A special filter chain that implements the FilterChain calls
*/
private class MarmottaFilterChain implements FilterChain {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/c39ac731/platform/marmotta-user/src/main/java/org/apache/marmotta/platform/user/filters/MarmottaAuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/src/main/java/org/apache/marmotta/platform/user/filters/MarmottaAuthenticationFilter.java b/platform/marmotta-user/src/main/java/org/apache/marmotta/platform/user/filters/MarmottaAuthenticationFilter.java
index 6bde0d4..f8e729b 100644
--- a/platform/marmotta-user/src/main/java/org/apache/marmotta/platform/user/filters/MarmottaAuthenticationFilter.java
+++ b/platform/marmotta-user/src/main/java/org/apache/marmotta/platform/user/filters/MarmottaAuthenticationFilter.java
@@ -42,7 +42,7 @@ import java.io.IOException;
import static org.apache.commons.codec.binary.Base64.decodeBase64;
/**
- * This filter implements HTTB Basic Authentication support for the LMF. It serves two purposes:
+ * This filter implements HTTB Basic Authentication support for the Marmotta. It serves two purposes:
* <ul>
* <li>carrying out HTTP Basic Authentication when an "Authorization" header is present</li>
* <li>sending an HTTP authorization request in case one of the services in the chain threw an AccessDeniedException</li>
@@ -50,7 +50,7 @@ import static org.apache.commons.codec.binary.Base64.decodeBase64;
*
* In case security is enabled, it listens for the presence of an "Authorization" header, parses it according to HTTP Basic Authentication
* (Base64 decoding and splitting username/password at ":") and tries to authenticate with the given
- * credentials using the LMF AuthenticationService.
+ * credentials using the Marmotta AuthenticationService.
* <ul>
* <li>In case authentication succeeds, it sets the attributes
* user.name and user.roles in the request so that further filters/services can make use of the
@@ -59,7 +59,7 @@ import static org.apache.commons.codec.binary.Base64.decodeBase64;
* </ul>
* The filter also listens for {@link org.apache.marmotta.platform.core.exception.security.AccessDeniedException} thrown by
* subsequent filters or servlets in the chain, in which case it returns an HTTP authorization request to the
- * client. In particular, this functionality is used by the LMFAccessControlFilter to restrict access to
+ * client. In particular, this functionality is used by the MarmottaAccessControlFilter to restrict access to
* services based on security profiles.
* <p/>
* @see UserService
@@ -92,7 +92,7 @@ public class MarmottaAuthenticationFilter implements MarmottaHttpFilter {
/**
- * Return the pattern (regular expression) that a request URI (relative to the LMF base URI) has to match
+ * Return the pattern (regular expression) that a request URI (relative to the base URI) has to match
* before triggering this filter.
*
* @return