You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/07/13 15:01:07 UTC
svn commit: r1361191 - in /incubator/isis/trunk/framework: tck/tck-dom/
viewer/restfulobjects/restfulobjects-tck/src/main/webapp/WEB-INF/
viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/
Author: danhaywood
Date: Fri Jul 13 13:01:06 2012
New Revision: 1361191
URL: http://svn.apache.org/viewvc?rev=1361191&view=rev
Log:
ISIS-233: fixing embedded viewer webapp config for restful viewer
Modified:
incubator/isis/trunk/framework/tck/tck-dom/.project
incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/EmbeddedWebViewerJson.java
Modified: incubator/isis/trunk/framework/tck/tck-dom/.project
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/.project?rev=1361191&r1=1361190&r2=1361191&view=diff
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/.project (original)
+++ incubator/isis/trunk/framework/tck/tck-dom/.project Fri Jul 13 13:01:06 2012
@@ -11,12 +11,12 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
+ <name>org.datanucleus.ide.eclipse.enhancerbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.datanucleus.ide.eclipse.enhancerbuilder</name>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/main/webapp/WEB-INF/web.xml?rev=1361191&r1=1361190&r2=1361191&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/main/webapp/WEB-INF/web.xml Fri Jul 13 13:01:06 2012
@@ -23,34 +23,6 @@
<display-name>RestfulObjects TCK</display-name>
- <listener>
- <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
- </listener>
-
- <context-param>
- <param-name>isis.viewers</param-name>
- <param-value>restfulobjects</param-value>
- </context-param>
-
- <context-param>
- <param-name>javax.ws.rs.Application</param-name>
- <param-value>org.apache.isis.viewer.restfulobjects.viewer.RestfulObjectsApplication</param-value>
- </context-param>
-
- <filter>
- <filter-name>IsisSessionFilter</filter-name>
- <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
- <init-param>
- <!-- trusted client, so no authentication required -->
- <param-name>authenticationSessionStrategy</param-name>
- <param-value>org.apache.isis.viewer.restfulobjects.viewer.authentication.AuthenticationSessionStrategyTrusted</param-value>
- </init-param>
- <init-param>
- <!-- what to do if no session was found; we indicate to issue a 401 basic authentication challenge -->
- <param-name>whenNoSession</param-name>
- <param-value>continue</param-value>
- </init-param>
- </filter>
<filter>
<filter-name>ResourceCachingFilter</filter-name>
@@ -62,11 +34,6 @@
</filter>
<filter-mapping>
- <filter-name>IsisSessionFilter</filter-name>
- <url-pattern>*</url-pattern>
- </filter-mapping>
-
- <filter-mapping>
<filter-name>ResourceCachingFilter</filter-name>
<url-pattern>*.js</url-pattern>
</filter-mapping>
@@ -87,26 +54,12 @@
<url-pattern>*.gif</url-pattern>
</filter-mapping>
- <listener>
- <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>RestEasy</servlet-name>
- <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
- </servlet>
-
<servlet>
<servlet-name>Resource</servlet-name>
<servlet-class>org.apache.isis.core.webapp.content.ResourceServlet</servlet-class>
</servlet>
<servlet-mapping>
- <servlet-name>RestEasy</servlet-name>
- <url-pattern>/</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
<servlet-name>Resource</servlet-name>
<url-pattern>*.js</url-pattern>
</servlet-mapping>
@@ -123,4 +76,58 @@
<url-pattern>*.html</url-pattern>
</servlet-mapping>
+
+
+
+ <listener>
+ <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
+ </listener>
+
+ <context-param>
+ <param-name>isis.viewers</param-name>
+ <param-value>restfulobjects</param-value>
+ </context-param>
+
+ <filter>
+ <filter-name>IsisSessionFilter</filter-name>
+ <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
+ <init-param>
+ <!-- trusted client, so no authentication required -->
+ <param-name>authenticationSessionStrategy</param-name>
+ <param-value>org.apache.isis.viewer.restfulobjects.viewer.authentication.AuthenticationSessionStrategyTrusted</param-value>
+ </init-param>
+ <init-param>
+ <!-- what to do if no session was found; we indicate to issue a 401 basic authentication challenge -->
+ <param-name>whenNoSession</param-name>
+ <param-value>continue</param-value>
+ </init-param>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>IsisSessionFilter</filter-name>
+ <url-pattern>*</url-pattern>
+ </filter-mapping>
+
+
+
+
+ <listener>
+ <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
+ </listener>
+
+ <context-param>
+ <param-name>javax.ws.rs.Application</param-name>
+ <param-value>org.apache.isis.viewer.restfulobjects.viewer.RestfulObjectsApplication</param-value>
+ </context-param>
+
+ <servlet>
+ <servlet-name>RestEasy</servlet-name>
+ <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>RestEasy</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+
</web-app>
Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/EmbeddedWebViewerJson.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/EmbeddedWebViewerJson.java?rev=1361191&r1=1361190&r2=1361191&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/EmbeddedWebViewerJson.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/EmbeddedWebViewerJson.java Fri Jul 13 13:01:06 2012
@@ -27,6 +27,7 @@ import org.apache.isis.core.webapp.conte
import org.apache.isis.runtimes.dflt.runtime.viewer.web.WebAppSpecification;
import org.apache.isis.runtimes.dflt.runtime.web.EmbeddedWebViewer;
import org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter;
+import org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper;
import org.apache.isis.viewer.restfulobjects.viewer.RestfulObjectsApplication;
import org.apache.isis.viewer.restfulobjects.viewer.authentication.AuthenticationSessionStrategyTrusted;
@@ -35,18 +36,26 @@ final class EmbeddedWebViewerJson extend
public WebAppSpecification getWebAppSpecification() {
final WebAppSpecification webAppSpec = new WebAppSpecification();
- webAppSpec.addContextParams("isis.viewers", "json");
+ webAppSpec.addServletContextListener(IsisWebAppBootstrapper.class);
+
+ webAppSpec.addContextParams("isis.viewers", "restfulobjects");
webAppSpec.addContextParams(JsonViewerInstaller.JAVAX_WS_RS_APPLICATION, RestfulObjectsApplication.class.getName());
- webAppSpec.addServletContextListener(ResteasyBootstrap.class);
-
- webAppSpec.addFilterSpecification(IsisSessionFilter.class, MapUtils.asMap(IsisSessionFilter.AUTHENTICATION_SESSION_STRATEGY_KEY, AuthenticationSessionStrategyTrusted.class.getName()), JsonViewerInstaller.EVERYTHING);
- webAppSpec.addServletSpecification(HttpServletDispatcher.class, JsonViewerInstaller.ROOT);
+ webAppSpec.addFilterSpecification(IsisSessionFilter.class,
+ MapUtils.asMap(
+ IsisSessionFilter.AUTHENTICATION_SESSION_STRATEGY_KEY, AuthenticationSessionStrategyTrusted.class.getName(),
+ IsisSessionFilter.WHEN_NO_SESSION_KEY, IsisSessionFilter.WhenNoSession.CONTINUE.name().toLowerCase()),
+ JsonViewerInstaller.EVERYTHING);
webAppSpec.addFilterSpecification(ResourceCachingFilter.class, JsonViewerInstaller.STATIC_CONTENT);
webAppSpec.addServletSpecification(ResourceServlet.class, JsonViewerInstaller.STATIC_CONTENT);
+
+ webAppSpec.addServletContextListener(ResteasyBootstrap.class);
+ webAppSpec.addServletSpecification(HttpServletDispatcher.class, JsonViewerInstaller.ROOT);
+
+
return webAppSpec;
}
}
\ No newline at end of file