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 2019/01/04 16:08:13 UTC
[isis] branch v2 updated (a1376d7 -> db3bc09)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git.
from a1376d7 ISIS-1978: fixes dependency convergence issue
new 9cb3fc1 ISIS-2013: converts example apps to use h2 instead of hsqldb
new 74d3586 ISIS-1899: fixes menubar - downloadMetaModelXml mentioned twice.
add b572e40 ISIS-1899: updates STATUS, was missing details of 2.0.0-M1 release
add 18fce1d ISIS-1899: updates STATUS, fixes out-of-date URLs
new db3bc09 Merge branch 'release-1.17.0-RC3' into v2
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
STATUS | 14 +++--
.../applib/services/hsqldb/HsqlDbManagerMenu.java | 4 +-
example/application/helloworld/pom.xml | 6 ++
.../java/domainapp/application/menubars.layout.xml | 6 +-
.../src/main/webapp/WEB-INF/isis.properties | 12 ++--
.../helloworld/src/main/webapp/WEB-INF/web.xml | 15 +++++
.../application/manifest/menubars.layout.xml | 6 +-
example/application/simpleapp/webapp/pom.xml | 66 ++++++++--------------
.../webapp/src/main/webapp/WEB-INF/isis.properties | 15 ++++-
.../webapp/src/main/webapp/WEB-INF/web.xml | 14 +++++
10 files changed, 94 insertions(+), 64 deletions(-)
[isis] 01/03: ISIS-2013: converts example apps to use h2 instead of
hsqldb
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9cb3fc15b62b5ee44a02101a0184f771195f4ddc
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 4 16:07:18 2019 +0000
ISIS-2013: converts example apps to use h2 instead of hsqldb
---
.../applib/services/hsqldb/HsqlDbManagerMenu.java | 4 +-
example/application/helloworld/pom.xml | 6 ++
.../java/domainapp/application/menubars.layout.xml | 3 +
.../src/main/webapp/WEB-INF/isis.properties | 12 ++--
.../helloworld/src/main/webapp/WEB-INF/web.xml | 15 +++++
.../application/manifest/menubars.layout.xml | 3 +
example/application/simpleapp/webapp/pom.xml | 66 ++++++++--------------
.../webapp/src/main/webapp/WEB-INF/isis.properties | 15 ++++-
.../webapp/src/main/webapp/WEB-INF/web.xml | 14 +++++
9 files changed, 85 insertions(+), 53 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/hsqldb/HsqlDbManagerMenu.java b/core/applib/src/main/java/org/apache/isis/applib/services/hsqldb/HsqlDbManagerMenu.java
index 3bf388c..42f74e2 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/hsqldb/HsqlDbManagerMenu.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/hsqldb/HsqlDbManagerMenu.java
@@ -73,8 +73,8 @@ public class HsqlDbManagerMenu {
public boolean hideHsqlDbManager() {
try {
// hsqldb is configured as optional in the applib's pom.xml
- _Context.loadClass(DatabaseManagerSwing.class.getCanonicalName());
- } catch (ClassNotFoundException e) {
+ _Context.loadClass("org.hsqldb.util.DatabaseManagerSwing");
+ } catch (ClassNotFoundException | NoClassDefFoundError e) {
return true;
}
return _Strings.isNullOrEmpty(url) || !url.contains("hsqldb:mem");
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index 33f2ced..9c2adcc 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -191,10 +191,16 @@
</dependency>
<!-- OTHER DEPENDENCIES -->
+<!--
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</dependency>
+-->
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
diff --git a/example/application/helloworld/src/main/java/domainapp/application/menubars.layout.xml b/example/application/helloworld/src/main/java/domainapp/application/menubars.layout.xml
index 75fe0a6..e8c6de5 100644
--- a/example/application/helloworld/src/main/java/domainapp/application/menubars.layout.xml
+++ b/example/application/helloworld/src/main/java/domainapp/application/menubars.layout.xml
@@ -99,6 +99,9 @@
<mb3:serviceAction objectType="isisApplib.HsqlDbManagerMenu" id="hsqlDbManager">
<cpt:named>HSQL DB Manager</cpt:named>
</mb3:serviceAction>
+ <mb3:serviceAction objectType="isisApplib.H2ManagerMenu" id="openH2Console">
+ <cpt:named>H2 Console</cpt:named>
+ </mb3:serviceAction>
</mb3:section>
</mb3:menu>
</mb3:secondary>
diff --git a/example/application/helloworld/src/main/webapp/WEB-INF/isis.properties b/example/application/helloworld/src/main/webapp/WEB-INF/isis.properties
index 888b5a1..9f63b4f 100644
--- a/example/application/helloworld/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/helloworld/src/main/webapp/WEB-INF/isis.properties
@@ -44,9 +44,13 @@ isis.persistor.datanucleus.impl.datanucleus.schema.autoCreateAll=true
#
#################################################################################
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.hsqldb.jdbcDriver
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:hsqldb:mem:test
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.hsqldb.jdbcDriver
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:hsqldb:mem:test
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.h2.Driver
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:h2:mem:test
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
diff --git a/example/application/helloworld/src/main/webapp/WEB-INF/web.xml b/example/application/helloworld/src/main/webapp/WEB-INF/web.xml
index e5061c1..b400426 100644
--- a/example/application/helloworld/src/main/webapp/WEB-INF/web.xml
+++ b/example/application/helloworld/src/main/webapp/WEB-INF/web.xml
@@ -31,4 +31,19 @@
<listener>
<listener-class>org.apache.isis.core.webapp.IsisWebAppContextListener</listener-class>
</listener>
+
+ <servlet>
+ <servlet-name>H2Console</servlet-name>
+ <servlet-class>org.h2.server.web.WebServlet</servlet-class>
+ <init-param>
+ <param-name>webAllowOthers</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>H2Console</servlet-name>
+ <url-pattern>/db/*</url-pattern>
+ </servlet-mapping>
+
</web-app>
diff --git a/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/menubars.layout.xml b/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/menubars.layout.xml
index 523fcb5..de538d3 100644
--- a/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/menubars.layout.xml
+++ b/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/menubars.layout.xml
@@ -99,6 +99,9 @@
<mb3:serviceAction objectType="isisApplib.HsqlDbManagerMenu" id="hsqlDbManager">
<cpt:named>HSQL DB Manager</cpt:named>
</mb3:serviceAction>
+ <mb3:serviceAction objectType="isisApplib.H2ManagerMenu" id="openH2Console">
+ <cpt:named>H2 Console</cpt:named>
+ </mb3:serviceAction>
</mb3:section>
</mb3:menu>
</mb3:secondary>
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index 8f943e3..29ee971 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -129,6 +129,27 @@
<type>pom</type>
</dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </dependency>
+<!--
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>9.1-901.jdbc4</version>
+ </dependency>
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>mssql-jdbc</artifactId>
+ <version>6.4.0.jre8</version>
+ </dependency>
+-->
+
</dependencies>
<profiles>
@@ -179,20 +200,7 @@
</plugins>
</build>
</profile>
- <profile>
- <id>jdbc-hsqldb</id>
- <activation>
- <property>
- <name>!skip.jdbc-hsqldb</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </dependency>
- </dependencies>
- </profile>
+
<profile>
<id>jdbc-logging</id>
<activation>
@@ -213,36 +221,6 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>jdbc-postgres</id>
- <activation>
- <property>
- <name>jdbc-postgres</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>9.1-901.jdbc4</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>jdbc-mssql</id>
- <activation>
- <property>
- <name>jdbc-mssql</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>mssql-jdbc</artifactId>
- <version>6.4.0.jre8</version>
- </dependency>
- </dependencies>
- </profile>
<profile>
<id>skinny-war</id>
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties
index 3b67965..6450575 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -46,15 +46,24 @@ isis.persistor.datanucleus.impl.datanucleus.schema.autoCreateAll=true
#
-# HSQLDB in-memory
+# H2 in-memory
#
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.hsqldb.jdbcDriver
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:hsqldb:mem:test
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.h2.Driver
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:h2:mem:test
isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
#
+# HSQLDB in-memory
+#
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.hsqldb.jdbcDriver
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:hsqldb:mem:test
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
+
+
+#
# HSQLDB in-memory (using log4jdbc-remix)
#
#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=net.sf.log4jdbc.DriverSpy
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml
index bfaaebb..87d6a5c 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml
@@ -32,4 +32,18 @@
<listener-class>org.apache.isis.core.webapp.IsisWebAppContextListener</listener-class>
</listener>
+ <servlet>
+ <servlet-name>H2Console</servlet-name>
+ <servlet-class>org.h2.server.web.WebServlet</servlet-class>
+ <init-param>
+ <param-name>webAllowOthers</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>H2Console</servlet-name>
+ <url-pattern>/db/*</url-pattern>
+ </servlet-mapping>
+
</web-app>
[isis] 02/03: ISIS-1899: fixes menubar - downloadMetaModelXml
mentioned twice.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 74d358651e7dc84761adf61fe797184127fb99f3
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 4 16:07:28 2019 +0000
ISIS-1899: fixes menubar - downloadMetaModelXml mentioned twice.
---
.../helloworld/src/main/java/domainapp/application/menubars.layout.xml | 3 ---
.../src/main/java/domainapp/application/manifest/menubars.layout.xml | 3 ---
2 files changed, 6 deletions(-)
diff --git a/example/application/helloworld/src/main/java/domainapp/application/menubars.layout.xml b/example/application/helloworld/src/main/java/domainapp/application/menubars.layout.xml
index e8c6de5..53a140d 100644
--- a/example/application/helloworld/src/main/java/domainapp/application/menubars.layout.xml
+++ b/example/application/helloworld/src/main/java/domainapp/application/menubars.layout.xml
@@ -66,9 +66,6 @@
<mb3:serviceAction objectType="isisApplib.MetaModelServicesMenu" id="downloadMetaModelCsv">
<cpt:named>Download Meta Model (CSV)</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="isisApplib.MetaModelServicesMenu" id="downloadMetaModelXml">
- <cpt:named>Download Meta Model (XML)</cpt:named>
- </mb3:serviceAction>
</mb3:section>
<mb3:section>
<mb3:serviceAction objectType="isisApplib.SwaggerServiceMenu" id="openSwaggerUi">
diff --git a/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/menubars.layout.xml b/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/menubars.layout.xml
index de538d3..2d30180 100644
--- a/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/menubars.layout.xml
+++ b/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/menubars.layout.xml
@@ -66,9 +66,6 @@
<mb3:serviceAction objectType="isisApplib.MetaModelServicesMenu" id="downloadMetaModelCsv">
<cpt:named>Download Meta Model (CSV)</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="isisApplib.MetaModelServicesMenu" id="downloadMetaModelXml">
- <cpt:named>Download Meta Model (XML)</cpt:named>
- </mb3:serviceAction>
</mb3:section>
<mb3:section>
<mb3:serviceAction objectType="isisApplib.SwaggerServiceMenu" id="openSwaggerUi">
[isis] 03/03: Merge branch 'release-1.17.0-RC3' into v2
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit db3bc09fadc048260b25b290bacdc71e176c7470
Merge: 74d3586 18fce1d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 4 16:07:43 2019 +0000
Merge branch 'release-1.17.0-RC3' into v2
STATUS | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)