gh-168 Add support to register apps with its companion artifact

Author: ghillert

ui/app/scripts/app/controllers/register-apps.js

@@ -35,6 +35,7 @@ define(function () {
                     type: $scope.types[0],
                     force: false,
                     uri: '',
+                    metadataUri: ''
                 };
             }
 
@@ -57,7 +58,7 @@ define(function () {
                 var successMsg = 'Successfully registered ' + ($scope.apps.length === 1 ? 'application "' + $scope.apps[0].name + '" of type "' + $scope.apps[0].type + '"' : $scope.apps.length + ' applications.');
                 // Fire off a registration request for each app
                 $scope.apps.forEach(function(app) {
-                    promise = appService.registerApp(app.type, app.name, app.uri, app.force).$promise;
+                    promise = appService.registerApp(app.type, app.name, app.uri, app.force, app.metadataUri).$promise;
                     promise.then(function() {
                         // Need to find app index because index might have been changed by the time promise is resolved due to other removals
                         index = $scope.apps.indexOf(app);

ui/app/scripts/app/services.js

@@ -78,14 +78,19 @@ define(['angular', 'lodash'], function (angular, _) {
                         url: $rootScope.dataflowServerUrl + '/apps/'+appType+'/'+appName
                     });
                 },
-                registerApp: function(type, name, uri, force) {
+                registerApp: function(type, name, uri, force, metadataUri) {
+
+                    var httpParams = {
+                      uri: uri,
+                      force: force ? true : false
+                    };
+                    if (metadataUri) {
+                        httpParams['metadata-uri'] = metadataUri;
+                    }
                     var request = $resource($rootScope.dataflowServerUrl + '/apps/' + type + '/' + name, {}, {
                         registerApp: {
                             method: 'POST',
-                            params: {
-                                uri: uri,
-                                force: force ? true : false
-                            }
+                            params: httpParams
                         }
                     }).registerApp();
                     request.$promise.then(function() {

ui/app/scripts/app/views/register-apps.html

@@ -1,5 +1,12 @@
 <h1>Register Applications</h1>
-<p>Register one or more applications by entering a <strong>Name</strong>, <strong>Type</strong> and <strong>URI</strong> of the application Jar. The URI is typically provided using the Maven coordinates of the Jar (e.g. <code>maven://io.spring.cloud:scdf-sample-app:jar:1.0.0.BUILD-SNAPSHOT</code>), but can be a local file or a docker image URI.</p>
+<p>
+    Register one or more applications by entering a <strong>Name</strong>,
+    <strong>Type</strong> and <strong>App URI</strong> of the application Jar.
+    You can also provide an optional <strong>metadata artifact URI</strong>.
+    The App URI &amp; the Metadata Artifact URI are typically provided using the Maven coordinates of the Jar
+    (e.g. <code>maven://io.spring.cloud:scdf-sample-app:jar:1.0.0.BUILD-SNAPSHOT</code>),
+    but can be a local file or a docker image URI.
+</p>
 <hr/>
 <form name="registerAppsForm" role="form" ng-submit="register()" novalidate>
     <table class="table form-table">
@@ -11,7 +18,7 @@ <h1>Register Applications</h1>
             <tr>
                 <th>Name</th>
                 <th>Type</th>
-                <th>URI</th>
+                <th>App URI &amp; optional Metadata URI</th>
                 <th>
                     <span>
                         <input type="checkbox" ng-model="toggleAllForce" ng-model-options="{ getterSetter: true }" ui-indeterminate="someForceButNotAll()"/>
@@ -35,9 +42,13 @@ <h1>Register Applications</h1>
                 </td>
                 <td>
                     <div ng-class="registerAppsForm[$index + '_uri'].$invalid ? 'has-warning has-feedback' : ''">
-                        <input type="text" id="{{'uri_' + $index}}" name="{{$index + '_uri'}}" class="form-control" placeholder="<maven://io.spring.cloud:scdf-sample-app:jar:1.0.0.BUILD-SNAPSHOT>" required ng-model="app.uri" ng-pattern="uriPattern">
+                        <input type="text" id="{{'uri_' + $index}}" name="{{$index + '_uri'}}" class="form-control" placeholder="<maven://io.spring.cloud:scdf-sample-app:jar:1.0.0>" required ng-model="app.uri" ng-pattern="uriPattern">
                         <span class="glyphicon glyphicon-warning-sign form-control-feedback" ng-show="registerAppsForm[$index + '_uri'].$invalid"></span>
                     </div>
+                    <div style="margin-top: 2px;" ng-class="registerAppsForm[$index + '_metadataUri'].$invalid ? 'has-warning has-feedback' : ''">
+                        <input type="text" id="{{'metadataUri_' + $index}}" name="{{$index + '_metadataUri'}}" class="form-control" placeholder="<maven://io.spring.cloud:scdf-sample-app:jar:metadata:1.0.0> [OPTIONAL]" ng-model="app.metadataUri" ng-pattern="uriPattern">
+                        <span class="glyphicon glyphicon-warning-sign form-control-feedback" ng-show="registerAppsForm[$index + '_metadataUri'].$invalid"></span>
+                    </div>
                 </td>
                 <td class="text-center">
                     <input type="checkbox" id="{{$index + '_force'}}" name="{{$index + '_force'}}" ng-model="app.force">