diff --git a/pom.xml b/pom.xml index 44610b41b0ff9bab88071530ed342cbd97eee497..d18e7bb117c0d4e258a1ce4679e2bc40d1b4706a 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <targetJdk>1.7</targetJdk> <org.springframework.version>3.2.8.RELEASE</org.springframework.version> - <org.hibernate.version>4.2.10.Final</org.hibernate.version> + <org.hibernate.version>4.2.11.Final</org.hibernate.version> <com.sun.jersey.version>1.17.1</com.sun.jersey.version> <jackson.version>1.9.2</jackson.version> <org.mysql.version>5.1.29</org.mysql.version> diff --git a/src/main/webapp-gae/WEB-INF/web.xml b/src/main/webapp-gae/WEB-INF/web.xml deleted file mode 100644 index 161c623d880f369e120c4012ca7c21fd8b319c4e..0000000000000000000000000000000000000000 --- a/src/main/webapp-gae/WEB-INF/web.xml +++ /dev/null @@ -1,321 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.5" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - metadata-complete="true"> - - <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> - <!-- IMPORTANT : DO NOT CHANGE SEQUENCE OF XML TYPES BECAUSE VALIDATION MAY FAIL --> - <!-- Please check before checkin http://www.xmlvalidation.com/index.php --> - <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> - - <display-name>OLAT Online Learning and Training</display-name> - <description> - Online Learning and Training Application (OLAT) is a Learning Management Platform. - </description> - - - <!-- 1. Context-Param --> - <!-- add all spring config files here --> - <context-param> - <param-name>contextConfigLocation</param-name> - <param-value> - classpath:/org/olat/_spring/mainContext.xml - </param-value> - </context-param> - - <context-param> - <param-name>resteasy.servlet.mapping.prefix</param-name> - <param-value>/restapi</param-value> - </context-param> - - <context-param> - <param-name>contextInitializerClasses</param-name> - <param-value>org.olat.core.CoreSpringInitializer</param-value> - </context-param> - - - - <!-- 2. Filters --> - <filter> - <filter-name>OnyxHttpsFilter</filter-name> - <filter-class>org.olat.core.servlets.FakeHttpsFilter</filter-class> - </filter> - - <filter> - <filter-name>PaypalIPNFilter</filter-name> - <filter-class>org.olat.resource.accesscontrol.provider.paypal.PaypalIPNFilter</filter-class> - </filter> - - <filter> - <filter-name>CrossOriginFilter</filter-name> - <filter-class>org.olat.core.servlets.CrossOriginFilter</filter-class> - </filter> - - <filter> - <filter-name>RESTApiLoginFilter</filter-name> - <filter-class>org.olat.restapi.security.RestApiLoginFilter</filter-class> - </filter> - - <filter> - <filter-name>Resteasy</filter-name> - <filter-class> - org.jboss.resteasy.plugins.server.servlet.FilterDispatcher - </filter-class> - <init-param> - <param-name>javax.ws.rs.Application</param-name> - <param-value>org.olat.restapi.support.OlatRestApplication</param-value> - </init-param> - </filter> - - <!-- Use FakeHTTPSFilter for requests to WSService and TraineeStatusService (dynamic WSDL for ONYX) --> - <filter-mapping> - <filter-name>OnyxHttpsFilter</filter-name> - <url-pattern>/services/ReturnWSService</url-pattern> - </filter-mapping> - <filter-mapping> - <filter-name>OnyxHttpsFilter</filter-name> - <url-pattern>/services/TraineeStatusService</url-pattern> - </filter-mapping> - - <!-- The mapping to the Login filter REST API --> - <filter-mapping> - <filter-name>PaypalIPNFilter</filter-name> - <url-pattern>/paypal/*</url-pattern> - </filter-mapping> - - <filter-mapping> - <filter-name>CrossOriginFilter</filter-name> - <url-pattern>/restapi/*</url-pattern> - </filter-mapping> - - <filter-mapping> - <filter-name>RESTApiLoginFilter</filter-name> - <url-pattern>/restapi/*</url-pattern> - </filter-mapping> - - <filter-mapping> - <filter-name>Resteasy</filter-name> - <url-pattern>/restapi/*</url-pattern> - </filter-mapping> - - - <!-- 3. Listeners --> - <!-- triggers the above spring files to be processed by the spring framework --> - <listener> - <listener-class> - org.springframework.web.context.ContextLoaderListener - </listener-class> - </listener> - - <listener> - <listener-class> - org.springframework.web.context.request.RequestContextListener - </listener-class> - </listener> - - - - <!-- this only works in an expanded war file: Comment on spring website: - If you want to keep your WAR unexpanded or don't need application-specific log files within the WAR directory, - don't use log4j setup within the application (thus, don't use Log4jConfigListener or Log4jConfigServlet). - Instead, use a global, VM-wide log4j setup (for example, in JBoss) or JDK 1.4's java.util.logging (which is global too). --> - <listener> - <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class> - </listener> - <listener> - <listener-class>org.olat.restapi.security.RestApiSessionListener</listener-class> - </listener> - <listener> - <listener-class>org.olat.core.dispatcher.mapper.MapperSessionListener</listener-class> - </listener> - - <!-- 4. Servlets --> - <servlet> - <servlet-name>log4j-init</servlet-name> - <servlet-class>org.olat.core.servlets.Log4JInitServlet</servlet-class> - - <init-param> - <param-name>log4j-init-file</param-name> - <param-value>log4j.xml</param-value> - - <!-- this is the default for lazy developers to have output on eclipse console. - Overwrite it with -Dlog4j.configuration="file:/tmp/mylog4j.xml" (java system property) and specifie a path for your logging config. - See olat3/conf for an example file --> - - </init-param> - - <load-on-startup>1</load-on-startup> - </servlet> - - - <!-- OLAT servlet --> - <servlet> - <servlet-name>openolatservlet</servlet-name> - <servlet-class>org.olat.core.servlets.OpenOLATServlet</servlet-class> - <!-- Set the load order --> - <load-on-startup>1</load-on-startup> - </servlet> - <servlet> - <servlet-name>rawservlet</servlet-name> - <servlet-class>org.olat.core.servlets.StaticServlet</servlet-class> - <!-- Set the load order --> - <load-on-startup>1</load-on-startup> - </servlet> - - <!-- axis --> - <servlet> - <display-name>Apache-Axis Servlet</display-name> - <servlet-name>AxisServlet</servlet-name> - <servlet-class>de.bps.onyx.plugin.wsserver.OnyxAxisServlet</servlet-class> - <init-param> - <param-name>axis2.xml.path</param-name> - <param-value>/axis2.xml</param-value> - </init-param> - </servlet> - - - <servlet> - <display-name>Apache-Axis Admin Servlet Web Admin</display-name> - <servlet-name>AxisAdminServlet</servlet-name> - <servlet-class>org.apache.axis2.transport.http.AxisAdminServlet</servlet-class> - <load-on-startup>100</load-on-startup> - </servlet> - <!-- /axis --> - - <!-- RSS feed requests --> - <servlet> - <servlet-name>rss</servlet-name> - <servlet-class>org.olat.commons.servlets.RSSServlet</servlet-class> - - <init-param> - <param-name>input</param-name> - <param-value>32768</param-value> - </init-param> - - <init-param> - <param-name>output</param-name> - <param-value>32768</param-value> - </init-param> - - <load-on-startup>3</load-on-startup> - </servlet> - - <!-- ICAL feed requests --> - <servlet> - <servlet-name>ical</servlet-name> - <servlet-class>org.olat.commons.servlets.ICalServlet</servlet-class> - - <init-param> - <param-name>input</param-name> - <param-value>32768</param-value> - </init-param> - - <init-param> - <param-name>output</param-name> - <param-value>32768</param-value> - </init-param> - - <load-on-startup>3</load-on-startup> - </servlet> - - <!-- 5.Servlet-Mapping --> - <!-- The mapping for the OLAT servlet --> - <servlet-mapping> - <servlet-name>openolatservlet</servlet-name> - <url-pattern>/</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>openolatservlet</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>rawservlet</servlet-name> - <url-pattern>/raw/*</url-pattern> - </servlet-mapping> - - <!-- The mapping for the RSS servlet --> - <servlet-mapping> - <servlet-name>rss</servlet-name> - <url-pattern>/rss/*</url-pattern> - </servlet-mapping> - - <!-- The mapping for the ICal servlet --> - <servlet-mapping> - <servlet-name>ical</servlet-name> - <url-pattern>/ical/*</url-pattern> - </servlet-mapping><!-- Spring loading --> - - <!-- Axis mapping --> - <servlet-mapping> - <servlet-name>AxisServlet</servlet-name> - <url-pattern>/servlet/AxisServlet</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>AxisServlet</servlet-name> - <url-pattern>*.jws</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>AxisServlet</servlet-name> - <url-pattern>/services/*</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>AxisAdminServlet</servlet-name> - <url-pattern>/axis2-admin/*</url-pattern> - </servlet-mapping> - - - <!-- 6. Session-Config --> - <!-- default session timeout --> - <session-config> - <session-timeout>60</session-timeout> - </session-config> - - - <!-- Additional MIME mappings --> - <mime-mapping> - <extension>ppt</extension> - <mime-type>application/vnd.ms-powerpoint</mime-type> - </mime-mapping> - <mime-mapping> - <extension>pps</extension> - <mime-type>application/vnd.ms-powerpoint</mime-type> - </mime-mapping> - <mime-mapping> - <extension>xls</extension> - <mime-type>application/vnd.ms-excel</mime-type> - </mime-mapping> - <mime-mapping> - <extension>xlt</extension> - <mime-type>application/vnd.ms-excel</mime-type> - </mime-mapping> - <mime-mapping> - <extension>xla</extension> - <mime-type>application/vnd.ms-excel</mime-type> - </mime-mapping> - <mime-mapping> - <extension>flv</extension> - <mime-type>video/x-flv</mime-type> - </mime-mapping> - <mime-mapping> - <extension>f4v</extension> - <mime-type>video/x-flv</mime-type> - </mime-mapping> - <mime-mapping> - <extension>aac</extension> - <mime-type>audio/x-aac</mime-type> - </mime-mapping> - <mime-mapping> - <extension>m4a</extension> - <mime-type>audio/x-m4a</mime-type> - </mime-mapping> - <mime-mapping> - <extension>m4v</extension> - <mime-type>video/x-m4v</mime-type> - </mime-mapping> - -</web-app>