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/02/17 00:56:22 UTC
svn commit: r1245258 - in
/incubator/isis/trunk/examples/onlinedemo/webapp/src/main:
java/org/apache/isis/examples/onlinedemo/filters/ webapp/WEB-INF/
webapp/doc/ webapp/mobile/
Author: danhaywood
Date: Thu Feb 16 23:56:21 2012
New Revision: 1245258
URL: http://svn.apache.org/viewvc?rev=1245258&view=rev
Log:
ISIS-188: misc changes for onlinedemo, to use servlet-name rather than url paths for filter routing in web.xml
Removed:
incubator/isis/trunk/examples/onlinedemo/webapp/src/main/java/org/apache/isis/examples/onlinedemo/filters/
Modified:
incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/doc/index.html
incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/mobile/generic.js
incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/mobile/index.html
incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/mobile/namespace.js
Modified: incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/web.xml?rev=1245258&r1=1245257&r2=1245258&view=diff
==============================================================================
--- incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/web.xml Thu Feb 16 23:56:21 2012
@@ -121,7 +121,7 @@
<!-- redirect to /doc/index.html if accessing "/" using web browser -->
<filter>
<filter-name>RedirectToDocsFilter</filter-name>
- <filter-class>org.apache.isis.examples.onlinedemo.filters.RedirectToDocsFilter</filter-class>
+ <filter-class>org.apache.isis.core.webapp.routing.RedirectToDocsFilter</filter-class>
<init-param>
<param-name>redirectTo</param-name>
<param-value>/doc/index.html</param-value>
@@ -189,11 +189,13 @@
</filter>
<filter-mapping>
<filter-name>IsisSessionFilterForHtml</filter-name>
- <url-pattern>*.htmlviewer</url-pattern>
+ <servlet-name>HtmlLogon</servlet-name>
+ <servlet-name>HtmlRegister</servlet-name>
+ <servlet-name>HtmlController</servlet-name>
</filter-mapping>
<servlet>
- <servlet-name>Logon</servlet-name>
+ <servlet-name>HtmlLogon</servlet-name>
<servlet-class>org.apache.isis.viewer.html.servlet.LogonServlet</servlet-class>
<init-param>
<param-name>authenticationSessionStrategy</param-name>
@@ -205,25 +207,25 @@
</init-param>
</servlet>
<servlet-mapping>
- <servlet-name>Logon</servlet-name>
+ <servlet-name>HtmlLogon</servlet-name>
<url-pattern>/logon.htmlviewer</url-pattern>
</servlet-mapping>
<servlet>
- <servlet-name>Register</servlet-name>
+ <servlet-name>HtmlRegister</servlet-name>
<servlet-class>org.apache.isis.viewer.html.servlet.RegisterServlet</servlet-class>
</servlet>
<servlet-mapping>
- <servlet-name>Register</servlet-name>
+ <servlet-name>HtmlRegister</servlet-name>
<url-pattern>/register.htmlviewer</url-pattern>
</servlet-mapping>
<servlet>
- <servlet-name>Controller</servlet-name>
+ <servlet-name>HtmlController</servlet-name>
<servlet-class>org.apache.isis.viewer.html.servlet.ControllerServlet</servlet-class>
</servlet>
<servlet-mapping>
- <servlet-name>Controller</servlet-name>
+ <servlet-name>HtmlController</servlet-name>
<url-pattern>*.htmlviewer</url-pattern>
</servlet-mapping>
@@ -263,27 +265,25 @@
<param-name>whenNoSession</param-name>
<param-value>basicAuthChallenge</param-value>
</init-param>
- <init-param>
- <!-- ignores any requests to the HTML viewer resources -->
- <param-name>ignoreExtensions</param-name>
- <param-value>htmlviewer</param-value>
- </init-param>
</filter>
<filter-mapping>
<!-- this is mapped to the entire app; however the IsisSessionFilter will "notice" if the session filter has already been
executed for the request pipeline, and if so will do nothing -->
<filter-name>IsisSessionFilterForJson</filter-name>
- <url-pattern>*</url-pattern>
+ <servlet-name>JsonDispatcher</servlet-name>
</filter-mapping>
-
<servlet>
- <servlet-name>RestEasy</servlet-name>
+ <servlet-name>JsonDispatcher</servlet-name>
<servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
</servlet>
<servlet-mapping>
- <servlet-name>RestEasy</servlet-name>
+ <servlet-name>JsonDispatcher</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>
-
+
+
</web-app>
+
+
+
Modified: incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/doc/index.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/doc/index.html?rev=1245258&r1=1245257&r2=1245258&view=diff
==============================================================================
--- incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/doc/index.html (original)
+++ incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/doc/index.html Thu Feb 16 23:56:21 2012
@@ -153,18 +153,18 @@
href="#webapp">HTML viewer</a>, and setup some demo fixture data. Then,
shrink down your browser window to the dimensions of a smart
phone.</p><p>You start the demo mobile app by browsing to its <a
- href="../mobile/index.html">home page</a> :</p><center><img alt="Home Page"
- src="jqm-home.png" style="width:600px;" /></center><p>This button is
+ href="../mobile/index.html">home page</a> :</p><img alt="Home Page"
+ src="jqm-home.png" style="width:300px;" /><p>This button is
hard-coded to call the "ToDoItems#todaysTasks()" service for the current
user; from here on though the application is entirely generic.</p><p>Click
on the button; the page should transition to a list of the current task
- items:</p><center><img alt="Home Page" src="jqm-list.png"
- style="width:600px;" /></center><p>Click on one of the todo
- items:</p><center><img alt="Home Page" src="jqm-object.png"
- style="width:600px;" /></center><p>From here you can transition to other,
+ items:</p><img alt="Home Page" src="jqm-list.png"
+ style="width:300px;" /><p>Click on one of the todo
+ items:</p><img alt="Home Page" src="jqm-object.png"
+ style="width:300px;" /><p>From here you can transition to other,
related objects. For example, clicking on the "similarItems" collection
- shows a list of other task items:</p><center><img alt="Home Page"
- src="jqm-collection.png" style="width:600px;" /></center><h2><a
+ shows a list of other task items:</p><img alt="Home Page"
+ src="jqm-collection.png" style="width:300px;" /><h2><a
name="next-steps">Next Steps</a></h2><p>If you wish, you can download the
WAR file <a
href="https://sites.google.com/a/haywood-associates.co.uk/restfulobjects/files/isis-onlinedemo.war">here</a>.
Modified: incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/mobile/generic.js
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/mobile/generic.js?rev=1245258&r1=1245257&r2=1245258&view=diff
==============================================================================
--- incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/mobile/generic.js (original)
+++ incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/mobile/generic.js Thu Feb 16 23:56:21 2012
@@ -49,9 +49,9 @@ generic.dataTypeFor = function(memberIte
generic.pageAndOptions = function(page, view, dataUrl, transition) {
var pageAndOptions = {
"page": page,
- "allowSamePageTransition": true,
"options": {
"dataUrl": "#" + view + "?dataUrl=" + util.urlencode(dataUrl),
+ "allowSamePageTransition": true,
"transition": transition
}
}
Modified: incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/mobile/index.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/mobile/index.html?rev=1245258&r1=1245257&r2=1245258&view=diff
==============================================================================
--- incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/mobile/index.html (original)
+++ incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/mobile/index.html Thu Feb 16 23:56:21 2012
@@ -187,33 +187,5 @@
</div>
- <div data-role="page" id="popup">
-
- <div data-role="header">
- <h1>Dialog</h1>
- </div>
-
- <div data-role="content">
- <h2>Popup</h2>
- <p>
- I have an id of "popup" on my page container and only look like a
- dialog because the link to me had a
- <code>data-rel="dialog"</code>
- attribute which gives me this inset look and a
- <code>data-transition="pop"</code>
- attribute to change the transition to pop. Without this, I'd be
- styled as a normal page.
- </p>
- <p>
- <a href="#one" data-rel="back" data-role="button" data-inline="true"
- data-icon="back">Back to page "one"</a>
- </p>
- </div>
-
- <div data-role="footer">
- <h4>Page Footer</h4>
- </div>
- </div>
-
</body>
</html>
\ No newline at end of file
Modified: incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/mobile/namespace.js
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/mobile/namespace.js?rev=1245258&r1=1245257&r2=1245258&view=diff
==============================================================================
--- incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/mobile/namespace.js (original)
+++ incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/mobile/namespace.js Thu Feb 16 23:56:21 2012
@@ -1,5 +1,3 @@
-
-
namespace = function(namespaceString) {
var parts = namespaceString.split('.'),
parent = window,