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/02/10 08:35:19 UTC
[1/2] git commit: ISIS-684: moving quartz job delegate to JDO,
so can reuse.
Updated Branches:
refs/heads/master 2f219a338 -> 544c959a1
ISIS-684: moving quartz job delegate to JDO, so can reuse.
Also cosmetic tidy-up elsewhere.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7ac27760
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7ac27760
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7ac27760
Branch: refs/heads/master
Commit: 7ac27760dbae27185ef082e129d4c911415eaf65
Parents: 2f219a3
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Feb 7 14:51:00 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Feb 7 14:51:00 2014 +0000
----------------------------------------------------------------------
...xecutionFromBackgroundCommandServiceJdo.java | 22 ++++++++++++++++++++
.../org/apache/isis/applib/annotation/Bulk.java | 2 --
.../webapp/scheduler/AbstractIsisQuartzJob.java | 2 --
.../BackgroundCommandExecutionQuartzJob.java | 22 +-------------------
4 files changed, 23 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7ac27760/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.java
new file mode 100644
index 0000000..b0a3fdb
--- /dev/null
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/BackgroundCommandExecutionFromBackgroundCommandServiceJdo.java
@@ -0,0 +1,22 @@
+package org.apache.isis.objectstore.jdo.service;
+
+import java.util.List;
+
+import org.apache.isis.applib.services.command.Command;
+import org.apache.isis.core.runtime.services.background.BackgroundCommandExecution;
+import org.apache.isis.objectstore.jdo.applib.service.background.BackgroundCommandServiceJdoRepository;
+import org.apache.isis.objectstore.jdo.applib.service.command.CommandJdo;
+
+public final class BackgroundCommandExecutionFromBackgroundCommandServiceJdo extends BackgroundCommandExecution {
+
+ @Override
+ protected List<? extends Command> findBackgroundCommandsToExecute() {
+ final List<CommandJdo> commands = backgroundCommandRepository.findBackgroundCommandsNotYetStarted();
+ return commands;
+ }
+
+ // //////////////////////////////////////
+
+ @javax.inject.Inject
+ private BackgroundCommandServiceJdoRepository backgroundCommandRepository;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/7ac27760/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java
index 07f12e1..0211d01 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java
@@ -124,7 +124,6 @@ public @interface Bulk {
private InvokedAs invokedAs;
private List<Object> domainObjects;
- private int size;
private int index;
@@ -149,7 +148,6 @@ public @interface Bulk {
public InteractionContext(final InvokedAs invokedAs, final List<Object> domainObjects) {
this.invokedAs = invokedAs;
this.domainObjects = domainObjects;
- this.size = domainObjects.size();
}
// //////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/7ac27760/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/scheduler/AbstractIsisQuartzJob.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/scheduler/AbstractIsisQuartzJob.java b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/scheduler/AbstractIsisQuartzJob.java
index fde2085..f1161ba 100644
--- a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/scheduler/AbstractIsisQuartzJob.java
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/scheduler/AbstractIsisQuartzJob.java
@@ -26,8 +26,6 @@ import org.quartz.JobExecutionException;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
import org.apache.isis.core.runtime.sessiontemplate.AbstractIsisSessionTemplate;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSession;
public class AbstractIsisQuartzJob implements Job {
http://git-wip-us.apache.org/repos/asf/isis/blob/7ac27760/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/scheduler/BackgroundCommandExecutionQuartzJob.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/scheduler/BackgroundCommandExecutionQuartzJob.java b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/scheduler/BackgroundCommandExecutionQuartzJob.java
index 1b99782..5e2c2ae 100644
--- a/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/scheduler/BackgroundCommandExecutionQuartzJob.java
+++ b/example/application/quickstart_wicket_restful_jdo/webapp/src/main/java/webapp/scheduler/BackgroundCommandExecutionQuartzJob.java
@@ -16,12 +16,8 @@
*/
package webapp.scheduler;
-import java.util.List;
+import org.apache.isis.objectstore.jdo.service.BackgroundCommandExecutionFromBackgroundCommandServiceJdo;
-import org.apache.isis.applib.services.command.Command;
-import org.apache.isis.core.runtime.services.background.BackgroundCommandExecution;
-import org.apache.isis.objectstore.jdo.applib.service.background.BackgroundCommandServiceJdoRepository;
-import org.apache.isis.objectstore.jdo.applib.service.command.CommandJdo;
public class BackgroundCommandExecutionQuartzJob extends AbstractIsisQuartzJob {
@@ -29,20 +25,4 @@ public class BackgroundCommandExecutionQuartzJob extends AbstractIsisQuartzJob {
super(new BackgroundCommandExecutionFromBackgroundCommandServiceJdo());
}
- // //////////////////////////////////////
-
- public final static class BackgroundCommandExecutionFromBackgroundCommandServiceJdo extends BackgroundCommandExecution {
-
- @Override
- protected List<? extends Command> findBackgroundCommandsToExecute() {
- final List<CommandJdo> commands = backgroundCommandRepository.findBackgroundCommandsNotYetStarted();
- return commands;
- }
-
- // //////////////////////////////////////
-
- @javax.inject.Inject
- private BackgroundCommandServiceJdoRepository backgroundCommandRepository;
- }
-
}
[2/2] git commit: ISIS-693: extensions in support of excel
import/export
Posted by da...@apache.org.
ISIS-693: extensions in support of excel import/export
Specifically:
* RuntimeContext#bookmarkFor(Class,String)
* ViewModelFacet#memento(Object)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/544c959a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/544c959a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/544c959a
Branch: refs/heads/master
Commit: 544c959a12de1a0137d7820a017468d4f4d12375
Parents: 7ac2776
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Feb 10 07:33:41 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Feb 10 07:33:41 2014 +0000
----------------------------------------------------------------------
.../applib/services/bookmark/BookmarkService.java | 9 ++++++---
.../isis/applib/services/command/Command.java | 2 +-
.../metamodel/adapter/DomainObjectServices.java | 3 +++
.../facets/object/viewmodel/ViewModelFacet.java | 9 +++++----
.../noruntime/RuntimeContextNoRuntime.java | 5 +++++
.../services/bookmarks/BookmarkServiceDefault.java | 17 +++++++++++------
.../annotation/ViewModelFacetForInterface.java | 6 ++++++
.../container/DomainObjectContainerResolve.java | 13 +++++++++++++
.../internal/RuntimeContextFromSession.java | 6 ++++++
9 files changed, 56 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/544c959a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
index d7fedf3..6f951b3 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
@@ -18,9 +18,9 @@
*/
package org.apache.isis.applib.services.bookmark;
-import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.Named;
import org.apache.isis.applib.annotation.NotInServiceMenu;
+import org.apache.isis.applib.annotation.Programmatic;
@Named("Bookmarks")
public interface BookmarkService {
@@ -28,10 +28,13 @@ public interface BookmarkService {
@NotInServiceMenu
Object lookup(BookmarkHolder bookmarkHolder);
- @Hidden
+ @Programmatic
Object lookup(Bookmark bookmarkHolder);
- @Hidden
+ @Programmatic
Bookmark bookmarkFor(Object domainObject);
+
+ @Programmatic
+ Bookmark bookmarkFor(Class<?> cls, String identifier);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/544c959a/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java b/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
index fbdebba..9dfc271 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/command/Command.java
@@ -430,7 +430,7 @@ public interface Command extends HasTransactionId {
* Generates numbers in a named sequence
*
* <p>
- * Used to support <tt>BackgroundTaskServiceJdo</tt> and <tt>PublishingServiceJdo</tt> implementations whose
+ * Used to support the <tt>PublishingServiceJdo</tt> implementation whose
* persisted entities are uniquely identified by a ({@link #getTransactionId() transactionId}, <tt>sequence</tt>)
* tuple.
*/
http://git-wip-us.apache.org/repos/asf/isis/blob/544c959a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/DomainObjectServices.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/DomainObjectServices.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/DomainObjectServices.java
index dec60b6..a365b05 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/DomainObjectServices.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/DomainObjectServices.java
@@ -87,7 +87,9 @@ public interface DomainObjectServices extends Injectable {
Bookmark bookmarkFor(Object domainObject);
+ Bookmark bookmarkFor(Class<?> cls, String identifier);
+
// ///////////////////////////////////////////
// flush, commit
// ///////////////////////////////////////////
@@ -160,4 +162,5 @@ public interface DomainObjectServices extends Injectable {
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/544c959a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java
index b4f6cfc..40263a7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/viewmodel/ViewModelFacet.java
@@ -19,18 +19,19 @@
package org.apache.isis.core.metamodel.facets.object.viewmodel;
-import org.apache.isis.core.metamodel.facets.MarkerFacet;
+import org.apache.isis.core.metamodel.facetapi.Facet;
/**
- * Indicates that this class is a view model, that is, any changes to its structure
- * will be backwards compatible.
+ * Indicates that this class is a view model.
*
* <p>
* In the standard Apache Isis Programming Model, typically corresponds to
* applying the <tt>@ViewModel</tt> annotation at the class level.
*/
-public interface ViewModelFacet extends MarkerFacet {
+public interface ViewModelFacet extends Facet {
void initialize(Object pojo, String memento);
+ String memento(Object pojo);
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/544c959a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
index 0417498..faec78f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/runtimecontext/noruntime/RuntimeContextNoRuntime.java
@@ -208,6 +208,11 @@ public class RuntimeContextNoRuntime extends RuntimeContextAbstract {
}
@Override
+ public Bookmark bookmarkFor(Class<?> cls, String identifier) {
+ throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
+ }
+
+ @Override
public void resolve(final Object parent, final Object field) {
throw new UnsupportedOperationException("Not supported by this implementation of RuntimeContext");
}
http://git-wip-us.apache.org/repos/asf/isis/blob/544c959a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
index b6caa2c..8619d33 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/bookmarks/BookmarkServiceDefault.java
@@ -83,17 +83,22 @@ public class BookmarkServiceDefault implements BookmarkService, DomainObjectServ
return domainObjectServices.lookup(bookmark);
}
+ @Override
+ @Hidden
+ public Bookmark bookmarkFor(final Object domainObject) {
+ return domainObjectServices.bookmarkFor(domainObject);
+ }
@Override
- @Programmatic
- public void setDomainObjectServices(final DomainObjectServices domainObjectServices) {
- this.domainObjectServices = domainObjectServices;
+ public Bookmark bookmarkFor(Class<?> cls, String identifier) {
+ return domainObjectServices.bookmarkFor(cls, identifier);
}
+
@Override
- @Hidden
- public Bookmark bookmarkFor(final Object domainObject) {
- return domainObjectServices.bookmarkFor(domainObject);
+ @Programmatic
+ public void setDomainObjectServices(final DomainObjectServices domainObjectServices) {
+ this.domainObjectServices = domainObjectServices;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/544c959a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/viewmodel/annotation/ViewModelFacetForInterface.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/viewmodel/annotation/ViewModelFacetForInterface.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/viewmodel/annotation/ViewModelFacetForInterface.java
index 8c7f2ec..bb6c5e1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/viewmodel/annotation/ViewModelFacetForInterface.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/viewmodel/annotation/ViewModelFacetForInterface.java
@@ -34,5 +34,11 @@ public class ViewModelFacetForInterface extends ViewModelFacetAbstract {
final ViewModel viewModel = (ViewModel)pojo;
viewModel.viewModelInit(memento);
}
+
+ @Override
+ public String memento(Object pojo) {
+ final ViewModel viewModel = (ViewModel)pojo;
+ return viewModel.viewModelMemento();
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/544c959a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/container/DomainObjectContainerResolve.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/container/DomainObjectContainerResolve.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/container/DomainObjectContainerResolve.java
index fa93325..a95e435 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/container/DomainObjectContainerResolve.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/container/DomainObjectContainerResolve.java
@@ -26,6 +26,8 @@ import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
@@ -75,6 +77,12 @@ public class DomainObjectContainerResolve {
return rootOid.asBookmark();
}
+ public Bookmark bookmarkFor(final Class<?> cls, final String identifier) {
+ final ObjectSpecification objectSpec = getSpecificationLoader().loadSpecification(cls);
+ String objectType = objectSpec.getSpecId().asString();
+ return new Bookmark(objectType, identifier);
+ }
+
public void resolve(final Object parent) {
final ObjectAdapter adapter = adapterFor(parent);
if (adapter.canTransitionToResolving()) {
@@ -108,5 +116,10 @@ public class DomainObjectContainerResolve {
return getPersistenceSession().getAdapterManager();
}
+ protected SpecificationLoaderSpi getSpecificationLoader() {
+ return IsisContext.getSpecificationLoader();
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/544c959a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
index 1f13e00..a1dba17 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
@@ -209,6 +209,12 @@ public class RuntimeContextFromSession extends RuntimeContextAbstract {
}
@Override
+ public Bookmark bookmarkFor(Class<?> cls, String identifier) {
+ return new DomainObjectContainerResolve().bookmarkFor(cls, identifier);
+ }
+
+
+ @Override
public void resolve(final Object parent) {
new DomainObjectContainerResolve().resolve(parent);
}