Impostato StandardServletMultipartResolver come multipartResolver e rimossi file non utilizzati

ems-core/src/main/java/it/integry/ems/rules/util/CustomAccumulateFunction.java

@@ -1,58 +0,0 @@
-package it.integry.ems.rules.util;
-
-import it.integry.ems_model.base.EntityBase;
-import org.kie.api.runtime.rule.AccumulateFunction;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.Serializable;
-
-public class CustomAccumulateFunction implements AccumulateFunction {
-
-    @Override
-    public void readExternal(ObjectInput arg0) throws IOException, ClassNotFoundException {
-
-    }
-
-    @Override
-    public void writeExternal(ObjectOutput arg0) throws IOException {
-
-    }
-
-    @Override
-    public Serializable createContext() {
-        return new Double(0);
-    }
-
-    @Override
-    public void init(Serializable context) throws Exception {
-        //System.out.println();
-    }
-
-    @Override
-    public void accumulate(Serializable context, Object value) {
-
-    }
-
-    @Override
-    public void reverse(Serializable context, Object value) throws Exception {
-
-    }
-
-    @Override
-    public Object getResult(Serializable context) throws Exception {
-        return context;
-    }
-
-    @Override
-    public boolean supportsReverse() {
-        return false;
-    }
-
-    @Override
-    public Class<?> getResultType() {
-        return EntityBase.class;
-    }
-
-}

ems-engine/src/main/resources/META-INF/drools.packagebuilder.conf

@@ -1 +0,0 @@
-drools.accumulate.function.customAccumulate=it.integry.ems.rules.util.CustomAccumulateFunction

ems-engine/src/main/resources/META-INF/spring.handlers

@@ -1 +0,0 @@
-http\://robertmaldon.com/springbeans/condbean=it.integry.ems.spring.etl.ConditionalBeanNamespaceHandler

ems-engine/src/main/resources/META-INF/spring.schemas

@@ -1 +0,0 @@
-http\://robertmaldon.com/springbeans/condbean/condbean.xsd=conditional/springbeans/condbean.xsd

ems-engine/src/main/resources/conditional/springbeans/condbean.xsd

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            xmlns="http://robertmaldon.com/springbeans/condbean"
-            targetNamespace="http://robertmaldon.com/springbeans/condbean"
-            elementFormDefault="qualified"
-            attributeFormDefault="unqualified">
-
-    <xsd:import namespace="http://www.springframework.org/schema/beans"/>
-
-    <xsd:element name="cond">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:any minOccurs="0"/>
-            </xsd:sequence>
-            <xsd:attribute name="test" type="xsd:string" use="required"/>
-        </xsd:complexType>
-    </xsd:element>
-
-</xsd:schema>

ems-engine/src/main/resources/mvc-dispatcher-servlet.xml

@@ -3,7 +3,7 @@
        xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns="http://www.springframework.org/schema/beans"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
                             http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
-                            http://www.springframework.org/schema/mvc  
+                            http://www.springframework.org/schema/mvc
 							http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd">
 
     <mvc:resources mapping="/assets/**" location="/assets/"/>

ems-engine/src/main/resources/spring/applicationContext.xml

@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <beans xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:if="http://robertmaldon.com/springbeans/condbean"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:task="http://www.springframework.org/schema/task"
+       xmlns:mvc="http://www.springframework.org/schema/mvc"
+       xmlns:task="http://www.springframework.org/schema/task"
        xmlns="http://www.springframework.org/schema/beans"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-                            http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
+                            http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
                             http://www.springframework.org/schema/context
-                            http://www.springframework.org/schema/context/spring-context-4.1.xsd
-
-
-                            http://www.springframework.org/schema/mvc  
-							http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd
-							http://robertmaldon.com/springbeans/condbean 
-							http://robertmaldon.com/springbeans/condbean/condbean.xsd   http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd">
-
+                            http://www.springframework.org/schema/context/spring-context-4.3.xsd
+                            http://www.springframework.org/schema/mvc
+                            http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
+                            http://www.springframework.org/schema/task
+                            http://www.springframework.org/schema/task/spring-task.xsd">
     <context:component-scan base-package="it.integry"/>
 
     <bean id="ppConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -27,21 +24,10 @@
         </property>
     </bean>
 
-
-
-    <if:cond test="${receipts.en}">
-        <import resource="classpath*:spring/retail-spring-config.xml"/>
-    </if:cond>
-
-    <if:cond test="${brt.tracknumber.listener.en}">
-        <import resource="classpath*:spring/order-spring-config.xml"/>
-    </if:cond>
-
     <task:scheduler id="taskScheduler" pool-size="5"/>
 
     <!-- Enables support to @Scheduled -->
-    <task:annotation-driven />
-
+    <task:annotation-driven/>
 
     <bean id="localeResolver"
           class="org.springframework.web.servlet.i18n.SessionLocaleResolver">
@@ -59,9 +45,7 @@
     <bean id="emsProperties" class="it.integry.ems.properties.EmsProperties"/>
     <bean id="envProperties" class="it.integry.ems.properties.EnvProperties"/>
 
-    <bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
-        <property name="maxUploadSize" value="104857600"/> <!-- 100MB - 100x1024x1024 -->
-    </bean>
+    <bean id="multipartResolver" class="org.springframework.web.multipart.support.StandardServletMultipartResolver"/>
 
     <!-- NB: DICHIARAZIONE DELLO SCHEDULER PER IL CARICAMENTO DINAMICO DEI MODULI ABILITATI -->
     <bean id="quartzScheduler"
@@ -71,7 +55,6 @@
         <property name="autoStartup" value="true"/>
     </bean>
 
-
     <mvc:interceptors>
         <bean class="it.integry.ems.system.SystemRequisiteCheckInterceptor"/>
         <bean class="it.integry.ems.devices.DevicesRequestInterceptor"/>

ems-engine/src/main/webapp/WEB-INF/web.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://java.sun.com/xml/ns/javaee"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-         id="pvmWS" version="2.5">
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         id="pvmWS" version="3.0">
     <display-name>Integry Management System API</display-name>
     <context-param>
         <param-name>contextConfigLocation</param-name>
@@ -37,6 +37,9 @@
             <param-value>classpath:mvc-dispatcher-servlet.xml</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
+        <multipart-config>
+            <max-file-size>104857600</max-file-size> <!-- 100MB - 100x1024x1024 -->
+        </multipart-config>
     </servlet>
     <servlet-mapping>
         <servlet-name>SpringDispatcherServlet</servlet-name>