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 2018/09/14 16:12:00 UTC
[isis] 19/19: ISIS-1895: updates simpleapp and helloworld so can
boot
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit cb2c7ae8fa7a82b7dc9dccdfacfbb775424acf22
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Sep 14 17:11:09 2018 +0100
ISIS-1895: updates simpleapp and helloworld so can boot
---
example/application/helloworld/pom.xml | 33 ++-
.../src/main/webapp/WEB-INF/logging.properties | 4 +-
.../helloworld/src/main/webapp/WEB-INF/web.xml | 307 +------------------
example/application/simpleapp/pom.xml | 7 +
.../src/main/webapp/WEB-INF/logging.properties | 4 +-
.../webapp/src/main/webapp/WEB-INF/web.xml | 327 +--------------------
6 files changed, 63 insertions(+), 619 deletions(-)
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index 265d704..0341bc5 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -43,9 +43,17 @@
<compiler-plugin.target>1.8</compiler-plugin.target>
<compiler-plugin.compilerArgument>-parameters</compiler-plugin.compilerArgument>
+ <!-- override incode-build -->
+ <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
+
<!-- override incode-build (see dn5-xxx.version in isis-core-plugins-jdo-datanucleus-5) -->
<datanucleus-api-jdo.version>5.1.9</datanucleus-api-jdo.version>
<datanucleus-core.version>5.1.11</datanucleus-core.version>
+ <datanucleus-api-jdo.version>5.1.9</datanucleus-api-jdo.version>
+ <datanucleus-jodatime.version>5.1.0-release</datanucleus-jodatime.version>
+ <hsqldb.version>2.3.4</hsqldb.version>
+
+ <failOnMissingWebXml>false</failOnMissingWebXml>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -56,6 +64,13 @@
<build>
<resources>
<resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </resource>
+ <resource>
<filtering>false</filtering>
<directory>src/main/java</directory>
<includes>
@@ -143,30 +158,30 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
</dependency>
-
-
- <!-- ISIS CORE PLUGINS -->
+
+
+ <!-- ISIS CORE PLUGINS -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-codegen-bytebuddy</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-discovery-reflections</artifactId>
</dependency>
-
- <dependency>
+
+ <dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-jdo-datanucleus-5</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-eventbus-axon</artifactId>
</dependency>
-
- <dependency>
+
+ <dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-jaxrs-resteasy-3</artifactId>
</dependency>
diff --git a/example/application/helloworld/src/main/webapp/WEB-INF/logging.properties b/example/application/helloworld/src/main/webapp/WEB-INF/logging.properties
index faa6dcf..573a664 100644
--- a/example/application/helloworld/src/main/webapp/WEB-INF/logging.properties
+++ b/example/application/helloworld/src/main/webapp/WEB-INF/logging.properties
@@ -240,5 +240,5 @@ log4j.additivity.dom.simple.SimpleObject=false
# ERROR to suppress the WARNings we get as of 1.15.0
-log4j.logger.org.apache.wicket.page.PartialPageUpdate=ERROR,Console
-log4j.additivity.org.apache.wicket.page.PartialPageUpdate=false
+log4j.logger.org.apache.wicket.page.XmlPartialPageUpdate=ERROR,Console
+log4j.additivity.org.apache.wicket.page.XmlPartialPageUpdate=false
diff --git a/example/application/helloworld/src/main/webapp/WEB-INF/web.xml b/example/application/helloworld/src/main/webapp/WEB-INF/web.xml
index a6c042c..76d33f1 100644
--- a/example/application/helloworld/src/main/webapp/WEB-INF/web.xml
+++ b/example/application/helloworld/src/main/webapp/WEB-INF/web.xml
@@ -28,302 +28,25 @@
<welcome-file>about/index.html</welcome-file>
</welcome-file-list>
- <!-- shiro security configuration -->
- <listener>
- <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class>
- </listener>
-
- <filter>
- <filter-name>ShiroFilter</filter-name>
- <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>ShiroFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
-
-
- <!-- which configuration directory to read overloaded property files from -->
- <!--
- By default the framework will read configuration properties from the WEB-INF
- directory (where this web.xml file resides).
-
- If you want to read configuration files from some other external directory,
- and the location of that external directory is the same/standardized for all
- locations where you intend to deploy the WAR file, you can uncomment the
- 'isis.config.dir' context parameter, below, and set it to that standardized
- location, eg:
-
- <context-param>
- <param-name>isis.config.dir</param-name>
- <param-value>/usr/local/conf</param-value>
- </context-param>
-
- If however the location of the external directory changes from one deployment
- to another (eg system testing, UAT, production etc) then you should be
- able to override the context parameter through the servlet container's own
- (proprietary) configuration files.
-
- For example, if deploying to Tomcat, you can edit $CATALINA_BASE/conf/context.xml,
- and add:
-
- <Parameter name="isis.config.dir"
- value="/usr/local/conf/systest"
- override="false"/>
-
- For more detail see: http://tomcat.apache.org/tomcat-7.0-doc/config/context.html#Context_Parameters
- -->
-
-
- <!--
- determines which additional configuration files to search for
- -->
- <context-param>
- <param-name>isis.viewers</param-name>
- <param-value>wicket,restfulobjects</param-value>
- </context-param>
-
-
-
- <!--
- for diagnostics
- -->
- <filter>
- <filter-name>IsisLogOnExceptionFilter</filter-name>
- <filter-class>org.apache.isis.core.webapp.diagnostics.IsisLogOnExceptionFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>IsisLogOnExceptionFilter</filter-name>
- <url-pattern>/wicket/*</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>IsisLogOnExceptionFilter</filter-name>
- <url-pattern>/restful/*</url-pattern>
- </filter-mapping>
-
-
-
- <!-- cache static resources for 1 day -->
- <filter>
- <filter-name>ResourceCachingFilter</filter-name>
- <filter-class>org.apache.isis.core.webapp.content.ResourceCachingFilter</filter-class>
- <init-param>
- <param-name>CacheTime</param-name>
- <param-value>86400</param-value>
- </init-param>
- </filter>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.css</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.png</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.jpg</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.jpeg</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.gif</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.svg</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.js</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.html</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.swf</url-pattern>
- </filter-mapping>
-
- <servlet>
- <servlet-name>Resource</servlet-name>
- <servlet-class>org.apache.isis.core.webapp.content.ResourceServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.css</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.png</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.jpg</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.jpeg</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.gif</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.svg</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.js</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.html</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.swf</url-pattern>
- </servlet-mapping>
+ <!-- can be removed with axon >= 3.5 -->
+ <persistence-context-ref>
+ <persistence-context-ref-name>org.axonframework.common.jpa.ContainerManagedEntityManagerProvider/entityManager</persistence-context-ref-name>
+ <persistence-unit-name>noop</persistence-unit-name>
+ </persistence-context-ref>
-
- <servlet>
- <servlet-name>WebjarsServlet</servlet-name>
- <servlet-class>org.webjars.servlet.WebjarsServlet</servlet-class>
- <init-param>
- <param-name>disableCache</param-name>
- <param-value>false</param-value>
- </init-param>
- <load-on-startup>2</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>WebjarsServlet</servlet-name>
- <url-pattern>/webjars/*</url-pattern>
- </servlet-mapping>
-
-
-
- <!--
- -
- - config specific to the wicket-viewer
- -
- -->
- <filter>
- <filter-name>WicketFilter</filter-name>
- <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
- <init-param>
- <param-name>applicationClassName</param-name>
- <param-value>domainapp.webapp.HelloWorldApplication</param-value>
- </init-param>
- </filter>
- <filter-mapping>
- <filter-name>WicketFilter</filter-name>
- <url-pattern>/wicket/*</url-pattern>
- </filter-mapping>
-
-
- <context-param>
- <param-name>configuration</param-name>
- <!--
- <param-value>deployment</param-value>
- -->
- <param-value>development</param-value>
- </context-param>
-
-
- <!--
- -
- - config specific to the restfulobjects-viewer
- -
- -->
-
- <!--
- THE FOLLOWING CONFIGURATION IS NOT REQUIRED IF THE WICKET VIEWER IS IN USE.
- IF THE WICKET VIEWER CONFIGURATION IS REMOVED, THEN UNCOMMENT
-
<listener>
- <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppContextListener</listener-class>
</listener>
<context-param>
- <param-name>deploymentType</param-name>
- <param-value>SERVER_PROTOTYPE</param-value>
+ <param-name>isis.viewer.wicket.app</param-name>
+ <param-value>domainapp.webapp.HelloWorldApplication</param-value>
</context-param>
-
- <context-param>
- <param-name>isis.viewers</param-name>
- <param-value>restfulobjects</param-value>
- </context-param>
- -->
-
- <!-- bootstrap the RestEasy framework -->
- <listener>
- <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
- </listener>
-
- <!-- used by RestEasy to determine the JAX-RS resources and other related configuration -->
- <context-param>
- <param-name>javax.ws.rs.Application</param-name>
- <param-value>org.apache.isis.viewer.restfulobjects.server.RestfulObjectsApplication</param-value>
- </context-param>
-
- <context-param>
- <param-name>resteasy.servlet.mapping.prefix</param-name>
- <param-value>/restful/</param-value>
- </context-param>
-
-
- <!-- authenticate user, set up an Isis session -->
- <filter>
- <filter-name>IsisSessionFilterForRestfulObjects</filter-name>
- <filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class>
- <!-- authentication required for REST -->
- <init-param>
- <param-name>authenticationSessionStrategy</param-name>
- <param-value>org.apache.isis.viewer.restfulobjects.server.authentication.AuthenticationSessionStrategyBasicAuth</param-value>
- </init-param>
- <init-param>
- <!-- what to do if no session was found... -->
- <param-name>whenNoSession</param-name>
- <!-- ... 401 and a basic authentication challenge if request originates from web browser -->
- <param-value>auto</param-value>
- </init-param>
- <init-param>
- <param-name>passThru</param-name>
- <param-value>/restful/swagger</param-value>
- </init-param>
- </filter>
- <filter-mapping>
- <!-- this is mapped to the entire app; however the IsisSessionFilter will "notice" if the session filter has already been
- executed for the request pipeline, and if so will do nothing -->
- <filter-name>IsisSessionFilterForRestfulObjects</filter-name>
- <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
- </filter-mapping>
-
- <filter>
- <filter-name>IsisTransactionFilterForRestfulObjects</filter-name>
- <filter-class>org.apache.isis.viewer.restfulobjects.server.webapp.IsisTransactionFilterForRestfulObjects</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>IsisTransactionFilterForRestfulObjects</filter-name>
- <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
- </filter-mapping>
-
-
- <servlet>
- <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
- <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
- <url-pattern>/restful/*</url-pattern>
- </servlet-mapping>
-
-
+
+ <!-- this config value wins over that provided via environment variable PROTOTYPING=true/false -->
+<!-- <context-param> -->
+<!-- <param-name>isis.viewer.wicket.mode</param-name> -->
+<!-- <param-value>development</param-value> -->
+<!-- </context-param> -->
+
</web-app>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index d7d7878..1cbd1b9 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -45,11 +45,18 @@
<compiler-plugin.target>1.8</compiler-plugin.target>
<compiler-plugin.compilerArgument>-parameters</compiler-plugin.compilerArgument>
+ <!-- override incode-build -->
+ <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
+
<!-- override incode-build (see dn5-xxx.version in isis-core-plugins-jdo-datanucleus-5) -->
<datanucleus-api-jdo.version>5.1.9</datanucleus-api-jdo.version>
<datanucleus-core.version>5.1.11</datanucleus-core.version>
+ <datanucleus-api-jdo.version>5.1.9</datanucleus-api-jdo.version>
+ <datanucleus-jodatime.version>5.1.0-release</datanucleus-jodatime.version>
<hsqldb.version>2.3.4</hsqldb.version>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
index faa6dcf..573a664 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
@@ -240,5 +240,5 @@ log4j.additivity.dom.simple.SimpleObject=false
# ERROR to suppress the WARNings we get as of 1.15.0
-log4j.logger.org.apache.wicket.page.PartialPageUpdate=ERROR,Console
-log4j.additivity.org.apache.wicket.page.PartialPageUpdate=false
+log4j.logger.org.apache.wicket.page.XmlPartialPageUpdate=ERROR,Console
+log4j.additivity.org.apache.wicket.page.XmlPartialPageUpdate=false
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml
index 885e0c9..e17f6ef 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml
@@ -28,328 +28,27 @@
<welcome-file>about/index.html</welcome-file>
</welcome-file-list>
- <!-- shiro security configuration -->
- <listener>
- <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class>
- </listener>
-
- <filter>
- <filter-name>ShiroFilter</filter-name>
- <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>ShiroFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
-
-
- <!-- which configuration directory to read overloaded property files from -->
- <!--
- By default the framework will read configuration properties from the WEB-INF
- directory (where this web.xml file resides).
-
- If you want to read configuration files from some other external directory,
- and the location of that external directory is the same/standardized for all
- locations where you intend to deploy the WAR file, you can uncomment the
- 'isis.config.dir' context parameter, below, and set it to that standardized
- location, eg:
-
- <context-param>
- <param-name>isis.config.dir</param-name>
- <param-value>/usr/local/conf</param-value>
- </context-param>
-
- If however the location of the external directory changes from one deployment
- to another (eg system testing, UAT, production etc) then you should be
- able to override the context parameter through the servlet container's own
- (proprietary) configuration files.
-
- For example, if deploying to Tomcat, you can edit $CATALINA_BASE/conf/context.xml,
- and add:
-
- <Parameter name="isis.config.dir"
- value="/usr/local/conf/systest"
- override="false"/>
-
- For more detail see: http://tomcat.apache.org/tomcat-7.0-doc/config/context.html#Context_Parameters
- -->
-
-
- <!--
- determines which additional configuration files to search for
- -->
- <context-param>
- <param-name>isis.viewers</param-name>
- <param-value>wicket,restfulobjects</param-value>
- </context-param>
-
-
-
- <!--
- for diagnostics
- -->
- <filter>
- <filter-name>IsisLogOnExceptionFilter</filter-name>
- <filter-class>org.apache.isis.core.webapp.diagnostics.IsisLogOnExceptionFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>IsisLogOnExceptionFilter</filter-name>
- <url-pattern>/wicket/*</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>IsisLogOnExceptionFilter</filter-name>
- <url-pattern>/restful/*</url-pattern>
- </filter-mapping>
-
-
+ <!-- can be removed with axon >= 3.5 -->
+ <persistence-context-ref>
+ <persistence-context-ref-name>org.axonframework.common.jpa.ContainerManagedEntityManagerProvider/entityManager</persistence-context-ref-name>
+ <persistence-unit-name>noop</persistence-unit-name>
+ </persistence-context-ref>
- <!-- cache static resources for 1 day -->
- <filter>
- <filter-name>ResourceCachingFilter</filter-name>
- <filter-class>org.apache.isis.core.webapp.content.ResourceCachingFilter</filter-class>
- <init-param>
- <param-name>CacheTime</param-name>
- <param-value>86400</param-value>
- </init-param>
- </filter>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.css</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.png</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.jpg</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.jpeg</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.gif</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.svg</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.js</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.html</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>ResourceCachingFilter</filter-name>
- <url-pattern>*.swf</url-pattern>
- </filter-mapping>
-
- <servlet>
- <servlet-name>Resource</servlet-name>
- <servlet-class>org.apache.isis.core.webapp.content.ResourceServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.css</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.png</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.jpg</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.jpeg</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.gif</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.svg</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.js</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.html</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Resource</servlet-name>
- <url-pattern>*.swf</url-pattern>
- </servlet-mapping>
-
-
- <servlet>
- <servlet-name>WebjarsServlet</servlet-name>
- <servlet-class>org.webjars.servlet.WebjarsServlet</servlet-class>
- <init-param>
- <param-name>disableCache</param-name>
- <param-value>false</param-value>
- </init-param>
- <load-on-startup>2</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>WebjarsServlet</servlet-name>
- <url-pattern>/webjars/*</url-pattern>
- </servlet-mapping>
-
-
-
- <!--
- -
- - config specific to the wicket-viewer
- -
- -->
- <filter>
- <filter-name>WicketFilter</filter-name>
- <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
- <init-param>
- <param-name>applicationClassName</param-name>
- <param-value>domainapp.webapp.DomainApplication</param-value>
- </init-param>
- </filter>
- <filter-mapping>
- <filter-name>WicketFilter</filter-name>
- <url-pattern>/wicket/*</url-pattern>
- </filter-mapping>
-
-
- <context-param>
- <param-name>configuration</param-name>
- <!--
- <param-value>deployment</param-value>
- -->
- <param-value>development</param-value>
- </context-param>
-
-
- <!--
- -
- - config specific to the restfulobjects-viewer
- -
- -->
-
- <!--
- THE FOLLOWING CONFIGURATION IS NOT REQUIRED IF THE WICKET VIEWER IS IN USE.
- IF THE WICKET VIEWER CONFIGURATION IS REMOVED, THEN UNCOMMENT
-
<listener>
- <listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
+ <listener-class>org.apache.isis.core.webapp.IsisWebAppContextListener</listener-class>
</listener>
- <context-param>
- <param-name>deploymentType</param-name>
- <param-value>SERVER_PROTOTYPE</param-value>
- </context-param>
<context-param>
- <param-name>isis.viewers</param-name>
- <param-value>restfulobjects</param-value>
- </context-param>
- -->
-
- <!-- bootstrap the RestEasy framework -->
- <listener>
- <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
- </listener>
-
- <!-- used by RestEasy to determine the JAX-RS resources and other related configuration -->
- <context-param>
- <param-name>javax.ws.rs.Application</param-name>
- <param-value>org.apache.isis.viewer.restfulobjects.server.RestfulObjectsApplication</param-value>
- </context-param>
-
- <context-param>
- <param-name>resteasy.servlet.mapping.prefix</param-name>
- <param-value>/restful/</param-value>
+ <param-name>isis.viewer.wicket.app</param-name>
+ <param-value>domainapp.webapp.DomainApplication</param-value>
</context-param>
-
-
- <!-- authenticate user, set up an Isis session -->
- <filter>
- <filter-name>IsisSessionFilterForRestfulObjects</filter-name>
- <filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class>
- <!-- authentication required for REST -->
- <init-param>
- <param-name>authenticationSessionStrategy</param-name>
- <param-value>org.apache.isis.viewer.restfulobjects.server.authentication.AuthenticationSessionStrategyBasicAuth</param-value>
- </init-param>
- <init-param>
- <!-- what to do if no session was found... -->
- <param-name>whenNoSession</param-name>
- <!-- ... 401 and a basic authentication challenge if request originates from web browser -->
- <param-value>auto</param-value>
- </init-param>
- <init-param>
- <param-name>passThru</param-name>
- <param-value>/restful/swagger</param-value>
- </init-param>
- </filter>
- <filter-mapping>
- <!-- this is mapped to the entire app; however the IsisSessionFilter will "notice" if the session filter has already been
- executed for the request pipeline, and if so will do nothing -->
- <filter-name>IsisSessionFilterForRestfulObjects</filter-name>
- <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
- </filter-mapping>
-
- <filter>
- <filter-name>IsisTransactionFilterForRestfulObjects</filter-name>
- <filter-class>org.apache.isis.viewer.restfulobjects.server.webapp.IsisTransactionFilterForRestfulObjects</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>IsisTransactionFilterForRestfulObjects</filter-name>
- <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
- </filter-mapping>
-
-
- <servlet>
- <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
- <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
- <url-pattern>/restful/*</url-pattern>
- </servlet-mapping>
-
- <!--
- uncomment to use container-managed datasource;
- for both container-managed (JTA) and non-container-managed transactions
- -->
- <!--
- <resource-ref>
- <description>db</description>
- <res-ref-name>jdbc/quickstart</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
- -->
+ <!-- this config value wins over that provided via environment variable PROTOTYPING=true/false -->
+<!-- <context-param> -->
+<!-- <param-name>isis.viewer.wicket.mode</param-name> -->
+<!-- <param-value>development</param-value> -->
+<!-- </context-param> -->
- <!--
- uncomment to use container-managed datasource
- with container-managed transactions (JTA).
- -->
- <!--
- <resource-ref>
- <description>db</description>
- <res-ref-name>jdbc/quickstart-nontx</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
- -->
</web-app>