dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5172
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-11-16 09:00:32 +0000
message:
  removed unused bean
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml	2011-11-12 15:46:34 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml	2011-11-16 09:00:32 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-             xmlns:beans="http://www.springframework.org/schema/beans";
-             xmlns:context="http://www.springframework.org/schema/context";
-             xmlns:mvc="http://www.springframework.org/schema/mvc";
-             xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+       xmlns="http://www.springframework.org/schema/beans";
+       xmlns:context="http://www.springframework.org/schema/context";
+       xmlns:mvc="http://www.springframework.org/schema/mvc";
+       xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
     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";>
 
@@ -11,32 +11,30 @@
 
   <context:component-scan base-package="org.hisp.dhis.api" />
 
-  <beans:bean class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver">
-    <beans:property name="order" value="1" />
-    <beans:property name="mediaTypes">
-      <beans:map>
-        <beans:entry key="json" value="application/json" />
-        <beans:entry key="jsonp" value="application/javascript" />
-        <beans:entry key="xml" value="application/xml" />
-      </beans:map>
-    </beans:property>
-
-    <beans:property name="defaultViews">
-      <beans:list>
-        <beans:bean class="org.hisp.dhis.api.view.ExtendedMappingJacksonView" />
-
-        <beans:bean class="org.hisp.dhis.api.view.ExtendedMappingJacksonView">
-          <beans:constructor-arg name="withPadding" value="true" />
-        </beans:bean>
-
-        <beans:bean class="org.hisp.dhis.api.view.Jaxb2View" />
-      </beans:list>
-    </beans:property>
-
-    <beans:property name="defaultContentType" value="application/xml" />
-    <beans:property name="favorParameter" value="true" />
-  </beans:bean>
-
-  <beans:bean class="org.hisp.dhis.api.converter.Jaxb2HttpMessageConverter" />
-
-</beans:beans>
+  <bean class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver">
+    <property name="order" value="1" />
+    <property name="mediaTypes">
+      <map>
+        <entry key="json" value="application/json" />
+        <entry key="jsonp" value="application/javascript" />
+        <entry key="xml" value="application/xml" />
+      </map>
+    </property>
+
+    <property name="defaultViews">
+      <list>
+        <bean class="org.hisp.dhis.api.view.ExtendedMappingJacksonView" />
+
+        <bean class="org.hisp.dhis.api.view.ExtendedMappingJacksonView">
+          <constructor-arg name="withPadding" value="true" />
+        </bean>
+
+        <bean class="org.hisp.dhis.api.view.Jaxb2View" />
+      </list>
+    </property>
+
+    <property name="defaultContentType" value="application/xml" />
+    <property name="favorParameter" value="true" />
+  </bean>
+
+</beans>