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/02/18 14:06:28 UTC
git commit: ISIS-695: removing refs to wicket extensions from example
apps
Repository: isis
Updated Branches:
refs/heads/master 7dc5b0b26 -> efa12771b
ISIS-695: removing refs to wicket extensions from example apps
specifically:
- removing references to extensions in the todo app
- GMAP3, FULLCALENDAR
- removing references to extensions in the simple app
- GMAP3, FULLCALENDAR, EXCEL, WICKEDCHARTS
also:
- reinstating method that had been removed from EntityModel (breaking one of the github extensions)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/efa12771
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/efa12771
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/efa12771
Branch: refs/heads/master
Commit: efa12771bd2a35af04481975fd934e48c01cd1d4
Parents: 7dc5b0b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Feb 18 13:06:16 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Feb 18 13:06:16 2014 +0000
----------------------------------------------------------------------
.../viewer/wicket/model/models/EntityModel.java | 6 ++++
.../quickstart_wicket_restful_jdo/dom/pom.xml | 8 -----
.../dom/src/main/java/dom/todo/ToDoItem.java | 21 +-----------
.../quickstart_wicket_restful_jdo/pom.xml | 11 ------
.../webapp/pom.xml | 14 --------
.../simple_wicket_restful_jdo/webapp/pom.xml | 35 --------------------
6 files changed, 7 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/efa12771/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
index aa5d859..54b8c20 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
@@ -193,6 +193,11 @@ public class EntityModel extends BookmarkableModel<ObjectAdapter> implements UiH
return pageParameters;
}
+ @Deprecated
+ public PageParameters asPageParameters() {
+ return getPageParameters();
+ }
+
public PageParameters getPageParametersWithoutUiHints() {
return createPageParameters(getObject());
}
@@ -721,4 +726,5 @@ public class EntityModel extends BookmarkableModel<ObjectAdapter> implements UiH
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/efa12771/example/application/quickstart_wicket_restful_jdo/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/pom.xml b/example/application/quickstart_wicket_restful_jdo/dom/pom.xml
index fbb3321..2a42f50 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/dom/pom.xml
@@ -138,14 +138,6 @@
<scope>test</scope>
</dependency>
- <!--
- GMAP3: uncomment to use https://github.com/danhaywood/isis-wicket-gmap3
- <dependency>
- <groupId>com.danhaywood.isis.wicket</groupId>
- <artifactId>danhaywood-isis-wicket-gmap3-applib</artifactId>
- </dependency>
- -->
-
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/efa12771/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 e60fd65..c04aedc 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
@@ -125,7 +125,7 @@ import services.ClockService;
@AutoComplete(repository=ToDoItems.class, action="autoComplete") // default unless overridden by autoCompleteNXxx() method
//@Bounded - if there were a small number of instances only (overrides autoComplete functionality)
@Bookmarkable
-public class ToDoItem implements Comparable<ToDoItem> /*, Locatable*/ { // GMAP3: uncomment to use https://github.com/danhaywood/isis-wicket-gmap3
+public class ToDoItem implements Comparable<ToDoItem> {
/**
* It isn't common for entities to log, but they can if required.
@@ -837,24 +837,5 @@ public class ToDoItem implements Comparable<ToDoItem> /*, Locatable*/ { // GMAP3
this.scratchpad = scratchpad;
}
- // //////////////////////////////////////
- // Extensions
- // //////////////////////////////////////
-
-
-// GMAP3: uncomment to use https://github.com/danhaywood/isis-wicket-gmap3
-//
-// @Persistent
-// private Location location;
-//
-// @MemberOrder(name="Detail", sequence = "10")
-// @Optional
-// public Location getLocation() {
-// return location;
-// }
-// public void setLocation(Location location) {
-// this.location = location;
-// }
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/efa12771/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 8944767..ce5c82b 100644
--- a/example/application/quickstart_wicket_restful_jdo/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/pom.xml
@@ -385,17 +385,6 @@
<!-- 3rd party extensions -->
<!--
- GMAP3: uncomment to use https://github.com/danhaywood/isis-wicket-gmap3
- <dependency>
- <groupId>com.danhaywood.isis.wicket</groupId>
- <artifactId>danhaywood-isis-wicket-gmap3</artifactId>
- <version>1.2.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- -->
-
- <!--
WICKEDCHARTS: uncomment to use https://github.com/danhaywood/isis-wicket-wickedcharts
<dependency>
<groupId>com.danhaywood.isis.wicket</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/efa12771/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 866a371..f4330f1 100644
--- a/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/pom.xml
@@ -279,13 +279,6 @@
<!-- 3rd party dependency -->
<!--
- GMAP3: uncomment to use https://github.com/danhaywood/isis-wicket-gmap3
- <dependency>
- <groupId>com.danhaywood.isis.wicket</groupId>
- <artifactId>danhaywood-isis-wicket-gmap3-ui</artifactId>
- </dependency>
- -->
- <!--
WICKEDCHARTS: uncomment to use https://github.com/danhaywood/isis-wicket-wickedcharts
<dependency>
<groupId>com.danhaywood.isis.wicket</groupId>
@@ -303,13 +296,6 @@
<artifactId>danhaywood-isis-wicket-excel</artifactId>
</dependency>
-->
- <!--
- FULLCALENDAR: uncomment to use https://github.com/danhaywood/isis-wicket-fullcalendar
- <dependency>
- <groupId>com.danhaywood.isis.wicket</groupId>
- <artifactId>danhaywood-isis-wicket-fullcalendar</artifactId>
- </dependency>
- -->
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/efa12771/example/application/simple_wicket_restful_jdo/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/webapp/pom.xml b/example/application/simple_wicket_restful_jdo/webapp/pom.xml
index 454ae71..ff30482 100644
--- a/example/application/simple_wicket_restful_jdo/webapp/pom.xml
+++ b/example/application/simple_wicket_restful_jdo/webapp/pom.xml
@@ -265,41 +265,6 @@
</exclusions>
</dependency>
-
- <!-- 3rd party dependency -->
- <!--
- GMAP3: uncomment to use https://github.com/danhaywood/isis-wicket-gmap3
- <dependency>
- <groupId>com.danhaywood.isis.wicket</groupId>
- <artifactId>danhaywood-isis-wicket-gmap3-ui</artifactId>
- </dependency>
- -->
- <!--
- WICKEDCHARTS: uncomment to use https://github.com/danhaywood/isis-wicket-wickedcharts
- <dependency>
- <groupId>com.danhaywood.isis.wicket</groupId>
- <artifactId>danhaywood-isis-wicket-wickedcharts-scalarchart</artifactId>
- </dependency>
- <dependency>
- <groupId>com.danhaywood.isis.wicket</groupId>
- <artifactId>danhaywood-isis-wicket-wickedcharts-summarycharts</artifactId>
- </dependency>
- -->
- <!--
- EXCEL: uncomment to use https://github.com/danhaywood/isis-wicket-excel
- <dependency>
- <groupId>com.danhaywood.isis.wicket</groupId>
- <artifactId>danhaywood-isis-wicket-excel</artifactId>
- </dependency>
- -->
- <!--
- FULLCALENDAR: uncomment to use https://github.com/danhaywood/isis-wicket-fullcalendar
- <dependency>
- <groupId>com.danhaywood.isis.wicket</groupId>
- <artifactId>danhaywood-isis-wicket-fullcalendar</artifactId>
- </dependency>
- -->
-
</dependencies>
</project>