You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/04/01 15:12:20 UTC
[1/2] isis git commit: ISIS-1052 Add simple logging with the time
needed to start the app in embedded Jetty
Repository: isis
Updated Branches:
refs/heads/master 2c7cfbfec -> 867188b86
ISIS-1052 Add simple logging with the time needed to start the app in embedded Jetty
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/dfaef0b6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/dfaef0b6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/dfaef0b6
Branch: refs/heads/master
Commit: dfaef0b628934e15d27b41dfb53ce6fdbf158306
Parents: 2c7cfbf
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Apr 1 16:03:53 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Apr 1 16:03:53 2015 +0300
----------------------------------------------------------------------
.../org/apache/isis/core/webserver/WebServerBootstrapper.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/dfaef0b6/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
----------------------------------------------------------------------
diff --git a/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java b/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
index 69d43bc..02a47c9 100644
--- a/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
+++ b/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
@@ -80,9 +80,11 @@ final class WebServerBootstrapper implements IsisBootstrapper {
jettyServer.setHandler(context);
- LOG.info("starting Jetty on port " + port + " to serve webapp");
+ LOG.info("Starting Jetty on port '{}' to serve the web application", port);
+ long start = System.currentTimeMillis();
try {
jettyServer.start();
+ LOG.info("Started the application in {}ms", System.currentTimeMillis() - start);
if (startupMode.isForeground()) {
System.in.read();
System.out.println(">>> STOPPING EMBEDDED JETTY SERVER");
[2/2] isis git commit: ISIS-1130 Add #isEnabled() method to services
based on Wicket
Posted by mg...@apache.org.
ISIS-1130 Add #isEnabled() method to services based on Wicket
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/867188b8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/867188b8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/867188b8
Branch: refs/heads/master
Commit: 867188b865edaae77c4999c6059f79f0bc79b096
Parents: dfaef0b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Apr 1 16:11:01 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Apr 1 16:11:01 2015 +0300
----------------------------------------------------------------------
.../apache/isis/applib/services/linking/DeepLinkService.java | 5 +++++
.../viewer/wicket/viewer/services/DeepLinkServiceWicket.java | 6 +++++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/867188b8/core/applib/src/main/java/org/apache/isis/applib/services/linking/DeepLinkService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/linking/DeepLinkService.java b/core/applib/src/main/java/org/apache/isis/applib/services/linking/DeepLinkService.java
index 4d23b61..49f0be8 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/linking/DeepLinkService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/linking/DeepLinkService.java
@@ -38,4 +38,9 @@ public interface DeepLinkService {
@Programmatic
URI deepLinkFor(Object domainObject);
+ /**
+ * @return {@code true} if the service be used to create a link to domain objects
+ */
+ @Programmatic
+ boolean isEnabled();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/867188b8/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
index a665979..7453de2 100644
--- a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
+++ b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
@@ -37,7 +37,6 @@ import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
-import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassListDefault;
/**
* An implementation of {@link org.apache.isis.applib.services.linking.DeepLinkService}
@@ -69,6 +68,11 @@ public class DeepLinkServiceWicket implements DeepLinkService {
}
}
+ @Override
+ public boolean isEnabled() {
+ return RequestCycle.get() != null;
+ }
+
protected AdapterManagerDefault getAdapterManager() {
return getPersistenceSession().getAdapterManager();
}