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:02:45 UTC
svn commit: r1361193 - in /incubator/isis/trunk/framework:
runtimes/dflt/runtime/src/main/resources/org/apache/isis/runtimes/dflt/runtime/
viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/
Author: danhaywood
Date: Fri Jul 13 13:02:45 2012
New Revision: 1361193
URL: http://svn.apache.org/viewvc?rev=1361193&view=rev
Log:
ISIS-233: fixing the embedded viewer installer for restfulobjects
Added:
incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/EmbeddedWebViewerRestfulObjects.java
- copied, changed from r1361191, incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/EmbeddedWebViewerJson.java
incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/RestfulObjectsViewerInstaller.java
- copied, changed from r1361191, incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/JsonViewerInstaller.java
Removed:
incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/EmbeddedWebViewerJson.java
incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/JsonViewerInstaller.java
Modified:
incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/resources/org/apache/isis/runtimes/dflt/runtime/installer-registry.properties
Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/resources/org/apache/isis/runtimes/dflt/runtime/installer-registry.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/resources/org/apache/isis/runtimes/dflt/runtime/installer-registry.properties?rev=1361193&r1=1361192&r2=1361193&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/resources/org/apache/isis/runtimes/dflt/runtime/installer-registry.properties (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/resources/org/apache/isis/runtimes/dflt/runtime/installer-registry.properties Fri Jul 13 13:02:45 2012
@@ -45,11 +45,9 @@ org.apache.isis.security.sql.authenticat
# VIEWERS
############################################################
-# dnd
-org.apache.isis.viewer.dnd.DndViewerInstaller # "dnd"
-org.apache.isis.viewer.html.HtmlViewerInstaller # "html" (runs within embedded web server)
-org.apache.isis.viewer.xhtml.viewer.embedded.XhtmlViewerInstaller # "xhtml" (runs within embedded web server)
-org.apache.isis.viewer.json.viewer.embedded.JsonViewerInstaller # "json" (runs within embedded web server)
+org.apache.isis.viewer.dnd.DndViewerInstaller # "dnd"
+org.apache.isis.viewer.html.HtmlViewerInstaller # "html" (runs within embedded web server)
+org.apache.isis.viewer.restfulobjects.viewer.embedded.RestfulObjectsViewerInstaller # "restfulobjects" (runs within embedded web server)
Copied: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/EmbeddedWebViewerRestfulObjects.java (from r1361191, 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/EmbeddedWebViewerRestfulObjects.java?p2=incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/EmbeddedWebViewerRestfulObjects.java&p1=incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/EmbeddedWebViewerJson.java&r1=1361191&r2=1361193&rev=1361193&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/EmbeddedWebViewerRestfulObjects.java Fri Jul 13 13:02:45 2012
@@ -31,7 +31,7 @@ import org.apache.isis.runtimes.dflt.web
import org.apache.isis.viewer.restfulobjects.viewer.RestfulObjectsApplication;
import org.apache.isis.viewer.restfulobjects.viewer.authentication.AuthenticationSessionStrategyTrusted;
-final class EmbeddedWebViewerJson extends EmbeddedWebViewer {
+final class EmbeddedWebViewerRestfulObjects extends EmbeddedWebViewer {
@Override
public WebAppSpecification getWebAppSpecification() {
final WebAppSpecification webAppSpec = new WebAppSpecification();
@@ -40,20 +40,20 @@ final class EmbeddedWebViewerJson extend
webAppSpec.addContextParams("isis.viewers", "restfulobjects");
- webAppSpec.addContextParams(JsonViewerInstaller.JAVAX_WS_RS_APPLICATION, RestfulObjectsApplication.class.getName());
+ webAppSpec.addContextParams(RestfulObjectsViewerInstaller.JAVAX_WS_RS_APPLICATION, RestfulObjectsApplication.class.getName());
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);
+ RestfulObjectsViewerInstaller.EVERYTHING);
- webAppSpec.addFilterSpecification(ResourceCachingFilter.class, JsonViewerInstaller.STATIC_CONTENT);
- webAppSpec.addServletSpecification(ResourceServlet.class, JsonViewerInstaller.STATIC_CONTENT);
+ webAppSpec.addFilterSpecification(ResourceCachingFilter.class, RestfulObjectsViewerInstaller.STATIC_CONTENT);
+ webAppSpec.addServletSpecification(ResourceServlet.class, RestfulObjectsViewerInstaller.STATIC_CONTENT);
webAppSpec.addServletContextListener(ResteasyBootstrap.class);
- webAppSpec.addServletSpecification(HttpServletDispatcher.class, JsonViewerInstaller.ROOT);
+ webAppSpec.addServletSpecification(HttpServletDispatcher.class, RestfulObjectsViewerInstaller.ROOT);
return webAppSpec;
Copied: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/RestfulObjectsViewerInstaller.java (from r1361191, incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/JsonViewerInstaller.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/RestfulObjectsViewerInstaller.java?p2=incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/RestfulObjectsViewerInstaller.java&p1=incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/JsonViewerInstaller.java&r1=1361191&r2=1361193&rev=1361193&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/JsonViewerInstaller.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/embedded/RestfulObjectsViewerInstaller.java Fri Jul 13 13:02:45 2012
@@ -32,7 +32,7 @@ import org.apache.isis.runtimes.dflt.run
* In a production deployment the configuration represented by the
* {@link WebAppSpecification} would be specified in the <tt>web.xml<tt> file.
*/
-public class JsonViewerInstaller extends IsisViewerInstallerAbstract {
+public class RestfulObjectsViewerInstaller extends IsisViewerInstallerAbstract {
static final String JAVAX_WS_RS_APPLICATION = "javax.ws.rs.Application";
@@ -40,13 +40,13 @@ public class JsonViewerInstaller extends
protected static final String ROOT = "/";
protected static final String[] STATIC_CONTENT = new String[] { "*.js", "*.gif", "*.png", "*.html" };
- public JsonViewerInstaller() {
- super("json");
+ public RestfulObjectsViewerInstaller() {
+ super("restfulobjects");
}
@Override
protected IsisViewer doCreateViewer() {
- return new EmbeddedWebViewerJson();
+ return new EmbeddedWebViewerRestfulObjects();
}
}