From: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Date: Mon, 19 Sep 2016 04:19:41 +0000 (+0900)
Subject: Merge branch 'master' into cloud-interface
X-Git-Tag: 1.3.0~348^2^2~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab64942a3569a387be82d12fa111184cb7d0034a;p=platform%2Fupstream%2Fiotivity.git

Merge branch 'master' into cloud-interface

Change-Id: I9af09877a796742be84589e70c7e3dec522422f4
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
---

ab64942a3569a387be82d12fa111184cb7d0034a
diff --cc cloud/account/src/main/java/org/iotivity/cloud/accountserver/AccountServer.java
index 1168093,858e7ed..a282d13
--- a/cloud/account/src/main/java/org/iotivity/cloud/accountserver/AccountServer.java
+++ b/cloud/account/src/main/java/org/iotivity/cloud/accountserver/AccountServer.java
@@@ -63,16 -62,14 +63,18 @@@ public class AccountServer 
  
          serverSystem.addResource(new GroupResource());
  
+         serverSystem.addResource(new AclResource());
+ 
          serverSystem.addResource(new CertificateResource());
  
 +        serverSystem.addResource(new CrlResource());
 +
 +        serverSystem.addResource(new AclResource());
 +
          serverSystem.addResource(new InviteResource());
  
 -        serverSystem.addServer(new CoapServer(new InetSocketAddress(Integer
 -                .parseInt(args[0]))));
 +        serverSystem.addServer(new CoapServer(
 +                new InetSocketAddress(Integer.parseInt(args[0]))));
  
          boolean tlsMode = Integer.parseInt(args[1]) == 1;