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/06/07 20:41:15 UTC
[1/9] git commit: ISIS-798: fixes for integration tests.
Repository: isis
Updated Branches:
refs/heads/prepare/isis-1.5.0-RC1 9c96290d3 -> 38b136a6b
ISIS-798: fixes for integration tests.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4cec6f05
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4cec6f05
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4cec6f05
Branch: refs/heads/prepare/isis-1.5.0-RC1
Commit: 4cec6f05d1c12c3856755fa32ee763bdede7cd39
Parents: 1d4a3a6
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jun 5 17:33:43 2014 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jun 5 17:33:43 2014 +0200
----------------------------------------------------------------------
.../applib/fixturescripts/FixtureScript.java | 6 ++--
.../IntegrationTestAbstract.java | 15 ++++++++
.../handlers/DomainObjectInvocationHandler.java | 37 ++------------------
3 files changed, 21 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4cec6f05/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
index 81526f0..2da358f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
@@ -326,7 +326,7 @@ public abstract class FixtureScript
@Programmatic
public final List<FixtureResult> run(final String parameters) {
- final ExecutionContext executionContext = new ExecutionContext(parameters, fixtureScripts).withTracing(this.tracePrintStream);
+ final ExecutionContext executionContext = fixtureScripts.newExecutionContext(parameters).withTracing(this.tracePrintStream);
executionContext.executeIfNotAlready(this);
return executionContext.getResults();
}
@@ -348,7 +348,7 @@ public abstract class FixtureScript
* Adds a child {@link FixtureScript fixture script}, overriding its default name with one more
* meaningful in the context of this fixture.
*/
- protected final void execute(final String localNameOverride, final FixtureScript fixtureScript, ExecutionContext executionContext) {
+ protected void execute(final String localNameOverride, final FixtureScript fixtureScript, ExecutionContext executionContext) {
fixtureScript.setParentPath(pathWith(""));
if(localNameOverride != null) {
fixtureScript.setLocalName(localNameOverride);
@@ -359,7 +359,7 @@ public abstract class FixtureScript
/**
* Executes a child {@link FixtureScript fixture script} (simply using its default name).
*/
- protected final void execute(final FixtureScript fixtureScript, ExecutionContext executionContext) {
+ protected void execute(final FixtureScript fixtureScript, ExecutionContext executionContext) {
execute(null, fixtureScript, executionContext);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/4cec6f05/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract.java
index 15fff21..ef743ce 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract.java
@@ -28,6 +28,7 @@ import org.junit.runners.model.Statement;
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.RecoverableException;
+import org.apache.isis.applib.fixturescripts.FixtureScript;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.core.specsupport.scenarios.ScenarioExecution;
import org.apache.isis.core.specsupport.specs.CukeGlueAbstract;
@@ -190,6 +191,20 @@ public abstract class IntegrationTestAbstract {
}
}
+ // //////////////////////////////////////
+
+ /**
+ * Convenience method to avoid some boilerplate and rename (as more in keeping with the
+ * {@link org.apache.isis.applib.fixturescripts.FixtureScript} API compared to the older
+ * {@link org.apache.isis.applib.fixtures.InstallableFixture} API).
+ */
+ protected static void runScript(FixtureScript... fixtureScripts) {
+ scenarioExecution().install(fixtureScripts);
+ }
+
+ // //////////////////////////////////////
+
+
@Rule
public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
http://git-wip-us.apache.org/repos/asf/isis/blob/4cec6f05/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
index aa7b320..9e26e26 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
@@ -25,23 +25,11 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.events.CollectionAccessEvent;
-import org.apache.isis.applib.events.InteractionEvent;
-import org.apache.isis.applib.events.ObjectTitleEvent;
-import org.apache.isis.applib.events.PropertyAccessEvent;
-import org.apache.isis.applib.events.UsabilityEvent;
-import org.apache.isis.applib.events.ValidityEvent;
-import org.apache.isis.applib.events.VisibilityEvent;
+import org.apache.isis.applib.events.*;
import org.apache.isis.applib.filter.Filter;
-import org.apache.isis.applib.services.wrapper.DisabledException;
-import org.apache.isis.applib.services.wrapper.HiddenException;
-import org.apache.isis.applib.services.wrapper.InteractionException;
-import org.apache.isis.applib.services.wrapper.InvalidException;
-import org.apache.isis.applib.services.wrapper.WrapperFactory;
+import org.apache.isis.applib.services.wrapper.*;
import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
-import org.apache.isis.applib.services.wrapper.WrapperObject;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -55,17 +43,6 @@ import org.apache.isis.core.metamodel.facetapi.DecoratingFacet;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
import org.apache.isis.core.metamodel.facets.ImperativeFacet.Intent;
-import org.apache.isis.core.metamodel.facets.accessor.PropertyOrCollectionAccessorFacet;
-import org.apache.isis.core.metamodel.facets.actions.choices.ActionChoicesFacet;
-import org.apache.isis.core.metamodel.facets.actions.defaults.ActionDefaultsFacet;
-import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
-import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
-import org.apache.isis.core.metamodel.facets.param.choices.ActionParameterChoicesFacet;
-import org.apache.isis.core.metamodel.facets.properties.choices.PropertyChoicesFacet;
-import org.apache.isis.core.metamodel.facets.properties.defaults.PropertyDefaultFacet;
-import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
-import org.apache.isis.core.metamodel.facets.properties.modify.PropertyInitializationFacet;
-import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
import org.apache.isis.core.metamodel.interactions.ObjectTitleContext;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoader;
@@ -74,14 +51,6 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
-import org.apache.isis.core.progmodel.facets.actions.validate.method.ActionValidationFacetViaMethod;
-import org.apache.isis.core.progmodel.facets.collections.validate.CollectionValidateAddToFacetViaMethod;
-import org.apache.isis.core.progmodel.facets.collections.validate.CollectionValidateRemoveFromFacetViaMethod;
-import org.apache.isis.core.progmodel.facets.members.disabled.method.DisableForContextFacetViaMethod;
-import org.apache.isis.core.progmodel.facets.members.hidden.method.HideForContextFacetViaMethod;
-import org.apache.isis.core.progmodel.facets.properties.modify.PropertyClearFacetViaClearMethod;
-import org.apache.isis.core.progmodel.facets.properties.modify.PropertySetterFacetViaModifyMethod;
-import org.apache.isis.core.progmodel.facets.properties.validate.PropertyValidateFacetViaMethod;
public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandlerDefault<T> {
@@ -144,7 +113,7 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle
return delegate(method, args);
}
- final ObjectAdapter targetAdapter = getAdapterManager().getAdapterFor(getDelegate());
+ final ObjectAdapter targetAdapter = getAdapterManager().adapterFor(getDelegate());
if (isTitleMethod(method)) {
return handleTitleMethod(method, args, targetAdapter);
[8/9] git commit: Merge branch 'prepare/isis-quickstart-1.5.0-RC2'
into prepare/isis-1.5.0-RC1
Posted by da...@apache.org.
Merge branch 'prepare/isis-quickstart-1.5.0-RC2' into prepare/isis-1.5.0-RC1
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b1ab14d2
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b1ab14d2
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b1ab14d2
Branch: refs/heads/prepare/isis-1.5.0-RC1
Commit: b1ab14d2164f94e576fa4fc7c26f79aed2383564
Parents: 8797968 e7eec8c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Jun 7 08:14:38 2014 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Jun 7 08:14:38 2014 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/9] git commit: [maven-release-plugin] prepare for next development
iteration
Posted by da...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/887396b0
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/887396b0
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/887396b0
Branch: refs/heads/prepare/isis-1.5.0-RC1
Commit: 887396b0d71cd190c7144c3d53f53afe82f9d278
Parents: c8e3422
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jun 6 07:46:20 2014 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jun 6 07:46:20 2014 +0200
----------------------------------------------------------------------
example/archetype/simple_wicket_restful_jdo/pom.xml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/887396b0/example/archetype/simple_wicket_restful_jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simple_wicket_restful_jdo/pom.xml b/example/archetype/simple_wicket_restful_jdo/pom.xml
index 1448400..436fb5c 100644
--- a/example/archetype/simple_wicket_restful_jdo/pom.xml
+++ b/example/archetype/simple_wicket_restful_jdo/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simple_wicket_restful_jdo-archetype</artifactId>
- <version>1.5.0</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>simple_wicket_restful_jdo-archetype</name>
<build>
@@ -47,8 +47,4 @@
<version>1.5.0</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
-
- <scm>
- <tag>simple_wicket_restful_jdo-archetype-1.5.0-RC2</tag>
- </scm>
</project>
[7/9] git commit: Merge branch 'prepare/isis-simple-1.5.0-RC2' into
prepare/isis-1.5.0-RC1
Posted by da...@apache.org.
Merge branch 'prepare/isis-simple-1.5.0-RC2' into prepare/isis-1.5.0-RC1
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8797968e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8797968e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8797968e
Branch: refs/heads/prepare/isis-1.5.0-RC1
Commit: 8797968e41d022e9f593d3a4b5301be24a0fe740
Parents: 9c96290 887396b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Jun 7 08:14:07 2014 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Jun 7 08:14:07 2014 +0200
----------------------------------------------------------------------
.../simple_wicket_restful_jdo/webapp/pom.xml | 12 +++++++++---
.../webapp/src/main/webapp/WEB-INF/isis.properties | 3 +++
.../main/resources/archetype-resources/webapp/pom.xml | 12 +++++++++---
.../webapp/src/main/webapp/WEB-INF/isis.properties | 3 +++
4 files changed, 24 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[9/9] git commit: Merge branch 'master' into prepare/isis-1.5.0-RC1
Posted by da...@apache.org.
Merge branch 'master' into prepare/isis-1.5.0-RC1
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/38b136a6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/38b136a6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/38b136a6
Branch: refs/heads/prepare/isis-1.5.0-RC1
Commit: 38b136a6b8f36a0cd762273eb514fe976d0cc5d3
Parents: b1ab14d 4cec6f0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Jun 7 08:15:22 2014 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Jun 7 08:15:22 2014 +0200
----------------------------------------------------------------------
.../applib/fixturescripts/FixtureScript.java | 6 ++--
.../IntegrationTestAbstract.java | 15 ++++++++
.../handlers/DomainObjectInvocationHandler.java | 37 ++------------------
3 files changed, 21 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
[5/9] git commit: [maven-release-plugin] prepare release
quickstart_wicket_restful_jdo-archetype-1.5.0-RC2
Posted by da...@apache.org.
[maven-release-plugin] prepare release quickstart_wicket_restful_jdo-archetype-1.5.0-RC2
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a4e028be
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a4e028be
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a4e028be
Branch: refs/heads/prepare/isis-1.5.0-RC1
Commit: a4e028bec77b8394d49e20a96adb7bb2cab90dd0
Parents: 69a89fa
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jun 6 07:51:24 2014 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jun 6 07:51:24 2014 +0200
----------------------------------------------------------------------
example/archetype/quickstart_wicket_restful_jdo/pom.xml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a4e028be/example/archetype/quickstart_wicket_restful_jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/pom.xml b/example/archetype/quickstart_wicket_restful_jdo/pom.xml
index ce85822..5e7c590 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/pom.xml
+++ b/example/archetype/quickstart_wicket_restful_jdo/pom.xml
@@ -17,11 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>quickstart_wicket_restful_jdo-archetype</artifactId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.5.0</version>
<packaging>maven-archetype</packaging>
<name>quickstart_wicket_restful_jdo-archetype</name>
<build>
@@ -47,4 +47,8 @@
<version>1.5.0</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
+
+ <scm>
+ <tag>quickstart_wicket_restful_jdo-archetype-1.5.0-RC2</tag>
+ </scm>
</project>
[6/9] git commit: [maven-release-plugin] prepare for next development
iteration
Posted by da...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e7eec8c8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e7eec8c8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e7eec8c8
Branch: refs/heads/prepare/isis-1.5.0-RC1
Commit: e7eec8c8f95ccb55ebeaedb8f1b729f2bbff5c54
Parents: a4e028b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jun 6 07:51:27 2014 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jun 6 07:51:27 2014 +0200
----------------------------------------------------------------------
example/archetype/quickstart_wicket_restful_jdo/pom.xml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e7eec8c8/example/archetype/quickstart_wicket_restful_jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/pom.xml b/example/archetype/quickstart_wicket_restful_jdo/pom.xml
index 5e7c590..687d632 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/pom.xml
+++ b/example/archetype/quickstart_wicket_restful_jdo/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>quickstart_wicket_restful_jdo-archetype</artifactId>
- <version>1.5.0</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>quickstart_wicket_restful_jdo-archetype</name>
<build>
@@ -47,8 +47,4 @@
<version>1.5.0</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
-
- <scm>
- <tag>quickstart_wicket_restful_jdo-archetype-1.5.0-RC2</tag>
- </scm>
</project>
[3/9] git commit: [maven-release-plugin] prepare release
simple_wicket_restful_jdo-archetype-1.5.0-RC2
Posted by da...@apache.org.
[maven-release-plugin] prepare release simple_wicket_restful_jdo-archetype-1.5.0-RC2
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c8e34220
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c8e34220
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c8e34220
Branch: refs/heads/prepare/isis-1.5.0-RC1
Commit: c8e34220d6957ca3c1d84984c3cbf498310db5dc
Parents: 8a0d750
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jun 6 07:46:17 2014 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jun 6 07:46:17 2014 +0200
----------------------------------------------------------------------
example/archetype/simple_wicket_restful_jdo/pom.xml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c8e34220/example/archetype/simple_wicket_restful_jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simple_wicket_restful_jdo/pom.xml b/example/archetype/simple_wicket_restful_jdo/pom.xml
index 0a302a2..1448400 100644
--- a/example/archetype/simple_wicket_restful_jdo/pom.xml
+++ b/example/archetype/simple_wicket_restful_jdo/pom.xml
@@ -17,11 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simple_wicket_restful_jdo-archetype</artifactId>
- <version>1.4.2-SNAPSHOT</version>
+ <version>1.5.0</version>
<packaging>maven-archetype</packaging>
<name>simple_wicket_restful_jdo-archetype</name>
<build>
@@ -47,4 +47,8 @@
<version>1.5.0</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
+
+ <scm>
+ <tag>simple_wicket_restful_jdo-archetype-1.5.0-RC2</tag>
+ </scm>
</project>
[2/9] git commit: ISIS-792: fixes for simple archetype
Posted by da...@apache.org.
ISIS-792: fixes for simple archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8a0d750f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8a0d750f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8a0d750f
Branch: refs/heads/prepare/isis-1.5.0-RC1
Commit: 8a0d750fac2d78df36712a0742d2ff1284f93a98
Parents: 38f6506
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jun 6 07:16:44 2014 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jun 6 07:33:17 2014 +0200
----------------------------------------------------------------------
.../simple_wicket_restful_jdo/webapp/pom.xml | 12 +++++++++---
.../webapp/src/main/webapp/WEB-INF/isis.properties | 3 +++
.../main/resources/archetype-resources/webapp/pom.xml | 12 +++++++++---
.../webapp/src/main/webapp/WEB-INF/isis.properties | 3 +++
4 files changed, 24 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8a0d750f/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 374e1d7..420a825 100644
--- a/example/application/simple_wicket_restful_jdo/webapp/pom.xml
+++ b/example/application/simple_wicket_restful_jdo/webapp/pom.xml
@@ -54,6 +54,7 @@
</goals>
<configuration>
<backgroundImage>${basedir}/src/main/jettyconsole/isis-banner.png</backgroundImage>
+ <destinationFile>${project.build.directory}/${project.build.finalName}-jetty-console.jar</destinationFile>
</configuration>
<phase>package</phase>
</execution>
@@ -185,6 +186,10 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-wrapper</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-profilestore</artifactId>
</dependency>
<dependency>
@@ -238,7 +243,7 @@
<!--
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
- <artifactId>jdbc</artifactId>
+ <artifactId>sqljdbc4</artifactId>
<version>4.0</version>
</dependency>
-->
@@ -271,7 +276,7 @@
<tasks>
<exec executable="java" failonerror="true">
<arg value="-jar" />
- <arg value="${project.build.directory}/${project.build.finalName}-jetty-console.war" />
+ <arg value="${project.build.directory}/${project.build.finalName}-jetty-console.jar" />
</exec>
</tasks>
</configuration>
@@ -285,7 +290,6 @@
<properties>
<!-- as used in the rebel.xml in the dom project -->
<target.dir>target</target.dir>
-
<isis-jrebel-plugin.packagePrefix>dom.simple,org.apache.isis.objectstore.jdo.applib</isis-jrebel-plugin.packagePrefix>
<isis-jrebel-plugin.loggingLevel>warn</isis-jrebel-plugin.loggingLevel>
</properties>
@@ -340,4 +344,6 @@
</profile>
</profiles>
+
+
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/8a0d750f/example/application/simple_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties b/example/application/simple_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
index 1d6eb1c..4591060 100644
--- a/example/application/simple_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/simple_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -180,6 +180,8 @@ isis.services = \
org.apache.isis.applib.annotation.Bulk$InteractionContext,\
org.apache.isis.applib.services.scratchpad.Scratchpad,\
org.apache.isis.applib.services.queryresultscache.QueryResultsCache,\
+ org.apache.isis.core.wrapper.WrapperFactoryDefault,\
+ org.apache.isis.applib.services.classdiscovery.ClassDiscoveryServiceUsingReflections,\
\
# JDO implementation of the EventBusService, \
org.apache.isis.objectstore.jdo.datanucleus.service.eventbus.EventBusServiceJdo,\
@@ -246,6 +248,7 @@ isis.fixtures=fixture.simple.SimpleObjectsFixture
+
################################################################################
#
# Viewer defaults
http://git-wip-us.apache.org/repos/asf/isis/blob/8a0d750f/example/archetype/simple_wicket_restful_jdo/src/main/resources/archetype-resources/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simple_wicket_restful_jdo/src/main/resources/archetype-resources/webapp/pom.xml b/example/archetype/simple_wicket_restful_jdo/src/main/resources/archetype-resources/webapp/pom.xml
index 2816b5c..ee58552 100644
--- a/example/archetype/simple_wicket_restful_jdo/src/main/resources/archetype-resources/webapp/pom.xml
+++ b/example/archetype/simple_wicket_restful_jdo/src/main/resources/archetype-resources/webapp/pom.xml
@@ -54,6 +54,7 @@
</goals>
<configuration>
<backgroundImage>${basedir}/src/main/jettyconsole/isis-banner.png</backgroundImage>
+ <destinationFile>${project.build.directory}/${project.build.finalName}-jetty-console.jar</destinationFile>
</configuration>
<phase>package</phase>
</execution>
@@ -179,6 +180,10 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-wrapper</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-profilestore</artifactId>
</dependency>
<dependency>
@@ -232,7 +237,7 @@
<!--
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
- <artifactId>jdbc</artifactId>
+ <artifactId>sqljdbc4</artifactId>
<version>4.0</version>
</dependency>
-->
@@ -265,7 +270,7 @@
<tasks>
<exec executable="java" failonerror="true">
<arg value="-jar" />
- <arg value="${project.build.directory}/${project.build.finalName}-jetty-console.war" />
+ <arg value="${project.build.directory}/${project.build.finalName}-jetty-console.jar" />
</exec>
</tasks>
</configuration>
@@ -279,7 +284,6 @@
<properties>
<!-- as used in the rebel.xml in the dom project -->
<target.dir>target</target.dir>
-
<isis-jrebel-plugin.packagePrefix>dom.simple,org.apache.isis.objectstore.jdo.applib</isis-jrebel-plugin.packagePrefix>
<isis-jrebel-plugin.loggingLevel>warn</isis-jrebel-plugin.loggingLevel>
</properties>
@@ -334,4 +338,6 @@
</profile>
</profiles>
+
+
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/8a0d750f/example/archetype/simple_wicket_restful_jdo/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simple_wicket_restful_jdo/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties b/example/archetype/simple_wicket_restful_jdo/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
index c9e5fc6..5e0186c 100644
--- a/example/archetype/simple_wicket_restful_jdo/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/archetype/simple_wicket_restful_jdo/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -183,6 +183,8 @@ isis.services = ${symbol_escape}
org.apache.isis.applib.annotation.Bulk${symbol_dollar}InteractionContext,${symbol_escape}
org.apache.isis.applib.services.scratchpad.Scratchpad,${symbol_escape}
org.apache.isis.applib.services.queryresultscache.QueryResultsCache,${symbol_escape}
+ org.apache.isis.core.wrapper.WrapperFactoryDefault,${symbol_escape}
+ org.apache.isis.applib.services.classdiscovery.ClassDiscoveryServiceUsingReflections,${symbol_escape}
${symbol_escape}
${symbol_pound} JDO implementation of the EventBusService, ${symbol_escape}
org.apache.isis.objectstore.jdo.datanucleus.service.eventbus.EventBusServiceJdo,${symbol_escape}
@@ -249,6 +251,7 @@ ${symbol_pound}isis.services.command.actions=all|none|ignoreQueryOnly
+
${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
${symbol_pound}
${symbol_pound} Viewer defaults