This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch ISIS-1976-rethink-object-adapters in repository https://gitbox.apache.org/repos/asf/isis.git
commit f87ea18050f8cab39b674d61bd2fa87f3a451e2e Author: Andi Huber <ahu...@apache.org> AuthorDate: Fri Sep 7 19:02:41 2018 +0200 ISIS-1899: post release ... bump BASELINE to next iteration -> 2.0.0-M2 simple-app/helloworld ... simplify web descriptors (web.xml) simple-app/helloworld ... bump DN-5 version --- .gitlab-ci.yml | 2 +- example/application/helloworld/pom.xml | 4 +- .../helloworld/src/main/webapp/WEB-INF/web.xml | 278 +------------------ example/application/simpleapp/pom.xml | 4 +- .../webapp/src/main/webapp/WEB-INF/web.xml | 305 +-------------------- 5 files changed, 33 insertions(+), 560 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 811db55..e61ad07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ image: maven:3.5.3-jdk-8 before_script: - - export BASELINE=2.0.0-M1 + - export BASELINE=2.0.0-M2 - export REVISION=$BASELINE.$(date +%Y%m%d)-$(date +%H%M)-$(echo $CI_COMMIT_SHA | cut -c1-8) services: diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml index 3c7a73a..ee0fcbe 100644 --- a/example/application/helloworld/pom.xml +++ b/example/application/helloworld/pom.xml @@ -36,7 +36,7 @@ <packaging>war</packaging> <properties> - <revision>2.0.0-M1</revision> + <revision>2.0.0-M2-SNAPSHOT</revision> <isis.version>${revision}</isis.version> <compiler-plugin.source>1.8</compiler-plugin.source> @@ -44,7 +44,7 @@ <compiler-plugin.compilerArgument>-parameters</compiler-plugin.compilerArgument> <!-- override incode-build --> - <datanucleus-core.version>5.1.6</datanucleus-core.version> + <datanucleus-core.version>5.1.11</datanucleus-core.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> 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..5a7e71a 100644 --- a/example/application/helloworld/src/main/webapp/WEB-INF/web.xml +++ b/example/application/helloworld/src/main/webapp/WEB-INF/web.xml @@ -28,21 +28,20 @@ <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> - + <listener> + <listener-class>org.apache.isis.core.webapp.IsisWebAppContextListener</listener-class> + </listener> + + <context-param> + <param-name>isis.viewer.wicket.app</param-name> + <param-value>domainapp.webapp.HelloWorldApplication</param-value> + </context-param> + + <!-- 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> --> <!-- which configuration directory to read overloaded property files from --> @@ -77,253 +76,4 @@ --> - <!-- - 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> - - - <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> - - <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> - </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> - - </web-app> diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml index a50ad68..9a41b13 100644 --- a/example/application/simpleapp/pom.xml +++ b/example/application/simpleapp/pom.xml @@ -36,7 +36,7 @@ <packaging>pom</packaging> <properties> - <revision>2.0.0-M1</revision> + <revision>2.0.0-M2-SNAPSHOT</revision> <isis.version>${revision}</isis.version> <lombok.version>[1.18,)</lombok.version> @@ -46,7 +46,7 @@ <compiler-plugin.compilerArgument>-parameters</compiler-plugin.compilerArgument> <!-- override incode-build --> - <datanucleus-core.version>5.1.6</datanucleus-core.version> + <datanucleus-core.version>5.1.11</datanucleus-core.version> <hsqldb.version>2.3.4</hsqldb.version> 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..b579574 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,21 +28,20 @@ <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> - + <listener> + <listener-class>org.apache.isis.core.webapp.IsisWebAppContextListener</listener-class> + </listener> + + <context-param> + <param-name>isis.viewer.wicket.app</param-name> + <param-value>domainapp.webapp.DomainApplication</param-value> + </context-param> + + <!-- 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> --> <!-- which configuration directory to read overloaded property files from --> @@ -76,280 +75,4 @@ 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> - - - <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> - - <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> - </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> - --> - - <!-- - 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>