major refactoring effort to rename Application to Client [App]

apiman · Dec 10, 2015 · 06fc144 · 06fc144
1 parent d4c83d8
commit 06fc144
Show file tree

Hide file tree

Showing 422 changed files with 3,999 additions and 4,009 deletions.
diff --git a/distro/db/src/main/resources/data/idm/001_create-org-owner.resttest b/distro/db/src/main/resources/data/idm/001_create-org-owner.resttest
@@ -7,7 +7,7 @@ Content-Type: application/json
   "autoGrant" : true,
   "permissions" : [ 
      "orgView", "orgEdit", "orgAdmin",
-     "appView", "appEdit", "appAdmin",
+     "clientView", "clientEdit", "clientAdmin",
      "apiView", "apiEdit", "apiAdmin",
      "planView", "planEdit", "planAdmin"
   ]
@@ -21,7 +21,7 @@ Content-Type: application/json
   "name" : "Organization Owner",
   "permissions" : [
      "orgView", "orgEdit", "orgAdmin",
-     "appView", "appEdit", "appAdmin",
+     "clientView", "clientEdit", "clientAdmin",
      "apiView", "apiEdit", "apiAdmin",
      "planView", "planEdit", "planAdmin" ]
 }
diff --git a/distro/db/src/main/resources/data/idm/002_create-app-dev.resttest b/distro/db/src/main/resources/data/idm/002_create-app-dev.resttest
@@ -2,16 +2,16 @@ POST /roles ${apiman.suite.api-username}/${apiman.suite.api-password}
 Content-Type: application/json
 
 {
-  "name" : "Application Developer",
-  "description" : "Users responsible for creating and managing applications should be granted this role within an Organization.",
-  "permissions" : [ "appView", "appEdit", "appAdmin" ]
+  "name" : "Client App Developer",
+  "description" : "Users responsible for creating and managing client apps should be granted this role within an Organization.",
+  "permissions" : [ "clientView", "clientEdit", "clientAdmin" ]
 }
 ----
 200
 Content-Type: application/json
 
 {
-  "id" : "ApplicationDeveloper",
-  "name" : "Application Developer",
-  "permissions" : [ "appView", "appEdit", "appAdmin" ]
+  "id" : "ClientAppDeveloper",
+  "name" : "Client App Developer",
+  "permissions" : [ "clientView", "clientEdit", "clientAdmin" ]
 }
diff --git a/distro/ddl/src/main/liquibase/current/010-apiman-manager-api.db.tables.changelog.xml b/distro/ddl/src/main/liquibase/current/010-apiman-manager-api.db.tables.changelog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.3.xsd">
     <changeSet author="apiman (generated)" id="1436469846462-1">
-        <createTable tableName="application_versions">
+        <createTable tableName="client_versions">
             <column name="id" type="BIGINT">
                 <constraints nullable="false"/>
             </column>
@@ -25,12 +25,12 @@
             <column name="version" type="VARCHAR(255)">
                 <constraints nullable="false"/>
             </column>
-            <column name="app_id" type="VARCHAR(255)"/>
-            <column name="app_org_id" type="VARCHAR(255)"/>
+            <column name="client_id" type="VARCHAR(255)"/>
+            <column name="client_org_id" type="VARCHAR(255)"/>
         </createTable>
     </changeSet>
     <changeSet author="apiman (generated)" id="1436469846462-2">
-        <createTable tableName="applications">
+        <createTable tableName="clients">
             <column name="id" type="VARCHAR(255)">
                 <constraints nullable="false"/>
             </column>
@@ -88,7 +88,7 @@
             <column name="created_on" type="TIMESTAMP">
                 <constraints nullable="false"/>
             </column>
-            <column name="appv_id" type="BIGINT"/>
+            <column name="clientv_id" type="BIGINT"/>
             <column name="planv_id" type="BIGINT"/>
             <column name="apiv_id" type="BIGINT"/>
         </createTable>

diff --git a/distro/ddl/src/main/liquibase/current/050-apiman-manager-api.db.data.changelog.xml b/distro/ddl/src/main/liquibase/current/050-apiman-manager-api.db.data.changelog.xml
@@ -126,15 +126,15 @@
             <column name="permissions" valueNumeric="0"/>
         </insert>
         <insert tableName="permissions">
-            <column name="role_id" value="ApplicationDeveloper"/>
+            <column name="role_id" value="ClientAppDeveloper"/>
             <column name="permissions" valueNumeric="6"/>
         </insert>
         <insert tableName="permissions">
-            <column name="role_id" value="ApplicationDeveloper"/>
+            <column name="role_id" value="ClientAppDeveloper"/>
             <column name="permissions" valueNumeric="8"/>
         </insert>
         <insert tableName="permissions">
-            <column name="role_id" value="ApplicationDeveloper"/>
+            <column name="role_id" value="ClientAppDeveloper"/>
             <column name="permissions" valueNumeric="7"/>
         </insert>
         <insert tableName="permissions">
@@ -282,13 +282,13 @@
             <column name="name" value="Organization Owner"/>
         </insert>
         <insert tableName="roles">
-            <column name="id" value="ApplicationDeveloper"/>
+            <column name="id" value="ClientAppDeveloper"/>
             <column name="auto_grant"/>
             <column name="created_by" value="admin"/>
             <column name="created_on" valueDate="2015-06-18 17:56:57.632"/>
             <column name="description"
-                    value="Users responsible for creating and managing applications should be granted this role within an Organization."/>
-            <column name="name" value="Application Developer"/>
+                    value="Users responsible for creating and managing client apps should be granted this role within an Organization."/>
+            <column name="name" value="ClientApp Developer"/>
         </insert>
         <insert tableName="roles">
             <column name="id" value="APIDeveloper"/>

diff --git a/distro/ddl/src/main/liquibase/current/100-apiman-manager-api.db.constraints.changelog.xml b/distro/ddl/src/main/liquibase/current/100-apiman-manager-api.db.constraints.changelog.xml
@@ -10,10 +10,10 @@
         <addPrimaryKey columnNames="api_version_id, plan_id, version" tableName="api_plans"/>
     </changeSet>
     <changeSet author="apiman (generated)" id="1436469846462-26">
-        <addPrimaryKey columnNames="id" constraintName="application_versionsPK" tableName="application_versions"/>
+        <addPrimaryKey columnNames="id" constraintName="client_versionsPK" tableName="client_versions"/>
     </changeSet>
     <changeSet author="apiman (generated)" id="1436469846462-27">
-        <addPrimaryKey columnNames="id, organization_id" constraintName="applicationsPK" tableName="applications"/>
+        <addPrimaryKey columnNames="id, organization_id" constraintName="clientsPK" tableName="clients"/>
     </changeSet>
     <changeSet author="apiman (generated)" id="1436469846462-28">
         <addPrimaryKey columnNames="id" constraintName="auditlogPK" tableName="auditlog"/>
@@ -64,13 +64,13 @@
         <addForeignKeyConstraint baseColumnNames="organization_id" baseTableName="apis" constraintName="FK_31hj3xmhp1wedxjh5bklnlg15" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="organizations"/>
     </changeSet>
     <changeSet author="apiman (generated)" id="1436469846462-44">
-        <addForeignKeyConstraint baseColumnNames="appv_id" baseTableName="contracts" constraintName="FK_6h06sgs4dudh1wehmk0us973g" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="application_versions"/>
+        <addForeignKeyConstraint baseColumnNames="appv_id" baseTableName="contracts" constraintName="FK_6h06sgs4dudh1wehmk0us973g" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="client_versions"/>
     </changeSet>
     <changeSet author="apiman (generated)" id="1436469846462-45">
         <addForeignKeyConstraint baseColumnNames="api_version_id" baseTableName="api_defs" constraintName="FK_81fuw1n8afmvpw4buk7l4tyxk" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="api_versions"/>
     </changeSet>
     <changeSet author="apiman (generated)" id="1436469846462-46">
-        <addForeignKeyConstraint baseColumnNames="app_id,app_org_id" baseTableName="application_versions" constraintName="FK_8epnoby31bt7xakegakigpikp" deferrable="false" initiallyDeferred="false" referencedColumnNames="id,organization_id" referencedTableName="applications"/>
+        <addForeignKeyConstraint baseColumnNames="app_id,app_org_id" baseTableName="client_versions" constraintName="FK_8epnoby31bt7xakegakigpikp" deferrable="false" initiallyDeferred="false" referencedColumnNames="id,organization_id" referencedTableName="clients"/>
     </changeSet>
     <changeSet author="apiman (generated)" id="1436469846462-47">
         <addForeignKeyConstraint baseColumnNames="apiv_id" baseTableName="contracts" constraintName="FK_8o6t1f3kg96rxy5uv51f6k9fy" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="api_versions"/>
@@ -82,7 +82,7 @@
         <addForeignKeyConstraint baseColumnNames="api_version_id" baseTableName="endpoint_properties" constraintName="FK_gn0ydqur10sxuvpyw2jvv4xxb" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="api_versions"/>
     </changeSet>
     <changeSet author="apiman (generated)" id="1436469846462-50">
-        <addForeignKeyConstraint baseColumnNames="organization_id" baseTableName="applications" constraintName="FK_jenpu34rtuncsgvtw0sfo8qq9" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="organizations"/>
+        <addForeignKeyConstraint baseColumnNames="organization_id" baseTableName="clients" constraintName="FK_jenpu34rtuncsgvtw0sfo8qq9" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="organizations"/>
     </changeSet>
     <changeSet author="apiman (generated)" id="1436469846462-51">
         <addForeignKeyConstraint baseColumnNames="definition_id" baseTableName="policies" constraintName="FK_l4q6we1bos1yl9unmogei6aja" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="policydefs"/>

diff --git a/...ddl/src/main/liquibase/current/110-apiman-manager-api.db.unique.constraints.changelog.xml b/...ddl/src/main/liquibase/current/110-apiman-manager-api.db.unique.constraints.changelog.xml
@@ -14,7 +14,7 @@
     </changeSet>
     <changeSet author="apiman" id="addUniqueConstraint-4">
         <addUniqueConstraint columnNames="app_id, app_org_id, version" deferrable="false" disabled="false"
-                             constraintName="UK_app_versions_1" initiallyDeferred="false" tableName="application_versions"/>
+                             constraintName="UK_app_versions_1" initiallyDeferred="false" tableName="client_versions"/>
     </changeSet>
     <changeSet author="apiman" id="addUniqueConstraint-5">
         <addUniqueConstraint columnNames="api_id, api_org_id, version" deferrable="false" disabled="false"

diff --git a/distro/ddl/src/main/liquibase/current/200-apiman-manager-api.db.indexes.changelog.xml b/distro/ddl/src/main/liquibase/current/200-apiman-manager-api.db.indexes.changelog.xml
@@ -58,8 +58,8 @@
         </createIndex>
     </changeSet>
     <changeSet author="apiman" id="createIndex-10">
-        <createIndex indexName="IDX_FK_applications_1"
-                     tableName="applications">
+        <createIndex indexName="IDX_FK_clients_1"
+                     tableName="clients">
             <column name="organization_id"/>
         </createIndex>
     </changeSet>