------------------------------------------------------------
revno: 9075
committer: Lars Helge Øverland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Fri 2012-11-16 15:01:45 +0100
message:
Removed sms from standard build because it introduces an in-memory activemq
modified:
dhis-2/dhis-services/pom.xml
dhis-2/dhis-web/dhis-web-portal/pom.xml
dhis-2/dhis-web/pom.xml
resources/sql/div.sql
--
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/pom.xml'
--- dhis-2/dhis-services/pom.xml 2012-11-14 16:52:37 +0000
+++ dhis-2/dhis-services/pom.xml 2012-11-16 14:01:45 +0000
@@ -24,7 +24,6 @@
<module>dhis-service-aggregationengine-default</module>
<module>dhis-service-patient</module>
<module>dhis-service-mobile</module>
- <module>dhis-service-sms</module>
<module>dhis-service-integration</module>
</modules>
=== modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml'
--- dhis-2/dhis-web/dhis-web-portal/pom.xml 2012-11-15 08:44:31 +0000
+++ dhis-2/dhis-web/dhis-web-portal/pom.xml 2012-11-16 14:01:45 +0000
@@ -41,12 +41,14 @@
</dependency>
<!-- Web maintenance modules -->
+ <!--
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-sms</artifactId>
<version>${project.version}</version>
<type>war</type>
- </dependency>
+ </dependency>
+ -->
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-maintenance-datadictionary</artifactId>
=== modified file 'dhis-2/dhis-web/pom.xml'
--- dhis-2/dhis-web/pom.xml 2012-11-15 08:44:31 +0000
+++ dhis-2/dhis-web/pom.xml 2012-11-16 14:01:45 +0000
@@ -28,7 +28,6 @@
<module>dhis-web-light</module>
<module>dhis-web-mobile</module>
<module>dhis-web-portal</module>
- <module>dhis-web-sms</module>
</modules>
<build>
<plugins>
=== modified file 'resources/sql/div.sql'
--- resources/sql/div.sql 2012-11-12 18:23:15 +0000
+++ resources/sql/div.sql 2012-11-16 14:01:45 +0000
@@ -76,7 +76,7 @@
-- User overview (Postgres only)
-select u.username, u.lastlogin, ui.surname, ui.firstname, ui.email, ui.phonenumber, ui.jobtitle, (
+select u.username, u.lastlogin, u.selfregistered, ui.surname, ui.firstname, ui.email, ui.phonenumber, ui.jobtitle, (
select array_to_string( array(
select name from userrole ur
join userrolemembers urm using(userroleid)
_______________________________________________
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
