dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #24290
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11880: Added west africa community flag
------------------------------------------------------------
revno: 11880
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-09-03 16:53:19 +0200
message:
Added west africa community flag
added:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/east_africa_community.png
modified:
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
dhis-2/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-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2013-09-01 21:38:52 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2013-09-03 14:53:19 +0000
@@ -608,6 +608,7 @@
<value>congo_brazzaville</value>
<value>congo_kinshasa</value>
<value>ecuador</value>
+ <value>east_africa_community</value>
<value>ethiopia</value>
<value>gambia</value>
<value>ghana</value>
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/east_africa_community.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/east_africa_community.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/east_africa_community.png 2013-09-03 14:53:19 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2013-08-16 12:29:21 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2013-09-03 14:53:19 +0000
@@ -681,6 +681,7 @@
vietnam=Vietnam
pepfar=PEPFAR
nigeria=Nigeria
+east_africa_community=East Africa Community
ivory_coast=Ivory Coast
botswana=Botswana
global_fund=Global Fund
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2013-08-22 13:19:57 +0000
+++ dhis-2/pom.xml 2013-09-03 14:53:19 +0000
@@ -138,102 +138,104 @@
</reporting>
<build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.12</version>
- <configuration>
- <systemProperties>
- <property>
- <name>org.hisp.dhis.test</name>
- <value>true</value>
- </property>
- </systemProperties>
- <argLine>-Xmx256m</argLine>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.3</version>
- <configuration>
- <findbugsXmlOutput>true</findbugsXmlOutput>
- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
- <xmlOutput>true</xmlOutput>
- <excludeFilterFile>${rootDir}findbugs-exclude.xml</excludeFilterFile>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <phase>generate-resources</phase>
+ <pluginManagement>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.12</version>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>org.hisp.dhis.test</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ <argLine>-Xmx256m</argLine>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.3</version>
+ <configuration>
+ <findbugsXmlOutput>true</findbugsXmlOutput>
+ <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
+ <xmlOutput>true</xmlOutput>
+ <excludeFilterFile>${rootDir}findbugs-exclude.xml</excludeFilterFile>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <tstamp>
+ <format property="now" pattern="yyyy-MM-dd HH:mm:ss" />
+ </tstamp>
+ <mkdir dir="${project.build.outputDirectory}" />
+ <exec executable="bzr" outputproperty="revision" failifexecutionfails="false">
+ <arg value="revno" />
+ </exec>
+ <echo file="${project.build.outputDirectory}/build.properties"
+ message="build.version = ${project.version} build.time = ${now} build.revision = ${revision} " />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
+ <artifactId>maven-java-formatter-plugin</artifactId>
+ <version>0.3.1</version>
<configuration>
- <target>
- <tstamp>
- <format property="now" pattern="yyyy-MM-dd HH:mm:ss" />
- </tstamp>
- <mkdir dir="${project.build.outputDirectory}" />
- <exec executable="bzr" outputproperty="revision" failifexecutionfails="false">
- <arg value="revno" />
- </exec>
- <echo file="${project.build.outputDirectory}/build.properties"
- message="build.version = ${project.version} build.time = ${now} build.revision = ${revision} " />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <version>0.3.1</version>
- <configuration>
- <configFile>${rootDir}DHISFormatter.xml</configFile>
- <lineEnding>LF</lineEnding>
- </configuration>
- <!-- Uncomment the following to add autoformatting when building -->
- <!--
- <executions>
- <execution>
- <goals>
- <goal>format</goal>
- </goals>
- </execution>
- </executions>
- -->
- </plugin>
- </plugins>
+ <configFile>${rootDir}DHISFormatter.xml</configFile>
+ <lineEnding>LF</lineEnding>
+ </configuration>
+ <!-- Uncomment the following to add autoformatting when building -->
+ <!--
+ <executions>
+ <execution>
+ <goals>
+ <goal>format</goal>
+ </goals>
+ </execution>
+ </executions>
+ -->
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencyManagement>
