Merge remote-tracking branch 'upstream/master'

modules/distribution/pom.xml

@@ -409,6 +409,10 @@
 
                                 <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/statistics" />
 
+                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/patches" />
+
+                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/dropins" />
+
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps" overwrite="true">
                                     <fileset dir="src/repository/jaggeryapps"></fileset>
                                 </copy>
@@ -424,6 +428,15 @@
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/statistics" overwrite="true">
                                     <fileset dir="src/statistics" />
                                 </copy>
+
+                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/patches">
+                                    <fileset dir="src/patches" />
+                                </copy>
+
+                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/dropins">
+                                    <fileset dir="src/dropins" />
+                                </copy>
+
                                 <!--<copy todir="target/wso2carbon-core-${carbon.kernel.version}/modules" overwrite="true">
                                     <fileset dir="src/repository/modules"></fileset>
                                 </copy>

modules/distribution/src/repository/jaggeryapps/iotserver/units/policy-create/policy-create.hbs

@@ -237,7 +237,5 @@
     </div>
 {{/zone}}
 {{#zone "bottomJs"}}
-    <script id="hidden-operations-bar-ios" src="{{self.publicURL}}/templates/hidden-operations-ios.hbs" type="text/x-handlebars-template" ></script>
-    <script id="hidden-operations-bar-android" src="{{self.publicURL}}/templates/hidden-operations-android.hbs" type="text/x-handlebars-template" ></script>
     <script src="{{self.publicURL}}/js/policy-create.js"></script>
 {{/zone}}

modules/distribution/src/repository/jaggeryapps/iotserver/units/policy-create/public/js/policy-create.js

@@ -78,16 +78,15 @@ function savePolicy(){
     }else if (policy.selectedUserRoles){
         payload.roles = policy.selectedUserRoles;
     }
-    invokerUtil.post("/mdm-admin/policies", payload, function(){
+    //invokerUtil.post("/mdm-admin/policies", payload, function(){
-        $(".policy-message").removeClass("hidden");
+    //    $(".policy-message").removeClass("hidden");
-        $(".add-policy").addClass("hidden");
+    //    $(".add-policy").addClass("hidden");
-    }, function(){
+    //}, function(){
-
+    //
-    });
+    //});
 }
 
 $(document).ready(function(){
-    alert("hiiiii");
     initStepper(".wizard-stepper");
     $( "input[type='radio'].user-select-radio" ).change(function() {
         $('.user-select').hide();

modules/distribution/src/repository/jaggeryapps/iotserver/units/select2/select2.hbs

@@ -0,0 +1,6 @@
+{{#zone "topLibCss"}}
+    <link rel="stylesheet" href="{{self.publicURL}}/css/select2.min.css">
+{{/zone}}
+{{#zone "bottomJs"}}
+    <script src="{{self.publicURL}}/js/select2.full.min.js"></script>
+{{/zone}}

modules/distribution/src/repository/jaggeryapps/iotserver/units/select2/select2.json

@@ -0,0 +1,3 @@
+{
+    "predicate":"true"
+}