Merge "Update namespaces for applications" into stable/kilo

2016-07-19 16:11:22 +00:00 · 2016-07-19 16:11:22 +00:00 · 429b98a0bc
parent e8dfaa36fd 9e5cc50753
commit 429b98a0bc
33 changed files with 55 additions and 55 deletions
--- a/ApacheHTTPServer/package/Classes/ApacheHttpServer.yaml
+++ b/ApacheHTTPServer/package/Classes/ApacheHttpServer.yaml
@ -11,7 +11,7 @@
 #  under the License.

 Namespaces:
-  =: io.murano.apps.apache
+  =: com.example.apache
  std: io.murano
  res: io.murano.resources
  sys: io.murano.system
--- a/ApacheHTTPServer/package/UI/ui.yaml
+++ b/ApacheHTTPServer/package/UI/ui.yaml
@ -14,7 +14,7 @@ Version: 2

 Application:
  ?:
-    type: io.murano.apps.apache.ApacheHttpServer
+    type: com.example.apache.ApacheHttpServer
  name: $.appConfiguration.name
  enablePHP: $.appConfiguration.enablePHP
  instance:
--- a/ApacheHTTPServer/package/manifest.yaml
+++ b/ApacheHTTPServer/package/manifest.yaml
@ -12,7 +12,7 @@

 Format: 1.0
 Type: Application
-FullName: io.murano.apps.apache.ApacheHttpServer
+FullName: com.example.apache.ApacheHttpServer
 Name: Apache HTTP Server
 Description: |
 The Apache HTTP Server Project is an effort to develop and maintain an
@ -25,4 +25,4 @@ Description: |
 Author: 'Mirantis, Inc'
 Tags: [HTTP, Server, WebServer, HTML, Apache]
 Classes:
- io.murano.apps.apache.ApacheHttpServer: ApacheHttpServer.yaml
+ com.example.apache.ApacheHttpServer: ApacheHttpServer.yaml
--- a/CloudFoundry/package/Classes/CloudFoundry.yaml
+++ b/CloudFoundry/package/Classes/CloudFoundry.yaml
@ -11,7 +11,7 @@
 #  under the License.

 Namespaces:
-  =: io.murano.apps.paas
+  =: com.example.paas
  std: io.murano
  res: io.murano.resources
  sys: io.murano.system
--- a/CloudFoundry/package/UI/ui.yaml
+++ b/CloudFoundry/package/UI/ui.yaml
@ -14,7 +14,7 @@ Version: 2

 Application:
  ?:
-    type: io.murano.apps.paas.CloudFoundry
+    type: com.example.paas.CloudFoundry
  name: $.appConfiguration.name
  instance:
    ?:
--- a/CloudFoundry/package/manifest.yaml
+++ b/CloudFoundry/package/manifest.yaml
@ -12,11 +12,11 @@

 Format: 1.0
 Type: Application
-FullName: io.murano.apps.paas.CloudFoundry
+FullName: com.example.paas.CloudFoundry
 Name: Cloud Foundry
 Description: |
 Cloud Foundry is an opensource PaaS solution. PaaS makes platform much easier to deploy, run and scale applications. Some PaaS offerings have limited language and framework support, do not deliver key application services, or restrict deployment to a single cloud. Cloud Foundry is the industry’s Open PaaS and provides a choice of clouds, frameworks and application services. As an open source project, there is a broad community both contributing and supporting Cloud Foundry.
 Author: 'Mirantis, Inc'
 Tags: ['PAAS']
 Classes:
- io.murano.apps.paas.CloudFoundry: CloudFoundry.yaml
+ com.example.paas.CloudFoundry: CloudFoundry.yaml
--- a/Examples/ChefExample/package/Classes/ChefExample.yaml
+++ b/Examples/ChefExample/package/Classes/ChefExample.yaml
@ -11,7 +11,7 @@
 #  under the License.

 Namespaces:
-  =: io.murano.conflang.test.ChefExample
+  =: com.example.conflang.test.ChefExample
  std: io.murano
  res: io.murano.resources
  sys: io.murano.system
--- a/Examples/ChefExample/package/manifest.yaml
+++ b/Examples/ChefExample/package/manifest.yaml
@ -12,11 +12,11 @@

 Format: 1.0
 Type: Application
-FullName: io.murano.conflang.test.ChefExample
+FullName: com.example.conflang.test.ChefExample
 Name: ChefExample
 Description: |
  Chef Test.
 Author: 'TID'
 Tags: [Test, Chef]
 Classes:
- io.murano.conflang.test.ChefExample: ChefExample.yaml
+ com.example.conflang.test.ChefExample: ChefExample.yaml
--- a/Examples/PuppetExample/package/Classes/PuppetExample.yaml
+++ b/Examples/PuppetExample/package/Classes/PuppetExample.yaml
@ -11,7 +11,7 @@
 #  under the License.

 Namespaces:
-  =: io.murano.conflang.test.PuppetExample
+  =: com.example.conflang.test.PuppetExample
  std: io.murano
  res: io.murano.resources
  sys: io.murano.system
--- a/Examples/PuppetExample/package/manifest.yaml
+++ b/Examples/PuppetExample/package/manifest.yaml
@ -12,11 +12,11 @@

 Format: 1.0
 Type: Application
-FullName: io.murano.conflang.test.PuppetExample
+FullName: com.example.conflang.test.PuppetExample
 Name: PuppetExample
 Description: |
  Puppet Test.
 Author: 'TID'
 Tags: [Test, Puppet]
 Classes:
- io.murano.conflang.test.PuppetExample: PuppetExample.yaml
+ com.example.conflang.test.PuppetExample: PuppetExample.yaml
--- a/MySQL/package/Classes/MySql.yaml
+++ b/MySQL/package/Classes/MySql.yaml
@ -11,7 +11,7 @@
 #  under the License.

 Namespaces:
-  =: io.murano.databases
+  =: com.example.databases
  std: io.murano
  res: io.murano.resources
  sys: io.murano.system
--- a/MySQL/package/UI/ui.yaml
+++ b/MySQL/package/UI/ui.yaml
@ -14,7 +14,7 @@ Version: 2

 Application:
  ?:
-    type: io.murano.databases.MySql
+    type: com.example.databases.MySql
  name: $.appConfiguration.name
  database: $.initDatabaseConfiguration.database
  username: $.initDatabaseConfiguration.username
--- a/MySQL/package/manifest.yaml
+++ b/MySQL/package/manifest.yaml
@ -12,7 +12,7 @@

 Format: 1.0
 Type: Application
-FullName: io.murano.databases.MySql
+FullName: com.example.databases.MySql
 Name: MySQL
 Description: |
 MySql is a relational database management system (RDBMS), and ships with
@ -21,6 +21,6 @@ Description: |
 Author: 'Mirantis, Inc'
 Tags: [Database, MySql, SQL, RDBMS]
 Classes:
- io.murano.databases.MySql: MySql.yaml
+ com.example.databases.MySql: MySql.yaml
 Require:
- io.murano.databases:
+ com.example.databases:
--- a/PivotalOperationsManager/package/Classes/OpsManager.yaml
+++ b/PivotalOperationsManager/package/Classes/OpsManager.yaml
@ -11,7 +11,7 @@
 #  under the License.

 Namespaces:
-  =: io.murano.apps.pivotal
+  =: com.example.pivotal
  std: io.murano
  res: io.murano.resources
  sys: io.murano.system
--- a/PivotalOperationsManager/package/UI/ui.yaml
+++ b/PivotalOperationsManager/package/UI/ui.yaml
@ -14,7 +14,7 @@ Version: 2

 Application:
  ?:
-    type: io.murano.apps.pivotal.OpsManager
+    type: com.example.pivotal.OpsManager
  name: $.appConfiguration.name
  username: $.opsManagerConfiguration.username
  password: $.opsManagerConfiguration.password
@ -24,7 +24,7 @@ Application:
  sshKey: $.opsManagerConfiguration.sshKey
  instance:
    ?:
-      type: io.murano.apps.pivotal.OpsManagerInstance
+      type: com.example.pivotal.OpsManagerInstance
    name: generateHostname($.instanceConfiguration.unitNamingPattern, 1)
    flavor: $.instanceConfiguration.flavor
    image: 'Ops Manager'
--- a/PivotalOperationsManager/package/manifest.yaml
+++ b/PivotalOperationsManager/package/manifest.yaml
@ -12,12 +12,12 @@

 Format: 1.0
 Type: Application
-FullName: io.murano.apps.pivotal.OpsManager
+FullName: com.example.pivotal.OpsManager
 Name: Pivotal Operations Manager
 Description: |
 Operations Manager is a web application that you use to deploy and manage a Pivotal Cloud Foundry.
 Author: 'Mirantis, Inc'
 Tags: [PAAS, Cloud Foundry]
 Classes:
- io.murano.apps.pivotal.OpsManager: OpsManager.yaml
- io.murano.apps.pivotal.OpsManagerInstance: OpsManagerInstance.yaml
+ com.example.pivotal.OpsManager: OpsManager.yaml
+ com.example.pivotal.OpsManagerInstance: OpsManagerInstance.yaml
--- a/PostgreSQL/package/Classes/PostgreSql.yaml
+++ b/PostgreSQL/package/Classes/PostgreSql.yaml
@ -11,7 +11,7 @@
 #  under the License.

 Namespaces:
-  =: io.murano.databases
+  =: com.example.databases
  std: io.murano
  res: io.murano.resources
  sys: io.murano.system
--- a/PostgreSQL/package/UI/ui.yaml
+++ b/PostgreSQL/package/UI/ui.yaml
@ -14,7 +14,7 @@ Version: 2

 Application:
  ?:
-    type: io.murano.databases.PostgreSql
+    type: com.example.databases.PostgreSql
  name: $.appConfiguration.name
  database: $.initDatabaseConfiguration.database
  username: $.initDatabaseConfiguration.username
--- a/PostgreSQL/package/manifest.yaml
+++ b/PostgreSQL/package/manifest.yaml
@ -12,7 +12,7 @@

 Format: 1.0
 Type: Application
-FullName: io.murano.databases.PostgreSql
+FullName: com.example.databases.PostgreSql
 Name: PostgreSQL
 Description: |
 PostgreSQL is a powerful, open source object-relational database system.
@ -22,6 +22,6 @@ Description: |
 Author: 'Mirantis, Inc'
 Tags: [Database, Postgre, SQL, RDBMS]
 Classes:
- io.murano.databases.PostgreSql: PostgreSql.yaml
+ com.example.databases.PostgreSql: PostgreSql.yaml
 Require:
- io.murano.databases:
+ com.example.databases:
--- a/SQLDatabaseLibrary/package/Classes/SqlDatabase.yaml
+++ b/SQLDatabaseLibrary/package/Classes/SqlDatabase.yaml
@ -11,7 +11,7 @@
 #  under the License.

 Namespaces:
-  =: io.murano.databases
+  =: com.example.databases
  std: io.murano

 Name: SqlDatabase
--- a/SQLDatabaseLibrary/package/manifest.yaml
+++ b/SQLDatabaseLibrary/package/manifest.yaml
@ -12,11 +12,11 @@

 Format: 1.0
 Type: Library
-FullName: io.murano.databases
+FullName: com.example.databases
 Name: SQL Library
 Description: |
 This is the interface defining API for different SQL - RDBMS databases
 Author: 'Mirantis, Inc'
 Tags: [SQL, RDBMS]
 Classes:
- io.murano.databases.SqlDatabase: SqlDatabase.yaml
+ com.example.databases.SqlDatabase: SqlDatabase.yaml
--- a/Tomcat/package/Classes/Tomcat.yaml
+++ b/Tomcat/package/Classes/Tomcat.yaml
@ -11,7 +11,7 @@
 #  under the License.

 Namespaces:
-  =: io.murano.apps.apache
+  =: com.example.apache
  std: io.murano
  res: io.murano.resources
  sys: io.murano.system
--- a/Tomcat/package/UI/ui.yaml
+++ b/Tomcat/package/UI/ui.yaml
@ -14,7 +14,7 @@ Version: 2

 Application:
  ?:
-    type: io.murano.apps.apache.Tomcat
+    type: com.example.apache.Tomcat
  name: $.appConfiguration.name
  instance:
    ?:
--- a/Tomcat/package/manifest.yaml
+++ b/Tomcat/package/manifest.yaml
@ -12,11 +12,11 @@

 Format: 1.0
 Type: Application
-FullName: io.murano.apps.apache.Tomcat
+FullName: com.example.apache.Tomcat
 Name: Apache Tomcat
 Description: |
 Apache Tomcat is an open source software implementation of the Java Servlet and JavaServer Pages technologies.
 Author: 'Mirantis, Inc'
 Tags: [Servlets, Server, Pages, Java]
 Classes:
- io.murano.apps.apache.Tomcat: Tomcat.yaml
+ com.example.apache.Tomcat: Tomcat.yaml
--- a/WordPress/package/Classes/WordPress.yaml
+++ b/WordPress/package/Classes/WordPress.yaml
@ -11,11 +11,11 @@
 #  under the License.

 Namespaces:
-  =: io.murano.apps
+  =: com.example
  std: io.murano
  sys: io.murano.system
-  db: io.murano.databases
-  srv: io.murano.apps.apache
+  db: com.example.databases
+  srv: com.example.apache

 Name: WordPress

--- a/WordPress/package/UI/ui.yaml
+++ b/WordPress/package/UI/ui.yaml
@ -14,7 +14,7 @@ Version: 2

 Application:
  ?:
-    type: io.murano.apps.WordPress
+    type: com.example.WordPress
  name: $.appConfiguration.name
  database: $.appConfiguration.database
  server: $.appConfiguration.server
@ -40,17 +40,17 @@ Forms:
            Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and
            underline are allowed
        - name: database
-          type: io.murano.databases.MySql
+          type: com.example.databases.MySql
          label: Database Server
          description: >-
            Select a database server to host the application`s database
        - name: server
-          type: io.murano.apps.apache.ApacheHttpServer
+          type: com.example.apache.ApacheHttpServer
          label: HTTP Server
          description: >-
            Select an instance of Apache HTTP Server to run the app
        - name: zabbix
-          type: io.murano.apps.ZabbixAgent
+          type: com.example.ZabbixAgent
          label: Monitoring
          required: false
          description: >-
--- a/WordPress/package/manifest.yaml
+++ b/WordPress/package/manifest.yaml
@ -12,11 +12,11 @@

 Format: 1.0
 Type: Application
-FullName: io.murano.apps.WordPress
+FullName: com.example.WordPress
 Name: WordPress
 Description: |
 WordPress is a free and open source blogging tool and a content management system (CMS) based on PHP and MySQL.
 Author: 'Mirantis, Inc'
 Tags: [CMS, PHP, Web]
 Classes:
- io.murano.apps.WordPress: WordPress.yaml
+ com.example.WordPress: WordPress.yaml
--- a/ZabbixAgent/package/Classes/ZabbixAgent.yaml
+++ b/ZabbixAgent/package/Classes/ZabbixAgent.yaml
@ -11,7 +11,7 @@
 #  under the License.

 Namespaces:
-  =: io.murano.apps
+  =: com.example
  std: io.murano
  res: io.murano.resources
  sys: io.murano.system
--- a/ZabbixAgent/package/UI/ui.yaml
+++ b/ZabbixAgent/package/UI/ui.yaml
@ -14,7 +14,7 @@ Version: 2

 Application:
  ?:
-    type: io.murano.apps.ZabbixAgent
+    type: com.example.ZabbixAgent
  name: $.appConfiguration.name
  hostname: $.appConfiguration.hostname
  server: $.appConfiguration.server
@ -48,7 +48,7 @@ Forms:
            Required for active checks and must match hostname as configured on the server.
       
        - name: server
-          type: io.murano.apps.ZabbixServer
+          type: com.example.ZabbixServer
          label: Zabbix Server
          description: >-
            Select zabbix server to monitor activity
--- a/ZabbixAgent/package/manifest.yaml
+++ b/ZabbixAgent/package/manifest.yaml
@ -12,11 +12,11 @@

 Format: 1.0
 Type: Application
-FullName: io.murano.apps.ZabbixAgent
+FullName: com.example.ZabbixAgent
 Name: Zabbix Agent
 Description: |
 Zabbix is the ultimate open source availability and performance monitoring solution. Zabbix offer advance monitoring, alerting, and visualization features today which are missing in other monitoring system, even some of the best commercial ones.
 Author: 'Mirantis, Inc'
 Tags: [Monitoring]
 Classes:
- io.murano.apps.ZabbixAgent: ZabbixAgent.yaml
+ com.example.ZabbixAgent: ZabbixAgent.yaml
--- a/ZabbixServer/package/Classes/ZabbixServer.yaml
+++ b/ZabbixServer/package/Classes/ZabbixServer.yaml
@ -11,7 +11,7 @@
 #  under the License.

 Namespaces:
-  =: io.murano.apps
+  =: com.example
  std: io.murano
  res: io.murano.resources
  sys: io.murano.system
--- a/ZabbixServer/package/UI/ui.yaml
+++ b/ZabbixServer/package/UI/ui.yaml
@ -14,7 +14,7 @@ Version: 2

 Application:
  ?:
-    type: io.murano.apps.ZabbixServer
+    type: com.example.ZabbixServer
  name: $.appConfiguration.name
  database: $.dbConfiguration.database
  username: $.dbConfiguration.username
--- a/ZabbixServer/package/manifest.yaml
+++ b/ZabbixServer/package/manifest.yaml
@ -12,7 +12,7 @@

 Format: 1.0
 Type: Application
-FullName: io.murano.apps.ZabbixServer
+FullName: com.example.ZabbixServer
 Name: Zabbix Server
 Description: |
 Zabbix server is the central process of Zabbix software.
@ -20,4 +20,4 @@ Description: |
 Author: 'Mirantis, Inc'
 Tags: [Monitoring]
 Classes:
- io.murano.apps.ZabbixServer: ZabbixServer.yaml
+ com.example.ZabbixServer: ZabbixServer.yaml