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 2013/11/15 16:52:26 UTC

git commit: fixed error messages

Updated Branches:
  refs/heads/develop 4232deda7 -> 531b15164


fixed error messages


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

Branch: refs/heads/develop
Commit: 531b151641c67f50a7458e8b3dcb4cd553f5d478
Parents: 4232ded
Author: Sergio Fernández <wi...@apache.org>
Authored: Fri Nov 15 16:52:16 2013 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Fri Nov 15 16:52:16 2013 +0100

----------------------------------------------------------------------
 .../platform/core/webservices/resource/MetaWebService.java         | 2 +-
 .../platform/core/webservices/resource/ResourceWebService.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/531b1516/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/MetaWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/MetaWebService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/MetaWebService.java
index 9b7cbe4..cf43488 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/MetaWebService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/MetaWebService.java
@@ -262,7 +262,7 @@ public class MetaWebService {
             	}
             	
                 if (r == null || !ResourceUtils.isUsed(conn, r)) {
-                	return ResourceWebServiceHelper.buildErrorPage(resource, configurationService.getBaseUri(), Response.Status.NOT_FOUND, "the requested resource could not be found in LMF right now, but may be available again in the future", configurationService, templatingService);
+                	return ResourceWebServiceHelper.buildErrorPage(resource, configurationService.getBaseUri(), Response.Status.NOT_FOUND, "the requested resource could not be found in Marmotta right now, but may be available again in the future", configurationService, templatingService);
                 }
             	
                 // create parser

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/531b1516/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/ResourceWebService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/ResourceWebService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/ResourceWebService.java
index fe3fe5d..2373140 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/ResourceWebService.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/webservices/resource/ResourceWebService.java
@@ -384,7 +384,7 @@ public class ResourceWebService {
 	                	return Response.status(Status.NOT_FOUND).entity("blank node id "  + resource + " not found").build();
 	                }
             	}
-                if (r == null) return ResourceWebServiceHelper.buildErrorPage(resource, configurationService.getBaseUri(), Response.Status.NOT_FOUND, "the requested resource could not be found in LMF right now, but may be available again in the future", configurationService, templatingService);
+                if (r == null) return ResourceWebServiceHelper.buildErrorPage(resource, configurationService.getBaseUri(), Response.Status.NOT_FOUND, "the requested resource could not be found in Marmotta right now, but may be available again in the future", configurationService, templatingService);
                 // FIXME String appendix = uuid == null ? "?uri=" + URLEncoder.encode(uri, "utf-8") :
                 // "/" + uuid;