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 2013/07/15 15:32:03 UTC
[3/3] git commit: ISIS-466: tidy-up and fix.
ISIS-466: tidy-up and fix.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4fce5753
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4fce5753
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4fce5753
Branch: refs/heads/master
Commit: 4fce5753343d4167159c1d03f0a4f39af9c2725d
Parents: f0aee8c
Author: Dan Haywood <da...@apache.org>
Authored: Mon Jul 15 14:31:36 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Mon Jul 15 14:31:36 2013 +0100
----------------------------------------------------------------------
.../dom/src/main/java/dom/todo/ToDoItem.java | 6 ++
.../src/main/java/dom/todo/ToDoItemsJdo.java | 87 ++++++++++++++++++++
.../java/fixture/todo/ToDoItemsFixture.java | 14 +++-
.../fixture/todo/ToDoItemsFixturesService.java | 64 --------------
.../integtests/pom.xml | 8 +-
.../java/integration/ToDoSystemInitializer.java | 2 +-
.../objstore-jdo/.gitignore | 2 -
.../objstore-jdo/lib/.gitignore | 5 --
.../objstore-jdo/pom.xml | 57 -------------
.../java/objstore/jdo/todo/ToDoItemsJdo.java | 87 --------------------
.../quickstart_wicket_restful_jdo/pom.xml | 6 --
.../webapp/pom.xml | 17 +---
.../java/app/services/DeveloperUtilities.java | 2 -
.../app/services/ToDoItemsFixturesService.java | 59 +++++++++++++
.../src/main/webapp/WEB-INF/isis.properties | 5 +-
.../webapp/src/main/webapp/about/index.html | 4 +-
16 files changed, 178 insertions(+), 247 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4fce5753/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
index 42b5ec9..ed4a1c7 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
@@ -41,6 +41,7 @@ import org.apache.isis.applib.annotation.Audited;
import org.apache.isis.applib.annotation.AutoComplete;
import org.apache.isis.applib.annotation.Bookmarkable;
import org.apache.isis.applib.annotation.Bulk;
+import org.apache.isis.applib.annotation.CssClass;
import org.apache.isis.applib.annotation.Disabled;
import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.MemberGroups;
@@ -138,6 +139,7 @@ public class ToDoItem implements Comparable<ToDoItem> /*, Locatable*/ { // GMAP3
@MemberOrder(name="Detail", sequence = "3")
@Optional
+ @CssClass("x-key")
public LocalDate getDueBy() {
return dueBy;
}
@@ -233,6 +235,7 @@ public class ToDoItem implements Comparable<ToDoItem> /*, Locatable*/ { // GMAP3
@PublishedAction
@Bulk
@MemberOrder(name="complete", sequence = "1")
+ @CssClass("x-highlight")
public ToDoItem completed() {
setComplete(true);
return this;
@@ -410,6 +413,7 @@ public class ToDoItem implements Comparable<ToDoItem> /*, Locatable*/ { // GMAP3
}
@MemberOrder(name="dependencies", sequence = "4")
+ @CssClass("x-caution")
public ToDoItem remove(final ToDoItem toDoItem) {
getDependencies().remove(toDoItem);
return this;
@@ -442,6 +446,7 @@ public class ToDoItem implements Comparable<ToDoItem> /*, Locatable*/ { // GMAP3
@MemberOrder(sequence = "5")
@NotPersisted
@Render(Type.LAZILY)
+ @CssClass("x-info")
public List<ToDoItem> getSimilarItems() {
return toDoItems.similarTo(this);
}
@@ -456,6 +461,7 @@ public class ToDoItem implements Comparable<ToDoItem> /*, Locatable*/ { // GMAP3
// nb: method is not called "clone()" is inherited by java.lang.Object and
// (a) has different semantics and (b) is in any case automatically ignored
// by the framework
+ @CssClass("x-caution")
public ToDoItem duplicate(
@Named("Description")
String description,
http://git-wip-us.apache.org/repos/asf/isis/blob/4fce5753/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemsJdo.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemsJdo.java b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemsJdo.java
new file mode 100644
index 0000000..1927ec0
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemsJdo.java
@@ -0,0 +1,87 @@
+/*
+ * 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 dom.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.ToDoItems;
+
+import org.apache.isis.applib.query.QueryDefault;
+
+public class ToDoItemsJdo extends ToDoItems {
+
+ // {{ notYetComplete (action)
+ @Override
+ protected List<ToDoItem> doNotYetComplete() {
+ return allMatches(
+ new QueryDefault<ToDoItem>(ToDoItem.class,
+ "todo_notYetComplete",
+ "ownedBy", currentUserName()));
+ }
+ // }}
+
+ // {{ done (action)
+ @Override
+ protected List<ToDoItem> doComplete() {
+ return allMatches(
+ new QueryDefault<ToDoItem>(ToDoItem.class,
+ "todo_complete",
+ "ownedBy", currentUserName()));
+ }
+ // }}
+
+ // {{ similarTo (action)
+ @Override
+ public List<ToDoItem> similarTo(final ToDoItem thisToDoItem) {
+ final List<ToDoItem> similarToDoItems = allMatches(
+ new QueryDefault<ToDoItem>(ToDoItem.class,
+ "todo_similarTo",
+ "ownedBy", currentUserName(),
+ "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;
+ }
+ };
+ }
+ // }}
+
+ // {{ autoComplete (action)
+ @Override
+ public List<ToDoItem> autoComplete(String description) {
+
+ return allMatches(
+ new QueryDefault<ToDoItem>(ToDoItem.class,
+ "todo_autoComplete",
+ "ownedBy", currentUserName(),
+ "description", description));
+ }
+ // }}
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/4fce5753/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java
index 6c9280b..7a14f6d 100644
--- a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java
+++ b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java
@@ -33,10 +33,20 @@ import org.apache.isis.objectstore.jdo.applib.service.support.IsisJdoSupport;
public class ToDoItemsFixture extends AbstractFixture {
+ private final String user;
+
+ public ToDoItemsFixture() {
+ this(null);
+ }
+
+ public ToDoItemsFixture(String ownedBy) {
+ this.user = ownedBy;
+ }
+
@Override
public void install() {
- final String ownedBy = getContainer().getUser().getName();
+ final String ownedBy = this.user != null? this.user : getContainer().getUser().getName();
isisJdoSupport.executeUpdate("delete from TODOITEM where OWNEDBY = '" + ownedBy + "'");
@@ -45,7 +55,7 @@ public class ToDoItemsFixture extends AbstractFixture {
getContainer().flush();
}
- public void installFor(String user) {
+ private void installFor(String user) {
createToDoItemForUser("Buy milk", Category.Domestic, user, daysFromToday(0), new BigDecimal("0.75"));
createToDoItemForUser("Buy bread", Category.Domestic, user, daysFromToday(0), new BigDecimal("1.75"));
http://git-wip-us.apache.org/repos/asf/isis/blob/4fce5753/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java b/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java
deleted file mode 100644
index bc86f67..0000000
--- a/example/application/quickstart_wicket_restful_jdo/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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 fixture.todo;
-
-import java.util.List;
-
-import org.apache.isis.applib.AbstractService;
-import org.apache.isis.applib.annotation.Named;
-
-import com.google.common.collect.Lists;
-
-import dom.todo.ToDoItems;
-
-/**
- * Enables fixtures to be installed from the application.
- */
-@Named("Fixtures")
-public class ToDoItemsFixturesService extends AbstractService {
-
- public String install() {
- final ToDoItemsFixture fixture = new ToDoItemsFixture();
- fixture.setContainer(getContainer());
- fixture.setToDoItems(toDoItems);
- fixture.install();
- return "Example fixtures installed";
- }
-
- public String installFor(@Named("User") String user) {
- final ToDoItemsFixture fixture = new ToDoItemsFixture();
- fixture.setContainer(getContainer());
- fixture.setToDoItems(toDoItems);
- fixture.installFor(user);
- return "Example fixtures installed for " + user;
- }
- public String default0InstallFor() {
- return "guest";
- }
- public List<String> choices0InstallFor() {
- return Lists.newArrayList("guest", "dick", "bob", "joe");
- }
-
-
- private ToDoItems toDoItems;
- public void setToDoItems(final ToDoItems toDoItems) {
- this.toDoItems = toDoItems;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/4fce5753/example/application/quickstart_wicket_restful_jdo/integtests/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/pom.xml b/example/application/quickstart_wicket_restful_jdo/integtests/pom.xml
index 26d95c0..553f460 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/pom.xml
@@ -54,10 +54,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>quickstart_wicket_restful_jdo-fixture</artifactId>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>quickstart_wicket_restful_jdo-objstore-jdo</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -82,6 +78,10 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-objectstore-jdo-datanucleus</artifactId>
+ </dependency>
<dependency>
<groupId>org.hsqldb</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/4fce5753/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/ToDoSystemInitializer.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/ToDoSystemInitializer.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/ToDoSystemInitializer.java
index 349fd34..e24d78a 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/ToDoSystemInitializer.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/ToDoSystemInitializer.java
@@ -16,7 +16,7 @@
*/
package integration;
-import objstore.jdo.todo.ToDoItemsJdo;
+import dom.todo.ToDoItemsJdo;
import org.apache.log4j.Level;
http://git-wip-us.apache.org/repos/asf/isis/blob/4fce5753/example/application/quickstart_wicket_restful_jdo/objstore-jdo/.gitignore
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/objstore-jdo/.gitignore b/example/application/quickstart_wicket_restful_jdo/objstore-jdo/.gitignore
deleted file mode 100644
index 1c85271..0000000
--- a/example/application/quickstart_wicket_restful_jdo/objstore-jdo/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target-ide
-/target-ide
http://git-wip-us.apache.org/repos/asf/isis/blob/4fce5753/example/application/quickstart_wicket_restful_jdo/objstore-jdo/lib/.gitignore
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/objstore-jdo/lib/.gitignore b/example/application/quickstart_wicket_restful_jdo/objstore-jdo/lib/.gitignore
deleted file mode 100644
index 70eee7e..0000000
--- a/example/application/quickstart_wicket_restful_jdo/objstore-jdo/lib/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# explicitly ignoring Microsoft JDBC4 jar
-# (cannot redistribute, licensing)
-#
-sqljdbc4.jar
http://git-wip-us.apache.org/repos/asf/isis/blob/4fce5753/example/application/quickstart_wicket_restful_jdo/objstore-jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/objstore-jdo/pom.xml b/example/application/quickstart_wicket_restful_jdo/objstore-jdo/pom.xml
deleted file mode 100644
index 3350241..0000000
--- a/example/application/quickstart_wicket_restful_jdo/objstore-jdo/pom.xml
+++ /dev/null
@@ -1,57 +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>org.apache.isis.example.application</groupId>
- <artifactId>quickstart_wicket_restful_jdo</artifactId>
- <version>1.0.4-SNAPSHOT</version>
- </parent>
-
- <artifactId>quickstart_wicket_restful_jdo-objstore-jdo</artifactId>
- <name>Quickstart Wicket/Restful/JDO Repositories (for JDO)</name>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
-
- <!-- other modules in this project -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>quickstart_wicket_restful_jdo-dom</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.objectstore</groupId>
- <artifactId>isis-objectstore-jdo-datanucleus</artifactId>
- </dependency>
-
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/4fce5753/example/application/quickstart_wicket_restful_jdo/objstore-jdo/src/main/java/objstore/jdo/todo/ToDoItemsJdo.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/objstore-jdo/src/main/java/objstore/jdo/todo/ToDoItemsJdo.java b/example/application/quickstart_wicket_restful_jdo/objstore-jdo/src/main/java/objstore/jdo/todo/ToDoItemsJdo.java
deleted file mode 100644
index a16c228..0000000
--- a/example/application/quickstart_wicket_restful_jdo/objstore-jdo/src/main/java/objstore/jdo/todo/ToDoItemsJdo.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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 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.ToDoItems;
-
-import org.apache.isis.applib.query.QueryDefault;
-
-public class ToDoItemsJdo extends ToDoItems {
-
- // {{ notYetComplete (action)
- @Override
- protected List<ToDoItem> doNotYetComplete() {
- return allMatches(
- new QueryDefault<ToDoItem>(ToDoItem.class,
- "todo_notYetComplete",
- "ownedBy", currentUserName()));
- }
- // }}
-
- // {{ done (action)
- @Override
- protected List<ToDoItem> doComplete() {
- return allMatches(
- new QueryDefault<ToDoItem>(ToDoItem.class,
- "todo_complete",
- "ownedBy", currentUserName()));
- }
- // }}
-
- // {{ similarTo (action)
- @Override
- public List<ToDoItem> similarTo(final ToDoItem thisToDoItem) {
- final List<ToDoItem> similarToDoItems = allMatches(
- new QueryDefault<ToDoItem>(ToDoItem.class,
- "todo_similarTo",
- "ownedBy", currentUserName(),
- "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;
- }
- };
- }
- // }}
-
- // {{ autoComplete (action)
- @Override
- public List<ToDoItem> autoComplete(String description) {
-
- return allMatches(
- new QueryDefault<ToDoItem>(ToDoItem.class,
- "todo_autoComplete",
- "ownedBy", currentUserName(),
- "description", description));
- }
- // }}
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/4fce5753/example/application/quickstart_wicket_restful_jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/pom.xml b/example/application/quickstart_wicket_restful_jdo/pom.xml
index 8b0600c..ad8ca91 100644
--- a/example/application/quickstart_wicket_restful_jdo/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/pom.xml
@@ -252,7 +252,6 @@
<modules>
<module>dom</module>
<module>fixture</module>
- <module>objstore-jdo</module>
<module>integtests</module>
<module>webapp</module>
</modules>
@@ -314,11 +313,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>quickstart_wicket_restful_jdo-objstore-jdo</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>quickstart_wicket_restful_jdo-webapp</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/4fce5753/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml b/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml
index 7ef1c65..e9b4186 100644
--- a/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml
@@ -173,22 +173,13 @@
</exclusion>
</exclusions>
</dependency>
-
- <!-- objectstore/domain service/repository implementations (brings in dependency to objectstore-jdo)-->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>quickstart_wicket_restful_jdo-objstore-jdo</artifactId>
- <exclusions>
- <exclusion>
- <!-- so don't pick up transitive dependency to asm 4.0.0 -->
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-enhancer</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!-- other isis components -->
<dependency>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-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/4fce5753/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/app/services/DeveloperUtilities.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/app/services/DeveloperUtilities.java b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/app/services/DeveloperUtilities.java
index 75c4e07..4675c4e 100644
--- a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/app/services/DeveloperUtilities.java
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/app/services/DeveloperUtilities.java
@@ -16,8 +16,6 @@
*/
package app.services;
-import fixture.todo.ToDoItemsFixturesService;
-
import org.apache.isis.applib.annotation.ActionSemantics;
import org.apache.isis.applib.annotation.ActionSemantics.Of;
import org.apache.isis.applib.annotation.MemberOrder;
http://git-wip-us.apache.org/repos/asf/isis/blob/4fce5753/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/app/services/ToDoItemsFixturesService.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/app/services/ToDoItemsFixturesService.java b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/app/services/ToDoItemsFixturesService.java
new file mode 100644
index 0000000..f665ec3
--- /dev/null
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/app/services/ToDoItemsFixturesService.java
@@ -0,0 +1,59 @@
+/*
+ * 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.services;
+
+import java.util.List;
+
+import com.google.common.collect.Lists;
+
+import fixture.todo.ToDoItemsFixture;
+
+import org.apache.isis.applib.AbstractService;
+import org.apache.isis.applib.annotation.Named;
+import org.apache.isis.core.runtime.fixtures.FixturesInstallerDelegate;
+
+/**
+ * Enables fixtures to be installed from the application.
+ */
+@Named("Fixtures")
+public class ToDoItemsFixturesService extends AbstractService {
+
+ public String install() {
+ installFixturesFor(null); // ie current user
+ return "Example fixtures installed";
+ }
+
+ public String installFor(@Named("User") String user) {
+ installFixturesFor(user);
+ return "Example fixtures installed for " + user;
+ }
+ public String default0InstallFor() {
+ return "guest";
+ }
+ public List<String> choices0InstallFor() {
+ return Lists.newArrayList("guest", "dick", "bob", "joe");
+ }
+
+ private static void installFixturesFor(String user) {
+ final FixturesInstallerDelegate installer = new FixturesInstallerDelegate().withOverride();
+ installer.addFixture(new ToDoItemsFixture(user));
+ installer.installFixtures();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/4fce5753/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
index 99907bb..a260961 100644
--- a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -185,11 +185,12 @@ isis.reflector.facet-decorators=org.apache.isis.core.progmodel.facetdecorators.i
# if using the DataNucleus object store
#isis.services.prefix =
-isis.services = objstore.jdo.todo.ToDoItemsJdo,\
- fixture.todo.ToDoItemsFixturesService,\
+isis.services = dom.todo.ToDoItemsJdo,\
+ app.services.ToDoItemsFixturesService,\
app.services.DeveloperUtilities,\
org.apache.isis.core.metamodel.services.bookmarks.BookmarkServiceDefault,\
org.apache.isis.objectstore.jdo.service.RegisterEntities,\
+ org.apache.isis.objectstore.jdo.datanucleus.service.support.IsisJdoSupportImpl,\
org.apache.isis.objectstore.jdo.applib.service.exceprecog.ExceptionRecognizerCompositeForJdoObjectStore,\
org.apache.isis.viewer.restfulobjects.rendering.eventserializer.RestfulObjectsSpecEventSerializer,\
org.apache.isis.applib.services.audit.AuditingService$Stderr,\
http://git-wip-us.apache.org/repos/asf/isis/blob/4fce5753/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/about/index.html
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/about/index.html b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/about/index.html
index cb966e6..dffcb45 100644
--- a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/about/index.html
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/webapp/about/index.html
@@ -102,13 +102,13 @@ th, td {
<p>The key files in the application are:</p>
<!-- the hrefs below are partially URL encoded to prevent them from being modified when the archetype is created -->
<ul>
- <li>Domain classes (todo functionality) (in <tt>dom</tt> module and <tt>objstore-jdo</tt> module)</a>
+ <li>Domain classes (todo functionality) (in <tt>dom</tt> module)</a>
<ul>
<li><a href="https://github.com/apache/isis/blob/master/example/application/quickstart%5Fwicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java"><tt>ToDoItem</tt></a> domain entity
</li>
<li><a href="https://github.com/apache/isis/blob/master/example/application/quickstart%5Fwicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItems.java"><tt>ToDoItems</tt></a> domain service (repository/factory)
</li>
- <li><a href="https://github.com/apache/isis/blob/master/example/application/quickstart%5Fwicket_restful_jdo/objstore-jdo/src/main/java/objstore/jdo/todo/ToDoItemsJdo.java"><tt>ToDoItemsJdo</tt></a> domain service (repository methods overridden for JDO)
+ <li><a href="https://github.com/apache/isis/blob/master/example/application/quickstart%5Fwicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemsJdo.java"><tt>ToDoItemsJdo</tt></a> domain service (repository methods overridden for JDO)
</li>
</ul>
</li>