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 2017/12/29 13:57:19 UTC
[isis] 02/03: ISIS-1465: renames isis.properties to
isis-non-changing.properties in the example apps
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e2eeead0b77b0afecdf4b3df9943943169250b28
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Dec 29 13:52:16 2017 +0000
ISIS-1465: renames isis.properties to isis-non-changing.properties in the example apps
---
.../application/HelloWorldAppManifest.java | 2 +-
...sis.properties => isis-non-changing.properties} | 0
.../src/main/webapp/WEB-INF/isis.properties | 23 ++++++++++++++++++++
.../application/manifest/DomainAppAppManifest.java | 2 +-
...sis.properties => isis-non-changing.properties} | 11 ----------
.../manifest/persistor_datanucleus.properties | 2 +-
.../webapp/src/main/webapp/WEB-INF/isis.properties | 25 +++++++++++-----------
7 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java b/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
index 30f5774..1e5baa9 100644
--- a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
+++ b/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
@@ -29,7 +29,7 @@ public class HelloWorldAppManifest extends AppManifestAbstract2 {
public static final Builder BUILDER = Builder
.forModule(new HelloWorldModule())
- .withConfigurationPropertiesFile(HelloWorldAppManifest.class, "isis.properties")
+ .withConfigurationPropertiesFile(HelloWorldAppManifest.class, "isis-non-changing.properties")
.withAuthMechanism("shiro");
public HelloWorldAppManifest() {
diff --git a/example/application/helloworld/src/main/java/domainapp/application/isis.properties b/example/application/helloworld/src/main/java/domainapp/application/isis-non-changing.properties
similarity index 100%
rename from example/application/helloworld/src/main/java/domainapp/application/isis.properties
rename to example/application/helloworld/src/main/java/domainapp/application/isis-non-changing.properties
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 2a6f36c..eea2ece 100644
--- a/example/application/helloworld/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/helloworld/src/main/webapp/WEB-INF/isis.properties
@@ -16,9 +16,32 @@
# under the License.
+#################################################################################
+#
+# AppManifest specifies the modules, system components and fixtures of the app
+#
+#################################################################################
+
+
isis.appManifest=domainapp.application.HelloWorldAppManifest
+
+#
+# The properties listed in this file vary between dev/test/prod.
+# All remaining properties (which are static and don't vary between dev/test/prod)
+# are loaded in programmatically by the AppManifest, see isis-non-changing.properties
+#
+
+
+
+#################################################################################
+#
+# JDBC connection details
+# (also update the pom.xml to reference the appropriate JDBC driver)
+#
+#################################################################################
+
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
diff --git a/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java b/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java
index 96cdc75..65197e1 100644
--- a/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java
+++ b/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java
@@ -30,7 +30,7 @@ public class DomainAppAppManifest extends AppManifestAbstract2 {
public static final Builder BUILDER = Builder
.forModule(new DomainAppApplicationModule())
.withConfigurationPropertiesFile(DomainAppAppManifest.class,
- "isis.properties",
+ "isis-non-changing.properties",
"authentication_shiro.properties",
"persistor_datanucleus.properties",
"viewer_restfulobjects.properties",
diff --git a/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis.properties b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis-non-changing.properties
similarity index 97%
rename from example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis.properties
rename to example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis-non-changing.properties
index a298f40..d21018b 100644
--- a/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis.properties
+++ b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis-non-changing.properties
@@ -15,17 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-#################################################################################
-#
-# use AppManifest to specify modules, system components and fixtures
-#
-#################################################################################
-
-#
-# Specify the modules (= entities + services) and other components that make up
-# this application.
-#
-isis.appManifest=domainapp.application.manifest.DomainAppAppManifest
diff --git a/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/persistor_datanucleus.properties b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/persistor_datanucleus.properties
index 48e3a35..d81f9b9 100644
--- a/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/persistor_datanucleus.properties
+++ b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/persistor_datanucleus.properties
@@ -101,6 +101,6 @@ isis.persistor.datanucleus.impl.datanucleus.cache.level2.mode=ENABLE_SELECTIVE
#
#
# JDBC connection details
-# ... are in persistor.properties
+# ... are in WEB-INF/isis.properties
#
#
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 961c086..046dd58 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
@@ -17,33 +17,32 @@
-isis.appManifest=domainapp.application.manifest.DomainAppAppManifest
-
-
+#################################################################################
#
-# All other properties are loaded programmatically by the AppManifest
-# (they are unlikely to vary between dev/test/prod so can be "baked in")
+# AppManifest specifies the modules, system components and fixtures of the app
#
+#################################################################################
+isis.appManifest=domainapp.application.manifest.DomainAppAppManifest
-# the baseUrl for hrefs in the events generated by the RO EventSerializer
-isis.viewer.restfulobjects.RestfulObjectsSpecEventSerializer.baseUrl=http://localhost:8080/restful/
+#
+# The properties listed in this file vary between dev/test/prod.
+# All remaining properties (which are static and don't vary between dev/test/prod)
+# are loaded in programmatically by the AppManifest, see isis-non-changing.properties
+#
#################################################################################
#
-# JDBC configuration
+# JDBC connection details
+# (also update the pom.xml to reference the appropriate JDBC driver)
#
#################################################################################
-#
-# JDBC connection details
-# (also update the pom.xml to reference the appropriate JDBC driver)
-#
#
# HSQLDB in-memory
@@ -124,3 +123,5 @@ isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
#
#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=neo4j:neo4j_DB
+
+
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.