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 2015/03/03 21:23:03 UTC
[11/20] isis git commit: Reverted some unnecessary changes
Reverted some unnecessary changes
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a7423cb2
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a7423cb2
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a7423cb2
Branch: refs/heads/ISIS-789
Commit: a7423cb26cbb9c086f67c537a8d8927c2cc436cb
Parents: 5944ae2
Author: jdb6853 <jd...@hotmail.com>
Authored: Fri Jan 2 01:04:43 2015 -0600
Committer: jdb6853 <jd...@hotmail.com>
Committed: Fri Jan 2 01:04:43 2015 -0600
----------------------------------------------------------------------
example/application/simpleapp/webapp/pom.xml | 2 +-
.../test/java/integration/tests/ToDoItemIntegTest.java | 3 +--
example/application/todoapp/webapp/pom.xml | 2 +-
.../webapp/src/main/webapp/WEB-INF/isis.properties | 5 ++---
.../webapp/src/main/webapp/WEB-INF/persistor.properties | 11 ++++++-----
5 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a7423cb2/example/application/simpleapp/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index c12cf6f..e218023 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -341,7 +341,7 @@
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-neo4j</artifactId>
- <version>3.2.3</version>
+ <version>4.0.4</version>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/isis/blob/a7423cb2/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java b/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
index 6998f93..83807c1 100644
--- a/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
+++ b/example/application/todoapp/integtests/src/test/java/integration/tests/ToDoItemIntegTest.java
@@ -65,8 +65,7 @@ public class ToDoItemIntegTest extends AbstractToDoIntegTest {
@Before
public void setUpData() throws Exception {
- final ToDoItem testToDo = toDoItems.newToDo("new todo", ToDoItem.Category.Professional, ToDoItem.Subcategory.OpenSource, null, null);
- fixtureScript = new ToDoItemsRecreateAndCompleteSeveral();
+ fixtureScript = new ToDoItemsRecreateAndCompleteSeveral();
fixtureScripts.runFixtureScript(fixtureScript, null);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a7423cb2/example/application/todoapp/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/pom.xml b/example/application/todoapp/webapp/pom.xml
index 753b3b5..964a931 100644
--- a/example/application/todoapp/webapp/pom.xml
+++ b/example/application/todoapp/webapp/pom.xml
@@ -341,7 +341,7 @@
<dependency>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-neo4j</artifactId>
- <version>3.2.3</version>
+ <version>4.0.4</version>
</dependency>
</dependencies>
</profile>
http://git-wip-us.apache.org/repos/asf/isis/blob/a7423cb2/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties b/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties
index 5b10931..e081634 100644
--- a/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -79,8 +79,7 @@ isis.authorization=shiro
# additional programming model facets
#
-isis.reflector.facets.include=org.apache.isis.core.metamodel.facets.object.ignore.jdo.RemoveJdoPersistableEnhancementTypesFacetFactory, \
-org.apache.isis.core.metamodel.facets.object.ignore.datanucleus.RemoveDatanucleusPersistableTypesFacetFactory
+#isis.reflector.facets.include=
#isis.reflector.facets.exclude=
@@ -174,7 +173,7 @@ isis.reflector.facet-decorators=org.apache.isis.core.metamodel.facetdecorator.i1
# end-user gains access to other domain objects by invoking the actions of the domain services.
#
isis.services-installer=configuration-and-annotation
-isis.services.ServicesInstallerFromAnnotation.packagePrefix=app,dom.todo,fixture.todo,webapp.admin,webapp.prototyping
+isis.services.ServicesInstallerFromAnnotation.packagePrefix=app,dom.todo,fixture.todo,webapp.admin,webapp.prototyping, \
dom.todo,\
fixture.todo,\
webapp.admin,\
http://git-wip-us.apache.org/repos/asf/isis/blob/a7423cb2/example/application/todoapp/webapp/src/main/webapp/WEB-INF/persistor.properties
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/webapp/WEB-INF/persistor.properties b/example/application/todoapp/webapp/src/main/webapp/WEB-INF/persistor.properties
index d365634..9778330 100644
--- a/example/application/todoapp/webapp/src/main/webapp/WEB-INF/persistor.properties
+++ b/example/application/todoapp/webapp/src/main/webapp/WEB-INF/persistor.properties
@@ -50,11 +50,6 @@ isis.persistor.disableConcurrencyChecking=false
#
#
-# neo4j
-#
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=neo4j:testDB
-
-#
# HSQLDB in-memory
#
isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.hsqldb.jdbcDriver
@@ -123,3 +118,9 @@ isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:log4jdbc:sqlserver://127.0.0.1:1433;instance=.;databaseName=isis
#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=isis
#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=isis
+
+
+#
+# neo4j
+#
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=neo4j:/temp/neo_DB
\ No newline at end of file