You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/12/15 17:12:06 UTC
[3/15] git commit: ISIS-188: getting example to run
ISIS-188: getting example to run
- example/application/quickstart_wicket_restful_jdo
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/94384e1d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/94384e1d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/94384e1d
Branch: refs/heads/master
Commit: 94384e1d195b98e6517deedf01cf730f50573861
Parents: a6c4fb9
Author: Dan Haywood <da...@apache.org>
Authored: Sat Dec 15 06:30:43 2012 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Sat Dec 15 07:02:22 2012 +0000
----------------------------------------------------------------------
core/pom.xml | 6 +
.../quickstart_wicket_restful_jdo/dom/pom.xml | 20 +-
.../objstore-jdo/pom.xml | 16 +-
.../quickstart_wicket_restful_jdo/pom.xml | 269 +++------------
.../viewer-restfulobjects/pom.xml | 5 +-
.../src/main/webapp/WEB-INF/isis.properties | 2 +-
.../viewer-wicket/pom.xml | 4 +-
.../src/main/webapp/WEB-INF/isis.properties | 2 +-
8 files changed, 74 insertions(+), 250 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/94384e1d/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 087a136..1ec1dd9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1190,6 +1190,12 @@ ${license.additional-notes}
<version>2.2.9</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.lazyluke</groupId>
+ <artifactId>log4jdbc-remix</artifactId>
+ <version>0.2.7</version>
+ </dependency>
<!-- RestEasy -->
http://git-wip-us.apache.org/repos/asf/isis/blob/94384e1d/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 2de1ef9..ea56682 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/dom/pom.xml
@@ -127,14 +127,12 @@
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-enhancer</artifactId>
- <!--
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
- -->
</dependency>
<dependency>
<groupId>org.datanucleus</groupId>
@@ -142,8 +140,8 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
+ <profiles>
+ <profile>
<id>not-m2e</id>
<activation>
<property>
@@ -152,10 +150,16 @@
</activation>
<dependencies>
<dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- <!-- keep up-to-date with latest release from mvn repo -->
- <version>3.1.3</version>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-core</artifactId>
+ <version>(3.0.99, 3.1.99)</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-enhancer</artifactId>
+ <version>(3.0.99, 3.1.99)</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/isis/blob/94384e1d/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
index 1a11eac..259a698 100644
--- a/example/application/quickstart_wicket_restful_jdo/objstore-jdo/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/objstore-jdo/pom.xml
@@ -29,6 +29,16 @@
<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.6.4</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<!-- other modules in this project -->
@@ -41,12 +51,6 @@
<groupId>org.apache.isis.objectstore</groupId>
<artifactId>isis-objectstore-jdo-datanucleus</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.4</version>
- </dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/94384e1d/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 6179580..eefdb93 100644
--- a/example/application/quickstart_wicket_restful_jdo/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/pom.xml
@@ -29,10 +29,6 @@
<packaging>pom</packaging>
- <properties>
- <isis.version>1.0.0-SNAPSHOT</isis.version>
- </properties>
-
<repositories>
<repository>
<id>apache.snapshots</id>
@@ -153,9 +149,49 @@
<module>viewer-wicket</module>
</modules>
+ <properties>
+ <isis.version>1.0.0</isis.version>
+ <isis-objectstore-jdo.version>1.0.0</isis-objectstore-jdo.version>
+ <isis-viewer-wicket.version>1.0.0</isis-viewer-wicket.version>
+ <isis-viewer-restfulobjects.version>1.0.0</isis-viewer-restfulobjects.version>
+ </properties>
+
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>${isis.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-objectstore-jdo</artifactId>
+ <version>${isis-objectstore-jdo.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>isis-viewer-wicket</artifactId>
+ <version>${isis-viewer-wicket.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>isis-viewer-restfulobjects</artifactId>
+ <version>${isis-viewer-restfulobjects.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+
<!-- this project's own modules -->
<dependency>
<groupId>${project.groupId}</groupId>
@@ -182,231 +218,6 @@
</dependency>
- <!-- isis: applib -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-applib</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-applib</artifactId>
- <classifier>javadoc</classifier>
- <version>${isis.version}</version>
- </dependency>
-
- <!-- isis: core -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-metamodel</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-security</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
- <!-- isis: security: ldap -->
- <dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>isis-security-ldap</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
- <!-- isis: security: file -->
- <dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>isis-security-file</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
- <!-- isis: runtimes: dflt -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-runtime</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-webserver</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-bytecode-cglib</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-bytecode-javassist</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
-
- <!-- isis: runtimes-dflt: objectstores: dflt -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-objectstore</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
- <!-- isis: runtimes-dflt: objectstores: jdo -->
- <dependency>
- <groupId>org.apache.isis.objectstore</groupId>
- <artifactId>isis-objectstore-jdo</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.objectstore</groupId>
- <artifactId>isis-objectstore-jdo-applib</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.objectstore</groupId>
- <artifactId>isis-objectstore-jdo-datanucleus</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.objectstore</groupId>
- <artifactId>isis-objectstore-nosql</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
- <!-- isis: runtimes-dflt: objectstore: sql -->
- <dependency>
- <groupId>org.apache.isis.objectstore</groupId>
- <artifactId>isis-objectstore-sql-impl</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
- <!-- isis: runtimes-dflt: objectstores: xml -->
- <dependency>
- <groupId>org.apache.isis.objectstore</groupId>
- <artifactId>isis-objectstore-xml</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
-
- <!-- isis: runtimes-dflt: profilestores: dflt -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-profilestore</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
- <!-- isis: runtimes-dflt: profilestores: xml -->
- <dependency>
- <groupId>org.apache.isis.profilestore</groupId>
- <artifactId>isis-profilestore-xml</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
-
- <!-- isis: viewer: dnd -->
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-dnd-impl</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
- <!-- isis: viewer: html -->
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-html-impl</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
- <!-- isis: viewer: restfulobjects -->
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-restfulobjects</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-restfulobjects-applib</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-restfulobjects-impl</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
- <!-- isis: viewer: junit -->
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-junit-impl</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
- <!-- isis: viewer: bdd -->
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-bdd</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-bdd-common</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-bdd-concordion</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.2</version>
- </dependency>
-
-
- <!-- isis: viewer: scimpi -->
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-scimpi</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-scimpi-dispatcher</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-scimpi-servlet</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
-
- <!-- isis: viewer: wicket -->
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-wicket</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-wicket-model</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-wicket-ui</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-wicket-impl</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/94384e1d/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/pom.xml b/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/pom.xml
index 4ac850f..3f3289c 100644
--- a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/pom.xml
@@ -139,10 +139,12 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
</dependency>
+<!--
<dependency>
<groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-file</artifactId>
</dependency>
+ -->
<!-- to run using WebServer (optional) -->
<dependency>
@@ -155,11 +157,9 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
</dependency>
-
<!--
JDBC drivers
(if using jdo or sql object store)
@@ -168,7 +168,6 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>2.2.8</version>
</dependency>
<!--
http://git-wip-us.apache.org/repos/asf/isis/blob/94384e1d/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/WEB-INF/isis.properties b/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/WEB-INF/isis.properties
index 82b0584..6ebe778 100644
--- a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/src/main/webapp/WEB-INF/isis.properties
@@ -73,7 +73,7 @@ isis.persistor=datanucleus
#
# default is file in SERVER mode, none in SERVER_EXPLORATION. Configure in web.xml
-isis.authentication=file
+isis.authentication=bypass
#
http://git-wip-us.apache.org/repos/asf/isis/blob/94384e1d/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml
index c0a5085..173429a 100644
--- a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml
@@ -134,10 +134,12 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.isis.security</groupId>
<artifactId>isis-security-file</artifactId>
</dependency>
+ -->
<!-- to run using WebServer (optional) -->
<dependency>
@@ -150,7 +152,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
</dependency>
@@ -162,7 +163,6 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>2.2.8</version>
</dependency>
<!--
http://git-wip-us.apache.org/repos/asf/isis/blob/94384e1d/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/isis.properties b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/isis.properties
index 0448184..191a324 100644
--- a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/src/main/webapp/WEB-INF/isis.properties
@@ -80,7 +80,7 @@ isis.persistor=datanucleus
#
# default is file in SERVER mode, none in SERVER_EXPLORATION. Derived from wicket mode
-isis.authentication=file
+isis.authentication=bypass
#