X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2Fafm-unit.conf;h=671242467e60677d28491cfd25e4546d47a0c5b6;hb=255c83029f56e8d90e7ce185b007c4ca65afec1e;hp=82113efbf50d7d948720cfe0863a473cf6e38b61;hpb=2c566e2dc9df934fb3884f9d4a9ad7ffc73a4aab;p=src%2Fapp-framework-main.git

diff --git a/conf/afm-unit.conf b/conf/afm-unit.conf
index 82113ef..6712424 100644
--- a/conf/afm-unit.conf
+++ b/conf/afm-unit.conf
@@ -106,8 +106,10 @@ ConditionSecurity=smack
 
 # Automatic bound to required api
 {{#required-api}}
-BindsTo=afm-api-{{name}}
-After=afm-api-{{name}}
+{{#value=auto|ws}}
+BindsTo=afm-api-ws-{{name}}
+After=afm-api-ws-{{name}}
+{{/value=auto|ws}}
 {{/required-api}}
 %nl
 
@@ -118,7 +120,7 @@ SuccessExitStatus=0 SIGKILL
 {{#required-permission}}
   {{#urn:AGL:permission::platform:no-oom}}      OOMScoreAdjust=-500             {{/urn:AGL:permission::platform:no-oom}}
   {{#urn:AGL:permission::partner:real-time}}    IOSchedulingClass=realtime      {{/urn:AGL:permission::partner:real-time}}
-  {{^urn:AGL:permission::partner:real-time}}    RestrictRealtime=on             {{/urn:AGL:permission::partner:real-time}}
+#  {{^urn:AGL:permission::partner:real-time}}    RestrictRealtime=on             {{/urn:AGL:permission::partner:real-time}}
   {{#urn:AGL:permission::public:display}}       SupplementaryGroups=display     {{/urn:AGL:permission::public:display}}
   {{^urn:AGL:permission::public:syscall:clock}} SystemCallFilter=~@clock        {{/urn:AGL:permission::public:syscall:clock}}
 {{/required-permission}}
@@ -137,14 +139,19 @@ Environment=AFM_APP_INSTALL_DIR={{:#metadata.install-dir}}
 {{/required-permission.urn:AGL:permission::public:hidden}}\
 
 ;---------------------------------------------------------------------------------
-;----                 text/html                                               ----
+;----   text/html  application/vnd.agl.native  application/vnd.agl.service    ----
 ;---------------------------------------------------------------------------------
-{{#content.type=text/html}}
+{{#content.type=text/html|application/vnd.agl.native|application/vnd.agl.service}}
 
+{{^content.type=application/vnd.agl.service}}
 X-AFM--http-port={{:#metadata.http-port}}
+{{/content.type=application/vnd.agl.service}}
+
 ExecStart=/usr/bin/afb-daemon \
-	--port={{:#metadata.http-port}} \
-	--random-token \
+	{{^content.type=application/vnd.agl.service}}\
+		--port={{:#metadata.http-port}} \
+		--random-token \
+	{{/content.type=application/vnd.agl.service}}\
 	--rootdir={{:#metadata.install-dir}} \
 	--workdir={{&#metadata.app-data-dir}}/{{id}} \
 	{{#required-permission.urn:AGL:permission::public:no-htdocs}}\
@@ -192,9 +199,18 @@ ExecStart=/usr/bin/afb-daemon \
 			--dbus-server={{name}} \
 		{{/value=dbus}}\
 	{{/provided-api}}\
-	--exec /usr/bin/web-runtime http://localhost:@p/{{content.src}}?token=@t
+	{{#content.type=text/html}}\
+		--exec /usr/bin/web-runtime http://localhost:@p/{{content.src}}?token=@t
+	{{/content.type=text/html}}\
+	{{#content.type=application/vnd.agl.native}}\
+		--exec {{:#metadata.install-dir}}/{{content.src}} @p @t
+	{{/content.type=application/vnd.agl.native}}\
+	{{#content.type=application/vnd.agl.service}}\
+		--no-httpd
+	{{/content.type=application/vnd.agl.service}}
+
+{{/content.type=text/html|application/vnd.agl.native|application/vnd.agl.service}}
 
-{{/content.type=text/html}}
 
 ;---------------------------------------------------------------------------------
 ;----                 application/x-executable                                ----
@@ -207,56 +223,6 @@ ExecStart={{:#metadata.install-dir}}/{{content.src}}
 
 {{/content.type=application/x-executable}}
 
-;---------------------------------------------------------------------------------
-;----                 application/vnd.agl.service                             ----
-;---------------------------------------------------------------------------------
-{{#content.type=application/vnd.agl.service}}
-
-ExecStart=/usr/bin/afb-daemon \
-	--rootdir={{:#metadata.install-dir}} \
-	--workdir={{&#metadata.install-dir}}/{{id}} \
-	{{#required-api}}\
-		{{#value=auto}}\
-			--ws-client=unix:%t/apis/ws/{{name}} \
-		{{/value=auto}}\
-		{{#value=ws}}\
-			--ws-client=unix:%t/apis/ws/{{name}} \
-		{{/value=ws}}\
-		{{#value=dbus}}\
-			--dbus-client={{name}} \
-		{{/value=dbus}}\
-		{{#value=link}}\
-			--binding=%t/apis/lib/{{name}} \
-		{{/value=link}}\
-		{{#value=cloud}}\
-			--cloud-client={{name}} \
-		{{/value=cloud}}\
-		{{#value=local}}\
-			--binding={{:#metadata.install-dir}}/{{name}} \
-		{{/value=local}}\
-	{{/required-api}}\
-	{{#provided-api}}\
-		{{#value=auto}}\
-			{{^required-permission.urn:AGL:permission::partner:service:no-ws}}\
-				--ws-server=sd:{{name}} \
-			{{/required-permission.urn:AGL:permission::partner:service:no-ws}}\
-			{{^required-permission.urn:AGL:permission::partner:service:no-dbus}}\
-				--dbus-server={{name}} \
-			{{/required-permission.urn:AGL:permission::partner:service:no-dbus}}\
-		{{/value=auto}}\
-		{{#value=ws}}\
-			--ws-server=sd:{{name}} \
-		{{/value=ws}}\
-		{{#value=dbus}}\
-			--dbus-server={{name}} \
-		{{/value=dbus}}\
-	{{/provided-api}}\
-	--no-httpd
-
-
-{{/content.type=application/vnd.agl.service}}
-
-
 ;---------------------------------------------------------------------------------
 ; auto start
 ;---------------------------------------------------------------------------------
@@ -277,47 +243,14 @@ WantedBy=default.target
 ;---------------------------------------------------------------------------------
 
 {{#provided-api}}
-{{#value=ws}}
-
-%begin systemd-unit
-
-# auto generated by wgtpkg-unit for {{id}} version {{version}} target {{:#target}} of {{idaver}}
-#
-%systemd-unit user
-%systemd-unit socket afm-socket-{{name}}
-
-[Socket]
-SmackLabel=*
-ListenStream=%t/bindings/{{name}}
-FileDescriptorName={{name}}
-
-{{#required-permission.urn:AGL:permission::public:hidden}}\
-Service=afm-service-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
-{{/required-permission.urn:AGL:permission::public:hidden}}\
-{{^required-permission.urn:AGL:permission::public:hidden}}\
-Service=afm-appli-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
-{{/required-permission.urn:AGL:permission::public:hidden}}\
-
-;---------------------------------------------------------------------------------
-{{#required-permission.urn:AGL:permission::system:run-by-default}}
-%nl
-[Install]
-WantedBy=default.target
-%systemd-unit wanted-by default.target
-{{/required-permission.urn:AGL:permission::system:run-by-default}}
-;---------------------------------------------------------------------------------
-
-%end systemd-unit
-
-{{/value=ws}}
-{{#value=auto}}
+{{#value=ws|auto}}
 
 %begin systemd-unit
 
 # auto generated by wgtpkg-unit for {{id}} version {{version}} target {{:#target}} of {{idaver}}
 #
 %systemd-unit user
-%systemd-unit socket afm-socket-{{name}}
+%systemd-unit socket afm-api-ws-{{name}}
 
 [Socket]
 SmackLabel=*
@@ -342,7 +275,7 @@ WantedBy=default.target
 
 %end systemd-unit
 
-{{/value=auto}}
+{{/value=ws|auto}}
 {{/provided-api}}
 
 {{/targets}}