incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1074654 - /incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java
Date Fri, 25 Feb 2011 18:13:45 GMT
Author: danhaywood
Date: Fri Feb 25 18:13:44 2011
New Revision: 1074654

URL: http://svn.apache.org/viewvc?rev=1074654&view=rev
Log:
fixing a problem with HTML viewer not rendering static content correctly (due to recent hacking
for archetype that didn't work out)

Modified:
    incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java

Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java?rev=1074654&r1=1074653&r2=1074654&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java
(original)
+++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/HtmlViewerInstaller.java
Fri Feb 25 18:13:44 2011
@@ -28,7 +28,6 @@ import org.apache.isis.core.runtime.web.
 import org.apache.isis.core.runtime.web.WebAppSpecification;
 import org.apache.isis.core.webapp.IsisSessionFilter;
 import org.apache.isis.core.webapp.StaticContentFilter;
-import org.apache.isis.core.webapp.servlets.RedirectServlet;
 import org.apache.isis.core.webapp.servlets.ResourceServlet;
 import org.apache.isis.viewer.html.servlet.ControllerServlet;
 import org.apache.isis.viewer.html.servlet.HtmlServletConstants;
@@ -84,13 +83,6 @@ public class HtmlViewerInstaller extends
                         STATIC_CONTENT);
                 webAppSpec.addServletSpecification(ResourceServlet.class, STATIC_CONTENT
);
 
-                // this is slightly different from the web.xml in the archetype, and doesn't
-                // redirect from '/', only from '/xxx' (ie need to type something after the
'/')  
-                webAppSpec.addServletSpecification(
-                        RedirectServlet.class, 
-                        MapUtils.asMap("redirectTo", LOGON_PAGE),
-                        "/" );
-
                 final String resourceBaseDir = getConfiguration().getString(HtmlViewerConstants.VIEWER_HTML_RESOURCE_BASE_KEY);
                 if (resourceBaseDir != null) {
                     webAppSpec.addResourcePath(resourceBaseDir);



Mime
View raw message