Commits

Juan Carlos Picado Herrera committed 0a992ac

Fixed mvc module 7 failures

Comments (0)

Files changed (4)

encuestame-mvc/src/main/resources/encuestame-controller-context.xml

             </list>
         </property>
   </bean>
-
-    <!-- thumbnail generator engine
-         thanks to raulraja.
-     -->
-    <bean id="thumbnailGeneratorEngine" class="org.encuestame.core.image.ThumbnailGeneratorEngineImpl">
-
-        <!-- the file extension for the thumbnail files -->
-        <property name="generatedExtension">
-            <value>.jpg</value>
-        </property>
-
-        <!-- the different sizes we want to generate, adjusting the aspect ratio based on the biggest dimension -->
-        <property name="supportedSizes">
-            <list>
-                <value>900</value>
-                <value>768</value>
-                <value>375</value>
-                <value>128</value>
-                <value>64</value>
-                <value>48</value>
-                <value>22</value>
-            </list>
-        </property>
-
-        <!-- mappings from the different content types to the right generator that handles each type -->
-        <property name="thumbnailGenerators">
-            <map>
-                <entry key="image/jpeg" value-ref="imageThumbnailGenerator" />
-                <entry key="image/jpg" value-ref="imageThumbnailGenerator" />
-                <entry key="image/pjpeg" value-ref="imageThumbnailGenerator" />
-                <entry key="image/gif" value-ref="imageThumbnailGenerator" />
-                <entry key="image/png" value-ref="imageThumbnailGenerator" />
-                <entry key="image/tiff" value-ref="imageThumbnailGenerator" />
-                <entry key="image/bmp" value-ref="imageThumbnailGenerator" />
-                <!--<entry key="application/pdf" value-ref="pdfThumbnailGenerator" />-->
-            </map>
-        </property>
-
-        <!-- A default thumbnail generator to be used for unregistered mime types -->
-        <property name="defaultThumbnailGenerator" ref="imageThumbnailGenerator"/>
-    </bean>
-
-    <!-- a thumbnail generator that generates thumbnails from images -->
-    <bean id="imageThumbnailGenerator" class="org.encuestame.core.image.ImageThumbnailGeneratorImpl" />
-
 </beans>

encuestame-mvc/src/main/resources/encuestame-upload-context.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans
+                        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+                        http://www.springframework.org/schema/context
+                        http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+
+    <!-- thumbnail generator engine
+         thanks to raulraja.
+     -->
+    <bean id="thumbnailGeneratorEngine" class="org.encuestame.core.image.ThumbnailGeneratorEngineImpl">
+
+        <!-- the file extension for the thumbnail files -->
+        <property name="generatedExtension">
+            <value>.jpg</value>
+        </property>
+
+        <!-- the different sizes we want to generate, adjusting the aspect ratio based on the biggest dimension -->
+        <property name="supportedSizes">
+            <list>
+                <value>900</value>
+                <value>768</value>
+                <value>375</value>
+                <value>128</value>
+                <value>64</value>
+                <value>48</value>
+                <value>22</value>
+            </list>
+        </property>
+
+        <!-- mappings from the different content types to the right generator that handles each type -->
+        <property name="thumbnailGenerators">
+            <map>
+                <entry key="image/jpeg" value-ref="imageThumbnailGenerator" />
+                <entry key="image/jpg" value-ref="imageThumbnailGenerator" />
+                <entry key="image/pjpeg" value-ref="imageThumbnailGenerator" />
+                <entry key="image/gif" value-ref="imageThumbnailGenerator" />
+                <entry key="image/png" value-ref="imageThumbnailGenerator" />
+                <entry key="image/tiff" value-ref="imageThumbnailGenerator" />
+                <entry key="image/bmp" value-ref="imageThumbnailGenerator" />
+                <!--<entry key="application/pdf" value-ref="pdfThumbnailGenerator" />-->
+            </map>
+        </property>
+
+        <!-- A default thumbnail generator to be used for unregistered mime types -->
+        <property name="defaultThumbnailGenerator" ref="imageThumbnailGenerator"/>
+    </bean>
+
+    <!-- a thumbnail generator that generates thumbnails from images -->
+    <bean id="imageThumbnailGenerator" class="org.encuestame.core.image.ImageThumbnailGeneratorImpl" />
+
+</beans>

encuestame-mvc/src/test/java/org/encuestame/mvc/test/config/AbstractJsonMvcUnitBeans.java

 @ContextConfiguration(locations = {
         "classpath:encuestame-test-json-context.xml",
         "classpath:encuestame-rss-context.xml",
+        "classpath:encuestame-upload-context.xml",
         "classpath:encuestame-param-test-context.xml" })
 public abstract class AbstractJsonMvcUnitBeans extends AbstractSpringSecurityContext {
 

encuestame-war/src/main/webapp/WEB-INF/web.xml

             classpath:encuestame-email-context.xml,
             classpath:encuestame-param-context.xml,
             <!-- classpath:encuestame-report-context.xml,-->
+            classpath:encuestame-upload-context.xml,
             classpath:encuestame-quartz-context.xml
             classpath:encuestame-rss-context.xml,
             classpath:encuestame-mvc-context.xml,
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.