dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #27598
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13741: renamed webapi-fred.xml -> webapi-ohie.xml
------------------------------------------------------------
revno: 13741
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-01-15 20:30:51 +0700
message:
renamed webapi-fred.xml -> webapi-ohie.xml
removed:
dhis-2/dhis-web/dhis-web-ohie/src/main/resources/META-INF/dhis/webapi-fred.xml
added:
dhis-2/dhis-web/dhis-web-ohie/src/main/resources/META-INF/dhis/webapi-ohie.xml
modified:
dhis-2/dhis-web/dhis-web-ohie/src/main/webapp/WEB-INF/web.xml
dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.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
=== removed file 'dhis-2/dhis-web/dhis-web-ohie/src/main/resources/META-INF/dhis/webapi-fred.xml'
--- dhis-2/dhis-web/dhis-web-ohie/src/main/resources/META-INF/dhis/webapi-fred.xml 2014-01-15 13:10:05 +0000
+++ dhis-2/dhis-web/dhis-web-ohie/src/main/resources/META-INF/dhis/webapi-fred.xml 1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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:sec="http://www.springframework.org/schema/security";
- xmlns:mvc="http://www.springframework.org/schema/mvc";
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
- http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd
- http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd";>
-
- <sec:global-method-security pre-post-annotations="enabled" />
-
- <context:component-scan base-package="org.hisp.dhis.web.ohie.fred" />
-
- <context:component-scan base-package="org.hisp.dhis.web.ohie.csd" />
-
- <context:annotation-config />
-
- <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
- <property name="converters">
- <set>
- <ref bean="facilityToOrganisationUnitConverter" />
- <ref bean="facilityToSimpleFeature" />
- <ref bean="organisationUnitToFacilityConverter" />
- <ref bean="organisationUnitToSimpleFeature" />
- </set>
- </property>
- </bean>
-
- <!-- TODO: doesn't seem to work right now, will investigate later
- <bean id="conversionService" class="org.springframework.format.support.FormattingConversionServiceFactoryBean">
- <property name="converters">
- <set>
- <ref bean="toFacilityConverter" />
- <ref bean="toOrganisationUnitConverter" />
- </set>
- </property>
-
- <property name="formatterRegistrars">
- <set>
- <bean class="org.springframework.format.datetime.joda.JodaTimeFormatterRegistrar">
- <property name="useIsoFormat" value="true" />
- </bean>
- </set>
- </property>
- </bean>
- -->
-
- <bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean" />
-
- <mvc:annotation-driven conversion-service="conversionService" validator="validator" />
-
- <bean id="headerContentNegotiationStrategy" class="org.springframework.web.accept.HeaderContentNegotiationStrategy" />
-
- <bean id="pathExtensionContentNegotiationStrategy" class="org.springframework.web.accept.PathExtensionContentNegotiationStrategy">
- <constructor-arg name="mediaTypes">
- <map>
- <entry key="json" value="application/json" />
- </map>
- </constructor-arg>
- </bean>
-
- <bean class="org.springframework.web.servlet.view.json.MappingJackson2JsonView">
- <property name="objectMapper" ref="objectMapperFactoryBean" />
- <property name="modelKey" value="entity" />
- <property name="extractValueFromSingleKeyModel" value="true" />
- </bean>
-
- <bean class="org.springframework.oxm.jaxb.Jaxb2Marshaller">
- <property name="packagesToScan" value="org.hisp.dhis.web.ohie.csd.domain" />
- </bean>
-
- <mvc:annotation-driven>
- <mvc:message-converters register-defaults="false">
- <bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
- <property name="objectMapper" ref="objectMapperFactoryBean" />
- </bean>
- </mvc:message-converters>
- </mvc:annotation-driven>
-
- <bean id="contentNegotiationManager" class="org.springframework.web.accept.ContentNegotiationManager">
- <constructor-arg>
- <list>
- <ref bean="pathExtensionContentNegotiationStrategy" />
- <ref bean="headerContentNegotiationStrategy" />
- </list>
- </constructor-arg>
- </bean>
-
- <bean class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver">
- <property name="contentNegotiationManager" ref="contentNegotiationManager" />
-
- <property name="defaultViews">
- <list>
- <ref bean="org.springframework.web.servlet.view.json.MappingJackson2JsonView" />
- </list>
- </property>
- </bean>
-
-</beans>
=== added file 'dhis-2/dhis-web/dhis-web-ohie/src/main/resources/META-INF/dhis/webapi-ohie.xml'
--- dhis-2/dhis-web/dhis-web-ohie/src/main/resources/META-INF/dhis/webapi-ohie.xml 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-ohie/src/main/resources/META-INF/dhis/webapi-ohie.xml 2014-01-15 13:30:51 +0000
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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:sec="http://www.springframework.org/schema/security";
+ xmlns:mvc="http://www.springframework.org/schema/mvc";
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
+ http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd
+ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd";>
+
+ <sec:global-method-security pre-post-annotations="enabled" />
+
+ <context:component-scan base-package="org.hisp.dhis.web.ohie.fred" />
+
+ <context:component-scan base-package="org.hisp.dhis.web.ohie.csd" />
+
+ <context:annotation-config />
+
+ <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
+ <property name="converters">
+ <set>
+ <ref bean="facilityToOrganisationUnitConverter" />
+ <ref bean="facilityToSimpleFeature" />
+ <ref bean="organisationUnitToFacilityConverter" />
+ <ref bean="organisationUnitToSimpleFeature" />
+ </set>
+ </property>
+ </bean>
+
+ <!-- TODO: doesn't seem to work right now, will investigate later
+ <bean id="conversionService" class="org.springframework.format.support.FormattingConversionServiceFactoryBean">
+ <property name="converters">
+ <set>
+ <ref bean="toFacilityConverter" />
+ <ref bean="toOrganisationUnitConverter" />
+ </set>
+ </property>
+
+ <property name="formatterRegistrars">
+ <set>
+ <bean class="org.springframework.format.datetime.joda.JodaTimeFormatterRegistrar">
+ <property name="useIsoFormat" value="true" />
+ </bean>
+ </set>
+ </property>
+ </bean>
+ -->
+
+ <bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean" />
+
+ <mvc:annotation-driven conversion-service="conversionService" validator="validator" />
+
+ <bean id="headerContentNegotiationStrategy" class="org.springframework.web.accept.HeaderContentNegotiationStrategy" />
+
+ <bean id="pathExtensionContentNegotiationStrategy" class="org.springframework.web.accept.PathExtensionContentNegotiationStrategy">
+ <constructor-arg name="mediaTypes">
+ <map>
+ <entry key="json" value="application/json" />
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <bean class="org.springframework.web.servlet.view.json.MappingJackson2JsonView">
+ <property name="objectMapper" ref="objectMapperFactoryBean" />
+ <property name="modelKey" value="entity" />
+ <property name="extractValueFromSingleKeyModel" value="true" />
+ </bean>
+
+ <bean class="org.springframework.oxm.jaxb.Jaxb2Marshaller">
+ <property name="packagesToScan" value="org.hisp.dhis.web.ohie.csd.domain" />
+ </bean>
+
+ <mvc:annotation-driven>
+ <mvc:message-converters register-defaults="false">
+ <bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
+ <property name="objectMapper" ref="objectMapperFactoryBean" />
+ </bean>
+ </mvc:message-converters>
+ </mvc:annotation-driven>
+
+ <bean id="contentNegotiationManager" class="org.springframework.web.accept.ContentNegotiationManager">
+ <constructor-arg>
+ <list>
+ <ref bean="pathExtensionContentNegotiationStrategy" />
+ <ref bean="headerContentNegotiationStrategy" />
+ </list>
+ </constructor-arg>
+ </bean>
+
+ <bean class="org.springframework.web.servlet.view.ContentNegotiatingViewResolver">
+ <property name="contentNegotiationManager" ref="contentNegotiationManager" />
+
+ <property name="defaultViews">
+ <list>
+ <ref bean="org.springframework.web.servlet.view.json.MappingJackson2JsonView" />
+ </list>
+ </property>
+ </bean>
+
+</beans>
=== modified file 'dhis-2/dhis-web/dhis-web-ohie/src/main/webapp/WEB-INF/web.xml'
--- dhis-2/dhis-web/dhis-web-ohie/src/main/webapp/WEB-INF/web.xml 2014-01-15 13:02:27 +0000
+++ dhis-2/dhis-web/dhis-web-ohie/src/main/webapp/WEB-INF/web.xml 2014-01-15 13:30:51 +0000
@@ -95,11 +95,11 @@
</listener>
<servlet>
- <servlet-name>webapi-fred</servlet-name>
+ <servlet-name>ohie</servlet-name>
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
<init-param>
<param-name>contextConfigLocation</param-name>
- <param-value>classpath*:/META-INF/dhis/webapi-fred.xml</param-value>
+ <param-value>classpath*:/META-INF/dhis/webapi-ohie.xml</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -117,12 +117,12 @@
<!-- Web API -->
<servlet-mapping>
- <servlet-name>webapi-fred</servlet-name>
+ <servlet-name>ohie</servlet-name>
<url-pattern>/api-fred</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>webapi-fred</servlet-name>
+ <servlet-name>ohie</servlet-name>
<url-pattern>/api-fred/*</url-pattern>
</servlet-mapping>
=== modified file 'dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml'
--- dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml 2013-04-30 16:15:42 +0000
+++ dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml 2014-01-15 13:30:51 +0000
@@ -124,11 +124,11 @@
</servlet>
<servlet>
- <servlet-name>webapi-fred</servlet-name>
+ <servlet-name>ohie</servlet-name>
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
<init-param>
<param-name>contextConfigLocation</param-name>
- <param-value>classpath*:/META-INF/dhis/webapi-fred.xml</param-value>
+ <param-value>classpath*:/META-INF/dhis/webapi-ohie.xml</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -160,12 +160,12 @@
<!-- FRED Web-API -->
<servlet-mapping>
- <servlet-name>webapi-fred</servlet-name>
+ <servlet-name>ohie</servlet-name>
<url-pattern>/api-fred</url-pattern>
</servlet-mapping>
<servlet-mapping>
- <servlet-name>webapi-fred</servlet-name>
+ <servlet-name>ohie</servlet-name>
<url-pattern>/api-fred/*</url-pattern>
</servlet-mapping>
