Motechupgrade

docs/source/demos/mds/mds_with_code.rst

@@ -60,7 +60,7 @@ Defining an entity in MDS is as simple as writing a Java class and defining a fe
     import org.motechproject.mds.annotations.Field;
     import org.motechproject.mds.annotations.UIDisplayable;
 
-    import org.apache.commons.lang.ObjectUtils;
+    import org.apache.commons.lang3.ObjectUtils;
     import org.joda.time.DateTime;
     import java.util.List;
     import java.util.Objects;
@@ -433,7 +433,7 @@ Let's take a look at Patient. Here is how we might specify the entity:
     import org.motechproject.mds.annotations.Field;
     import org.motechproject.mds.annotations.Cascade;
 
-    import org.apache.commons.lang.ObjectUtils;
+    import org.apache.commons.lang3.ObjectUtils;
     import java.util.List;
     import java.util.Objects;
 
@@ -476,7 +476,7 @@ The domain object for Provider is similar:
     import org.motechproject.mds.annotations.Field;
     import org.motechproject.mds.annotations.Cascade;
 
-    import org.apache.commons.lang.ObjectUtils;
+    import org.apache.commons.lang3.ObjectUtils;
     import java.util.List;
     import java.util.Objects;
 
@@ -523,7 +523,7 @@ At the very least, a Concept in a concept dictionary requires a name and a data
     import org.motechproject.mds.annotations.UIDisplayable;
 
     import javax.jdo.annotations.Unique;
-    import org.apache.commons.lang.ObjectUtils;
+    import org.apache.commons.lang3.ObjectUtils;
     import java.util.List;
     import java.util.Objects;
 
@@ -577,7 +577,7 @@ Hence, our Observation entity look like this:
     import org.motechproject.mds.annotations.Field;
 
     import javax.jdo.annotations.Persistent;
-    import org.apache.commons.lang.ObjectUtils;
+    import org.apache.commons.lang3.ObjectUtils;
     import java.util.List;
     import java.util.Objects;
     import java.util.Date;
@@ -635,7 +635,7 @@ Because an Encounter may (and typically will) include numerous Observations abou
     import org.motechproject.mds.annotations.Entity;
     import org.motechproject.mds.annotations.Field;
 
-    import org.apache.commons.lang.ObjectUtils;
+    import org.apache.commons.lang3.ObjectUtils;
     import java.util.Objects;
     import java.util.Date;
     import java.util.Set;

docs/source/deployment/felix_webconsole.rst

@@ -0,0 +1,32 @@
+===================================
+Using Felix Web Console with MOTECH
+===================================
+
+.. contents:: Table of Contents
+   :depth: 2
+
+Overview
+========
+
+MOTECH is built on top of the `Felix OSGi Framework <http://felix.apache.org/>`_. Thanks to this, users can install the Felix Web Console
+on their installations and then use it for monitoring the server.
+
+Benefits of using the Web Console
+=================================
+
+The Felix Web Console allows viewing details of all bundles installed in the system. It also allows installing and
+uninstalling modules. Generally speaking the only benefit of using the web console over the MOTECH Admin module
+is that it gives access to bundles that are not MOTECH modules - for example third party libraries such as Spring.
+More information on the Web Console can be found in the `Web Console Documentation <http://felix.apache.org/documentation/subprojects/apache-felix-web-console.html>`_.
+
+Installation
+============
+
+The Web Console can be installed by simply downloading it from the `Felix Downloads Page<http://felix.apache.org/downloads.cgi>`_ into the
+*~/.motech/bundles* directory belonging to the user running MOTECH. The console should become active after starting MOTECH.
+
+Accessing the Console
+=====================
+
+The console should be available after appending *module/system/console* to your MOTECH server url. The default login
+is admin/admin. Refer to the `Web Console Documentation <http://felix.apache.org/documentation/subprojects/apache-felix-web-console.html>`_ for ways to change it.

docs/source/deployment/index.rst

@@ -6,4 +6,5 @@ Deployment
     :maxdepth: 1
 
     sticky_session_apache
-    multibyte_characters
+    multibyte_characters
+    felix_webconsole

docs/source/development/external_bundles.rst

@@ -128,7 +128,7 @@ pom.xml file for creating a bundle from org.example.example-artifact, version 1.
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.3.4</version>
+                    <version>3.5.1</version>
                     <extensions>true</extensions>
                     <configuration>
                         <instructions>

docs/source/get_started/model_data/model_data.rst

@@ -870,6 +870,49 @@ lookup field, the customOperator field of the @LookupField annotation has to be
     The list of standard JDO operators that can be used in lookups is defined as constants in the
     class **org.motechproject.mds.util.Constants.Operators**.
 
+Defining editable lookups for DDE entities
+##########################################
+
+One way to define lookups for DDE entities is to include a :code:`mds-lookups.json` file in module resource directory.
+The file should be a valid array of :code:`EntityLookups` class objects. Every lookup defined in the file will be added
+only once, so even after user had deleted lookup it won't be recreated during module or MOTECH restart. This gives the
+user complete control over those lookups without any restrictions. The unique identifier of every lookup is its
+entity class name and lookup name combination. This is intended way for modules to define lookups that should be made
+editable by the end user. Backend code should not depend on these lookups.
+
+Example :code:`mds-lookups.json` file.
+
+.. code-block:: json
+
+    [
+        {
+            "entityClassName" : "org.motechproject.tasks.domain.Task",
+            "lookups" : [
+                {
+                    "lookupName" : "Find Task by Owner",
+                    "singleObjectReturn" : false,
+                    "exposedViaRest" : false,
+                    "lookupFields" : [
+                        {
+                            "name" : "owner",
+                            "type" : "VALUE",
+                            "customOperator" : "\u003d\u003d",
+                            "useGenericParam" : false
+                        }
+                    ],
+                    "readOnly" : false,
+                    "methodName" : "findTaskByOwner",
+                    "fieldsOrder" : [
+                      "owner"
+                    ]
+                }
+            ]
+        }
+    ]
+
+Including the example json in Tasks module will result in adding lookup for Task entity that will return all tasks that
+are owned by the specified user.
+
 Programmatic usage of DDE entities
 ##################################
 

modules/admin/pom.xml

@@ -3,13 +3,13 @@
     <parent>
         <artifactId>motech</artifactId>
         <groupId>org.motechproject</groupId>
-        <version>0.27-SNAPSHOT</version>
+        <version>0.27.8</version>
         <relativePath>../../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>motech-admin</artifactId>
-    <version>0.27-SNAPSHOT</version>
+    <version>0.27.8</version>
 
     <name>MOTECH Admin</name>
     <packaging>bundle</packaging>
@@ -65,29 +65,33 @@
             <groupId>org.apache.activemq</groupId>
             <artifactId>org.motechproject.org.apache.activemq</artifactId>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>org.motechproject.org.codehaus.jackson</artifactId>
+        </dependency>-->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>javax.validation</groupId>
-            <artifactId>com.springsource.javax.validation</artifactId>
-        </dependency>
+            <artifactId>validation-api</artifactId>
+        </dependency>-->
         <!-- test -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test-mvc</artifactId>
+        <!--<dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.spring-test-mvc</artifactId>
             <scope>test</scope>
-        </dependency>
-        <dependency>
+        </dependency>-->
+        <!--<dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
             <scope>test</scope>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.sonatype.aether</groupId>
             <artifactId>org.motechproject.aether-api</artifactId>
@@ -154,7 +158,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.4</version>
+                <version>3.5.1</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -177,6 +181,12 @@
                             org.springframework.web.servlet.config,
                             org.eclipse.gemini.blueprint.config,
                             org.springframework.security.config,
+                            org.datanucleus.enhancement,
+                            org.springframework.validation.beanvalidation,
+                            org.springframework.core,
+                            org.springframework.cglib.proxy,
+                            org.springframework.cglib.core,
+                            org.springframework.cglib.reflect,
                             *
                         </Import-Package>
                         <Export-Package>

modules/admin/src/main/java/org/motechproject/admin/bundles/DefaultBundleFilter.java

@@ -1,6 +1,6 @@
 package org.motechproject.admin.bundles;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.springframework.beans.factory.annotation.Autowired;

modules/admin/src/main/java/org/motechproject/admin/bundles/ExtendedBundleInformation.java

@@ -1,6 +1,6 @@
 package org.motechproject.admin.bundles;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.motechproject.server.api.BundleInformation;
 import org.osgi.framework.Bundle;

modules/admin/src/main/java/org/motechproject/admin/bundles/ImportExportResolver.java

@@ -1,6 +1,6 @@
 package org.motechproject.admin.bundles;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.packageadmin.ExportedPackage;

modules/admin/src/main/java/org/motechproject/admin/domain/NotificationRule.java

@@ -1,6 +1,6 @@
 package org.motechproject.admin.domain;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.motechproject.admin.messages.ActionType;
 import org.motechproject.admin.messages.Level;
 import org.motechproject.mds.annotations.Access;
@@ -21,6 +21,8 @@
 @Entity(recordHistory = true)
 @Access(value = SecurityMode.PERMISSIONS, members = {"manageMessages"})
 public class NotificationRule {
+
+    @Field
     private Long id;
 
     @Field(required = true)

modules/admin/src/main/java/org/motechproject/admin/domain/StatusMessage.java

@@ -18,6 +18,7 @@
 @Entity(nonEditable = true)
 @Access(value = SecurityMode.PERMISSIONS, members = {"manageMessages"})
 public class StatusMessage {
+
     @Field(required = true)
     private String text;