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 2014/03/17 23:49:50 UTC
[31/50] [abbrv] git commit: ISIS-695: deleting dir accidentally
created ...
ISIS-695: deleting dir accidentally created ...
... when recreating the quickstart archetype.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c4752a8c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c4752a8c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c4752a8c
Branch: refs/heads/master
Commit: c4752a8ca9f950d089aea3ced1d767701adb307c
Parents: 0e9581c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Mar 6 17:20:28 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Mar 6 17:20:28 2014 +0000
----------------------------------------------------------------------
.../archetype/pom.xml | 50 --
.../appended-resources/supplemental-models.xml | 26 -
.../META-INF/maven/archetype-metadata.xml | 165 ----
.../archetype-resources/dom/log4j.properties | 44 -
.../resources/archetype-resources/dom/pom.xml | 134 ---
.../dom/src/main/java/META-INF/persistence.xml | 29 -
.../dom/src/main/java/app/ToDoAppDashboard.java | 89 --
.../main/java/app/ToDoAppDashboard.layout.json | 26 -
.../main/java/app/ToDoAppDashboardService.java | 59 --
.../dom/src/main/java/app/ToDoItemAnalysis.java | 133 ---
.../java/app/ToDoItemAnalysisContributions.java | 55 --
.../java/app/ToDoItemsByCategoryViewModel.java | 184 ----
.../ToDoItemsByCategoryViewModel.layout.json | 43 -
.../java/app/ToDoItemsByDateRangeViewModel.java | 160 ----
.../ToDoItemsByDateRangeViewModel.layout.json | 33 -
.../dom/src/main/java/dom/todo/ToDoItem.java | 863 -------------------
.../src/main/java/dom/todo/ToDoItem.layout.json | 177 ----
.../dom/todo/ToDoItemChangedPayloadFactory.java | 50 --
.../java/dom/todo/ToDoItemContributions.java | 258 ------
.../dom/src/main/java/dom/todo/ToDoItems.java | 260 ------
.../dom/src/main/resources/images/Dashboard.png | Bin 684 -> 0 bytes
.../src/main/resources/images/ToDoItem-done.png | Bin 1363 -> 0 bytes
.../src/main/resources/images/ToDoItem-todo.png | Bin 971 -> 0 bytes
.../dom/src/main/resources/images/ToDoItem.png | Bin 971 -> 0 bytes
.../test/java/dom/todo/ToDoTest_completed.java | 58 --
.../java/dom/todo/ToDoTest_notYetCompleted.java | 51 --
.../archetype-resources/fixture/.gitignore | 1 -
.../archetype-resources/fixture/pom.xml | 38 -
.../java/fixture/todo/ToDoItemsFixture.java | 105 ---
.../integtests/logging.properties | 104 ---
.../archetype-resources/integtests/pom.xml | 122 ---
.../java/integration/ToDoSystemInitializer.java | 90 --
.../integration/glue/BootstrappingGlue.java | 59 --
.../integration/glue/CatalogOfFixturesGlue.java | 50 --
.../integration/glue/InMemoryDBForToDoApp.java | 43 -
.../integration/glue/todoitem/ToDoItemGlue.java | 169 ----
.../integration/specs/todoitem/RunSpecs.java | 41 -
.../ToDoItemSpec_findAndComplete.feature | 39 -
...findCompletedAndMarkAsNotYetComplete.feature | 35 -
.../java/integration/tests/ToDoIntegTest.java | 43 -
...oDoItemContributionsTest_updateCategory.java | 101 ---
.../tests/actions/ToDoItemTest_completed.java | 86 --
.../tests/actions/ToDoItemTest_duplicate.java | 76 --
.../actions/ToDoItemTest_notYetCompleted.java | 76 --
.../ToDoItemContributionsTest_similarTo.java | 69 --
.../colls/ToDoItemTest_dependencies_add.java | 92 --
.../colls/ToDoItemTest_dependencies_remove.java | 96 ---
.../ToDoItemContributionsTest_priority.java | 71 --
.../tests/props/ToDoItemTest_attachment.java | 81 --
.../tests/props/ToDoItemTest_category.java | 56 --
.../tests/props/ToDoItemTest_cost.java | 95 --
.../tests/props/ToDoItemTest_description.java | 102 ---
.../tests/props/ToDoItemTest_dueBy.java | 99 ---
.../tests/props/ToDoItemTest_notes.java | 73 --
.../tests/props/ToDoItemTest_ownedBy.java | 59 --
.../tests/props/ToDoItemTest_subcategory.java | 56 --
.../tests/repo/ToDoItemsTest_finders.java | 78 --
.../repo/ToDoItemsTest_newToDo_and_delete.java | 57 --
.../tests/smoke/ToDoItemTest_title.java | 112 ---
.../main/resources/archetype-resources/pom.xml | 395 ---------
.../launch/ToDoApp-PROTOTYPE-jrebel.launch | 26 -
.../launch/ToDoApp-PROTOTYPE-no-fixtures.launch | 25 -
.../ToDoApp-PROTOTYPE-with-fixtures.launch | 22 -
.../launch/ToDoApp-SERVER-no-fixtures.launch | 25 -
.../archetype-resources/webapp/lib/.gitignore | 5 -
.../archetype-resources/webapp/pom.xml | 275 ------
.../ComponentFactoryRegistrarForToDoApp.java | 36 -
.../java/webapp/PageClassListForToDoApp.java | 64 --
.../src/main/java/webapp/ToDoApplication.java | 145 ----
.../src/main/java/webapp/admin/Admin.java | 182 ----
.../java/webapp/admin/AdminContributions.java | 113 ---
.../webapp/prototyping/DeveloperUtilities.java | 51 --
.../prototyping/ExternalLinksService.java | 62 --
.../prototyping/ToDoItemsFixturesService.java | 87 --
.../webapp/scheduler/AbstractIsisQuartzJob.java | 96 ---
.../BackgroundCommandExecutionQuartzJob.java | 31 -
.../webapp/scheduler/SchedulerConstants.java | 30 -
.../src/main/jettyconsole/isis-banner.pdn | Bin 69658 -> 0 bytes
.../src/main/jettyconsole/isis-banner.png | Bin 30776 -> 0 bytes
.../webapp/src/main/resources/webapp/realm1.ini | 68 --
.../webapp/src/main/resources/webapp/realm2.ini | 66 --
.../webapp/scheduler/quartz-config.xml | 65 --
.../webapp/scheduler/quartz.properties | 28 -
.../src/main/resources/webapp/welcome.html | 38 -
.../WEB-INF/authentication_file.passwords | 28 -
.../WEB-INF/authentication_file.properties | 28 -
.../webapp/WEB-INF/authorization_file.allow | 28 -
.../WEB-INF/authorization_file.properties | 50 --
.../src/main/webapp/WEB-INF/isis.properties | 269 ------
.../src/main/webapp/WEB-INF/logging.properties | 188 ----
.../main/webapp/WEB-INF/persistor.properties | 107 ---
.../WEB-INF/persistor_datanucleus.properties | 78 --
.../webapp/src/main/webapp/WEB-INF/shiro.ini | 95 --
.../WEB-INF/viewer_restfulobjects.properties | 29 -
.../webapp/WEB-INF/viewer_wicket.properties | 58 --
.../webapp/src/main/webapp/WEB-INF/web.xml | 315 -------
.../src/main/webapp/about/images/isis-logo.png | Bin 14160 -> 0 bytes
.../webapp/src/main/webapp/about/index.html | 215 -----
.../webapp/src/main/webapp/css/application.css | 80 --
.../src/main/webapp/images/spinning-icon.gif | Bin 5266 -> 0 bytes
.../src/main/webapp/scripts/application.js | 3 -
.../projects/basic/archetype.properties | 5 -
.../src/test/resources/projects/basic/goal.txt | 0
103 files changed, 8932 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c4752a8c/example/archetype/quickstart_wicket_restful_jdo/archetype/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/archetype/pom.xml b/example/archetype/quickstart_wicket_restful_jdo/archetype/pom.xml
deleted file mode 100644
index 69dab72..0000000
--- a/example/archetype/quickstart_wicket_restful_jdo/archetype/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<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>quickstart_wicket_restful_jdo-archetype</artifactId>
- <version>1.4.0-SNAPSHOT</version>
- <packaging>maven-archetype</packaging>
- <name>quickstart_wicket_restful_jdo-archetype</name>
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-packaging</artifactId>
- <version>2.2</version>
- </extension>
- </extensions>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>1.4.0</version>
- <relativePath>../../../core/pom.xml</relativePath>
- </parent>
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/c4752a8c/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/appended-resources/supplemental-models.xml b/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/appended-resources/supplemental-models.xml
deleted file mode 100644
index 01c58d8..0000000
--- a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/appended-resources/supplemental-models.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<supplementalDataModels
- xmlns="http://maven.apache.org/supplemental-model/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/supplemental-model/1.0.0
- http://maven.apache.org/xsd/supplemental-model-1.0.0.xsd">
-
-</supplementalDataModels>
http://git-wip-us.apache.org/repos/asf/isis/blob/c4752a8c/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 6e02d99..0000000
--- a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<archetype-descriptor xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0" xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="quickstart_wicket_restful_jdo" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modules>
- <module id="${rootArtifactId}-dom" dir="dom" name="${rootArtifactId}-dom">
- <fileSets>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.java</include>
- </includes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.json</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.png</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.java</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory/>
- <includes>
- <include>log4j.properties</include>
- </includes>
- </fileSet>
- </fileSets>
- </module>
- <module id="${rootArtifactId}-fixture" dir="fixture" name="${rootArtifactId}-fixture">
- <fileSets>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.java</include>
- </includes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory/>
- <includes>
- <include>.gitignore</include>
- </includes>
- </fileSet>
- </fileSets>
- </module>
- <module id="${rootArtifactId}-integtests" dir="integtests" name="${rootArtifactId}-integtests">
- <fileSets>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.java</include>
- </includes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.feature</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory/>
- <includes>
- <include>logging.properties</include>
- </includes>
- </fileSet>
- </fileSets>
- </module>
- <module id="${rootArtifactId}-webapp" dir="webapp" name="${rootArtifactId}-webapp">
- <fileSets>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.java</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/main/webapp</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.html</include>
- <include>**/*.properties</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.html</include>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>src/main/jettyconsole</directory>
- <includes>
- <include>**/*.png</include>
- <include>**/*.pdn</include>
- </includes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>src/main/webapp</directory>
- <includes>
- <include>**/*.passwords</include>
- <include>**/*.allow</include>
- <include>**/*.png</include>
- <include>**/*.js</include>
- <include>**/*.ini</include>
- <include>**/*.gif</include>
- <include>**/*.css</include>
- </includes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.ini</include>
- </includes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>lib</directory>
- <includes>
- <include>**/*.gitignore</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>ide/eclipse</directory>
- <includes>
- <include>**/*.launch</include>
- </includes>
- </fileSet>
- </fileSets>
- </module>
- </modules>
-</archetype-descriptor>
http://git-wip-us.apache.org/repos/asf/isis/blob/c4752a8c/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/log4j.properties
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/log4j.properties b/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/log4j.properties
deleted file mode 100644
index 2040d89..0000000
--- a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/log4j.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-${symbol_pound} Licensed to the Apache Software Foundation (ASF) under one
-${symbol_pound} or more contributor license agreements. See the NOTICE file
-${symbol_pound} distributed with this work for additional information
-${symbol_pound} regarding copyright ownership. The ASF licenses this file
-${symbol_pound} to you under the Apache License, Version 2.0 (the
-${symbol_pound} "License"); you may not use this file except in compliance
-${symbol_pound} with the License. You may obtain a copy of the License at
-${symbol_pound}
-${symbol_pound} http://www.apache.org/licenses/LICENSE-2.0
-${symbol_pound}
-${symbol_pound} Unless required by applicable law or agreed to in writing,
-${symbol_pound} software distributed under the License is distributed on an
-${symbol_pound} "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-${symbol_pound} KIND, either express or implied. See the License for the
-${symbol_pound} specific language governing permissions and limitations
-${symbol_pound} under the License.
-
-${symbol_pound} LOG4J Configuration
-${symbol_pound} ===================
-
-${symbol_pound} Basic logging goes to "datanucleus.log"
-log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.File=datanucleus.log
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
-${symbol_pound}log4j.appender.A1.Threshold=INFO
-
-${symbol_pound} Categories
-${symbol_pound} Each category can be set to a "level", and to direct to an appender
-
-${symbol_pound} Default to DEBUG level for all DataNucleus categories
-log4j.logger.DataNucleus = DEBUG, A1
-
-log4j.category.com.mchange.v2.c3p0=INFO, A1
-log4j.category.com.mchange.v2.resourcepool=INFO, A1
-log4j.category.org.logicalcobwebs.proxool=INFO,A1
-
-
-${symbol_pound} Hbase libs logging
-log4j.category.org.apache.hadoop=INFO,A1
-log4j.category.org.apache.zookeeper=INFO,A1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/c4752a8c/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/pom.xml b/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/pom.xml
deleted file mode 100644
index 5e75287..0000000
--- a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/pom.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
---><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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>${groupId}</groupId>
- <artifactId>${rootArtifactId}</artifactId>
- <version>${version}</version>
- </parent>
-
- <artifactId>${artifactId}</artifactId>
- <name>Quickstart Wicket/Restful/JDO DOM</name>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-maven-plugin</artifactId>
- <version>${datanucleus-maven-plugin.version}</version>
- <configuration>
- <fork>false</fork>
- <log4jConfiguration>${basedir}/log4j.properties</log4jConfiguration>
- <verbose>true</verbose>
- <props>${basedir}/datanucleus.properties</props>
- </configuration>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-maven-plugin</artifactId>
- <versionRange>[3.2.0-release,)</versionRange>
- <goals>
- <goal>enhance</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-applib</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.objectstore</groupId>
- <artifactId>isis-objectstore-jdo-applib</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- Bytecode libraries (for mocking) -->
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/c4752a8c/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/META-INF/persistence.xml b/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/META-INF/persistence.xml
deleted file mode 100644
index 020d759..0000000
--- a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/META-INF/persistence.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- 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.
--->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0">
-
- <persistence-unit name="quickstart">
- </persistence-unit>
-</persistence>
http://git-wip-us.apache.org/repos/asf/isis/blob/c4752a8c/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.java
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.java b/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.java
deleted file mode 100644
index c73e6d6..0000000
--- a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.java
+++ /dev/null
@@ -1,89 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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.
- */
-package app;
-
-import java.util.List;
-
-import org.apache.isis.applib.AbstractViewModel;
-import org.apache.isis.applib.annotation.Disabled;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.Render;
-import org.apache.isis.applib.annotation.Render.Type;
-
-public class ToDoAppDashboard extends AbstractViewModel {
-
- public String title() {
- return "Dashboard";
- }
-
- public String iconName() {
- return "Dashboard";
- }
-
- // //////////////////////////////////////
- // ViewModel contract
- // //////////////////////////////////////
-
- private String memento;
-
- @Override
- public String viewModelMemento() {
- return memento;
- }
-
- @Override
- public void viewModelInit(String memento) {
- this.memento = memento;
- }
-
-
- // //////////////////////////////////////
- // getAnalysisByCategory
- // //////////////////////////////////////
-
- @Named("By Category")
- @Render(Type.EAGERLY)
- @Disabled
- public List<ToDoItemsByCategoryViewModel> getAnalysisByCategory() {
- return toDoItemAnalysis.toDoItemsByCategory();
- }
-
- // //////////////////////////////////////
- // getAnalysisByDateRange
- // //////////////////////////////////////
-
- @Named("By Date Range")
- @Render(Type.EAGERLY)
- @Disabled
- public List<ToDoItemsByDateRangeViewModel> getAnalysisByDateRange() {
- return toDoItemAnalysis.toDoItemsByDateRange();
- }
-
-
- // //////////////////////////////////////
- // injected services
- // //////////////////////////////////////
-
- @javax.inject.Inject
- private ToDoItemAnalysis toDoItemAnalysis;
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/c4752a8c/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.layout.json
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.layout.json b/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.layout.json
deleted file mode 100644
index 3421543..0000000
--- a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboard.layout.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "columns": [
- {
- "span": 0,
- "memberGroups": {}
- },
- {
- "span": 0,
- "memberGroups": {}
- },
- {
- "span": 0,
- "memberGroups": {}
- },
- {
- "span": 12,
- "collections": {
- "analysisByCategory": {}
- }
- }
- ],
- "actions": {
- "downloadLayout": {},
- "refreshLayout": {}
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/c4752a8c/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboardService.java
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboardService.java b/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboardService.java
deleted file mode 100644
index 600f458..0000000
--- a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoAppDashboardService.java
+++ /dev/null
@@ -1,59 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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.
- */
-package app;
-
-import org.apache.isis.applib.DomainObjectContainer;
-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.HomePage;
-
-@Hidden
-public class ToDoAppDashboardService {
-
- private static final String ID = "dashboard";
-
- public String getId() {
- return ID;
- }
-
- public String iconName() {
- return ID;
- }
-
- // //////////////////////////////////////
-
- @ActionSemantics(Of.SAFE)
- @HomePage
- public ToDoAppDashboard lookup() {
- return container.newViewModelInstance(ToDoAppDashboard.class, ID);
- }
-
-
- // //////////////////////////////////////
- // Injected services
- // //////////////////////////////////////
-
- @javax.inject.Inject
- private DomainObjectContainer container;
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/c4752a8c/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysis.java
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysis.java b/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysis.java
deleted file mode 100644
index 6863ab0..0000000
--- a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysis.java
+++ /dev/null
@@ -1,133 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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.
- */
-package app;
-
-import java.util.Arrays;
-import java.util.List;
-
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-
-import dom.todo.ToDoItem.Category;
-
-import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.applib.annotation.ActionSemantics;
-import org.apache.isis.applib.annotation.ActionSemantics.Of;
-import org.apache.isis.applib.annotation.Bookmarkable;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.Programmatic;
-
-@Named("Analysis")
-public class ToDoItemAnalysis {
-
- // //////////////////////////////////////
- // Identification in the UI
- // //////////////////////////////////////
-
- public String getId() {
- return "analysis";
- }
-
- public String iconName() {
- return "ToDoItem";
- }
-
- // //////////////////////////////////////
- // ByCategory (action)
- // //////////////////////////////////////
-
- @Named("By Category")
- @Bookmarkable
- @ActionSemantics(Of.SAFE)
- @MemberOrder(sequence = "1")
- public List<ToDoItemsByCategoryViewModel> toDoItemsByCategory() {
- final List<Category> categories = Arrays.asList(Category.values());
- return Lists.newArrayList(Iterables.transform(categories, byCategory()));
- }
-
- private Function<Category, ToDoItemsByCategoryViewModel> byCategory() {
- return new Function<Category, ToDoItemsByCategoryViewModel>(){
- @Override
- public ToDoItemsByCategoryViewModel apply(final Category category) {
- final ToDoItemsByCategoryViewModel byCategory =
- container.newViewModelInstance(ToDoItemsByCategoryViewModel.class, category.name());
- byCategory.setCategory(category);
- return byCategory;
- }
- };
- }
-
- // //////////////////////////////////////
- // ByDateRange (action)
- // //////////////////////////////////////
-
- public enum DateRange {
- OverDue,
- Today,
- Tomorrow,
- ThisWeek,
- Later,
- Unknown,
- }
-
- @Named("By Date Range")
- @Bookmarkable
- @ActionSemantics(Of.SAFE)
- @MemberOrder(sequence = "1")
- public List<ToDoItemsByDateRangeViewModel> toDoItemsByDateRange() {
- final List<DateRange> dateRanges = Arrays.asList(DateRange.values());
- return Lists.newArrayList(Iterables.transform(dateRanges, byDateRange()));
- }
-
- private Function<DateRange, ToDoItemsByDateRangeViewModel> byDateRange() {
- return new Function<DateRange, ToDoItemsByDateRangeViewModel>(){
- @Override
- public ToDoItemsByDateRangeViewModel apply(final DateRange dateRange) {
- final ToDoItemsByDateRangeViewModel byDateRange =
- container.newViewModelInstance(ToDoItemsByDateRangeViewModel.class, dateRange.name());
- byDateRange.setDateRange(dateRange);
- return byDateRange;
- }
- };
- }
-
-
- // //////////////////////////////////////
- // ForCategory (programmatic)
- // //////////////////////////////////////
-
- @Programmatic
- public ToDoItemsByCategoryViewModel toDoItemsForCategory(Category category) {
- return byCategory().apply(category);
- }
-
-
- // //////////////////////////////////////
- // Injected services
- // //////////////////////////////////////
-
- @javax.inject.Inject
- private DomainObjectContainer container;
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/c4752a8c/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysisContributions.java
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysisContributions.java b/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysisContributions.java
deleted file mode 100644
index e033b97..0000000
--- a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemAnalysisContributions.java
+++ /dev/null
@@ -1,55 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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.
- */
-package app;
-
-import dom.todo.ToDoItem;
-
-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.NotContributed;
-import org.apache.isis.applib.annotation.NotContributed.As;
-import org.apache.isis.applib.annotation.NotInServiceMenu;
-
-@Hidden
-public class ToDoItemAnalysisContributions {
-
-
- // //////////////////////////////////////
- // AnalyseCategory
- // //////////////////////////////////////
-
- @NotInServiceMenu
- @NotContributed(As.ASSOCIATION)
- @ActionSemantics(Of.SAFE)
- public ToDoItemsByCategoryViewModel analyseCategory(final ToDoItem item) {
- return toDoAppAnalysis.toDoItemsForCategory(item.getCategory());
- }
-
-
- // //////////////////////////////////////
- // injected services
- // //////////////////////////////////////
-
- @javax.inject.Inject
- private ToDoItemAnalysis toDoAppAnalysis;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/c4752a8c/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByCategoryViewModel.java
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByCategoryViewModel.java b/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByCategoryViewModel.java
deleted file mode 100644
index 4014ad9..0000000
--- a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByCategoryViewModel.java
+++ /dev/null
@@ -1,184 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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.
- */
-package app;
-
-import java.util.Arrays;
-import java.util.List;
-
-import com.google.common.base.Function;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-
-import dom.todo.ToDoItem;
-import dom.todo.ToDoItem.Category;
-import dom.todo.ToDoItem.Subcategory;
-import dom.todo.ToDoItems;
-
-import org.apache.isis.applib.AbstractViewModel;
-import org.apache.isis.applib.annotation.Bookmarkable;
-import org.apache.isis.applib.annotation.MultiLine;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.Render;
-import org.apache.isis.applib.annotation.Render.Type;
-import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.applib.util.ObjectContracts;
-
-@Named("By Category")
-@Bookmarkable
-public class ToDoItemsByCategoryViewModel
- extends AbstractViewModel
- implements Comparable<ToDoItemsByCategoryViewModel> {
-
-
- // //////////////////////////////////////
- // ViewModel implementation
- // //////////////////////////////////////
-
- @Override
- public String viewModelMemento() {
- return getCategory().name();
- }
-
- @Override
- public void viewModelInit(String memento) {
- setCategory(Category.valueOf(memento));
- }
-
- // //////////////////////////////////////
- // Category
- // //////////////////////////////////////
-
- private Category category;
-
- /**
- * Used as {@link ${symbol_pound}viewModelMemento() memento}
- */
- @Title
- public Category getCategory() {
- return category;
- }
-
- public void setCategory(final Category category) {
- this.category = category;
- }
-
-
- // //////////////////////////////////////
- // NotYetComplete, Complete
- // //////////////////////////////////////
-
- @MultiLine(numberOfLines=5)
- public String getNotYetComplete() {
- final List<ToDoItem> notYetComplete = getItemsNotYetComplete();
- return Joiner.on(", ").join(
- Iterables.transform(subcategories(), summarizeBySubcategory(notYetComplete)));
- }
-
- // //////////////////////////////////////
-
- @MultiLine(numberOfLines=5)
- public String getComplete() {
- final List<ToDoItem> completeInCategory = getItemsComplete();
- return Joiner.on(", ").join(
- Iterables.transform(subcategories(), summarizeBySubcategory(completeInCategory)));
- }
-
- // //////////////////////////////////////
-
- private Iterable<Subcategory> subcategories() {
- return Iterables.filter(Arrays.asList(Subcategory.values()), Subcategory.thoseFor(getCategory()));
- }
-
- private Function<Subcategory, String> summarizeBySubcategory(final Iterable<ToDoItem> itemsInCategory) {
- return new Function<Subcategory, String>() {
- @Override
- public String apply(final Subcategory subcategory) {
- return subcategory + ": " + countIn(itemsInCategory, subcategory);
- }
- };
- }
-
- private static int countIn(final Iterable<ToDoItem> items, final Subcategory subcategory) {
- return Iterables.size(Iterables.filter(items,
- ToDoItem.Predicates.thoseSubcategorised(subcategory)));
- }
-
-
- // //////////////////////////////////////
- // getItemsNotYetComplete, getItemsComplete
- // //////////////////////////////////////
-
- /**
- * All those items {@link ToDoItems${symbol_pound}notYetComplete() not yet complete}, for this {@link ${symbol_pound}getCategory() category}.
- */
- @Render(Type.EAGERLY)
- public List<ToDoItem> getItemsNotYetComplete() {
- final List<ToDoItem> notYetComplete = toDoItems.notYetCompleteNoUi();
- return Lists.newArrayList(Iterables.filter(notYetComplete, ToDoItem.Predicates.thoseCategorised(getCategory())));
- }
-
- // //////////////////////////////////////
-
- /**
- * All those items {@link ToDoItems${symbol_pound}complete() complete}, for this {@link ${symbol_pound}getCategory() category}.
- */
- @Render(Type.EAGERLY)
- public List<ToDoItem> getItemsComplete() {
- final List<ToDoItem> complete = toDoItems.completeNoUi();
- return Lists.newArrayList(Iterables.filter(complete, ToDoItem.Predicates.thoseCategorised(getCategory())));
- }
-
-
- // //////////////////////////////////////
- // DeleteCompleted (action)
- // //////////////////////////////////////
-
- @Named("Delete")
- public ToDoItemsByCategoryViewModel deleteCompleted() {
- for (ToDoItem item : getItemsComplete()) {
- removeIfNotAlready(item);
- }
- // force reload of page
- return this;
- }
-
-
-
- // //////////////////////////////////////
- // compareTo
- // //////////////////////////////////////
-
- @Override
- public int compareTo(ToDoItemsByCategoryViewModel other) {
- return ObjectContracts.compare(this, other, "category");
- }
-
-
- // //////////////////////////////////////
- // injected services
- // //////////////////////////////////////
-
- @javax.inject.Inject
- private ToDoItems toDoItems;
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/c4752a8c/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByCategoryViewModel.layout.json
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByCategoryViewModel.layout.json b/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByCategoryViewModel.layout.json
deleted file mode 100644
index c87b554..0000000
--- a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByCategoryViewModel.layout.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- "columns": [
- {
- "span": 4,
- "memberGroups": {
- "General": {
- "members": {
- "category": {}
- }
- },
- "Analysis": {
- "members": {
- "notYetComplete": {},
- "complete": {}
- }
- }
- }
- },
- {
- "span": 0,
- "memberGroups": {}
- },
- {
- "span": 0,
- "memberGroups": {}
- },
- {
- "span": 8,
- "collections": {
- "itemsNotYetComplete": {},
- "itemsComplete": {
- "actions": {
- "deleteCompleted": {}
- }
- }
- }
- }
- ],
- "actions": {
- "downloadLayout": {},
- "refreshLayout": {}
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/c4752a8c/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.java
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.java b/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.java
deleted file mode 100644
index baf75e4..0000000
--- a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.java
+++ /dev/null
@@ -1,160 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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.
- */
-package app;
-
-import java.util.List;
-
-import app.ToDoItemAnalysis.DateRange;
-
-import com.google.common.base.Objects;
-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.ToDoItems;
-
-import org.joda.time.DateTime;
-
-import org.apache.isis.applib.AbstractViewModel;
-import org.apache.isis.applib.annotation.Bookmarkable;
-import org.apache.isis.applib.annotation.Named;
-import org.apache.isis.applib.annotation.Render;
-import org.apache.isis.applib.annotation.Render.Type;
-import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.applib.services.clock.ClockService;
-import org.apache.isis.applib.util.ObjectContracts;
-
-@Named("By Date Range")
-@Bookmarkable
-public class ToDoItemsByDateRangeViewModel
- extends AbstractViewModel
- implements Comparable<ToDoItemsByDateRangeViewModel> {
-
-
- // //////////////////////////////////////
- // ViewModel implementation
- // //////////////////////////////////////
-
- @Override
- public String viewModelMemento() {
- return getDateRange().name();
- }
-
- @Override
- public void viewModelInit(String memento) {
- setDateRange(DateRange.valueOf(memento));
- }
-
- // //////////////////////////////////////
- // DateRange
- // //////////////////////////////////////
-
- private DateRange dateRange;
-
- /**
- * Used as {@link ${symbol_pound}viewModelMemento() memento}
- */
- @Title
- public DateRange getDateRange() {
- return dateRange;
- }
-
- public void setDateRange(final DateRange dateRange) {
- this.dateRange = dateRange;
- }
-
-
- // //////////////////////////////////////
- // Count
- // //////////////////////////////////////
-
- public int getCount() {
- return getItemsNotYetComplete().size();
- }
-
- // //////////////////////////////////////
- // getItemsNotYetComplete
- // //////////////////////////////////////
-
- /**
- * All those items {@link ToDoItems${symbol_pound}notYetComplete() not yet complete}, for this {@link ${symbol_pound}getCategory() category}.
- */
- @Render(Type.EAGERLY)
- public List<ToDoItem> getItemsNotYetComplete() {
- final List<ToDoItem> notYetComplete = toDoItems.notYetCompleteNoUi();
- return Lists.newArrayList(Iterables.filter(notYetComplete, thoseInDateRange()));
- }
-
- private Predicate<ToDoItem> thoseInDateRange() {
- return new Predicate<ToDoItem>() {
- @Override
- public boolean apply(ToDoItem t) {
- return Objects.equal(dateRangeFor(t), getDateRange());
- }
- };
- }
-
- private DateRange dateRangeFor(final ToDoItem t) {
- if(t.getDueBy() == null) {
- return DateRange.Unknown;
- }
- final DateTime dueBy = t.getDueBy().toDateTimeAtStartOfDay();
- final DateTime today = clockService.now().toDateTimeAtStartOfDay();
-
- if(dueBy.isBefore(today)) {
- return DateRange.OverDue;
- }
- if(dueBy.isBefore(today.plusDays(1))) {
- return DateRange.Today;
- }
- if(dueBy.isBefore(today.plusDays(2))) {
- return DateRange.Tomorrow;
- }
- if(dueBy.isBefore(today.plusDays(7))) {
- return DateRange.ThisWeek;
- }
- return DateRange.Later;
- }
-
-
- // //////////////////////////////////////
- // compareTo
- // //////////////////////////////////////
-
- @Override
- public int compareTo(ToDoItemsByDateRangeViewModel other) {
- return ObjectContracts.compare(this, other, "dateRange");
- }
-
-
- // //////////////////////////////////////
- // injected services
- // //////////////////////////////////////
-
- @javax.inject.Inject
- private ToDoItems toDoItems;
-
- @javax.inject.Inject
- private ClockService clockService;
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/c4752a8c/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.layout.json
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.layout.json b/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.layout.json
deleted file mode 100644
index 648e146..0000000
--- a/example/archetype/quickstart_wicket_restful_jdo/archetype/src/main/resources/archetype-resources/dom/src/main/java/app/ToDoItemsByDateRangeViewModel.layout.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "columns": [
- {
- "span": 4,
- "memberGroups": {
- "General": {
- "members": {
- "dateRange": {},
- "count": {}
- }
- }
- }
- },
- {
- "span": 0,
- "memberGroups": {}
- },
- {
- "span": 0,
- "memberGroups": {}
- },
- {
- "span": 8,
- "collections": {
- "itemsNotYetComplete": {}
- }
- }
- ],
- "actions": {
- "downloadLayout": {},
- "refreshLayout": {}
- }
-}
\ No newline at end of file