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/10/11 20:06:46 UTC
svn commit: r1397207 [1/3] - in /incubator/isis/trunk: examples/quickstart/
examples/quickstart/dom/src/main/java/dom/todo/
examples/quickstart/exploration/ examples/quickstart/exploration/config/
examples/quickstart/exploration/ide/eclipse/launch/ exa...
Author: danhaywood
Date: Thu Oct 11 18:06:36 2012
New Revision: 1397207
URL: http://svn.apache.org/viewvc?rev=1397207&view=rev
Log:
ISIS-188: more on the quickstart examples
* separate modules for each of the viewers
* renamed exploration -> viewer-dnd
* configure viewer-dnd for in-memory (with xml as an alternative)
* configure viewer-html for sql os
* configure viewer-scimpi for nosql os
* configure viewer-wicket for jdo os
* configure viewer-restfulobjects for jdo os
Added:
incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/application.css
incubator/isis/trunk/examples/quickstart/viewer-dnd/
incubator/isis/trunk/examples/quickstart/viewer-dnd/config/
incubator/isis/trunk/examples/quickstart/viewer-dnd/config/isis.properties
incubator/isis/trunk/examples/quickstart/viewer-dnd/config/logging.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/exploration/config/logging.properties
incubator/isis/trunk/examples/quickstart/viewer-dnd/config/persistor_in-memory.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/exploration/config/persistor_in-memory.properties
incubator/isis/trunk/examples/quickstart/viewer-dnd/config/persistor_xml.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_xml.properties
incubator/isis/trunk/examples/quickstart/viewer-dnd/config/viewer_dnd.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/exploration/config/authorization_file.allow
incubator/isis/trunk/examples/quickstart/viewer-dnd/ide/
incubator/isis/trunk/examples/quickstart/viewer-dnd/ide/eclipse/
incubator/isis/trunk/examples/quickstart/viewer-dnd/ide/eclipse/launch/
incubator/isis/trunk/examples/quickstart/viewer-dnd/ide/eclipse/launch/quickstart-viewer-dnd.launch
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/exploration/ide/eclipse/launch/quickstart-exploration.launch
incubator/isis/trunk/examples/quickstart/viewer-dnd/pom.xml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/exploration/pom.xml
incubator/isis/trunk/examples/quickstart/viewer-html/
incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/
incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/tests.lck
incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/tests.log
incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/tests.properties
incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/tests.script
incubator/isis/trunk/examples/quickstart/viewer-html/ide/
incubator/isis/trunk/examples/quickstart/viewer-html/ide/eclipse/
incubator/isis/trunk/examples/quickstart/viewer-html/ide/eclipse/launch/
incubator/isis/trunk/examples/quickstart/viewer-html/ide/eclipse/launch/quickstart-viewer-html.launch
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/ide/eclipse/launch/quickstart-webapp-with-jdo-fixtures.launch
incubator/isis/trunk/examples/quickstart/viewer-html/lib/
incubator/isis/trunk/examples/quickstart/viewer-html/lib/.gitignore
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/lib/.gitignore
incubator/isis/trunk/examples/quickstart/viewer-html/pom.xml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/pom.xml
incubator/isis/trunk/examples/quickstart/viewer-html/src/
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/jettyconsole/
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/jettyconsole/isis-banner.pdn
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.pdn
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/jettyconsole/isis-banner.png
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.png
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/resources/
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/resources/images/
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/resources/images/Default.png
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/resources/images/Default.png
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/authentication_file.passwords
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authentication_file.passwords
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/authentication_file.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/exploration/config/authentication_file.properties
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/authorization_file.allow
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/exploration/config/authorization_file.allow
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/authorization_file.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/exploration/config/authorization_file.properties
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/isis.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/exploration/config/isis.properties
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/logging.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/logging.properties
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/persistor_sql.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/persistor_sql.properties
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/viewer_html.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_html.properties
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/web.xml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/htmlviewer/
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/htmlviewer/images/
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/htmlviewer/images/banner-bg.png
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/images/banner-bg.png
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/htmlviewer/images/banner.png
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/images/banner.png
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/htmlviewer/style/
incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/htmlviewer/style/default.css
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/style/default.css
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/ide/
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/ide/eclipse/
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/ide/eclipse/launch/
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/ide/eclipse/launch/quickstart-viewer-restfulobjects.launch
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/ide/eclipse/launch/quickstart-wicket-with-jdo-fixtures.launch
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/lib/
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/lib/.gitignore
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/lib/.gitignore
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/pom.xml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/pom.xml
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/jettyconsole/
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/jettyconsole/isis-banner.pdn
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.pdn
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/jettyconsole/isis-banner.png
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.png
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/resources/
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/resources/images/
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/resources/images/Default.png
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/resources/images/Default.png
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/authentication_file.passwords
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/exploration/config/authentication_file.passwords
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/authentication_file.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authentication_file.properties
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/authorization_file.allow
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.allow
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/authorization_file.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.properties
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/isis.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/isis.properties
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/logging.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/logging.properties
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/persistor_datanucleus.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/persistor_datanucleus.properties
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/viewer_restfulobjects.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_restfulobjects.properties
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/WEB-INF/web.xml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery/
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/ajax-loader.png
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/ajax-loader.png
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/icons-18-black.png
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-18-black.png
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/icons-18-white.png
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-18-white.png
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/icons-36-black.png
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-36-black.png
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/images/icons-36-white.png
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-36-white.png
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/jquery.mobile-1.0.css
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/jquery.mobile-1.0.css
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/jquery.mobile-1.0.js
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/jquery.mobile-1.0.js
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.mobile/jquery.mobile.structure-1.0.css
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/jquery.mobile.structure-1.0.css
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.tmpl/
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.tmpl/jquery.tmpl-vBeta1.0.0.js
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.tmpl/jquery.tmpl-vBeta1.0.0.js
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery.tmpl/jquery.tmpl-vBeta1.0.0.min.js
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.tmpl/jquery.tmpl-vBeta1.0.0.min.js
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/jquery/jquery-1.6.4.js
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery/jquery-1.6.4.js
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/app.css
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/app.css
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/app.js
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/app.js
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/generic.js
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/generic.js
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/index.html
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/index.html
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/namespace.js
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/namespace.js
incubator/isis/trunk/examples/quickstart/viewer-restfulobjects/src/main/webapp/mobile/util.js
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/util.js
incubator/isis/trunk/examples/quickstart/viewer-scimpi/
incubator/isis/trunk/examples/quickstart/viewer-scimpi/ide/
incubator/isis/trunk/examples/quickstart/viewer-scimpi/ide/eclipse/
incubator/isis/trunk/examples/quickstart/viewer-scimpi/ide/eclipse/launch/
incubator/isis/trunk/examples/quickstart/viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/ide/eclipse/launch/quickstart-webapp.launch
incubator/isis/trunk/examples/quickstart/viewer-scimpi/lib/
incubator/isis/trunk/examples/quickstart/viewer-scimpi/lib/.gitignore
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/lib/.gitignore
incubator/isis/trunk/examples/quickstart/viewer-scimpi/pom.xml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/pom.xml
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/jettyconsole/
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/jettyconsole/isis-banner.pdn
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.pdn
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/jettyconsole/isis-banner.png
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.png
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/resources/
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/resources/images/
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/resources/images/Default.png
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/resources/images/Default.png
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/ToDoItem/
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/ToDoItem/edit.shtml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/ToDoItem/edit.shtml
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/ToDoItem/object.shtml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/ToDoItem/object.shtml
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/authentication_file.passwords
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authentication_file.passwords
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/authentication_file.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/authentication_file.properties
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/authorization_file.allow
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/authorization_file.allow
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/authorization_file.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/authorization_file.properties
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/isis.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/exploration/config/isis.properties
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/logging.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/logging.properties
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/persistor_fileserver.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_fileserver.properties
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/persistor_in-memory.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_in-memory.properties
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/persistor_mongodb.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_mongodb.properties
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/viewer_scimpi.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_scimpi.properties
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/debug.shtml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/debug.shtml
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/error.shtml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/error.shtml
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/generic/
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/generic/action.shtml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/action.shtml
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/generic/collection.shtml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/collection.shtml
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/generic/edit.shtml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/edit.shtml
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/generic/object.shtml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/object.shtml
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/index.shtml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.shtml
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/login.shtml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/login.shtml
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/custom/
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/custom/new-todo.shtml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/custom/new-todo.shtml
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/images/
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/images/scimpi-logo.png
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/images/scimpi-logo.png
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/style/
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/style/reset.css
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/reset.css
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/style/screen.css
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/screen.css
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/style/site-template.shtml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/site-template.shtml
incubator/isis/trunk/examples/quickstart/viewer-scimpi/src/main/webapp/scimpi/style/template.shtml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/template.shtml
incubator/isis/trunk/examples/quickstart/viewer-wicket/
incubator/isis/trunk/examples/quickstart/viewer-wicket/ide/
incubator/isis/trunk/examples/quickstart/viewer-wicket/ide/eclipse/
incubator/isis/trunk/examples/quickstart/viewer-wicket/ide/eclipse/launch/
incubator/isis/trunk/examples/quickstart/viewer-wicket/ide/eclipse/launch/quickstart-viewer-wicket.launch
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/ide/eclipse/launch/quickstart-wicket.launch
incubator/isis/trunk/examples/quickstart/viewer-wicket/lib/
incubator/isis/trunk/examples/quickstart/viewer-wicket/lib/.gitignore
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/lib/.gitignore
incubator/isis/trunk/examples/quickstart/viewer-wicket/pom.xml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/pom.xml
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/java/
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/java/app/
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/java/app/ComponentFactoryRegistrarForQuickStart.java
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/java/app/QuickStartApplication.java
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/jettyconsole/
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/jettyconsole/isis-banner.pdn
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/jettyconsole/isis-banner.pdn
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/jettyconsole/isis-banner.png
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/jettyconsole/isis-banner.png
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/resources/
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/resources/app/
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/resources/app/welcome.html
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/resources/images/
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/resources/images/Default.png
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/resources/images/Default.png
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/authentication_file.passwords
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/authentication_file.passwords
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/authentication_file.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/exploration/config/authentication_file.properties
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/authorization_file.allow
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/exploration/config/authorization_file.allow
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/authorization_file.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/exploration/config/authorization_file.properties
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/isis.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/isis.properties
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/logging.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/logging.properties
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/persistor_datanucleus.properties
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/WEB-INF/web.xml
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/css/
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/css/application.css
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/application.css
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/images/
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/images/app-banner.pdn
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/images/app-banner.pdn
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/images/app-banner.png
- copied, changed from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/images/app-banner.png
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/scripts/
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/webapp/scripts/application.js
Removed:
incubator/isis/trunk/examples/quickstart/exploration/config/authentication_file.passwords
incubator/isis/trunk/examples/quickstart/exploration/config/authentication_file.properties
incubator/isis/trunk/examples/quickstart/exploration/config/authorization_file.allow
incubator/isis/trunk/examples/quickstart/exploration/config/authorization_file.properties
incubator/isis/trunk/examples/quickstart/exploration/config/isis.properties
incubator/isis/trunk/examples/quickstart/exploration/config/logging.properties
incubator/isis/trunk/examples/quickstart/exploration/config/persistor_in-memory.properties
incubator/isis/trunk/examples/quickstart/exploration/config/persistor_xml.properties
incubator/isis/trunk/examples/quickstart/exploration/config/user-profile-store_in-memory.properties
incubator/isis/trunk/examples/quickstart/exploration/ide/eclipse/launch/quickstart-exploration.launch
incubator/isis/trunk/examples/quickstart/exploration/pom.xml
incubator/isis/trunk/examples/quickstart/objstore-dflt/pom.xml
incubator/isis/trunk/examples/quickstart/objstore-dflt/src/main/java/objstore/dflt/todo/ToDoItemsDefault.java
incubator/isis/trunk/examples/quickstart/objstore-nosql/pom.xml
incubator/isis/trunk/examples/quickstart/objstore-nosql/src/main/java/objstore/mongodb/todo/ToDoItemsMongo.java
incubator/isis/trunk/examples/quickstart/objstore-sql/pom.xml
incubator/isis/trunk/examples/quickstart/objstore-sql/src/main/java/objstore/sql/todo/ToDoItemsSql.java
incubator/isis/trunk/examples/quickstart/webapp/ide/eclipse/launch/quickstart-webapp-with-jdo-fixtures.launch
incubator/isis/trunk/examples/quickstart/webapp/ide/eclipse/launch/quickstart-webapp.launch
incubator/isis/trunk/examples/quickstart/webapp/lib/.gitignore
incubator/isis/trunk/examples/quickstart/webapp/pom.xml
incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.pdn
incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.png
incubator/isis/trunk/examples/quickstart/webapp/src/main/resources/images/Default.png
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/ToDoItem/edit.shtml
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/ToDoItem/object.shtml
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authentication_file.passwords
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authentication_file.properties
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.allow
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.properties
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/isis.properties
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/logging.properties
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_datanucleus.properties
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_fileserver.properties
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_in-memory.properties
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_mongodb.properties
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_sql.properties
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_xml.properties
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/user-profile-store_in-memory.properties
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_html.properties
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_restfulobjects.properties
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_scimpi.properties
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/debug.shtml
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/error.shtml
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/action.shtml
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/collection.shtml
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/edit.shtml
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/object.shtml
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/images/banner-bg.png
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/images/banner.png
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/style/default.css
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.html
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.shtml
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/ajax-loader.png
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-18-black.png
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-18-white.png
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-36-black.png
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-36-white.png
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/jquery.mobile-1.0.css
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/jquery.mobile-1.0.js
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/jquery.mobile.structure-1.0.css
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.tmpl/jquery.tmpl-vBeta1.0.0.js
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.tmpl/jquery.tmpl-vBeta1.0.0.min.js
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery/jquery-1.6.4.js
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/login.shtml
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/app.css
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/app.js
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/generic.js
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/index.html
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/namespace.js
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/util.js
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/custom/new-todo.shtml
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/images/scimpi-logo.png
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/reset.css
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/screen.css
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/site-template.shtml
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/template.shtml
incubator/isis/trunk/examples/quickstart/wicket/ide/eclipse/launch/quickstart-wicket-with-jdo-fixtures.launch
incubator/isis/trunk/examples/quickstart/wicket/ide/eclipse/launch/quickstart-wicket.launch
incubator/isis/trunk/examples/quickstart/wicket/lib/.gitignore
incubator/isis/trunk/examples/quickstart/wicket/pom.xml
incubator/isis/trunk/examples/quickstart/wicket/src/main/jettyconsole/isis-banner.pdn
incubator/isis/trunk/examples/quickstart/wicket/src/main/jettyconsole/isis-banner.png
incubator/isis/trunk/examples/quickstart/wicket/src/main/resources/images/Default.png
incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/authentication_file.passwords
incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/authentication_file.properties
incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/authorization_file.allow
incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/authorization_file.properties
incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/isis.properties
incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/logging.properties
incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/persistor_datanucleus.properties
incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/persistor_fileserver.properties
incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/persistor_in-memory.properties
incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/persistor_mongodb.properties
incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/persistor_sql.properties
incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/persistor_xml.properties
incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/user-profile-store_in-memory.properties
incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/application.css
incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/images/app-banner.pdn
incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/images/app-banner.png
Modified:
incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java
incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItems.java
incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java
incubator/isis/trunk/examples/quickstart/objstore-jdo/src/main/java/objstore/jdo/todo/ToDoItemsJdo.java
incubator/isis/trunk/examples/quickstart/pom.xml
incubator/isis/trunk/examples/quickstart/tests-bdd/pom.xml
incubator/isis/trunk/examples/quickstart/tests-junit/pom.xml
incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/AbstractTest.java
incubator/isis/trunk/framework/core/runtime/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/SqlObjectStore.java
incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.html
Modified: incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java?rev=1397207&r1=1397206&r2=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java (original)
+++ incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java Thu Oct 11 18:06:36 2012
@@ -19,6 +19,11 @@
package dom.todo;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.annotation.concurrent.Immutable;
import javax.jdo.JDOHelper;
import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.Persistent;
@@ -28,6 +33,7 @@ import javax.jdo.spi.PersistenceCapable;
import org.joda.time.LocalDate;
import org.apache.isis.applib.AbstractDomainObject;
+import org.apache.isis.applib.annotation.AutoComplete;
import org.apache.isis.applib.annotation.Disabled;
import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.MemberOrder;
@@ -36,7 +42,7 @@ import org.apache.isis.applib.annotation
import org.apache.isis.applib.annotation.ObjectType;
import org.apache.isis.applib.annotation.Optional;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.applib.value.Date;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.runtimes.dflt.objectstores.jdo.applib.annotations.Auditable;
@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.DATASTORE)
@@ -52,6 +58,7 @@ import org.apache.isis.runtimes.dflt.obj
@javax.jdo.annotations.Version(strategy=VersionStrategy.VERSION_NUMBER, column="VERSION")
@ObjectType("TODO")
@Auditable
+@AutoComplete(repository=ToDoItems.class, action="autoComplete")
public class ToDoItem extends AbstractDomainObject {
public static enum Category {
@@ -85,24 +92,10 @@ public class ToDoItem extends AbstractDo
}
// }}
- // {{ Done
- private boolean done;
-
- @Disabled
- @MemberOrder(sequence = "3")
- public boolean getDone() {
- return done;
- }
-
- public void setDone(final boolean done) {
- this.done = done;
- }
- // }}
-
// {{ DueBy (property)
private LocalDate dueBy;
- @MemberOrder(sequence = "4")
+ @MemberOrder(sequence = "3")
@Optional
@Persistent
public LocalDate getDueBy() {
@@ -114,9 +107,24 @@ public class ToDoItem extends AbstractDo
}
// }}
+ // {{ Done
+ private boolean done;
+
+ @Disabled
+ @MemberOrder(sequence = "4")
+ public boolean getDone() {
+ return done;
+ }
+
+ public void setDone(final boolean done) {
+ this.done = done;
+ }
+ // }}
+
// {{ Notes (property)
private String notes;
+ @Hidden(where=Where.ALL_TABLES)
@Optional
@MultiLine(numberOfLines=5)
@MemberOrder(sequence = "6")
@@ -143,6 +151,7 @@ public class ToDoItem extends AbstractDo
// }}
// {{ Version (derived property)
+ @Hidden(where=Where.ALL_TABLES)
@Disabled
@MemberOrder(sequence = "99")
@Named("Version")
@@ -183,6 +192,63 @@ public class ToDoItem extends AbstractDo
}
// }}
+
+ // {{ Dependencies (Collection)
+ private List<ToDoItem> dependencies = new ArrayList<ToDoItem>();
+
+ @Disabled
+ @MemberOrder(sequence = "1")
+ public List<ToDoItem> getDependencies() {
+ return dependencies;
+ }
+
+ public void setDependencies(final List<ToDoItem> dependencies) {
+ this.dependencies = dependencies;
+ }
+ // }}
+
+
+ // {{ dependsOn (action)
+ @MemberOrder(name="dependencies", sequence = "1")
+ public ToDoItem dependsOn(final ToDoItem toDoItem) {
+ if(!getDependencies().contains(toDoItem)) {
+ getDependencies().add(toDoItem);
+ }
+ return this;
+ }
+ public String validateDependsOn(final ToDoItem toDoItem) {
+ if(getDependencies().contains(toDoItem)) {
+ return "Already a dependency";
+ }
+ if(toDoItem == this) {
+ return "Can't set up a dependency to self";
+ }
+ return null;
+ }
+ // }}
+
+ // {{ noLongerDependsOn (action)
+ @MemberOrder(name="dependencies", sequence = "2")
+ public ToDoItem noLongerDependsOn(final ToDoItem toDoItem) {
+ if(!getDependencies().contains(toDoItem)) {
+ getDependencies().add(toDoItem);
+ }
+ return this;
+ }
+ public String validateNoLongerDependsOn(final ToDoItem toDoItem) {
+ if(!getDependencies().contains(toDoItem)) {
+ return "Not a dependency";
+ }
+ return null;
+ }
+ public List<ToDoItem> choicesNoLongerDependsOn() {
+ return getDependencies();
+ }
+ // }}
+
+
+
+
// {{ injected: ToDoItems
@SuppressWarnings("unused")
private ToDoItems toDoItems;
Modified: incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItems.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItems.java?rev=1397207&r1=1397206&r2=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItems.java (original)
+++ incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItems.java Thu Oct 11 18:06:36 2012
@@ -21,33 +21,106 @@ package dom.todo;
import java.util.List;
+import com.google.common.base.Objects;
+
+import dom.todo.ToDoItem.Category;
+
+import org.apache.isis.applib.AbstractFactoryAndRepository;
+import org.apache.isis.applib.annotation.ActionSemantics;
+import org.apache.isis.applib.annotation.ActionSemantics.Of;
import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.QueryOnly;
-
-import dom.todo.ToDoItem.Category;
+import org.apache.isis.applib.annotation.NotInServiceMenu;
+import org.apache.isis.applib.filter.Filter;
@Named("ToDos")
-public interface ToDoItems {
+public class ToDoItems extends AbstractFactoryAndRepository {
+
+ // {{ Id, iconName
+ @Override
+ public String getId() {
+ return "toDoItems";
+ }
+
+ public String iconName() {
+ return "ToDoItem";
+ }
+ // }}
- @QueryOnly
+ // {{ NotYetDone (action)
+ @ActionSemantics(Of.SAFE)
@MemberOrder(sequence = "1")
- public List<ToDoItem> notYetDone();
+ public List<ToDoItem> notYetDone() {
+ return allMatches(ToDoItem.class, new Filter<ToDoItem>() {
+ @Override
+ public boolean accept(final ToDoItem t) {
+ return ownedByCurrentUser(t) && !t.getDone();
+ }
+ });
+ }
+ // }}
+ // {{ NewToDo (action)
@MemberOrder(sequence = "2")
public ToDoItem newToDo(
@Named("Description") String description,
- Category category);
+ Category category) {
+ final String ownedBy = getContainer().getUser().getName();
+ return newToDo(description, category, ownedBy);
+ }
+ // }}
+ // {{ NewToDo (hidden)
@Hidden // for use by fixtures
public ToDoItem newToDo(
String description,
Category category,
- String ownedBy);
-
- @QueryOnly
+ String ownedBy) {
+ final ToDoItem toDoItem = newTransientInstance(ToDoItem.class);
+ toDoItem.setDescription(description);
+ toDoItem.setCategory(category);
+ toDoItem.setOwnedBy(ownedBy);
+ persist(toDoItem);
+ return toDoItem;
+ }
+ // }}
+
+ // {{ SimilarTo (action)
+ @NotInServiceMenu
+ @ActionSemantics(Of.SAFE)
@MemberOrder(sequence = "3")
- public List<ToDoItem> similarTo(ToDoItem toDoItem);
+ public List<ToDoItem> similarTo(final ToDoItem toDoItem) {
+ return allMatches(ToDoItem.class, new Filter<ToDoItem>() {
+ @Override
+ public boolean accept(ToDoItem t) {
+ return t != toDoItem && Objects.equal(toDoItem.getCategory(), t.getCategory()) && Objects.equal(toDoItem.getOwnedBy(), t.getOwnedBy());
+ }
+ });
+ }
+ // }}
+
+ // {{ AutoComplete (hidden)
+ @Hidden
+ @MemberOrder(sequence = "1")
+ public List<ToDoItem> autoComplete(final String description) {
+ return allMatches(ToDoItem.class, new Filter<ToDoItem>() {
+ @Override
+ public boolean accept(final ToDoItem t) {
+ return ownedByCurrentUser(t) && t.getDescription().contains(description);
+ }
+
+ });
+ }
+ // }}
+
+ // {{ helpers
+ protected boolean ownedByCurrentUser(final ToDoItem t) {
+ return Objects.equal(t.getOwnedBy(), currentUserName());
+ }
+ protected String currentUserName() {
+ return getContainer().getUser().getName();
+ }
+ // }}
}
Modified: incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java?rev=1397207&r1=1397206&r2=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java (original)
+++ incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java Thu Oct 11 18:06:36 2012
@@ -36,9 +36,6 @@ public class ToDoItemsFixture extends Ab
// for exploration user
createFiveFor("exploration");
- createThreeFor("exploration");
- createTwoFor("exploration");
- createOneFor("exploration");
}
private void createFiveFor(String ownedBy) {
@@ -70,7 +67,7 @@ public class ToDoItemsFixture extends Ab
private ToDoItems toDoItems;
- public void setToDoItemRepository(final ToDoItems toDoItems) {
+ public void setToDoItems(final ToDoItems toDoItems) {
this.toDoItems = toDoItems;
}
Copied: incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java (from r1396204, incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/application.css)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java?p2=incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java&p1=incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/application.css&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/wicket/src/main/webapp/application.css (original)
+++ incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java Thu Oct 11 18:06:36 2012
@@ -16,22 +16,31 @@
* specific language governing permissions and limitations
* under the License.
*/
-#header {
- background: none no-repeat scroll left center;
- height: 20px;
-}
-body {
- background-color: #00477F;
-}
-div.entitySummary > label.entityTitle {
- color: maroon;
- font-size: xx-large;
- font-weight: bolder;
-}
-.ToDoItem-description .scalarName {
- color: maroon;
- font-weight: bolder;
-}
+package fixture.todo;
+
+import dom.todo.ToDoItems;
+import org.apache.isis.applib.AbstractService;
+import org.apache.isis.applib.annotation.Named;
+/**
+ * Enables fixtures to be installed from the application.
+ */
+@Named("Fixtures")
+public class ToDoItemsFixturesService extends AbstractService {
+
+ public void install() {
+ final ToDoItemsFixture fixture = new ToDoItemsFixture();
+ fixture.setContainer(getContainer());
+ fixture.setToDoItems(toDoItems);
+ fixture.install();
+ }
+
+ private ToDoItems toDoItems;
+
+ public void setToDoItems(final ToDoItems toDoItems) {
+ this.toDoItems = toDoItems;
+ }
+
+}
Modified: incubator/isis/trunk/examples/quickstart/objstore-jdo/src/main/java/objstore/jdo/todo/ToDoItemsJdo.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/objstore-jdo/src/main/java/objstore/jdo/todo/ToDoItemsJdo.java?rev=1397207&r1=1397206&r2=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/objstore-jdo/src/main/java/objstore/jdo/todo/ToDoItemsJdo.java (original)
+++ incubator/isis/trunk/examples/quickstart/objstore-jdo/src/main/java/objstore/jdo/todo/ToDoItemsJdo.java Thu Oct 11 18:06:36 2012
@@ -21,26 +21,16 @@ package objstore.jdo.todo;
import java.util.List;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+
import dom.todo.ToDoItem;
-import dom.todo.ToDoItem.Category;
import dom.todo.ToDoItems;
-import org.apache.isis.applib.AbstractFactoryAndRepository;
import org.apache.isis.applib.query.QueryDefault;
-public class ToDoItemsJdo extends AbstractFactoryAndRepository implements ToDoItems {
-
- // {{ Id, iconName
- @Override
- public String getId() {
- return "toDoItems";
- }
-
- public String iconName() {
- return "ToDoItem";
- }
-
- // }}
+public class ToDoItemsJdo extends ToDoItems {
@Override
public List<ToDoItem> notYetDone() {
@@ -49,38 +39,25 @@ public class ToDoItemsJdo extends Abstra
new QueryDefault<ToDoItem>(ToDoItem.class, "todo_notYetDone", "ownedBy", userName));
}
- // {{ NewToDo (action)
- @Override
- public ToDoItem newToDo(final String description, Category category) {
- final String ownedBy = getContainer().getUser().getName();
- return newToDo(description, category, ownedBy);
- }
- // }}
-
- // {{ NewToDo (hidden)
- @Override
- public ToDoItem newToDo(final String description, Category category, String ownedBy) {
- final ToDoItem toDoItem = newTransientInstance(ToDoItem.class);
- toDoItem.setDescription(description);
- toDoItem.setCategory(category);
- toDoItem.setOwnedBy(ownedBy);
- persist(toDoItem);
- return toDoItem;
- }
- // }}
// {{ SimilarTo (action)
@Override
- public List<ToDoItem> similarTo(final ToDoItem toDoItem) {
- // TODO: should also filter out the supplied toDoItem
- return allMatches(
- new QueryDefault<ToDoItem>(ToDoItem.class, "todo_similarTo", "ownedBy", toDoItem.getOwnedBy(), "category", toDoItem.getCategory()));
-// return allMatches(ToDoItem.class, new Filter<ToDoItem>() {
-// @Override
-// public boolean accept(ToDoItem t) {
-// return t != toDoItem && Objects.equal(toDoItem.getCategory(), t.getCategory()) && Objects.equal(toDoItem.getOwnedBy(), t.getOwnedBy());
-// }
-// });
+ public List<ToDoItem> similarTo(final ToDoItem thisToDoItem) {
+ final List<ToDoItem> similarToDoItems = allMatches(
+ new QueryDefault<ToDoItem>(ToDoItem.class,
+ "todo_similarTo",
+ "ownedBy", thisToDoItem.getOwnedBy(),
+ "category", thisToDoItem.getCategory()));
+ return Lists.newArrayList(Iterables.filter(similarToDoItems, excluding(thisToDoItem)));
+ }
+
+ private static Predicate<ToDoItem> excluding(final ToDoItem toDoItem) {
+ return new Predicate<ToDoItem>() {
+ @Override
+ public boolean apply(ToDoItem input) {
+ return input != toDoItem;
+ }
+ };
}
// }}
Modified: incubator/isis/trunk/examples/quickstart/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/pom.xml?rev=1397207&r1=1397206&r2=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/pom.xml Thu Oct 11 18:06:36 2012
@@ -147,14 +147,13 @@
<modules>
<module>dom</module>
- <module>exploration</module>
<module>fixture</module>
- <module>objstore-dflt</module>
<module>objstore-jdo</module>
- <module>objstore-nosql</module>
- <module>objstore-sql</module>
- <module>webapp</module>
- <module>wicket</module>
+ <module>viewer-dnd</module>
+ <module>viewer-html</module>
+ <module>viewer-restfulobjects</module>
+ <module>viewer-scimpi</module>
+ <module>viewer-wicket</module>
<module>tests-junit</module>
<module>tests-bdd</module>
</modules>
@@ -177,30 +176,12 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>quickstart-objstore-dflt</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>quickstart-objstore-jdo</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>quickstart-objstore-nosql</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>quickstart-objstore-sql</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>quickstart-webapp</artifactId>
<version>${project.version}</version>
</dependency>
Modified: incubator/isis/trunk/examples/quickstart/tests-bdd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-bdd/pom.xml?rev=1397207&r1=1397206&r2=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-bdd/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/tests-bdd/pom.xml Thu Oct 11 18:06:36 2012
@@ -54,11 +54,6 @@
<artifactId>quickstart-dom</artifactId>
<version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>quickstart-objstore-dflt</artifactId>
- <version>0.3.1-incubating-SNAPSHOT</version>
- </dependency>
<!-- isis -->
<dependency>
Modified: incubator/isis/trunk/examples/quickstart/tests-junit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-junit/pom.xml?rev=1397207&r1=1397206&r2=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-junit/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/tests-junit/pom.xml Thu Oct 11 18:06:36 2012
@@ -37,11 +37,6 @@
<artifactId>quickstart-fixture</artifactId>
<version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>quickstart-objstore-dflt</artifactId>
- <version>0.3.1-incubating-SNAPSHOT</version>
- </dependency>
<!-- isis -->
<dependency>
Modified: incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/AbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/AbstractTest.java?rev=1397207&r1=1397206&r2=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/AbstractTest.java (original)
+++ incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/AbstractTest.java Thu Oct 11 18:06:36 2012
@@ -20,7 +20,6 @@
package junit;
import dom.todo.ToDoItems;
-import objstore.dflt.todo.ToDoItemsDefault;
import org.junit.After;
import org.junit.Before;
@@ -35,8 +34,8 @@ import org.apache.isis.viewer.junit.Serv
import org.apache.isis.viewer.junit.Services;
@RunWith(IsisTestRunner.class)
-@ConfigDir("../webapp/src/main/webapp/WEB-INF") // acts as default, but can be overridden by annotations
-@Services({ @Service(ToDoItemsDefault.class) })
+@ConfigDir("../exploration/config") // acts as default, but can be overridden by annotations
+@Services({ @Service(ToDoItems.class) })
public abstract class AbstractTest {
private DomainObjectContainer domainObjectContainer;
Added: incubator/isis/trunk/examples/quickstart/viewer-dnd/config/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-dnd/config/isis.properties?rev=1397207&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/viewer-dnd/config/isis.properties (added)
+++ incubator/isis/trunk/examples/quickstart/viewer-dnd/config/isis.properties Thu Oct 11 18:06:36 2012
@@ -0,0 +1,116 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
+#################################################################################
+#
+# specify system components.
+#
+# The values correspond to the named components in the installer-registry.properties file
+# in the org.apache.isis.runtimes.dflt:runtime JAR (in the org.apache.isis.runtimes.dflt.runtime package)
+#
+# Although all configuration could reside in isis.properties, the recommendation is
+# to split out into component specific files:
+#
+# xxx_yyy.properties files
+#
+# where
+# * xxx is the component type, and
+# * yyy is the component name.
+#
+# For example, persistor_sql.properties holds configuration information specific to the
+#
+#
+# If the components are changed, also remember to edit pom.xml (further comments can be
+# found in the persistor_xxx.properties files)
+#
+#################################################################################
+
+#
+# configure the persistor (object store) to use
+#
+# * in-memory requires no additional configuration, but stores object in-memory.
+# Only suitable for prototyping
+#
+# other persistor implementations are not appropriate for the DnD viewer
+#
+
+isis.persistor=in-memory
+#isis.persistor=xml
+
+
+
+
+#################################################################################
+#
+# MetaModel
+#
+# The metamodel typically does not require additional configuration, although
+# the system components (defined above) may refine the metamodel for their needs.
+#
+#################################################################################
+
+
+#
+# additional programming model facets
+#
+
+#isis.reflector.facets.include=
+#isis.reflector.facets.exclude=
+
+
+#
+# metamodel validator
+#
+
+#isis.reflector.validator=
+
+
+
+#################################################################################
+#
+# Application Services and fixtures
+#
+#################################################################################
+
+#
+# Specify the domain services.
+#
+# These are the most important configuration properties in the system, as they define
+# the set of the classes for Isis to instantiate as domain service singletons.
+# From these domain service instances the rest of the metamodel is discovered, while the
+# end-user gains access to other domain objects by invoking the actions of the domain services.
+#
+# The implementations depend on the configured (see isis.persistor above)
+#
+
+# if using the in-memory object store
+isis.services.prefix = dom
+isis.services = todo.ToDoItems
+
+
+
+
+#
+# Specify the (optional) test fixtures
+#
+# Fixtures are used to seed the object store with an initial set of data. For the
+# in-memory object store, the fixtures are installed on every run.
+#
+isis.fixtures.prefix= fixture
+isis.fixtures= todo.ToDoItemsFixture
+
Copied: incubator/isis/trunk/examples/quickstart/viewer-dnd/config/logging.properties (from r1396204, incubator/isis/trunk/examples/quickstart/exploration/config/logging.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-dnd/config/logging.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-dnd/config/logging.properties&p1=incubator/isis/trunk/examples/quickstart/exploration/config/logging.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-dnd/config/persistor_in-memory.properties (from r1396204, incubator/isis/trunk/examples/quickstart/exploration/config/persistor_in-memory.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-dnd/config/persistor_in-memory.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-dnd/config/persistor_in-memory.properties&p1=incubator/isis/trunk/examples/quickstart/exploration/config/persistor_in-memory.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-dnd/config/persistor_xml.properties (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_xml.properties)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-dnd/config/persistor_xml.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-dnd/config/persistor_xml.properties&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_xml.properties&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_xml.properties (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-dnd/config/persistor_xml.properties Thu Oct 11 18:06:36 2012
@@ -19,4 +19,4 @@
# configuration file for the XML objectstore
#
-isis.xmlos.dir=/tmp/isis-xmlos-dir
\ No newline at end of file
+isis.xmlos.dir=/tmp/isis-quickstart/persistor-xml/data
\ No newline at end of file
Copied: incubator/isis/trunk/examples/quickstart/viewer-dnd/config/viewer_dnd.properties (from r1396204, incubator/isis/trunk/examples/quickstart/exploration/config/authorization_file.allow)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-dnd/config/viewer_dnd.properties?p2=incubator/isis/trunk/examples/quickstart/viewer-dnd/config/viewer_dnd.properties&p1=incubator/isis/trunk/examples/quickstart/exploration/config/authorization_file.allow&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/exploration/config/authorization_file.allow (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-dnd/config/viewer_dnd.properties Thu Oct 11 18:06:36 2012
@@ -1,28 +1,22 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-#
-# configuration file for the file-based authorization
-#
-
-
-#
-# (intentionally empty)
-#
-
-
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#
+# configuration file for the DnD viewer
+#
+
+# (intentionally empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-dnd/ide/eclipse/launch/quickstart-viewer-dnd.launch (from r1396204, incubator/isis/trunk/examples/quickstart/exploration/ide/eclipse/launch/quickstart-exploration.launch)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-dnd/ide/eclipse/launch/quickstart-viewer-dnd.launch?p2=incubator/isis/trunk/examples/quickstart/viewer-dnd/ide/eclipse/launch/quickstart-viewer-dnd.launch&p1=incubator/isis/trunk/examples/quickstart/exploration/ide/eclipse/launch/quickstart-exploration.launch&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/exploration/ide/eclipse/launch/quickstart-exploration.launch (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-dnd/ide/eclipse/launch/quickstart-viewer-dnd.launch Thu Oct 11 18:06:36 2012
@@ -15,6 +15,6 @@
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.Isis"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--type exploration --viewer dnd"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart-exploration"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart-viewer-dnd"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
</launchConfiguration>
Copied: incubator/isis/trunk/examples/quickstart/viewer-dnd/pom.xml (from r1396204, incubator/isis/trunk/examples/quickstart/exploration/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-dnd/pom.xml?p2=incubator/isis/trunk/examples/quickstart/viewer-dnd/pom.xml&p1=incubator/isis/trunk/examples/quickstart/exploration/pom.xml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/exploration/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-dnd/pom.xml Thu Oct 11 18:06:36 2012
@@ -26,8 +26,15 @@
<version>0.3.1-incubating-SNAPSHOT</version>
</parent>
- <artifactId>quickstart-exploration</artifactId>
- <name>Quickstart Exploration</name>
+ <artifactId>quickstart-viewer-dnd</artifactId>
+ <name>Quickstart Viewer DnD</name>
+
+ <description>This module runs Isis' DnD viewer, intended for exploration, prototyping and
+ design. By default the viewer is configured to run with the in-memory object store,
+ meaning that changes will not be persisted from one run to the next; initial seed data
+ is read in from the isis.fixtures key in the isis.properties config file. Alternatively,
+ the viewer may be configured to run with the XML object store, which persists changes to set of
+ XML files.</description>
<!--
can run the dnd using either:
@@ -88,10 +95,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>quickstart-fixture</artifactId>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>quickstart-objstore-dflt</artifactId>
- </dependency>
<!-- isis core -->
<dependency>
Added: incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/tests.lck
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/tests.lck?rev=1397207&view=auto
==============================================================================
Files incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/tests.lck (added) and incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/tests.lck Thu Oct 11 18:06:36 2012 differ
Added: incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/tests.log
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/tests.log?rev=1397207&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/tests.log (added)
+++ incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/tests.log Thu Oct 11 18:06:36 2012
@@ -0,0 +1,2 @@
+/*C3*/SET SCHEMA PUBLIC
+create table ISIS_ADMIN_SERVICES (PK_ID int, ID varchar(255))
Added: incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/tests.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/tests.properties?rev=1397207&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/tests.properties (added)
+++ incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/tests.properties Thu Oct 11 18:06:36 2012
@@ -0,0 +1,4 @@
+#HSQL Database Engine 2.2.8
+#Wed Oct 10 18:15:49 BST 2012
+version=2.2.8
+modified=yes
Added: incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/tests.script
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/tests.script?rev=1397207&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/tests.script (added)
+++ incubator/isis/trunk/examples/quickstart/viewer-html/hsql-db/tests.script Thu Oct 11 18:06:36 2012
@@ -0,0 +1,46 @@
+SET DATABASE UNIQUE NAME HSQLDB3A4BACD59D
+SET DATABASE GC 0
+SET DATABASE DEFAULT RESULT MEMORY ROWS 0
+SET DATABASE EVENT LOG LEVEL 0
+SET DATABASE SQL NAMES FALSE
+SET DATABASE SQL REFERENCES FALSE
+SET DATABASE SQL SIZE TRUE
+SET DATABASE SQL TYPES FALSE
+SET DATABASE SQL TDC DELETE TRUE
+SET DATABASE SQL TDC UPDATE TRUE
+SET DATABASE SQL TRANSLATE TTI TYPES TRUE
+SET DATABASE SQL CONCAT NULLS TRUE
+SET DATABASE SQL NULLS FIRST TRUE
+SET DATABASE SQL UNIQUE NULLS TRUE
+SET DATABASE SQL CONVERT TRUNCATE TRUE
+SET DATABASE SQL AVG SCALE 0
+SET DATABASE SQL DOUBLE NAN TRUE
+SET DATABASE SQL LONGVAR IS LOB FALSE
+SET DATABASE TRANSACTION CONTROL LOCKS
+SET DATABASE DEFAULT ISOLATION LEVEL READ COMMITTED
+SET DATABASE TRANSACTION ROLLBACK ON CONFLICT TRUE
+SET DATABASE TEXT TABLE DEFAULTS ''
+SET FILES WRITE DELAY 500 MILLIS
+SET FILES BACKUP INCREMENT TRUE
+SET FILES CACHE SIZE 10000
+SET FILES CACHE ROWS 50000
+SET FILES SCALE 8
+SET FILES LOB SCALE 32
+SET FILES DEFRAG 0
+SET FILES NIO TRUE
+SET FILES NIO SIZE 256
+SET FILES LOG TRUE
+SET FILES LOG SIZE 50
+CREATE USER SA PASSWORD DIGEST 'd41d8cd98f00b204e9800998ecf8427e'
+ALTER USER SA SET LOCAL TRUE
+CREATE SCHEMA PUBLIC AUTHORIZATION DBA
+ALTER SEQUENCE SYSTEM_LOBS.LOB_ID RESTART WITH 1
+SET DATABASE DEFAULT INITIAL SCHEMA PUBLIC
+GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.YES_OR_NO TO PUBLIC
+GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.TIME_STAMP TO PUBLIC
+GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.CARDINAL_NUMBER TO PUBLIC
+GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.CHARACTER_DATA TO PUBLIC
+GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.SQL_IDENTIFIER TO PUBLIC
+GRANT DBA TO SA
+SET SCHEMA SYSTEM_LOBS
+INSERT INTO BLOCKS VALUES(0,2147483647,0)
Copied: incubator/isis/trunk/examples/quickstart/viewer-html/ide/eclipse/launch/quickstart-viewer-html.launch (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/ide/eclipse/launch/quickstart-webapp-with-jdo-fixtures.launch)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-html/ide/eclipse/launch/quickstart-viewer-html.launch?p2=incubator/isis/trunk/examples/quickstart/viewer-html/ide/eclipse/launch/quickstart-viewer-html.launch&p1=incubator/isis/trunk/examples/quickstart/webapp/ide/eclipse/launch/quickstart-webapp-with-jdo-fixtures.launch&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/ide/eclipse/launch/quickstart-webapp-with-jdo-fixtures.launch (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-html/ide/eclipse/launch/quickstart-viewer-html.launch Thu Oct 11 18:06:36 2012
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.apache.isis.runtimes.dflt.webserver/src/main/java/org/apache/isis/WebServer.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
-<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-D isis.persistor.datanucleus.install-fixtures=true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart-webapp"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.apache.isis.runtimes.dflt.webserver/src/main/java/org/apache/isis/WebServer.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
+<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--type server_exploration"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart-viewer-html"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>
Copied: incubator/isis/trunk/examples/quickstart/viewer-html/lib/.gitignore (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/lib/.gitignore)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-html/lib/.gitignore?p2=incubator/isis/trunk/examples/quickstart/viewer-html/lib/.gitignore&p1=incubator/isis/trunk/examples/quickstart/webapp/lib/.gitignore&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
(empty)
Copied: incubator/isis/trunk/examples/quickstart/viewer-html/pom.xml (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-html/pom.xml?p2=incubator/isis/trunk/examples/quickstart/viewer-html/pom.xml&p1=incubator/isis/trunk/examples/quickstart/webapp/pom.xml&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-html/pom.xml Thu Oct 11 18:06:36 2012
@@ -26,8 +26,11 @@
<version>0.3.1-incubating-SNAPSHOT</version>
</parent>
- <artifactId>quickstart-webapp</artifactId>
- <name>Quickstart Webapp</name>
+ <artifactId>quickstart-viewer-html</artifactId>
+ <name>Quickstart HTML Viewer</name>
+ <description>This module runs Isis' HTML webapp viewer. By default it is configured to
+ run using the sql object store. See other viewer modules for more persistence
+ options.</description>
<packaging>war</packaging>
@@ -88,47 +91,34 @@
- <!-- domain service/repository implementations -->
-
- <!--
- - uncomment in order to use in-memory or xml object stores
- - (also edit isis.properties)
- -
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>quickstart-objstore-dflt</artifactId>
- </dependency>
- -->
-
+ <!-- objectstore/domain service/repository implementations -->
+
<!--
- - uncomment in order to use jdo object store
+ - uncomment in order to use default object store
- (also edit isis.properties)
-
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+ <artifactId>dflt</artifactId>
+ </dependency>
-->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>quickstart-objstore-jdo</artifactId>
- </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+ <artifactId>sql-impl</artifactId>
+ </dependency>
<!--
- - uncomment in order to use sql object store
+ - uncomment in order to use jdo object store
- (also edit isis.properties)
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>quickstart-objstore-sql</artifactId>
- </dependency>
+ - (also uncomment in order to install facet factories used to
+ - filter out any JDO enhancement to pojos)
-->
-
- <!--
- - uncomment in order to use either mongodb or fileserver object store
- - (also edit isis.properties)
- -
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>quickstart-objstore-nosql</artifactId>
+ <artifactId>quickstart-objstore-jdo</artifactId>
</dependency>
- -->
@@ -138,15 +128,6 @@
<artifactId>html</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>restfulobjects-viewer</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>scimpi-servlet</artifactId>
- </dependency>
<!-- isis runtime -->
Copied: incubator/isis/trunk/examples/quickstart/viewer-html/src/main/jettyconsole/isis-banner.pdn (from r1396204, incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.pdn)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-html/src/main/jettyconsole/isis-banner.pdn?p2=incubator/isis/trunk/examples/quickstart/viewer-html/src/main/jettyconsole/isis-banner.pdn&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.pdn&r1=1396204&r2=1397207&rev=1397207&view=diff
==============================================================================
Binary files - no diff available.