You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/08/28 18:13:07 UTC
[isis] branch master updated: ISIS-1895:
IsisTransactionFilterForRestfulObjects no longer
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new f9d3b66 ISIS-1895: IsisTransactionFilterForRestfulObjects no longer
f9d3b66 is described below
commit f9d3b66d34f9955af7dbd367142a739321e0d83b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Aug 28 20:12:19 2018 +0200
ISIS-1895: IsisTransactionFilterForRestfulObjects no longer
required in web.xml
Task-Url: https://issues.apache.org/jira/browse/ISIS-1895
---
.../java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java | 2 +-
core/viewer-restfulobjects-server/pom.xml | 5 -----
.../server/webapp/IsisTransactionFilterForRestfulObjects.java | 2 ++
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
index 5699aa0..838496f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
@@ -112,7 +112,7 @@ public class IsisWebAppBootstrapper implements ServletContextListener {
}
/**
- * publis so can also be used by Wicket viewer.
+ * public so can also be used by Wicket viewer.
*/
public static IsisConfigurationBuilder obtainConfigBuilderFrom(final ServletContext servletContext) {
final IsisConfigurationBuilder isisConfigurationBuilder = lookupIsisConfigurationBuilder(servletContext);
diff --git a/core/viewer-restfulobjects-server/pom.xml b/core/viewer-restfulobjects-server/pom.xml
index b2f7d8b..59f18d3 100644
--- a/core/viewer-restfulobjects-server/pom.xml
+++ b/core/viewer-restfulobjects-server/pom.xml
@@ -42,11 +42,6 @@
<artifactId>isis-core-viewer-restfulobjects-rendering</artifactId>
</dependency>
-<!-- <dependency> -->
-<!-- <groupId>org.webjars</groupId> -->
-<!-- <artifactId>webjars-servlet-2.x</artifactId> -->
-<!-- </dependency> -->
-
<!-- JDO API (non transient, provided by plugin) -->
<dependency>
<groupId>javax.jdo</groupId>
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java
index e9ef941..4978144 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java
@@ -24,11 +24,13 @@ import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import javax.servlet.annotation.WebFilter;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
+@WebFilter(servletNames= {"RestfulObjectsRestEasyDispatcher"})
public class IsisTransactionFilterForRestfulObjects implements Filter {
@Override