Merge lp:~asac/snappy-hub/webdm-port-4200 into lp:~snappy-dev/snappy-hub/webdm

[Alexander Sack]

move to less commonly used port 4200

=== modified file 'README.md'
--- README.md	2015-01-16 18:56:43 +0000
+++ README.md	2015-01-20 09:39:21 +0000
@@ -27,15 +27,15 @@
 
 Assuming that 8022 is where ssh is listening on, e.g.; launched as:
 
-     kvm -m 768 -redir :8022::22 -redir :8080::8080 -hda snappy.img
+     kvm -m 768 -redir :8022::22 -redir :4200::4200 -hda snappy.img
 
 # Using
 
 Given that the snappy system where it was installed on was created with
 
-     kvm -m 768 -redir :8022::22 -redir :8080::8080 -hda snappy.img
+     kvm -m 768 -redir :8022::22 -redir :4200::4200 -hda snappy.img
 
-Then pointing the browser to [http://localhost:8080] will take you to the
+Then pointing the browser to [http://localhost:4200] will take you to the
 portal.
 
 ## API
@@ -44,47 +44,47 @@
 
 To retrieve current system image info:
 
-     curl http://localhost:8080/api/v1/systemimage/
+     curl http://localhost:4200/api/v1/systemimage/
 
 To check for system image update:
 
-     curl http://localhost:8080/api/v1/systemimage/checkForUpdate
+     curl http://localhost:4200/api/v1/systemimage/checkForUpdate
 
 To apply system image update:
 
-     curl --data "" http://localhost:8080/api/v1/systemimage/
+     curl --data "" http://localhost:4200/api/v1/systemimage/
 
 ### /api/v1/packages/
 
 To install a package:
 
-     curl -H "Content-Type: application/json" -d '{"package":"xkcd-webserver"}' http://localhost:8080/api/v1/packages/
+     curl -H "Content-Type: application/json" -d '{"package":"xkcd-webserver"}' http://localhost:4200/api/v1/packages/
 
 To uninstall a package:
 
-    curl -X DELETE http://localhost:8080/api/v1/packages/xkcd-webserver
+    curl -X DELETE http://localhost:4200/api/v1/packages/xkcd-webserver
 
 To list packages:
 
-     curl http://localhost:8080/api/v1/packages/
+     curl http://localhost:4200/api/v1/packages/
 
 To get a specific package:
 
-     curl http://localhost:8080/api/v1/packages/xkcd-webserver
+     curl http://localhost:4200/api/v1/packages/xkcd-webserver
 
 To start or stop a service from a package:
 
-    curl -w "\nstatus code: %{http_code}\n" -d '{"status":0}' http://localhost:8080/api/v1/packages/webdm/snappyd
+    curl -w "\nstatus code: %{http_code}\n" -d '{"status":0}' http://localhost:4200/api/v1/packages/webdm/snappyd
 
 To get the icon for a package:
 
-     curl http://localhost:8080/api/v1/packages/xkcd-webserver/icon
+     curl http://localhost:4200/api/v1/packages/xkcd-webserver/icon
 
 ### /api/v1/oem
 
 Grabs oem information from the oem package
 
-    curl http://localhost:8080/api/v1/oem/ && echo
+    curl http://localhost:4200/api/v1/oem/ && echo
     {“name”:”beagleboneblack.element14”,”vendor”:”element14”,”icon”:”meta/element14.png”,”version”:”1.0”,”type”:”oem”,”branding”:{“name”:”Beagle Bone Black”,”subname”:”element14”},”store”:{“oem-key”:”123456”}}
 
 And OEM package needs to be installed, example OEM package can be found on
@@ -94,10 +94,10 @@
 
 This basically is a proxy to the store
 
-    curl http://localhost:8080/api/v1/store/search
-    curl http://localhost:8080/api/v1/store/search?q=xkcd
+    curl http://localhost:4200/api/v1/store/search
+    curl http://localhost:4200/api/v1/store/search?q=xkcd
 
-    curl http://localhost:8080/api/v1/store/package/com.ubuntu.snappy.xkcd-webserver
+    curl http://localhost:4200/api/v1/store/package/com.ubuntu.snappy.xkcd-webserver
 
 ## Web Front End
 

=== modified file 'cmd/snappyd/snappyd.go'
--- cmd/snappyd/snappyd.go	2014-11-24 00:42:15 +0000
+++ cmd/snappyd/snappyd.go	2015-01-20 09:39:21 +0000
@@ -31,7 +31,7 @@
 
 var logger *log.Logger
 
-const httpAddr string = ":8080"
+const httpAddr string = ":4200"
 
 func init() {
 	logger = log.New(os.Stderr, "Snappy: ", log.Ldate|log.Ltime|log.Lshortfile)

=== modified file 'pkg/meta/package.yaml'
--- pkg/meta/package.yaml	2015-01-19 21:11:46 +0000
+++ pkg/meta/package.yaml	2015-01-20 09:39:21 +0000
@@ -20,6 +20,6 @@
       start: avahi-daemon -f avahi-daemon.conf
       description: Avahi daemon
 ports:
-    required: 8080
-maintainer: Clapping Team
+    required: 4200
+maintainer: Sergio Schvezov <[e-mail]>
 icon: meta/clap.png

=== modified file 'www/README.md'
--- www/README.md	2015-01-08 12:12:02 +0000
+++ www/README.md	2015-01-20 09:39:21 +0000
@@ -18,4 +18,4 @@
 
     ./watch.sh
 
-Leave this running in its own terminal window, and start work. Your changes should be copied over live to the snappy box, so you can see them on http://localhost:8080.
+Leave this running in its own terminal window, and start work. Your changes should be copied over live to the snappy box, so you can see them on http://localhost:4200.

=== modified file 'www/templates/layout.html'
--- www/templates/layout.html	2015-01-19 18:59:26 +0000
+++ www/templates/layout.html	2015-01-20 09:39:21 +0000
@@ -80,7 +80,7 @@
   <!-- config -->
   <script src="/public/vendor/yui/yui/yui-min.js"></script>
   <script>
-    //var url = 'http://192.168.234.171:8080';
+    //var url = 'http://192.168.234.171:4200';
     var url = '';
 
     YUI.Env.iot = {