Merge authors: Jan Henrik Ă˜verland (janhenrik-overland) ------------------------------------------------------------ revno: 16445 [merge] committer: Jan Henrik Overland <janhenrik.overl...@gmail.com> branch nick: dhis2 timestamp: Tue 2014-08-19 13:59:24 +0200 message: EC TC moved to dhis-web-apps. removed: dhis-2/dhis-web/dhis-web-event-capture/ dhis-2/dhis-web/dhis-web-event-capture/pom.xml dhis-2/dhis-web/dhis-web-event-capture/src/ dhis-2/dhis-web/dhis-web-event-capture/src/main/ dhis-2/dhis-web/dhis-web-event-capture/src/main/resources/ dhis-2/dhis-web/dhis-web-event-capture/src/main/resources/struts.xml dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/WEB-INF/ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/WEB-INF/classes/ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/WEB-INF/classes/velocity.properties dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/WEB-INF/web.xml dhis-2/dhis-web/dhis-web-tracker-capture/ dhis-2/dhis-web/dhis-web-tracker-capture/pom.xml dhis-2/dhis-web/dhis-web-tracker-capture/src/ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/resources/ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/resources/struts.xml dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/WEB-INF/ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/WEB-INF/classes/ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/WEB-INF/classes/velocity.properties dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/WEB-INF/web.xml renamed: dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/ => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/ modified: dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml dhis-2/dhis-web/dhis-web-portal/india-pom.xml dhis-2/dhis-web/dhis-web-portal/pom.xml dhis-2/dhis-web/pom.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-apps/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml 2014-08-19 11:43:34 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml 2014-08-19 11:58:26 +0000 @@ -36,7 +36,6 @@ </action> </package> -<!-- <package name="dhis-web-event-capture" extends="dhis-web-commons" namespace="/dhis-web-event-capture"> <action name="index" class="org.hisp.dhis.commons.action.NoAction"> <result name="success" type="redirect">index.html</result> @@ -48,6 +47,5 @@ <result name="success" type="redirect">index.html</result> </action> </package> ---> </struts> === renamed directory 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/dhis-web-event-capture' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture' === renamed directory 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture' === removed directory 'dhis-2/dhis-web/dhis-web-event-capture' === removed file 'dhis-2/dhis-web/dhis-web-event-capture/pom.xml' --- dhis-2/dhis-web/dhis-web-event-capture/pom.xml 2014-07-23 14:53:00 +0000 +++ dhis-2/dhis-web/dhis-web-event-capture/pom.xml 1970-01-01 00:00:00 +0000 @@ -1,66 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hisp.dhis</groupId> - <artifactId>dhis-web</artifactId> - <version>2.17-SNAPSHOT</version> - </parent> - - <artifactId>dhis-web-event-capture</artifactId> - <packaging>war</packaging> - <name>DHIS Web Event Capture</name> - - <build> - <finalName>dhis-web-event-capture</finalName> - </build> - - <dependencies> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <!-- DHIS --> - - <dependency> - <groupId>org.hisp.dhis</groupId> - <artifactId>dhis-api</artifactId> - </dependency> - <dependency> - <groupId>org.hisp.dhis</groupId> - <artifactId>dhis-web-commons</artifactId> - </dependency> - <dependency> - <groupId>org.hisp.dhis</groupId> - <artifactId>dhis-web-commons-resources</artifactId> - <type>war</type> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.hisp.dhis</groupId> - <artifactId>dhis-web-api</artifactId> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.hisp.dhis</groupId> - <artifactId>dhis-service-core</artifactId> - </dependency> - <dependency> - <groupId>org.hisp.dhis</groupId> - <artifactId>dhis-service-tracker</artifactId> - </dependency> - <dependency> - <groupId>org.hisp.dhis</groupId> - <artifactId>dhis-service-eventreporting</artifactId> - </dependency> - - </dependencies> - - <properties> - <rootDir>../../</rootDir> - </properties> -</project> === removed directory 'dhis-2/dhis-web/dhis-web-event-capture/src' === removed directory 'dhis-2/dhis-web/dhis-web-event-capture/src/main' === removed directory 'dhis-2/dhis-web/dhis-web-event-capture/src/main/resources' === removed file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-event-capture/src/main/resources/struts.xml 2014-03-05 11:07:39 +0000 +++ dhis-2/dhis-web/dhis-web-event-capture/src/main/resources/struts.xml 1970-01-01 00:00:00 +0000 @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE struts PUBLIC -"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" -"http://struts.apache.org/dtds/struts-2.0.dtd"> -<struts> - - <include file="dhis-web-commons.xml" /> - - <package name="dhis-web-event-capture" extends="dhis-web-commons" namespace="/dhis-web-event-capture"> - - <action name="index" class="org.hisp.dhis.commons.action.NoAction"> - <result name="success" type="redirect">index.html</result> - </action> - - </package> -</struts> === removed directory 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp' === removed directory 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/WEB-INF' === removed directory 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/WEB-INF/classes' === removed file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/WEB-INF/classes/velocity.properties' --- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/WEB-INF/classes/velocity.properties 2014-02-14 10:59:22 +0000 +++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/WEB-INF/classes/velocity.properties 1970-01-01 00:00:00 +0000 @@ -1,3 +0,0 @@ -resource.loader = dev -dev.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader -dev.resource.loader.path = src/main/webapp,../dhis-web-commons-resources/src/main/webapp \ No newline at end of file === removed file 'dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/WEB-INF/web.xml' --- dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/WEB-INF/web.xml 2014-02-14 10:59:22 +0000 +++ dhis-2/dhis-web/dhis-web-event-capture/src/main/webapp/WEB-INF/web.xml 1970-01-01 00:00:00 +0000 @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/dtd/web-app_2_3.dtd"> -<web-app> - <display-name>DHIS Web Event Capture</display-name> - - <context-param> - <param-name>contextConfigLocation</param-name> - <param-value>classpath*:/META-INF/dhis/beans.xml</param-value> - </context-param> - <context-param> - <param-name>automaticAccessType</param-name> - <param-value>ghostAdmin</param-value> - </context-param> - - <filter> - <filter-name>RedirectFilter</filter-name> - <filter-class>org.hisp.dhis.servlet.filter.HttpRedirectFilter</filter-class> - <init-param> - <param-name>redirectPath</param-name> - <param-value>dhis-web-event-capture/index.action</param-value> - </init-param> - </filter> - <filter> - <filter-name>OpenSessionInViewFilter</filter-name> - <filter-class>org.springframework.orm.hibernate4.support.OpenSessionInViewFilter</filter-class> - </filter> - <filter> - <filter-name>springSecurityFilterChain</filter-name> - <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class> - </filter> - <filter> - <filter-name>Struts</filter-name> - <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class> - </filter> - <filter> - <filter-name>encoding-filter</filter-name> - <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class> - <init-param> - <param-name>encoding</param-name> - <param-value>UTF-8</param-value> - </init-param> - <init-param> - <param-name>forceEncoding</param-name> - <param-value>true</param-value> - </init-param> - </filter> - - <filter-mapping> - <filter-name>encoding-filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - <filter-mapping> - <filter-name>RedirectFilter</filter-name> - <url-pattern>/</url-pattern> - </filter-mapping> - <filter-mapping> - <filter-name>OpenSessionInViewFilter</filter-name> - <url-pattern>*.action</url-pattern> - </filter-mapping> - <filter-mapping> - <filter-name>OpenSessionInViewFilter</filter-name> - <url-pattern>/api/*</url-pattern> - </filter-mapping> - <filter-mapping> - <filter-name>springSecurityFilterChain</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - <filter-mapping> - <filter-name>Struts</filter-name> - <url-pattern>*.action</url-pattern> - </filter-mapping> - - <listener> - <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> - </listener> - <listener> - <listener-class>org.hisp.dhis.system.startup.StartupListener</listener-class> - </listener> - - <!-- Web API --> - - <servlet> - <servlet-name>webapiServlet</servlet-name> - <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> - <init-param> - <param-name>contextConfigLocation</param-name> - <param-value>classpath*:/META-INF/dhis/servlet.xml</param-value> - </init-param> - <load-on-startup>1</load-on-startup> - </servlet> - - <servlet-mapping> - <servlet-name>webapiServlet</servlet-name> - <url-pattern>/api</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>webapiServlet</servlet-name> - <url-pattern>/api/*</url-pattern> - </servlet-mapping> - -</web-app> === modified file 'dhis-2/dhis-web/dhis-web-portal/india-pom.xml' --- dhis-2/dhis-web/dhis-web-portal/india-pom.xml 2014-08-19 09:38:25 +0000 +++ dhis-2/dhis-web/dhis-web-portal/india-pom.xml 2014-08-19 11:58:26 +0000 @@ -168,18 +168,6 @@ </dependency> <dependency> <groupId>org.hisp.dhis</groupId> - <artifactId>dhis-web-event-capture</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.hisp.dhis</groupId> - <artifactId>dhis-web-tracker-capture</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.hisp.dhis</groupId> <artifactId>dhis-web-apps</artifactId> <version>${project.version}</version> <type>war</type> === modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml' --- dhis-2/dhis-web/dhis-web-portal/pom.xml 2014-08-18 14:37:59 +0000 +++ dhis-2/dhis-web/dhis-web-portal/pom.xml 2014-08-19 11:58:26 +0000 @@ -168,18 +168,6 @@ </dependency> <dependency> <groupId>org.hisp.dhis</groupId> - <artifactId>dhis-web-event-capture</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.hisp.dhis</groupId> - <artifactId>dhis-web-tracker-capture</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.hisp.dhis</groupId> <artifactId>dhis-web-apps</artifactId> <version>${project.version}</version> <type>war</type> === removed directory 'dhis-2/dhis-web/dhis-web-tracker-capture' === removed file 'dhis-2/dhis-web/dhis-web-tracker-capture/pom.xml' --- dhis-2/dhis-web/dhis-web-tracker-capture/pom.xml 2014-07-23 14:53:00 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/pom.xml 1970-01-01 00:00:00 +0000 @@ -1,66 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hisp.dhis</groupId> - <artifactId>dhis-web</artifactId> - <version>2.17-SNAPSHOT</version> - </parent> - - <artifactId>dhis-web-tracker-capture</artifactId> - <packaging>war</packaging> - <name>DHIS Web Tracker Capture</name> - - <build> - <finalName>dhis-web-tracker-capture</finalName> - </build> - - <dependencies> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <!-- DHIS --> - - <dependency> - <groupId>org.hisp.dhis</groupId> - <artifactId>dhis-api</artifactId> - </dependency> - <dependency> - <groupId>org.hisp.dhis</groupId> - <artifactId>dhis-web-commons</artifactId> - </dependency> - <dependency> - <groupId>org.hisp.dhis</groupId> - <artifactId>dhis-web-commons-resources</artifactId> - <type>war</type> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.hisp.dhis</groupId> - <artifactId>dhis-web-api</artifactId> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.hisp.dhis</groupId> - <artifactId>dhis-service-core</artifactId> - </dependency> - <dependency> - <groupId>org.hisp.dhis</groupId> - <artifactId>dhis-service-tracker</artifactId> - </dependency> - <dependency> - <groupId>org.hisp.dhis</groupId> - <artifactId>dhis-service-eventreporting</artifactId> - </dependency> - - </dependencies> - - <properties> - <rootDir>../../</rootDir> - </properties> -</project> === removed directory 'dhis-2/dhis-web/dhis-web-tracker-capture/src' === removed directory 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main' === removed directory 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/resources' === removed file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/resources/struts.xml 2014-03-17 15:59:31 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/resources/struts.xml 1970-01-01 00:00:00 +0000 @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE struts PUBLIC -"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" -"http://struts.apache.org/dtds/struts-2.0.dtd"> -<struts> - - <include file="dhis-web-commons.xml" /> - - <package name="dhis-web-tracker-capture" extends="dhis-web-commons" namespace="/dhis-web-tracker-capture"> - - <action name="index" class="org.hisp.dhis.commons.action.NoAction"> - <result name="success" type="redirect">index.html</result> - </action> - - </package> -</struts> === removed directory 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp' === removed directory 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/WEB-INF' === removed directory 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/WEB-INF/classes' === removed file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/WEB-INF/classes/velocity.properties' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/WEB-INF/classes/velocity.properties 2014-03-17 15:59:31 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/WEB-INF/classes/velocity.properties 1970-01-01 00:00:00 +0000 @@ -1,3 +0,0 @@ -resource.loader = dev -dev.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader -dev.resource.loader.path = src/main/webapp,../dhis-web-commons-resources/src/main/webapp \ No newline at end of file === removed file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/WEB-INF/web.xml' --- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/WEB-INF/web.xml 2014-03-17 15:59:31 +0000 +++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/WEB-INF/web.xml 1970-01-01 00:00:00 +0000 @@ -1,102 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/dtd/web-app_2_3.dtd"> -<web-app> - <display-name>DHIS Web Tracker Capture</display-name> - - <context-param> - <param-name>contextConfigLocation</param-name> - <param-value>classpath*:/META-INF/dhis/beans.xml</param-value> - </context-param> - <context-param> - <param-name>automaticAccessType</param-name> - <param-value>ghostAdmin</param-value> - </context-param> - - <filter> - <filter-name>RedirectFilter</filter-name> - <filter-class>org.hisp.dhis.servlet.filter.HttpRedirectFilter</filter-class> - <init-param> - <param-name>redirectPath</param-name> - <param-value>dhis-web-tracker-capture/index.action</param-value> - </init-param> - </filter> - <filter> - <filter-name>OpenSessionInViewFilter</filter-name> - <filter-class>org.springframework.orm.hibernate4.support.OpenSessionInViewFilter</filter-class> - </filter> - <filter> - <filter-name>springSecurityFilterChain</filter-name> - <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class> - </filter> - <filter> - <filter-name>Struts</filter-name> - <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class> - </filter> - <filter> - <filter-name>encoding-filter</filter-name> - <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class> - <init-param> - <param-name>encoding</param-name> - <param-value>UTF-8</param-value> - </init-param> - <init-param> - <param-name>forceEncoding</param-name> - <param-value>true</param-value> - </init-param> - </filter> - - <filter-mapping> - <filter-name>encoding-filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - <filter-mapping> - <filter-name>RedirectFilter</filter-name> - <url-pattern>/</url-pattern> - </filter-mapping> - <filter-mapping> - <filter-name>OpenSessionInViewFilter</filter-name> - <url-pattern>*.action</url-pattern> - </filter-mapping> - <filter-mapping> - <filter-name>OpenSessionInViewFilter</filter-name> - <url-pattern>/api/*</url-pattern> - </filter-mapping> - <filter-mapping> - <filter-name>springSecurityFilterChain</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - <filter-mapping> - <filter-name>Struts</filter-name> - <url-pattern>*.action</url-pattern> - </filter-mapping> - - <listener> - <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> - </listener> - <listener> - <listener-class>org.hisp.dhis.system.startup.StartupListener</listener-class> - </listener> - - <!-- Web API --> - - <servlet> - <servlet-name>webapiServlet</servlet-name> - <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> - <init-param> - <param-name>contextConfigLocation</param-name> - <param-value>classpath*:/META-INF/dhis/servlet.xml</param-value> - </init-param> - <load-on-startup>1</load-on-startup> - </servlet> - - <servlet-mapping> - <servlet-name>webapiServlet</servlet-name> - <url-pattern>/api</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>webapiServlet</servlet-name> - <url-pattern>/api/*</url-pattern> - </servlet-mapping> - -</web-app> === modified file 'dhis-2/dhis-web/pom.xml' --- dhis-2/dhis-web/pom.xml 2014-08-18 14:37:59 +0000 +++ dhis-2/dhis-web/pom.xml 2014-08-19 11:58:26 +0000 @@ -27,8 +27,6 @@ <module>dhis-web-light</module> <module>dhis-web-mobile</module> <module>dhis-web-sms</module> - <module>dhis-web-event-capture</module> - <module>dhis-web-tracker-capture</module> <module>dhis-web-apps</module> <module>dhis-web-portal</module> </modules>
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp