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 2011/06/26 17:31:08 UTC
svn commit: r1139814 - in /incubator/isis/trunk: examples/quickstart/
examples/quickstart/quickrun/ examples/quickstart/viewer-json/
examples/quickstart/viewer-json/ide/eclipse/launch/
examples/quickstart/viewer-xhtml/ide/eclipse/launch/ runtimes/dflt/...
Author: danhaywood
Date: Sun Jun 26 15:31:07 2011
New Revision: 1139814
URL: http://svn.apache.org/viewvc?rev=1139814&view=rev
Log:
further updates on the xhtml/json viewers, impacting the examples/quickstart app
Added:
incubator/isis/trunk/examples/quickstart/viewer-json/ide/eclipse/launch/quickstart-viewer-json.launch
- copied unchanged from r1139808, incubator/isis/trunk/examples/quickstart/viewer-json/ide/eclipse/launch/quickstart-viewer-restful.launch
incubator/isis/trunk/examples/quickstart/viewer-xhtml/ide/eclipse/launch/quickstart-viewer-xhtml.launch
- copied unchanged from r1139808, incubator/isis/trunk/examples/quickstart/viewer-xhtml/ide/eclipse/launch/quickstart-viewer-restful.launch
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/JsonViewerInstaller.java
- copied, changed from r1139810, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/RestfulViewerInstaller.java
incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/embedded/XhtmlViewerInstaller.java
- copied, changed from r1139812, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/embedded/RestfulViewerInstaller.java
Removed:
incubator/isis/trunk/examples/quickstart/viewer-json/ide/eclipse/launch/quickstart-viewer-restful.launch
incubator/isis/trunk/examples/quickstart/viewer-xhtml/ide/eclipse/launch/quickstart-viewer-restful.launch
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/RestfulViewerInstaller.java
incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/embedded/RestfulViewerInstaller.java
Modified:
incubator/isis/trunk/examples/quickstart/pom.xml
incubator/isis/trunk/examples/quickstart/quickrun/pom.xml
incubator/isis/trunk/examples/quickstart/viewer-json/ (props changed)
incubator/isis/trunk/runtimes/dflt/runtime/src/main/resources/org/apache/isis/runtimes/dflt/runtime/installer-registry.properties
incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/EmbeddedWebViewerRestful.java
incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/embedded/EmbeddedWebViewerRestful.java
Modified: incubator/isis/trunk/examples/quickstart/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/pom.xml?rev=1139814&r1=1139813&r2=1139814&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/pom.xml Sun Jun 26 15:31:07 2011
@@ -579,7 +579,6 @@
<version>${isis.version}</version>
</dependency>
- </dependencies>
<!-- isis: viewer: json -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
Modified: incubator/isis/trunk/examples/quickstart/quickrun/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/quickrun/pom.xml?rev=1139814&r1=1139813&r2=1139814&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/quickrun/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/quickrun/pom.xml Sun Jun 26 15:31:07 2011
@@ -121,7 +121,11 @@
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>restful-viewer</artifactId>
+ <artifactId>xhtml-viewer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>json-viewer</artifactId>
</dependency>
@@ -216,12 +220,12 @@
</profile>
<profile>
<!-- prereqs: mvn package -->
- <!-- mvn antrun:run -D exec=restful -->
- <id>exec-restful</id>
+ <!-- mvn antrun:run -D exec=xhtml -->
+ <id>exec-xhtml</id>
<activation>
<property>
<name>exec</name>
- <value>restful</value>
+ <value>xhtml</value>
</property>
</activation>
<build>
@@ -237,7 +241,7 @@
<arg value="-type"/>
<arg value="exploration"/>
<arg value="-viewer"/>
- <arg value="org.apache.isis.viewer.restful.viewer.embedded.RestfulViewerInstaller"/>
+ <arg value="xhtml"/>
</exec>
</tasks>
</configuration>
@@ -245,6 +249,38 @@
</plugins>
</build>
</profile>
+ <profile>
+ <!-- prereqs: mvn package -->
+ <!-- mvn antrun:run -D exec=json -->
+ <id>exec-json</id>
+ <activation>
+ <property>
+ <name>exec</name>
+ <value>json</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <configuration>
+ <tasks>
+ <exec executable="java" failonerror="true">
+ <arg value="-jar"/>
+ <arg value="${project.build.directory}/${project.build.finalName}.jar"/>
+ <arg value="-type"/>
+ <arg value="exploration"/>
+ <arg value="-viewer"/>
+ <arg value="json"/>
+ </exec>
+ </tasks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
</project>
Propchange: incubator/isis/trunk/examples/quickstart/viewer-json/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jun 26 15:31:07 2011
@@ -0,0 +1,2 @@
+.settings
+.project
Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/resources/org/apache/isis/runtimes/dflt/runtime/installer-registry.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/resources/org/apache/isis/runtimes/dflt/runtime/installer-registry.properties?rev=1139814&r1=1139813&r2=1139814&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/resources/org/apache/isis/runtimes/dflt/runtime/installer-registry.properties (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/resources/org/apache/isis/runtimes/dflt/runtime/installer-registry.properties Sun Jun 26 15:31:07 2011
@@ -50,7 +50,8 @@ org.apache.isis.progmodels.dflt.JavaRefl
# dnd
org.apache.isis.viewer.dnd.DndViewerInstaller # "dnd"
org.apache.isis.viewer.html.HtmlViewerInstaller # "html" (runs within embedded web server)
-org.apache.isis.viewer.restful.viewer.embedded.RestfulViewerInstaller # "restful" (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)
Modified: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/EmbeddedWebViewerRestful.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/EmbeddedWebViewerRestful.java?rev=1139814&r1=1139813&r2=1139814&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/EmbeddedWebViewerRestful.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/EmbeddedWebViewerRestful.java Sun Jun 26 15:31:07 2011
@@ -36,17 +36,17 @@ final class EmbeddedWebViewerRestful ext
webAppSpec.addContextParams("isis.viewers", "restful");
- webAppSpec.addContextParams(RestfulViewerInstaller.JAVAX_WS_RS_APPLICATION, JsonApplication.class.getName());
+ webAppSpec.addContextParams(JsonViewerInstaller.JAVAX_WS_RS_APPLICATION, JsonApplication.class.getName());
webAppSpec.addServletContextListener(ResteasyBootstrap.class);
webAppSpec.addFilterSpecification(IsisSessionFilter.class, MapUtils.asMap(
IsisSessionFilter.AUTHENTICATION_SESSION_LOOKUP_STRATEGY_KEY,
- AuthenticationSessionLookupStrategyTrusted.class.getName()), RestfulViewerInstaller.EVERYTHING);
- webAppSpec.addServletSpecification(HttpServletDispatcher.class, RestfulViewerInstaller.ROOT);
+ AuthenticationSessionLookupStrategyTrusted.class.getName()), JsonViewerInstaller.EVERYTHING);
+ webAppSpec.addServletSpecification(HttpServletDispatcher.class, JsonViewerInstaller.ROOT);
- webAppSpec.addFilterSpecification(ResourceCachingFilter.class, RestfulViewerInstaller.STATIC_CONTENT);
- webAppSpec.addServletSpecification(ResourceServlet.class, RestfulViewerInstaller.STATIC_CONTENT);
+ webAppSpec.addFilterSpecification(ResourceCachingFilter.class, JsonViewerInstaller.STATIC_CONTENT);
+ webAppSpec.addServletSpecification(ResourceServlet.class, JsonViewerInstaller.STATIC_CONTENT);
return webAppSpec;
}
Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/JsonViewerInstaller.java (from r1139810, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/RestfulViewerInstaller.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/JsonViewerInstaller.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/JsonViewerInstaller.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/RestfulViewerInstaller.java&r1=1139810&r2=1139814&rev=1139814&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/RestfulViewerInstaller.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/embedded/JsonViewerInstaller.java Sun Jun 26 15:31:07 2011
@@ -31,7 +31,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 RestfulViewerInstaller extends IsisViewerInstallerAbstract {
+public class JsonViewerInstaller extends IsisViewerInstallerAbstract {
static final String JAVAX_WS_RS_APPLICATION = "javax.ws.rs.Application";
@@ -39,7 +39,7 @@ public class RestfulViewerInstaller exte
protected static final String ROOT = "/";
protected static final String[] STATIC_CONTENT = new String[] { "*.js", "*.gif", "*.png" };
- public RestfulViewerInstaller() {
+ public JsonViewerInstaller() {
super("restful");
}
Modified: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/embedded/EmbeddedWebViewerRestful.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/embedded/EmbeddedWebViewerRestful.java?rev=1139814&r1=1139813&r2=1139814&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/embedded/EmbeddedWebViewerRestful.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/embedded/EmbeddedWebViewerRestful.java Sun Jun 26 15:31:07 2011
@@ -36,17 +36,17 @@ final class EmbeddedWebViewerRestful ext
webAppSpec.addContextParams("isis.viewers", "restful");
- webAppSpec.addContextParams(RestfulViewerInstaller.JAVAX_WS_RS_APPLICATION, RestfulApplication.class.getName());
+ webAppSpec.addContextParams(XhtmlViewerInstaller.JAVAX_WS_RS_APPLICATION, RestfulApplication.class.getName());
webAppSpec.addServletContextListener(ResteasyBootstrap.class);
webAppSpec.addFilterSpecification(IsisSessionFilter.class, MapUtils.asMap(
IsisSessionFilter.AUTHENTICATION_SESSION_LOOKUP_STRATEGY_KEY,
- AuthenticationSessionLookupStrategyTrusted.class.getName()), RestfulViewerInstaller.EVERYTHING);
- webAppSpec.addServletSpecification(HttpServletDispatcher.class, RestfulViewerInstaller.ROOT);
+ AuthenticationSessionLookupStrategyTrusted.class.getName()), XhtmlViewerInstaller.EVERYTHING);
+ webAppSpec.addServletSpecification(HttpServletDispatcher.class, XhtmlViewerInstaller.ROOT);
- webAppSpec.addFilterSpecification(ResourceCachingFilter.class, RestfulViewerInstaller.STATIC_CONTENT);
- webAppSpec.addServletSpecification(ResourceServlet.class, RestfulViewerInstaller.STATIC_CONTENT);
+ webAppSpec.addFilterSpecification(ResourceCachingFilter.class, XhtmlViewerInstaller.STATIC_CONTENT);
+ webAppSpec.addServletSpecification(ResourceServlet.class, XhtmlViewerInstaller.STATIC_CONTENT);
return webAppSpec;
}
Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/embedded/XhtmlViewerInstaller.java (from r1139812, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/embedded/RestfulViewerInstaller.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/embedded/XhtmlViewerInstaller.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/embedded/XhtmlViewerInstaller.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/embedded/RestfulViewerInstaller.java&r1=1139812&r2=1139814&rev=1139814&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/embedded/RestfulViewerInstaller.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/embedded/XhtmlViewerInstaller.java Sun Jun 26 15:31:07 2011
@@ -31,7 +31,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 RestfulViewerInstaller extends IsisViewerInstallerAbstract {
+public class XhtmlViewerInstaller extends IsisViewerInstallerAbstract {
static final String JAVAX_WS_RS_APPLICATION = "javax.ws.rs.Application";
@@ -39,7 +39,7 @@ public class RestfulViewerInstaller exte
protected static final String ROOT = "/";
protected static final String[] STATIC_CONTENT = new String[] { "*.js", "*.gif", "*.png" };
- public RestfulViewerInstaller() {
+ public XhtmlViewerInstaller() {
super("restful");
}