Repository: isis Updated Branches: refs/heads/master 923751e6d -> 853f62137
ISIS-928: updating simpleapp archetype Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2fa4bcfc Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2fa4bcfc Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2fa4bcfc Branch: refs/heads/master Commit: 2fa4bcfcc4203957a865abbd0e6c51ca630340ad Parents: 923751e Author: Dan Haywood <[email protected]> Authored: Fri Nov 14 13:02:12 2014 +0000 Committer: Dan Haywood <[email protected]> Committed: Fri Nov 14 13:02:12 2014 +0000 ---------------------------------------------------------------------- .../src/main/java/webapp/ToDoApplication.java | 4 +- example/archetype/simpleapp/pom.xml | 2 +- .../archetype-resources/integtests/pom.xml | 2 +- .../main/resources/archetype-resources/pom.xml | 4 +- .../archetype-resources/webapp/pom.xml | 4 -- .../src/main/java/webapp/SimpleApplication.java | 16 ++++++- .../src/main/webapp/WEB-INF/isis.properties | 3 ++ .../WEB-INF/viewer_restfulobjects.properties | 45 +++++++++++++++++++- .../webapp/WEB-INF/viewer_wicket.properties | 43 ++++++++++++++----- .../projects/basic/archetype.properties | 2 +- 10 files changed, 101 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/2fa4bcfc/example/application/todoapp/webapp/src/main/java/webapp/ToDoApplication.java ---------------------------------------------------------------------- diff --git a/example/application/todoapp/webapp/src/main/java/webapp/ToDoApplication.java b/example/application/todoapp/webapp/src/main/java/webapp/ToDoApplication.java index 3fa5ba3..a686b34 100644 --- a/example/application/todoapp/webapp/src/main/java/webapp/ToDoApplication.java +++ b/example/application/todoapp/webapp/src/main/java/webapp/ToDoApplication.java @@ -65,12 +65,12 @@ public class ToDoApplication extends IsisWicketApplication { private static final long serialVersionUID = 1L; /** - * uncomment for a (slightly hacky) way of allowing logins using query args, eg: + * set to true for a (slightly hacky) way of allowing logins using query args, eg: * * <tt>?user=sven&pass=pass</tt> * * <p> - * for demos only, obvious. + * for demos only, obviously. */ private final static boolean DEMO_MODE_USING_CREDENTIALS_AS_QUERYARGS = false; http://git-wip-us.apache.org/repos/asf/isis/blob/2fa4bcfc/example/archetype/simpleapp/pom.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml index 05447c0..aa28ecb 100644 --- a/example/archetype/simpleapp/pom.xml +++ b/example/archetype/simpleapp/pom.xml @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.isis.archetype</groupId> <artifactId>simpleapp-archetype</artifactId> http://git-wip-us.apache.org/repos/asf/isis/blob/2fa4bcfc/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml index 0defa29..2b31421 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml @@ -77,7 +77,7 @@ </dependency> <dependency> <groupId>org.apache.isis.core</groupId> - <artifactId>isis-core-objectstore-jdo-datanucleus</artifactId> + <artifactId>isis-core-runtime</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/2fa4bcfc/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml index 53398b7..2b2db41 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml @@ -64,8 +64,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.1</version> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/isis/blob/2fa4bcfc/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml index efd384a..20d212d 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml @@ -156,10 +156,6 @@ <!-- other isis components --> <dependency> - <groupId>org.apache.isis.core</groupId> - <artifactId>isis-core-objectstore-jdo-datanucleus</artifactId> - </dependency> - <dependency> <groupId>org.apache.isis.viewer</groupId> <artifactId>isis-viewer-wicket-impl</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/2fa4bcfc/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/SimpleApplication.java ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/SimpleApplication.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/SimpleApplication.java index 2c87197..a747bc0 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/SimpleApplication.java +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/webapp/SimpleApplication.java @@ -21,6 +21,11 @@ */ package webapp; +import de.agilecoders.wicket.core.Bootstrap; +import de.agilecoders.wicket.core.settings.IBootstrapSettings; +import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchTheme; +import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchThemeProvider; + import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; @@ -73,7 +78,16 @@ public class SimpleApplication extends IsisWicketApplication { * for demos only, obvious. */ private final static boolean DEMO_MODE_USING_CREDENTIALS_AS_QUERYARGS = false; - + + + @Override + protected void init() { + super.init(); + + IBootstrapSettings settings = Bootstrap.getSettings(); + settings.setThemeProvider(new BootswatchThemeProvider(BootswatchTheme.Flatly)); + } + @Override public Session newSession(final Request request, final Response response) { if(!DEMO_MODE_USING_CREDENTIALS_AS_QUERYARGS) { http://git-wip-us.apache.org/repos/asf/isis/blob/2fa4bcfc/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties index 1e994ca..af65eca 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties @@ -192,3 +192,6 @@ ${symbol_pound} ${symbol_pound}isis.viewers.paged.standalone=30 ${symbol_pound}isis.viewers.paged.parented=10 + +${symbol_pound}isis.viewers.labelAt.property=LEFT +${symbol_pound}isis.viewers.labelAt.parameter=LEFT http://git-wip-us.apache.org/repos/asf/isis/blob/2fa4bcfc/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_restfulobjects.properties ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_restfulobjects.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_restfulobjects.properties index 0392dd7..85e658a 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_restfulobjects.properties +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_restfulobjects.properties @@ -23,4 +23,47 @@ ${symbol_pound} configuration file for the Restful Objects viewer ${symbol_pound} ${symbol_pound} the baseUrl for hrefs in the events generated by the RO EventSerializer -isis.viewer.restfulobjects.RestfulObjectsSpecEventSerializer.baseUrl=http://localhost:8080/restful/ \ No newline at end of file +isis.viewer.restfulobjects.RestfulObjectsSpecEventSerializer.baseUrl=http://localhost:8080/restful/ + +${symbol_pound} renders param details in the (incorrect) form that they were for GSOC2013 viewers +${symbol_pound} isis.viewer.restfulobjects.gsoc2013.legacyParamDetails=true + +${symbol_pound} whether to honor UI hints, in particular Render(EAGERLY). Defaults to false. +${symbol_pound}isis.viewer.restfulobjects.honorUiHints=false + + + +${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound} +${symbol_pound} Non-standard configuration settings. +${symbol_pound} +${symbol_pound} If enabled of the following are enabled then the viewer is deviating from the +${symbol_pound} RO spec standard; compatibility may be compromised with RO clients. +${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound} + +${symbol_pound} whether to show only object properties for object members +${symbol_pound} (on the object representation only) +${symbol_pound} Takes precedence over the other 'suppress' below. +${symbol_pound}isis.viewer.restfulobjects.objectPropertyValuesOnly=true + +${symbol_pound} whether to suppress "describedby" links. Defaults to false. +${symbol_pound}isis.viewer.restfulobjects.suppressDescribedByLinks=true + +${symbol_pound} whether to suppress "update" links. Defaults to false. +${symbol_pound}isis.viewer.restfulobjects.suppressUpdateLink=true + +${symbol_pound} whether to suppress "id" json-prop for object members. Defaults to false. +${symbol_pound}isis.viewer.restfulobjects.suppressMemberId=true + +${symbol_pound} whether to suppress "links" json-prop for object members +${symbol_pound} (on the object representation only). Defaults to false. +${symbol_pound}isis.viewer.restfulobjects.suppressMemberLinks=true + +${symbol_pound} whether to suppress "extensions" json-prop for object members +${symbol_pound} (on the object representation only). Defaults to false. +${symbol_pound}isis.viewer.restfulobjects.suppressMemberExtensions=true + +${symbol_pound} whether to suppress "disabledReason" json-prop for object members +${symbol_pound} (on the object representation only). Defaults to false. +${symbol_pound}isis.viewer.restfulobjects.suppressMemberDisabledReason=true + +${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound} http://git-wip-us.apache.org/repos/asf/isis/blob/2fa4bcfc/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties index 17accd5..e271990 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties @@ -35,32 +35,53 @@ isis.viewer.wicket.maxTitleLengthInStandaloneTables=0 isis.viewer.wicket.maxTitleLengthInParentedTables=0 -isis.viewer.wicket.datePattern=dd-MM-yyyy -isis.viewer.wicket.dateTimePattern=dd-MM-yyyy HH:mm -isis.viewer.wicket.datePickerPattern=dd-mm-yy +${symbol_pound}isis.viewer.wicket.datePattern=dd-MM-yyyy +${symbol_pound}isis.viewer.wicket.dateTimePattern=dd-MM-yyyy HH:mm +${symbol_pound}isis.viewer.wicket.datePickerPattern=DD-MM-YYYY ${symbol_pound}isis.viewer.wicket.datePattern=dd/MM/yy ${symbol_pound}isis.viewer.wicket.dateTimePattern=dd/MM/yy HH:mm -${symbol_pound}isis.viewer.wicket.datePickerPattern=dd/mm/y +${symbol_pound}isis.viewer.wicket.datePickerPattern=DD/MM/YY -${symbol_pound}isis.viewer.wicket.suppressRememberMe=true +${symbol_pound} +${symbol_pound} whether to strip wicket tags from markup (default is true, as they may break some CSS rules) +${symbol_pound} +${symbol_pound}isis.viewer.wicket.stripWicketTags=false + + +${symbol_pound} +${symbol_pound} whether to suppress the 'rememberMe' checkbox on the login page (default is false) +${symbol_pound} +${symbol_pound}isis.viewer.wicket.suppressRememberMe=false ${symbol_pound} ${symbol_pound} if user attempts to access a protected URL before signing in, then as a convenience the viewer will continue ${symbol_pound} through to that destination after successful login. If you consider this to be a security risk then this flag -${symbol_pound} disables that behaviour. +${symbol_pound} disables that behaviour (default is false). ${symbol_pound} ${symbol_pound}isis.viewer.wicket.clearOriginalDestination=true -${symbol_pound}isis.viewer.wicket.disableModalDialogs=true +${symbol_pound} +${symbol_pound} whether to show action dialogs on their own page rather than as a modal dialog (default is false) +${symbol_pound} +${symbol_pound}isis.viewer.wicket.disableModalDialogs=false -${symbol_pound} default is for wicket tags to be stripped in production (Isis SERVER mode == Wicket deployment mode), -${symbol_pound} not stripped otherwise (Isis' PROTOTYPE mode == Wicket's DEVELOPMENT mode) -${symbol_pound} isis.viewer.wicket.stripWicketTags=false +${symbol_pound} +${symbol_pound} the maximum number of pages to list in bookmark (default is 15) +${symbol_pound} ${symbol_pound}isis.viewer.wicket.bookmarkedPages.maxSize=15 -${symbol_pound}isis.viewer.wicket.regularCase=false +${symbol_pound} +${symbol_pound} whether to show the bootstrap theme chooser (defaults false) +${symbol_pound} +${symbol_pound}isis.viewer.wicket.themes.showChooser=false +isis.viewer.wicket.themes.showChooser=true + +${symbol_pound} +${symbol_pound} comma-separated list of themes to choose from (default is to show all themes from bootswatch.com). +${symbol_pound} +${symbol_pound}isis.viewer.wicket.themes.enabled=bootstrap-theme,Cosmo,Flatly,Darkly,Sandstone,United \ No newline at end of file http://git-wip-us.apache.org/repos/asf/isis/blob/2fa4bcfc/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties index b668f24..e004a7a 100644 --- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties +++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties @@ -1,4 +1,4 @@ -#Mon Oct 13 23:12:00 BST 2014 +#Fri Nov 14 12:51:54 GMT 2014 package=it.pkg version=0.1-SNAPSHOT groupId=archetype.it
