You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/10/09 13:28:02 UTC
git commit: fix a small bug in the webapp redirections
Updated Branches:
refs/heads/develop 710605529 -> 8b128873d
fix a small bug in the webapp redirections
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/8b128873
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/8b128873
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/8b128873
Branch: refs/heads/develop
Commit: 8b128873dd09e0fee56d5860befe85479b0f7142
Parents: 7106055
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Wed Oct 9 13:27:56 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Wed Oct 9 13:27:56 2013 +0200
----------------------------------------------------------------------
launchers/marmotta-webapp-bigdata/src/main/webapp/index.jsp | 2 +-
launchers/marmotta-webapp/src/main/webapp/index.jsp | 2 +-
platform/marmotta-core/pom.xml | 8 ++++++++
3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8b128873/launchers/marmotta-webapp-bigdata/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp-bigdata/src/main/webapp/index.jsp b/launchers/marmotta-webapp-bigdata/src/main/webapp/index.jsp
index a57f3d8..a25f4f6 100644
--- a/launchers/marmotta-webapp-bigdata/src/main/webapp/index.jsp
+++ b/launchers/marmotta-webapp-bigdata/src/main/webapp/index.jsp
@@ -21,5 +21,5 @@
<%@ page import="org.apache.marmotta.platform.core.util.CDIContext" %>
<%
ConfigurationService configurationService = CDIContext.getInstance(ConfigurationService.class);
- response.sendRedirect(configurationService.getBaseUri()+configurationService.getStringConfiguration("kiwi.pages.startup"));
+ response.sendRedirect(configurationService.getServerUri()+configurationService.getStringConfiguration("kiwi.pages.startup"));
%>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8b128873/launchers/marmotta-webapp/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/main/webapp/index.jsp b/launchers/marmotta-webapp/src/main/webapp/index.jsp
index a57f3d8..a25f4f6 100644
--- a/launchers/marmotta-webapp/src/main/webapp/index.jsp
+++ b/launchers/marmotta-webapp/src/main/webapp/index.jsp
@@ -21,5 +21,5 @@
<%@ page import="org.apache.marmotta.platform.core.util.CDIContext" %>
<%
ConfigurationService configurationService = CDIContext.getInstance(ConfigurationService.class);
- response.sendRedirect(configurationService.getBaseUri()+configurationService.getStringConfiguration("kiwi.pages.startup"));
+ response.sendRedirect(configurationService.getServerUri()+configurationService.getStringConfiguration("kiwi.pages.startup"));
%>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/8b128873/platform/marmotta-core/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml
index a3c5ca4..780359d 100644
--- a/platform/marmotta-core/pom.xml
+++ b/platform/marmotta-core/pom.xml
@@ -381,6 +381,14 @@
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
+ <!-- introduces a cyclic reference ...
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>marmotta-backend-kiwi</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ -->
<dependency>
<groupId>com.jayway.restassured</groupId>