From f0c0e6280b3ef8905e7531d62cd1d7c1da3a08a5 Mon Sep 17 00:00:00 2001 From: Nassib Nassar Date: Thu, 14 Jan 2016 14:23:49 -0500 Subject: [PATCH 01/10] Rename sling directory in auth --- auth/src/main/java/com/indexdata/{sling => okapi}/auth/Auth.java | 0 .../java/com/indexdata/{sling => okapi}/auth/LoginParameters.java | 0 .../java/com/indexdata/{sling => okapi}/auth/MainVerticle.java | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename auth/src/main/java/com/indexdata/{sling => okapi}/auth/Auth.java (100%) rename auth/src/main/java/com/indexdata/{sling => okapi}/auth/LoginParameters.java (100%) rename auth/src/main/java/com/indexdata/{sling => okapi}/auth/MainVerticle.java (100%) diff --git a/auth/src/main/java/com/indexdata/sling/auth/Auth.java b/auth/src/main/java/com/indexdata/okapi/auth/Auth.java similarity index 100% rename from auth/src/main/java/com/indexdata/sling/auth/Auth.java rename to auth/src/main/java/com/indexdata/okapi/auth/Auth.java diff --git a/auth/src/main/java/com/indexdata/sling/auth/LoginParameters.java b/auth/src/main/java/com/indexdata/okapi/auth/LoginParameters.java similarity index 100% rename from auth/src/main/java/com/indexdata/sling/auth/LoginParameters.java rename to auth/src/main/java/com/indexdata/okapi/auth/LoginParameters.java diff --git a/auth/src/main/java/com/indexdata/sling/auth/MainVerticle.java b/auth/src/main/java/com/indexdata/okapi/auth/MainVerticle.java similarity index 100% rename from auth/src/main/java/com/indexdata/sling/auth/MainVerticle.java rename to auth/src/main/java/com/indexdata/okapi/auth/MainVerticle.java From 0f6712160f5cc395b79eb131669369f28420523d Mon Sep 17 00:00:00 2001 From: Nassib Nassar Date: Thu, 14 Jan 2016 14:26:46 -0500 Subject: [PATCH 02/10] Rename sling-core directory --- {sling-core => okapi-core}/Dockerfile | 0 {sling-core => okapi-core}/README | 0 {sling-core => okapi-core}/nbactions.xml | 0 {sling-core => okapi-core}/pom.xml | 0 .../src/main/java/com/indexdata/sling/MainVerticle.java | 0 .../main/java/com/indexdata/sling/conduit/ModuleDescriptor.java | 0 .../src/main/java/com/indexdata/sling/conduit/ModuleHandle.java | 0 .../src/main/java/com/indexdata/sling/conduit/ModuleInstance.java | 0 .../src/main/java/com/indexdata/sling/conduit/ModuleMap.java | 0 .../src/main/java/com/indexdata/sling/conduit/Modules.java | 0 .../src/main/java/com/indexdata/sling/conduit/Ports.java | 0 .../com/indexdata/sling/conduit/ProcessDeploymentDescriptor.java | 0 .../java/com/indexdata/sling/conduit/ProcessModuleHandle.java | 0 .../src/main/java/com/indexdata/sling/conduit/RoutingEntry.java | 0 .../src/main/java/com/indexdata/sling/conduit/Tenant.java | 0 .../main/java/com/indexdata/sling/conduit/TenantDescriptor.java | 0 .../java/com/indexdata/sling/conduit/TenantModuleDescriptor.java | 0 .../java/com/indexdata/sling/conduit/service/ModuleService.java | 0 .../java/com/indexdata/sling/conduit/service/TenantService.java | 0 .../src/main/java/com/indexdata/sling/util/Box.java | 0 .../src/main/java/com/indexdata/sling/util/Failure.java | 0 .../src/main/java/com/indexdata/sling/util/Success.java | 0 {sling-core => okapi-core}/src/main/raml/okapi.raml | 0 {sling-core => okapi-core}/src/main/raml/types.raml | 0 .../test/java/com/indexdata/sling/conduit/DeployModuleTest.java | 0 .../java/com/indexdata/sling/conduit/ProcessModuleHandleTest.java | 0 .../src/test/java/com/indexdata/sling/conduit/TenantTest.java | 0 27 files changed, 0 insertions(+), 0 deletions(-) rename {sling-core => okapi-core}/Dockerfile (100%) rename {sling-core => okapi-core}/README (100%) rename {sling-core => okapi-core}/nbactions.xml (100%) rename {sling-core => okapi-core}/pom.xml (100%) rename {sling-core => okapi-core}/src/main/java/com/indexdata/sling/MainVerticle.java (100%) rename {sling-core => okapi-core}/src/main/java/com/indexdata/sling/conduit/ModuleDescriptor.java (100%) rename {sling-core => okapi-core}/src/main/java/com/indexdata/sling/conduit/ModuleHandle.java (100%) rename {sling-core => okapi-core}/src/main/java/com/indexdata/sling/conduit/ModuleInstance.java (100%) rename {sling-core => okapi-core}/src/main/java/com/indexdata/sling/conduit/ModuleMap.java (100%) rename {sling-core => okapi-core}/src/main/java/com/indexdata/sling/conduit/Modules.java (100%) rename {sling-core => okapi-core}/src/main/java/com/indexdata/sling/conduit/Ports.java (100%) rename {sling-core => okapi-core}/src/main/java/com/indexdata/sling/conduit/ProcessDeploymentDescriptor.java (100%) rename {sling-core => okapi-core}/src/main/java/com/indexdata/sling/conduit/ProcessModuleHandle.java (100%) rename {sling-core => okapi-core}/src/main/java/com/indexdata/sling/conduit/RoutingEntry.java (100%) rename {sling-core => okapi-core}/src/main/java/com/indexdata/sling/conduit/Tenant.java (100%) rename {sling-core => okapi-core}/src/main/java/com/indexdata/sling/conduit/TenantDescriptor.java (100%) rename {sling-core => okapi-core}/src/main/java/com/indexdata/sling/conduit/TenantModuleDescriptor.java (100%) rename {sling-core => okapi-core}/src/main/java/com/indexdata/sling/conduit/service/ModuleService.java (100%) rename {sling-core => okapi-core}/src/main/java/com/indexdata/sling/conduit/service/TenantService.java (100%) rename {sling-core => okapi-core}/src/main/java/com/indexdata/sling/util/Box.java (100%) rename {sling-core => okapi-core}/src/main/java/com/indexdata/sling/util/Failure.java (100%) rename {sling-core => okapi-core}/src/main/java/com/indexdata/sling/util/Success.java (100%) rename {sling-core => okapi-core}/src/main/raml/okapi.raml (100%) rename {sling-core => okapi-core}/src/main/raml/types.raml (100%) rename {sling-core => okapi-core}/src/test/java/com/indexdata/sling/conduit/DeployModuleTest.java (100%) rename {sling-core => okapi-core}/src/test/java/com/indexdata/sling/conduit/ProcessModuleHandleTest.java (100%) rename {sling-core => okapi-core}/src/test/java/com/indexdata/sling/conduit/TenantTest.java (100%) diff --git a/sling-core/Dockerfile b/okapi-core/Dockerfile similarity index 100% rename from sling-core/Dockerfile rename to okapi-core/Dockerfile diff --git a/sling-core/README b/okapi-core/README similarity index 100% rename from sling-core/README rename to okapi-core/README diff --git a/sling-core/nbactions.xml b/okapi-core/nbactions.xml similarity index 100% rename from sling-core/nbactions.xml rename to okapi-core/nbactions.xml diff --git a/sling-core/pom.xml b/okapi-core/pom.xml similarity index 100% rename from sling-core/pom.xml rename to okapi-core/pom.xml diff --git a/sling-core/src/main/java/com/indexdata/sling/MainVerticle.java b/okapi-core/src/main/java/com/indexdata/sling/MainVerticle.java similarity index 100% rename from sling-core/src/main/java/com/indexdata/sling/MainVerticle.java rename to okapi-core/src/main/java/com/indexdata/sling/MainVerticle.java diff --git a/sling-core/src/main/java/com/indexdata/sling/conduit/ModuleDescriptor.java b/okapi-core/src/main/java/com/indexdata/sling/conduit/ModuleDescriptor.java similarity index 100% rename from sling-core/src/main/java/com/indexdata/sling/conduit/ModuleDescriptor.java rename to okapi-core/src/main/java/com/indexdata/sling/conduit/ModuleDescriptor.java diff --git a/sling-core/src/main/java/com/indexdata/sling/conduit/ModuleHandle.java b/okapi-core/src/main/java/com/indexdata/sling/conduit/ModuleHandle.java similarity index 100% rename from sling-core/src/main/java/com/indexdata/sling/conduit/ModuleHandle.java rename to okapi-core/src/main/java/com/indexdata/sling/conduit/ModuleHandle.java diff --git a/sling-core/src/main/java/com/indexdata/sling/conduit/ModuleInstance.java b/okapi-core/src/main/java/com/indexdata/sling/conduit/ModuleInstance.java similarity index 100% rename from sling-core/src/main/java/com/indexdata/sling/conduit/ModuleInstance.java rename to okapi-core/src/main/java/com/indexdata/sling/conduit/ModuleInstance.java diff --git a/sling-core/src/main/java/com/indexdata/sling/conduit/ModuleMap.java b/okapi-core/src/main/java/com/indexdata/sling/conduit/ModuleMap.java similarity index 100% rename from sling-core/src/main/java/com/indexdata/sling/conduit/ModuleMap.java rename to okapi-core/src/main/java/com/indexdata/sling/conduit/ModuleMap.java diff --git a/sling-core/src/main/java/com/indexdata/sling/conduit/Modules.java b/okapi-core/src/main/java/com/indexdata/sling/conduit/Modules.java similarity index 100% rename from sling-core/src/main/java/com/indexdata/sling/conduit/Modules.java rename to okapi-core/src/main/java/com/indexdata/sling/conduit/Modules.java diff --git a/sling-core/src/main/java/com/indexdata/sling/conduit/Ports.java b/okapi-core/src/main/java/com/indexdata/sling/conduit/Ports.java similarity index 100% rename from sling-core/src/main/java/com/indexdata/sling/conduit/Ports.java rename to okapi-core/src/main/java/com/indexdata/sling/conduit/Ports.java diff --git a/sling-core/src/main/java/com/indexdata/sling/conduit/ProcessDeploymentDescriptor.java b/okapi-core/src/main/java/com/indexdata/sling/conduit/ProcessDeploymentDescriptor.java similarity index 100% rename from sling-core/src/main/java/com/indexdata/sling/conduit/ProcessDeploymentDescriptor.java rename to okapi-core/src/main/java/com/indexdata/sling/conduit/ProcessDeploymentDescriptor.java diff --git a/sling-core/src/main/java/com/indexdata/sling/conduit/ProcessModuleHandle.java b/okapi-core/src/main/java/com/indexdata/sling/conduit/ProcessModuleHandle.java similarity index 100% rename from sling-core/src/main/java/com/indexdata/sling/conduit/ProcessModuleHandle.java rename to okapi-core/src/main/java/com/indexdata/sling/conduit/ProcessModuleHandle.java diff --git a/sling-core/src/main/java/com/indexdata/sling/conduit/RoutingEntry.java b/okapi-core/src/main/java/com/indexdata/sling/conduit/RoutingEntry.java similarity index 100% rename from sling-core/src/main/java/com/indexdata/sling/conduit/RoutingEntry.java rename to okapi-core/src/main/java/com/indexdata/sling/conduit/RoutingEntry.java diff --git a/sling-core/src/main/java/com/indexdata/sling/conduit/Tenant.java b/okapi-core/src/main/java/com/indexdata/sling/conduit/Tenant.java similarity index 100% rename from sling-core/src/main/java/com/indexdata/sling/conduit/Tenant.java rename to okapi-core/src/main/java/com/indexdata/sling/conduit/Tenant.java diff --git a/sling-core/src/main/java/com/indexdata/sling/conduit/TenantDescriptor.java b/okapi-core/src/main/java/com/indexdata/sling/conduit/TenantDescriptor.java similarity index 100% rename from sling-core/src/main/java/com/indexdata/sling/conduit/TenantDescriptor.java rename to okapi-core/src/main/java/com/indexdata/sling/conduit/TenantDescriptor.java diff --git a/sling-core/src/main/java/com/indexdata/sling/conduit/TenantModuleDescriptor.java b/okapi-core/src/main/java/com/indexdata/sling/conduit/TenantModuleDescriptor.java similarity index 100% rename from sling-core/src/main/java/com/indexdata/sling/conduit/TenantModuleDescriptor.java rename to okapi-core/src/main/java/com/indexdata/sling/conduit/TenantModuleDescriptor.java diff --git a/sling-core/src/main/java/com/indexdata/sling/conduit/service/ModuleService.java b/okapi-core/src/main/java/com/indexdata/sling/conduit/service/ModuleService.java similarity index 100% rename from sling-core/src/main/java/com/indexdata/sling/conduit/service/ModuleService.java rename to okapi-core/src/main/java/com/indexdata/sling/conduit/service/ModuleService.java diff --git a/sling-core/src/main/java/com/indexdata/sling/conduit/service/TenantService.java b/okapi-core/src/main/java/com/indexdata/sling/conduit/service/TenantService.java similarity index 100% rename from sling-core/src/main/java/com/indexdata/sling/conduit/service/TenantService.java rename to okapi-core/src/main/java/com/indexdata/sling/conduit/service/TenantService.java diff --git a/sling-core/src/main/java/com/indexdata/sling/util/Box.java b/okapi-core/src/main/java/com/indexdata/sling/util/Box.java similarity index 100% rename from sling-core/src/main/java/com/indexdata/sling/util/Box.java rename to okapi-core/src/main/java/com/indexdata/sling/util/Box.java diff --git a/sling-core/src/main/java/com/indexdata/sling/util/Failure.java b/okapi-core/src/main/java/com/indexdata/sling/util/Failure.java similarity index 100% rename from sling-core/src/main/java/com/indexdata/sling/util/Failure.java rename to okapi-core/src/main/java/com/indexdata/sling/util/Failure.java diff --git a/sling-core/src/main/java/com/indexdata/sling/util/Success.java b/okapi-core/src/main/java/com/indexdata/sling/util/Success.java similarity index 100% rename from sling-core/src/main/java/com/indexdata/sling/util/Success.java rename to okapi-core/src/main/java/com/indexdata/sling/util/Success.java diff --git a/sling-core/src/main/raml/okapi.raml b/okapi-core/src/main/raml/okapi.raml similarity index 100% rename from sling-core/src/main/raml/okapi.raml rename to okapi-core/src/main/raml/okapi.raml diff --git a/sling-core/src/main/raml/types.raml b/okapi-core/src/main/raml/types.raml similarity index 100% rename from sling-core/src/main/raml/types.raml rename to okapi-core/src/main/raml/types.raml diff --git a/sling-core/src/test/java/com/indexdata/sling/conduit/DeployModuleTest.java b/okapi-core/src/test/java/com/indexdata/sling/conduit/DeployModuleTest.java similarity index 100% rename from sling-core/src/test/java/com/indexdata/sling/conduit/DeployModuleTest.java rename to okapi-core/src/test/java/com/indexdata/sling/conduit/DeployModuleTest.java diff --git a/sling-core/src/test/java/com/indexdata/sling/conduit/ProcessModuleHandleTest.java b/okapi-core/src/test/java/com/indexdata/sling/conduit/ProcessModuleHandleTest.java similarity index 100% rename from sling-core/src/test/java/com/indexdata/sling/conduit/ProcessModuleHandleTest.java rename to okapi-core/src/test/java/com/indexdata/sling/conduit/ProcessModuleHandleTest.java diff --git a/sling-core/src/test/java/com/indexdata/sling/conduit/TenantTest.java b/okapi-core/src/test/java/com/indexdata/sling/conduit/TenantTest.java similarity index 100% rename from sling-core/src/test/java/com/indexdata/sling/conduit/TenantTest.java rename to okapi-core/src/test/java/com/indexdata/sling/conduit/TenantTest.java From f1628cdf0bdc20fda8eda0fce6a0b113dc745385 Mon Sep 17 00:00:00 2001 From: Nassib Nassar Date: Thu, 14 Jan 2016 14:27:28 -0500 Subject: [PATCH 03/10] Rename sling directory in okapi-core --- .../main/java/com/indexdata/{sling => okapi}/MainVerticle.java | 0 .../com/indexdata/{sling => okapi}/conduit/ModuleDescriptor.java | 0 .../java/com/indexdata/{sling => okapi}/conduit/ModuleHandle.java | 0 .../com/indexdata/{sling => okapi}/conduit/ModuleInstance.java | 0 .../java/com/indexdata/{sling => okapi}/conduit/ModuleMap.java | 0 .../main/java/com/indexdata/{sling => okapi}/conduit/Modules.java | 0 .../main/java/com/indexdata/{sling => okapi}/conduit/Ports.java | 0 .../{sling => okapi}/conduit/ProcessDeploymentDescriptor.java | 0 .../indexdata/{sling => okapi}/conduit/ProcessModuleHandle.java | 0 .../java/com/indexdata/{sling => okapi}/conduit/RoutingEntry.java | 0 .../main/java/com/indexdata/{sling => okapi}/conduit/Tenant.java | 0 .../com/indexdata/{sling => okapi}/conduit/TenantDescriptor.java | 0 .../{sling => okapi}/conduit/TenantModuleDescriptor.java | 0 .../indexdata/{sling => okapi}/conduit/service/ModuleService.java | 0 .../indexdata/{sling => okapi}/conduit/service/TenantService.java | 0 .../src/main/java/com/indexdata/{sling => okapi}/util/Box.java | 0 .../main/java/com/indexdata/{sling => okapi}/util/Failure.java | 0 .../main/java/com/indexdata/{sling => okapi}/util/Success.java | 0 18 files changed, 0 insertions(+), 0 deletions(-) rename okapi-core/src/main/java/com/indexdata/{sling => okapi}/MainVerticle.java (100%) rename okapi-core/src/main/java/com/indexdata/{sling => okapi}/conduit/ModuleDescriptor.java (100%) rename okapi-core/src/main/java/com/indexdata/{sling => okapi}/conduit/ModuleHandle.java (100%) rename okapi-core/src/main/java/com/indexdata/{sling => okapi}/conduit/ModuleInstance.java (100%) rename okapi-core/src/main/java/com/indexdata/{sling => okapi}/conduit/ModuleMap.java (100%) rename okapi-core/src/main/java/com/indexdata/{sling => okapi}/conduit/Modules.java (100%) rename okapi-core/src/main/java/com/indexdata/{sling => okapi}/conduit/Ports.java (100%) rename okapi-core/src/main/java/com/indexdata/{sling => okapi}/conduit/ProcessDeploymentDescriptor.java (100%) rename okapi-core/src/main/java/com/indexdata/{sling => okapi}/conduit/ProcessModuleHandle.java (100%) rename okapi-core/src/main/java/com/indexdata/{sling => okapi}/conduit/RoutingEntry.java (100%) rename okapi-core/src/main/java/com/indexdata/{sling => okapi}/conduit/Tenant.java (100%) rename okapi-core/src/main/java/com/indexdata/{sling => okapi}/conduit/TenantDescriptor.java (100%) rename okapi-core/src/main/java/com/indexdata/{sling => okapi}/conduit/TenantModuleDescriptor.java (100%) rename okapi-core/src/main/java/com/indexdata/{sling => okapi}/conduit/service/ModuleService.java (100%) rename okapi-core/src/main/java/com/indexdata/{sling => okapi}/conduit/service/TenantService.java (100%) rename okapi-core/src/main/java/com/indexdata/{sling => okapi}/util/Box.java (100%) rename okapi-core/src/main/java/com/indexdata/{sling => okapi}/util/Failure.java (100%) rename okapi-core/src/main/java/com/indexdata/{sling => okapi}/util/Success.java (100%) diff --git a/okapi-core/src/main/java/com/indexdata/sling/MainVerticle.java b/okapi-core/src/main/java/com/indexdata/okapi/MainVerticle.java similarity index 100% rename from okapi-core/src/main/java/com/indexdata/sling/MainVerticle.java rename to okapi-core/src/main/java/com/indexdata/okapi/MainVerticle.java diff --git a/okapi-core/src/main/java/com/indexdata/sling/conduit/ModuleDescriptor.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleDescriptor.java similarity index 100% rename from okapi-core/src/main/java/com/indexdata/sling/conduit/ModuleDescriptor.java rename to okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleDescriptor.java diff --git a/okapi-core/src/main/java/com/indexdata/sling/conduit/ModuleHandle.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleHandle.java similarity index 100% rename from okapi-core/src/main/java/com/indexdata/sling/conduit/ModuleHandle.java rename to okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleHandle.java diff --git a/okapi-core/src/main/java/com/indexdata/sling/conduit/ModuleInstance.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleInstance.java similarity index 100% rename from okapi-core/src/main/java/com/indexdata/sling/conduit/ModuleInstance.java rename to okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleInstance.java diff --git a/okapi-core/src/main/java/com/indexdata/sling/conduit/ModuleMap.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleMap.java similarity index 100% rename from okapi-core/src/main/java/com/indexdata/sling/conduit/ModuleMap.java rename to okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleMap.java diff --git a/okapi-core/src/main/java/com/indexdata/sling/conduit/Modules.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/Modules.java similarity index 100% rename from okapi-core/src/main/java/com/indexdata/sling/conduit/Modules.java rename to okapi-core/src/main/java/com/indexdata/okapi/conduit/Modules.java diff --git a/okapi-core/src/main/java/com/indexdata/sling/conduit/Ports.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/Ports.java similarity index 100% rename from okapi-core/src/main/java/com/indexdata/sling/conduit/Ports.java rename to okapi-core/src/main/java/com/indexdata/okapi/conduit/Ports.java diff --git a/okapi-core/src/main/java/com/indexdata/sling/conduit/ProcessDeploymentDescriptor.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/ProcessDeploymentDescriptor.java similarity index 100% rename from okapi-core/src/main/java/com/indexdata/sling/conduit/ProcessDeploymentDescriptor.java rename to okapi-core/src/main/java/com/indexdata/okapi/conduit/ProcessDeploymentDescriptor.java diff --git a/okapi-core/src/main/java/com/indexdata/sling/conduit/ProcessModuleHandle.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/ProcessModuleHandle.java similarity index 100% rename from okapi-core/src/main/java/com/indexdata/sling/conduit/ProcessModuleHandle.java rename to okapi-core/src/main/java/com/indexdata/okapi/conduit/ProcessModuleHandle.java diff --git a/okapi-core/src/main/java/com/indexdata/sling/conduit/RoutingEntry.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/RoutingEntry.java similarity index 100% rename from okapi-core/src/main/java/com/indexdata/sling/conduit/RoutingEntry.java rename to okapi-core/src/main/java/com/indexdata/okapi/conduit/RoutingEntry.java diff --git a/okapi-core/src/main/java/com/indexdata/sling/conduit/Tenant.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/Tenant.java similarity index 100% rename from okapi-core/src/main/java/com/indexdata/sling/conduit/Tenant.java rename to okapi-core/src/main/java/com/indexdata/okapi/conduit/Tenant.java diff --git a/okapi-core/src/main/java/com/indexdata/sling/conduit/TenantDescriptor.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/TenantDescriptor.java similarity index 100% rename from okapi-core/src/main/java/com/indexdata/sling/conduit/TenantDescriptor.java rename to okapi-core/src/main/java/com/indexdata/okapi/conduit/TenantDescriptor.java diff --git a/okapi-core/src/main/java/com/indexdata/sling/conduit/TenantModuleDescriptor.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/TenantModuleDescriptor.java similarity index 100% rename from okapi-core/src/main/java/com/indexdata/sling/conduit/TenantModuleDescriptor.java rename to okapi-core/src/main/java/com/indexdata/okapi/conduit/TenantModuleDescriptor.java diff --git a/okapi-core/src/main/java/com/indexdata/sling/conduit/service/ModuleService.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/service/ModuleService.java similarity index 100% rename from okapi-core/src/main/java/com/indexdata/sling/conduit/service/ModuleService.java rename to okapi-core/src/main/java/com/indexdata/okapi/conduit/service/ModuleService.java diff --git a/okapi-core/src/main/java/com/indexdata/sling/conduit/service/TenantService.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/service/TenantService.java similarity index 100% rename from okapi-core/src/main/java/com/indexdata/sling/conduit/service/TenantService.java rename to okapi-core/src/main/java/com/indexdata/okapi/conduit/service/TenantService.java diff --git a/okapi-core/src/main/java/com/indexdata/sling/util/Box.java b/okapi-core/src/main/java/com/indexdata/okapi/util/Box.java similarity index 100% rename from okapi-core/src/main/java/com/indexdata/sling/util/Box.java rename to okapi-core/src/main/java/com/indexdata/okapi/util/Box.java diff --git a/okapi-core/src/main/java/com/indexdata/sling/util/Failure.java b/okapi-core/src/main/java/com/indexdata/okapi/util/Failure.java similarity index 100% rename from okapi-core/src/main/java/com/indexdata/sling/util/Failure.java rename to okapi-core/src/main/java/com/indexdata/okapi/util/Failure.java diff --git a/okapi-core/src/main/java/com/indexdata/sling/util/Success.java b/okapi-core/src/main/java/com/indexdata/okapi/util/Success.java similarity index 100% rename from okapi-core/src/main/java/com/indexdata/sling/util/Success.java rename to okapi-core/src/main/java/com/indexdata/okapi/util/Success.java From caff4a9038cbc34fce83be6618675b785171bd31 Mon Sep 17 00:00:00 2001 From: Nassib Nassar Date: Thu, 14 Jan 2016 14:28:43 -0500 Subject: [PATCH 04/10] Rename sling directory in okapi-core test --- .../com/indexdata/{sling => okapi}/conduit/DeployModuleTest.java | 0 .../{sling => okapi}/conduit/ProcessModuleHandleTest.java | 0 .../java/com/indexdata/{sling => okapi}/conduit/TenantTest.java | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename okapi-core/src/test/java/com/indexdata/{sling => okapi}/conduit/DeployModuleTest.java (100%) rename okapi-core/src/test/java/com/indexdata/{sling => okapi}/conduit/ProcessModuleHandleTest.java (100%) rename okapi-core/src/test/java/com/indexdata/{sling => okapi}/conduit/TenantTest.java (100%) diff --git a/okapi-core/src/test/java/com/indexdata/sling/conduit/DeployModuleTest.java b/okapi-core/src/test/java/com/indexdata/okapi/conduit/DeployModuleTest.java similarity index 100% rename from okapi-core/src/test/java/com/indexdata/sling/conduit/DeployModuleTest.java rename to okapi-core/src/test/java/com/indexdata/okapi/conduit/DeployModuleTest.java diff --git a/okapi-core/src/test/java/com/indexdata/sling/conduit/ProcessModuleHandleTest.java b/okapi-core/src/test/java/com/indexdata/okapi/conduit/ProcessModuleHandleTest.java similarity index 100% rename from okapi-core/src/test/java/com/indexdata/sling/conduit/ProcessModuleHandleTest.java rename to okapi-core/src/test/java/com/indexdata/okapi/conduit/ProcessModuleHandleTest.java diff --git a/okapi-core/src/test/java/com/indexdata/sling/conduit/TenantTest.java b/okapi-core/src/test/java/com/indexdata/okapi/conduit/TenantTest.java similarity index 100% rename from okapi-core/src/test/java/com/indexdata/sling/conduit/TenantTest.java rename to okapi-core/src/test/java/com/indexdata/okapi/conduit/TenantTest.java From 978ca7735aee600c8f7e60840dc84cc082ef6a20 Mon Sep 17 00:00:00 2001 From: Nassib Nassar Date: Thu, 14 Jan 2016 14:29:43 -0500 Subject: [PATCH 05/10] Rename sling-sample-module directory --- {sling-sample-module => okapi-sample-module}/Dockerfile | 0 {sling-sample-module => okapi-sample-module}/pom.xml | 0 .../src/main/java/com/indexdata/sling/MainVerticle.java | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {sling-sample-module => okapi-sample-module}/Dockerfile (100%) rename {sling-sample-module => okapi-sample-module}/pom.xml (100%) rename {sling-sample-module => okapi-sample-module}/src/main/java/com/indexdata/sling/MainVerticle.java (100%) diff --git a/sling-sample-module/Dockerfile b/okapi-sample-module/Dockerfile similarity index 100% rename from sling-sample-module/Dockerfile rename to okapi-sample-module/Dockerfile diff --git a/sling-sample-module/pom.xml b/okapi-sample-module/pom.xml similarity index 100% rename from sling-sample-module/pom.xml rename to okapi-sample-module/pom.xml diff --git a/sling-sample-module/src/main/java/com/indexdata/sling/MainVerticle.java b/okapi-sample-module/src/main/java/com/indexdata/sling/MainVerticle.java similarity index 100% rename from sling-sample-module/src/main/java/com/indexdata/sling/MainVerticle.java rename to okapi-sample-module/src/main/java/com/indexdata/sling/MainVerticle.java From 051f83c4bc443eebce55d5579abf6f1f9f54c235 Mon Sep 17 00:00:00 2001 From: Nassib Nassar Date: Thu, 14 Jan 2016 14:30:07 -0500 Subject: [PATCH 06/10] Rename sling directory in okapi-sample-module --- .../main/java/com/indexdata/{sling => okapi}/MainVerticle.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename okapi-sample-module/src/main/java/com/indexdata/{sling => okapi}/MainVerticle.java (100%) diff --git a/okapi-sample-module/src/main/java/com/indexdata/sling/MainVerticle.java b/okapi-sample-module/src/main/java/com/indexdata/okapi/MainVerticle.java similarity index 100% rename from okapi-sample-module/src/main/java/com/indexdata/sling/MainVerticle.java rename to okapi-sample-module/src/main/java/com/indexdata/okapi/MainVerticle.java From 74243a8c06797a52339aed00bd0f8cb3cae6e5d3 Mon Sep 17 00:00:00 2001 From: Nassib Nassar Date: Thu, 14 Jan 2016 14:39:08 -0500 Subject: [PATCH 07/10] Rename sling in auth code --- auth/pom.xml | 6 ++--- .../java/com/indexdata/okapi/auth/Auth.java | 22 +++++++++---------- .../indexdata/okapi/auth/LoginParameters.java | 2 +- .../indexdata/okapi/auth/MainVerticle.java | 2 +- auth/testdata/check.sh | 6 ++--- auth/testdata/login.sh | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/auth/pom.xml b/auth/pom.xml index 3147a0ff4..1ee551633 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -2,8 +2,8 @@ 4.0.0 - com.indexdata.sling - sling + com.indexdata.okapi + okapi 1.0-SNAPSHOT auth @@ -41,7 +41,7 @@ implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> io.vertx.core.Starter - com.indexdata.sling.auth.MainVerticle + com.indexdata.okapi.auth.MainVerticle diff --git a/auth/src/main/java/com/indexdata/okapi/auth/Auth.java b/auth/src/main/java/com/indexdata/okapi/auth/Auth.java index ddfd23083..58cc67260 100644 --- a/auth/src/main/java/com/indexdata/okapi/auth/Auth.java +++ b/auth/src/main/java/com/indexdata/okapi/auth/Auth.java @@ -3,7 +3,7 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.auth; +package com.indexdata.okapi.auth; import io.vertx.core.json.DecodeException; import io.vertx.core.json.Json; @@ -18,12 +18,12 @@ * Provides a minimal authentication mechanism. * @author heikki * - * TODO: Check the X-Sling-Tenant header matches the tenant parameter, or use + * TODO: Check the X-Okapi-Tenant header matches the tenant parameter, or use * that one instead of the parameter. * TODO: Separate the headers so that - * - X-Sling-Tenant is the tenant - * - X-Sling-User is the user - * - X-Sling-token is the crypto token + * - X-Okapi-Tenant is the tenant + * - X-Okapi-User is the user + * - X-Okapi-token is the crypto token * OKAPI needs to get hold of the tenant already before a login, so it should * be separate. @@ -35,7 +35,7 @@ public class Auth { - static final String SLINGTOKENHEADER = "X-Sling-Token"; + static final String OKAPITOKENHEADER = "X-Okapi-Token"; /** * Calculate a token from tenant and username. @@ -100,18 +100,18 @@ public void login(RoutingContext ctx) { } System.out.println("Ok login for " + u + ": " + tok); ctx.response() - .headers().add(SLINGTOKENHEADER,tok); + .headers().add(OKAPITOKENHEADER,tok); ctx.response().setStatusCode(200); ctx.response().end(json); } public void check (RoutingContext ctx) { - String tok = ctx.request().getHeader(SLINGTOKENHEADER); + String tok = ctx.request().getHeader(OKAPITOKENHEADER); if ( tok == null || tok.isEmpty() ) { - System.out.println("Auth.check called without " + SLINGTOKENHEADER); + System.out.println("Auth.check called without " + OKAPITOKENHEADER); ctx.response() .setStatusCode(401) // Check symbolic name for "forbidden" - .end("Auth.check called without " + SLINGTOKENHEADER ); + .end("Auth.check called without " + OKAPITOKENHEADER ); return; } //System.out.println("Auth.check called with " + tok); @@ -133,7 +133,7 @@ public void check (RoutingContext ctx) { Logger.getLogger(Auth.class.getName()).log(Level.SEVERE, null, ex); } ctx.response() - .headers().add(SLINGTOKENHEADER,tok); + .headers().add(OKAPITOKENHEADER,tok); ctx.response().setStatusCode(202); // 202 = Accepted echo(ctx); // signal to the conduit that we want to continue the module chain diff --git a/auth/src/main/java/com/indexdata/okapi/auth/LoginParameters.java b/auth/src/main/java/com/indexdata/okapi/auth/LoginParameters.java index 0f05f689c..e52df22a3 100644 --- a/auth/src/main/java/com/indexdata/okapi/auth/LoginParameters.java +++ b/auth/src/main/java/com/indexdata/okapi/auth/LoginParameters.java @@ -3,7 +3,7 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.auth; +package com.indexdata.okapi.auth; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/auth/src/main/java/com/indexdata/okapi/auth/MainVerticle.java b/auth/src/main/java/com/indexdata/okapi/auth/MainVerticle.java index 9528fdb8e..87bb134c7 100644 --- a/auth/src/main/java/com/indexdata/okapi/auth/MainVerticle.java +++ b/auth/src/main/java/com/indexdata/okapi/auth/MainVerticle.java @@ -3,7 +3,7 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.auth; +package com.indexdata.okapi.auth; import io.vertx.core.AbstractVerticle; import io.vertx.core.Future; diff --git a/auth/testdata/check.sh b/auth/testdata/check.sh index 66d723b18..01037d150 100755 --- a/auth/testdata/check.sh +++ b/auth/testdata/check.sh @@ -4,12 +4,12 @@ echo The following checks should fail: echo curl -D - http://localhost:9020/anything.at.all echo -curl -D - -H X-Sling-Token:t1:peter:10 -w'\n' http://localhost:9020/anything.at.all +curl -D - -H X-Okapi-Token:t1:peter:10 -w'\n' http://localhost:9020/anything.at.all echo -curl -D - -H X-Sling-Token:foo -w'\n' http://localhost:9020/anything.at.all +curl -D - -H X-Okapi-Token:foo -w'\n' http://localhost:9020/anything.at.all echo echo echo The following check should succeed: -curl -D - -H X-Sling-Token:t1:peter:10058b75cb0b719d5a9efb39e97416bc -w'\n' http://localhost:9020/anything.at.all +curl -D - -H X-Okapi-Token:t1:peter:10058b75cb0b719d5a9efb39e97416bc -w'\n' http://localhost:9020/anything.at.all echo diff --git a/auth/testdata/login.sh b/auth/testdata/login.sh index f42c5ad48..adc220981 100755 --- a/auth/testdata/login.sh +++ b/auth/testdata/login.sh @@ -1,7 +1,7 @@ echo The following login should fail -curl -D - -H X-Sling-Token:t1:peter:10058b75cb0b719d5a9efb39e97416bc -w'\n' -X POST -d @login-bad.json http://localhost:9020/login +curl -D - -H X-Okapi-Token:t1:peter:10058b75cb0b719d5a9efb39e97416bc -w'\n' -X POST -d @login-bad.json http://localhost:9020/login echo echo The following login should succeed -curl -D - -H X-Sling-Token:t1:peter:10058b75cb0b719d5a9efb39e97416bc -w'\n' -X POST -d @login1.json http://localhost:9020/login +curl -D - -H X-Okapi-Token:t1:peter:10058b75cb0b719d5a9efb39e97416bc -w'\n' -X POST -d @login1.json http://localhost:9020/login echo From 23266e246c2ca8dae14a47532f7c300ba07189a9 Mon Sep 17 00:00:00 2001 From: Nassib Nassar Date: Thu, 14 Jan 2016 14:55:18 -0500 Subject: [PATCH 08/10] Rename sling in okapi-core code --- okapi-core/Dockerfile | 6 +- okapi-core/nbactions.xml | 6 +- okapi-core/pom.xml | 8 +- .../com/indexdata/okapi/MainVerticle.java | 6 +- .../okapi/conduit/ModuleDescriptor.java | 2 +- .../indexdata/okapi/conduit/ModuleHandle.java | 2 +- .../okapi/conduit/ModuleInstance.java | 2 +- .../indexdata/okapi/conduit/ModuleMap.java | 2 +- .../com/indexdata/okapi/conduit/Modules.java | 2 +- .../com/indexdata/okapi/conduit/Ports.java | 2 +- .../conduit/ProcessDeploymentDescriptor.java | 2 +- .../okapi/conduit/ProcessModuleHandle.java | 2 +- .../indexdata/okapi/conduit/RoutingEntry.java | 2 +- .../com/indexdata/okapi/conduit/Tenant.java | 4 +- .../okapi/conduit/TenantDescriptor.java | 2 +- .../okapi/conduit/TenantModuleDescriptor.java | 2 +- .../okapi/conduit/service/ModuleService.java | 18 ++-- .../okapi/conduit/service/TenantService.java | 8 +- .../java/com/indexdata/okapi/util/Box.java | 2 +- .../com/indexdata/okapi/util/Failure.java | 4 +- .../com/indexdata/okapi/util/Success.java | 2 +- okapi-core/src/main/raml/okapi.raml | 2 +- .../okapi/conduit/DeployModuleTest.java | 86 +++++++++---------- .../conduit/ProcessModuleHandleTest.java | 2 +- .../indexdata/okapi/conduit/TenantTest.java | 4 +- 25 files changed, 90 insertions(+), 90 deletions(-) diff --git a/okapi-core/Dockerfile b/okapi-core/Dockerfile index 96d21e7a0..a359f88e3 100644 --- a/okapi-core/Dockerfile +++ b/okapi-core/Dockerfile @@ -1,14 +1,14 @@ ### # vert.x docker example using a Java verticle packaged as a fatjar # To build: -# docker build -t indexdata/sling-core . +# docker build -t indexdata/okapi-core . # To run: -# docker run -t -i -p 8080:8080 indexdata/sling-core +# docker run -t -i -p 8080:8080 indexdata/okapi-core ### FROM java:8 -ENV VERTICLE_FILE sling-core-fat.jar +ENV VERTICLE_FILE okapi-core-fat.jar # Set the location of the verticles ENV VERTICLE_HOME /usr/verticles diff --git a/okapi-core/nbactions.xml b/okapi-core/nbactions.xml index 596a33e86..33585fb81 100644 --- a/okapi-core/nbactions.xml +++ b/okapi-core/nbactions.xml @@ -10,7 +10,7 @@ org.codehaus.mojo:exec-maven-plugin:1.2.1:java - run com.indexdata.sling.MainVerticle + run com.indexdata.okapi.MainVerticle io.vertx.core.Starter @@ -24,7 +24,7 @@ org.codehaus.mojo:exec-maven-plugin:1.2.1:exec - -Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath io.vertx.core.Starter run com.indexdata.sling.MainVerticle + -Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath io.vertx.core.Starter run com.indexdata.okapi.MainVerticle java true @@ -39,7 +39,7 @@ org.codehaus.mojo:exec-maven-plugin:1.2.1:exec - -classpath %classpath io.vertx.core.Starter run com.indexdata.sling.MainVerticle + -classpath %classpath io.vertx.core.Starter run com.indexdata.okapi.MainVerticle java diff --git a/okapi-core/pom.xml b/okapi-core/pom.xml index e0e0b921a..8eee4ff10 100644 --- a/okapi-core/pom.xml +++ b/okapi-core/pom.xml @@ -4,12 +4,12 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.indexdata.sling - sling + com.indexdata.okapi + okapi 1.0-SNAPSHOT - sling-core + okapi-core @@ -54,7 +54,7 @@ implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> io.vertx.core.Starter - com.indexdata.sling.MainVerticle + com.indexdata.okapi.MainVerticle diff --git a/okapi-core/src/main/java/com/indexdata/okapi/MainVerticle.java b/okapi-core/src/main/java/com/indexdata/okapi/MainVerticle.java index 59ef816b7..e30bf5e21 100644 --- a/okapi-core/src/main/java/com/indexdata/okapi/MainVerticle.java +++ b/okapi-core/src/main/java/com/indexdata/okapi/MainVerticle.java @@ -3,10 +3,10 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling; +package com.indexdata.okapi; -import com.indexdata.sling.conduit.service.ModuleService; -import com.indexdata.sling.conduit.service.TenantService; +import com.indexdata.okapi.conduit.service.ModuleService; +import com.indexdata.okapi.conduit.service.TenantService; import io.vertx.core.AbstractVerticle; import io.vertx.core.Context; import io.vertx.core.Future; diff --git a/okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleDescriptor.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleDescriptor.java index b881b785a..baf1f9d15 100644 --- a/okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleDescriptor.java +++ b/okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleDescriptor.java @@ -3,7 +3,7 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.conduit; +package com.indexdata.okapi.conduit; import java.util.List; diff --git a/okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleHandle.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleHandle.java index e936a1f78..e774a5e5c 100644 --- a/okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleHandle.java +++ b/okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleHandle.java @@ -3,7 +3,7 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.conduit; +package com.indexdata.okapi.conduit; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; diff --git a/okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleInstance.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleInstance.java index 7e6dd74d3..8aba5be93 100644 --- a/okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleInstance.java +++ b/okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleInstance.java @@ -3,7 +3,7 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.conduit; +package com.indexdata.okapi.conduit; public class ModuleInstance { diff --git a/okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleMap.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleMap.java index 42109d8c7..30d496052 100644 --- a/okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleMap.java +++ b/okapi-core/src/main/java/com/indexdata/okapi/conduit/ModuleMap.java @@ -3,7 +3,7 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.conduit; +package com.indexdata.okapi.conduit; import java.util.Map; diff --git a/okapi-core/src/main/java/com/indexdata/okapi/conduit/Modules.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/Modules.java index 0389b4d6c..494362771 100644 --- a/okapi-core/src/main/java/com/indexdata/okapi/conduit/Modules.java +++ b/okapi-core/src/main/java/com/indexdata/okapi/conduit/Modules.java @@ -3,7 +3,7 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.conduit; +package com.indexdata.okapi.conduit; import io.vertx.core.http.HttpServerRequest; import java.util.ArrayList; diff --git a/okapi-core/src/main/java/com/indexdata/okapi/conduit/Ports.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/Ports.java index 6021782ae..57cd3a329 100644 --- a/okapi-core/src/main/java/com/indexdata/okapi/conduit/Ports.java +++ b/okapi-core/src/main/java/com/indexdata/okapi/conduit/Ports.java @@ -3,7 +3,7 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.conduit; +package com.indexdata.okapi.conduit; public class Ports { diff --git a/okapi-core/src/main/java/com/indexdata/okapi/conduit/ProcessDeploymentDescriptor.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/ProcessDeploymentDescriptor.java index 326b487c6..eeb24dd82 100644 --- a/okapi-core/src/main/java/com/indexdata/okapi/conduit/ProcessDeploymentDescriptor.java +++ b/okapi-core/src/main/java/com/indexdata/okapi/conduit/ProcessDeploymentDescriptor.java @@ -3,7 +3,7 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.conduit; +package com.indexdata.okapi.conduit; public class ProcessDeploymentDescriptor { private String cmdlineStart; diff --git a/okapi-core/src/main/java/com/indexdata/okapi/conduit/ProcessModuleHandle.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/ProcessModuleHandle.java index 17e6d487c..b1e2b4345 100644 --- a/okapi-core/src/main/java/com/indexdata/okapi/conduit/ProcessModuleHandle.java +++ b/okapi-core/src/main/java/com/indexdata/okapi/conduit/ProcessModuleHandle.java @@ -3,7 +3,7 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.conduit; +package com.indexdata.okapi.conduit; import io.vertx.core.AsyncResult; import io.vertx.core.Future; diff --git a/okapi-core/src/main/java/com/indexdata/okapi/conduit/RoutingEntry.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/RoutingEntry.java index 520638ca4..191720252 100644 --- a/okapi-core/src/main/java/com/indexdata/okapi/conduit/RoutingEntry.java +++ b/okapi-core/src/main/java/com/indexdata/okapi/conduit/RoutingEntry.java @@ -3,7 +3,7 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.conduit; +package com.indexdata.okapi.conduit; public class RoutingEntry { private String[] methods; diff --git a/okapi-core/src/main/java/com/indexdata/okapi/conduit/Tenant.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/Tenant.java index 06cb39b71..48bc3e3de 100644 --- a/okapi-core/src/main/java/com/indexdata/okapi/conduit/Tenant.java +++ b/okapi-core/src/main/java/com/indexdata/okapi/conduit/Tenant.java @@ -3,9 +3,9 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.conduit; +package com.indexdata.okapi.conduit; -import com.indexdata.sling.conduit.TenantDescriptor; +import com.indexdata.okapi.conduit.TenantDescriptor; import java.util.HashMap; public class Tenant { diff --git a/okapi-core/src/main/java/com/indexdata/okapi/conduit/TenantDescriptor.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/TenantDescriptor.java index 6fae6eee4..a4e99852b 100644 --- a/okapi-core/src/main/java/com/indexdata/okapi/conduit/TenantDescriptor.java +++ b/okapi-core/src/main/java/com/indexdata/okapi/conduit/TenantDescriptor.java @@ -3,7 +3,7 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.conduit; +package com.indexdata.okapi.conduit; public class TenantDescriptor { private String name; diff --git a/okapi-core/src/main/java/com/indexdata/okapi/conduit/TenantModuleDescriptor.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/TenantModuleDescriptor.java index 20087f1f9..f7cc08643 100644 --- a/okapi-core/src/main/java/com/indexdata/okapi/conduit/TenantModuleDescriptor.java +++ b/okapi-core/src/main/java/com/indexdata/okapi/conduit/TenantModuleDescriptor.java @@ -3,7 +3,7 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.conduit; +package com.indexdata.okapi.conduit; public class TenantModuleDescriptor { diff --git a/okapi-core/src/main/java/com/indexdata/okapi/conduit/service/ModuleService.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/service/ModuleService.java index e8876ce70..db00eed7e 100644 --- a/okapi-core/src/main/java/com/indexdata/okapi/conduit/service/ModuleService.java +++ b/okapi-core/src/main/java/com/indexdata/okapi/conduit/service/ModuleService.java @@ -3,14 +3,14 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.conduit.service; +package com.indexdata.okapi.conduit.service; -import com.indexdata.sling.conduit.ModuleDescriptor; -import com.indexdata.sling.conduit.ModuleInstance; -import com.indexdata.sling.conduit.Modules; -import com.indexdata.sling.conduit.Ports; -import com.indexdata.sling.conduit.ProcessModuleHandle; -import com.indexdata.sling.conduit.Tenant; +import com.indexdata.okapi.conduit.ModuleDescriptor; +import com.indexdata.okapi.conduit.ModuleInstance; +import com.indexdata.okapi.conduit.Modules; +import com.indexdata.okapi.conduit.Ports; +import com.indexdata.okapi.conduit.ProcessModuleHandle; +import com.indexdata.okapi.conduit.Tenant; import io.vertx.core.Vertx; import io.vertx.core.buffer.Buffer; import io.vertx.core.http.HttpClient; @@ -118,7 +118,7 @@ public void delete(RoutingContext ctx) { */ private void addTraceHeaders(RoutingContext ctx, List traceHeaders) { for ( String th : traceHeaders ) { - ctx.response().headers().add("X-Sling-Trace", th); + ctx.response().headers().add("X-Okapi-Trace", th); } } @@ -132,7 +132,7 @@ private void makeTraceHeader(RoutingContext ctx, ModuleInstance mi, int statusCo public void proxy(RoutingContext ctx) { - String tenant_id = ctx.request().getHeader("X-Sling-Tenant"); + String tenant_id = ctx.request().getHeader("X-Okapi-Tenant"); if (tenant_id == null) { ctx.response().setStatusCode(403).end("Missing Tenant"); return; diff --git a/okapi-core/src/main/java/com/indexdata/okapi/conduit/service/TenantService.java b/okapi-core/src/main/java/com/indexdata/okapi/conduit/service/TenantService.java index 08b1d2a79..d1a1b2cb6 100644 --- a/okapi-core/src/main/java/com/indexdata/okapi/conduit/service/TenantService.java +++ b/okapi-core/src/main/java/com/indexdata/okapi/conduit/service/TenantService.java @@ -3,11 +3,11 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.conduit.service; +package com.indexdata.okapi.conduit.service; -import com.indexdata.sling.conduit.Tenant; -import com.indexdata.sling.conduit.TenantDescriptor; -import com.indexdata.sling.conduit.TenantModuleDescriptor; +import com.indexdata.okapi.conduit.Tenant; +import com.indexdata.okapi.conduit.TenantDescriptor; +import com.indexdata.okapi.conduit.TenantModuleDescriptor; import io.vertx.core.Vertx; import io.vertx.core.json.DecodeException; import io.vertx.core.json.Json; diff --git a/okapi-core/src/main/java/com/indexdata/okapi/util/Box.java b/okapi-core/src/main/java/com/indexdata/okapi/util/Box.java index c0db8ffc9..785f69c0e 100644 --- a/okapi-core/src/main/java/com/indexdata/okapi/util/Box.java +++ b/okapi-core/src/main/java/com/indexdata/okapi/util/Box.java @@ -3,7 +3,7 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.util; +package com.indexdata.okapi.util; public class Box { private T item; diff --git a/okapi-core/src/main/java/com/indexdata/okapi/util/Failure.java b/okapi-core/src/main/java/com/indexdata/okapi/util/Failure.java index 151692fdb..2c090439e 100644 --- a/okapi-core/src/main/java/com/indexdata/okapi/util/Failure.java +++ b/okapi-core/src/main/java/com/indexdata/okapi/util/Failure.java @@ -1,4 +1,4 @@ -package com.indexdata.sling.util; +package com.indexdata.okapi.util; import io.vertx.core.AsyncResult; @@ -31,4 +31,4 @@ public boolean succeeded() { public boolean failed() { return true; } -} \ No newline at end of file +} diff --git a/okapi-core/src/main/java/com/indexdata/okapi/util/Success.java b/okapi-core/src/main/java/com/indexdata/okapi/util/Success.java index 9c22843f3..5767ee381 100644 --- a/okapi-core/src/main/java/com/indexdata/okapi/util/Success.java +++ b/okapi-core/src/main/java/com/indexdata/okapi/util/Success.java @@ -1,4 +1,4 @@ -package com.indexdata.sling.util; +package com.indexdata.okapi.util; import io.vertx.core.AsyncResult; public class Success implements AsyncResult { diff --git a/okapi-core/src/main/raml/okapi.raml b/okapi-core/src/main/raml/okapi.raml index 11e2574bb..34e1aa6b4 100644 --- a/okapi-core/src/main/raml/okapi.raml +++ b/okapi-core/src/main/raml/okapi.raml @@ -8,7 +8,7 @@ types: !include types.raml #traits: # The following are a set of APIs that module web service must accept/consume -# to allow sling environment to orchestrate it +# to allow okapi environment to orchestrate it # # This version assumes that a module instance may be shared by multiple # tenants, e.g we have a global set of module instances (aka Seb's doc) diff --git a/okapi-core/src/test/java/com/indexdata/okapi/conduit/DeployModuleTest.java b/okapi-core/src/test/java/com/indexdata/okapi/conduit/DeployModuleTest.java index 055cea101..8934ee6a4 100644 --- a/okapi-core/src/test/java/com/indexdata/okapi/conduit/DeployModuleTest.java +++ b/okapi-core/src/test/java/com/indexdata/okapi/conduit/DeployModuleTest.java @@ -3,9 +3,9 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.conduit; +package com.indexdata.okapi.conduit; -import com.indexdata.sling.MainVerticle; +import com.indexdata.okapi.MainVerticle; import io.vertx.core.DeploymentOptions; import io.vertx.core.Vertx; import io.vertx.core.buffer.Buffer; @@ -31,8 +31,8 @@ public class DeployModuleTest { private String locationSample2; private String locationSample3; private String locationAuth; - private String slingToken; - private final String slingTenant = "roskilde"; + private String okapiToken; + private final String okapiTenant = "roskilde"; private long startTime; private int repeatPostRunning; private HttpClient httpClient; @@ -159,7 +159,7 @@ public void deploySample(TestContext context, Async async) { + " \"name\" : \"sample-module\",\n" + " \"descriptor\" : {\n" + " \"cmdlineStart\" : " - + "\"java -Dport=%p -jar ../sling-sample-module/target/sling-sample-module-fat.jar\",\n" + + "\"java -Dport=%p -jar ../okapi-sample-module/target/okapi-sample-module-fat.jar\",\n" + " \"cmdlineStop\" : null\n" + " },\n" + " \"routingEntries\" : [ {\n" @@ -208,7 +208,7 @@ public void getIt(TestContext context, Async async, String doc) { public void createTenant(TestContext context, Async async) { final String doc = "{\n" - + " \"name\" : \"" + slingTenant + "\",\n" + + " \"name\" : \"" + okapiTenant + "\",\n" + " \"description\" : \"Roskilde bibliotek\"\n" + "}"; httpClient.post(port, "localhost", "/_/tenants", response -> { @@ -224,7 +224,7 @@ public void tenantEnableModuleAuth(TestContext context, Async async) { final String doc = "{\n" + " \"module\" : \"auth\"\n" + "}"; - httpClient.post(port, "localhost", "/_/tenants/" + slingTenant + "/modules", response -> { + httpClient.post(port, "localhost", "/_/tenants/" + okapiTenant + "/modules", response -> { context.assertEquals(200, response.statusCode()); response.endHandler(x -> { tenantEnableModuleSample(context, async); @@ -236,7 +236,7 @@ public void tenantEnableModuleSample(TestContext context, Async async) { final String doc = "{\n" + " \"module\" : \"sample-module\"\n" + "}"; - httpClient.post(port, "localhost", "/_/tenants/" + slingTenant + "/modules", response -> { + httpClient.post(port, "localhost", "/_/tenants/" + okapiTenant + "/modules", response -> { context.assertEquals(200, response.statusCode()); response.endHandler(x -> { useWithoutTenant(context, async); @@ -248,7 +248,7 @@ public void useWithoutTenant(TestContext context, Async async) { System.out.println("useWithoutTenant"); HttpClientRequest req = httpClient.get(port, "localhost", "/sample", response -> { context.assertEquals(403, response.statusCode()); - String trace = response.getHeader("X-Sling-Trace"); + String trace = response.getHeader("X-Okapi-Trace"); context.assertTrue(trace == null); response.endHandler(x -> { useWithoutLogin(context, async); @@ -261,13 +261,13 @@ public void useWithoutLogin(TestContext context, Async async) { System.out.println("useWithoutLogin"); HttpClientRequest req = httpClient.get(port, "localhost", "/sample", response -> { context.assertEquals(401, response.statusCode()); - String trace = response.getHeader("X-Sling-Trace"); + String trace = response.getHeader("X-Okapi-Trace"); context.assertTrue(trace != null && trace.matches(".*GET auth:401.*")); response.endHandler(x -> { failLogin(context, async); }); }); - req.putHeader("X-Sling-Tenant", slingTenant); + req.putHeader("X-Okapi-Tenant", okapiTenant); req.end(); } @@ -284,7 +284,7 @@ public void failLogin(TestContext context, Async async) { doLogin(context, async); }); }); - req.putHeader("X-Sling-Tenant", slingTenant); + req.putHeader("X-Okapi-Tenant", okapiTenant); req.end(doc); } @@ -298,14 +298,14 @@ public void doLogin(TestContext context, Async async) { HttpClientRequest req = httpClient.post(port, "localhost", "/login", response -> { context.assertEquals(200, response.statusCode()); String headers = response.headers().entries().toString(); - context.assertTrue(headers != null && headers.matches(".*X-Sling-Trace=POST auth:200.*")); - slingToken = response.getHeader("X-Sling-Token"); - System.out.println("token=" + slingToken); + context.assertTrue(headers != null && headers.matches(".*X-Okapi-Trace=POST auth:200.*")); + okapiToken = response.getHeader("X-Okapi-Token"); + System.out.println("token=" + okapiToken); response.endHandler(x -> { useItWithGet(context, async); }); }); - req.putHeader("X-Sling-Tenant", slingTenant); + req.putHeader("X-Okapi-Tenant", okapiTenant); req.end(doc); } @@ -315,7 +315,7 @@ public void useItWithGet(TestContext context, Async async) { context.assertEquals(200, response.statusCode()); String headers = response.headers().entries().toString(); System.out.println("useWithGet headers " + headers); - context.assertTrue(headers != null && headers.matches(".*X-Sling-Trace=GET sample-module:200.*")); + context.assertTrue(headers != null && headers.matches(".*X-Okapi-Trace=GET sample-module:200.*")); response.handler(x -> { context.assertEquals("It works", x.toString()); }); @@ -323,8 +323,8 @@ public void useItWithGet(TestContext context, Async async) { useItWithPost(context, async); }); }); - req.headers().add("X-Sling-Token", slingToken); - req.putHeader("X-Sling-Tenant", slingTenant); + req.headers().add("X-Okapi-Token", okapiToken); + req.putHeader("X-Okapi-Tenant", okapiTenant); req.end(); } @@ -334,18 +334,18 @@ public void useItWithPost(TestContext context, Async async) { HttpClientRequest req = httpClient.post(port, "localhost", "/sample", response -> { context.assertEquals(200, response.statusCode()); String headers = response.headers().entries().toString(); - context.assertTrue(headers != null && headers.matches(".*X-Sling-Trace=POST sample-module:200.*")); + context.assertTrue(headers != null && headers.matches(".*X-Okapi-Trace=POST sample-module:200.*")); response.handler(x -> { body.appendBuffer(x); }); response.endHandler(x -> { - context.assertEquals("Hello Sling", body.toString()); + context.assertEquals("Hello Okapi", body.toString()); useNoPath(context, async); }); }); - req.headers().add("X-Sling-Token", slingToken); - req.putHeader("X-Sling-Tenant", slingTenant); - req.end("Sling"); + req.headers().add("X-Okapi-Token", okapiToken); + req.putHeader("X-Okapi-Tenant", okapiTenant); + req.end("Okapi"); } public void useNoPath(TestContext context, Async async) { @@ -356,8 +356,8 @@ public void useNoPath(TestContext context, Async async) { useNoMethod(context, async); }); }); - req.headers().add("X-Sling-Token", slingToken); - req.putHeader("X-Sling-Tenant", slingTenant); + req.headers().add("X-Okapi-Token", okapiToken); + req.putHeader("X-Okapi-Tenant", okapiTenant); req.end(); } @@ -369,8 +369,8 @@ public void useNoMethod(TestContext context, Async async) { deploySample2(context, async); }); }); - req.headers().add("X-Sling-Token", slingToken); - req.putHeader("X-Sling-Tenant", slingTenant); + req.headers().add("X-Okapi-Token", okapiToken); + req.putHeader("X-Okapi-Tenant", okapiTenant); req.end(); } @@ -380,7 +380,7 @@ public void deploySample2(TestContext context, Async async) { + " \"name\" : \"sample-module2\",\n" + " \"descriptor\" : {\n" + " \"cmdlineStart\" : " - + "\"java -Dport=%p -jar ../sling-sample-module/target/sling-sample-module-fat.jar\",\n" + + "\"java -Dport=%p -jar ../okapi-sample-module/target/okapi-sample-module-fat.jar\",\n" + " \"cmdlineStop\" : null\n" + " },\n" + " \"routingEntries\" : [ {\n" @@ -403,7 +403,7 @@ public void tenantEnableModuleSample2(TestContext context, Async async) { final String doc = "{\n" + " \"module\" : \"sample-module2\"\n" + "}"; - httpClient.post(port, "localhost", "/_/tenants/" + slingTenant + "/modules", response -> { + httpClient.post(port, "localhost", "/_/tenants/" + okapiTenant + "/modules", response -> { context.assertEquals(200, response.statusCode()); response.endHandler(x -> { deploySample3(context, async); @@ -417,7 +417,7 @@ public void deploySample3(TestContext context, Async async) { + " \"name\" : \"sample-module3\",\n" + " \"descriptor\" : {\n" + " \"cmdlineStart\" : " - + "\"java -Dport=%p -jar ../sling-sample-module/target/sling-sample-module-fat.jar\",\n" + + "\"java -Dport=%p -jar ../okapi-sample-module/target/okapi-sample-module-fat.jar\",\n" + " \"cmdlineStop\" : null\n" + " },\n" + " \"routingEntries\" : [ {\n" @@ -440,7 +440,7 @@ public void tenantEnableModuleSample3(TestContext context, Async async) { final String doc = "{\n" + " \"module\" : \"sample-module3\"\n" + "}"; - httpClient.post(port, "localhost", "/_/tenants/" + slingTenant + "/modules", response -> { + httpClient.post(port, "localhost", "/_/tenants/" + okapiTenant + "/modules", response -> { context.assertEquals(200, response.statusCode()); response.endHandler(x -> { useItWithGet2(context, async); @@ -454,7 +454,7 @@ public void useItWithGet2(TestContext context, Async async) { context.assertEquals(200, response.statusCode()); String headers = response.headers().entries().toString(); System.out.println("useWithGet2 headers " + headers); - context.assertTrue(headers != null && headers.matches(".*X-Sling-Trace=GET sample-module2:200.*")); + context.assertTrue(headers != null && headers.matches(".*X-Okapi-Trace=GET sample-module2:200.*")); response.handler(x -> { context.assertEquals("It works", x.toString()); }); @@ -469,14 +469,14 @@ public void useItWithGet2(TestContext context, Async async) { } }); }); - req.headers().add("X-Sling-Token", slingToken); - req.putHeader("X-Sling-Tenant", slingTenant); + req.headers().add("X-Okapi-Token", okapiToken); + req.putHeader("X-Okapi-Tenant", okapiTenant); req.end(); } public void repeatPost(TestContext context, Async async, int cnt, int max, int parallels) { - final String msg = "Sling" + cnt; + final String msg = "Okapi" + cnt; if (cnt == max) { if (--repeatPostRunning == 0) { long timeDiff = (System.nanoTime() - startTime) / 1000000; @@ -495,7 +495,7 @@ public void repeatPost(TestContext context, Async async, HttpClientRequest req = httpClient.post(port, "localhost", "/sample", response -> { context.assertEquals(200, response.statusCode()); String headers = response.headers().entries().toString(); - context.assertTrue(headers.matches(".*X-Sling-Trace=POST sample-module2:200.*")); + context.assertTrue(headers.matches(".*X-Okapi-Trace=POST sample-module2:200.*")); response.handler(x -> { body.appendBuffer(x); }); @@ -507,8 +507,8 @@ public void repeatPost(TestContext context, Async async, context.fail(e); }); }); - req.headers().add("X-Sling-Token", slingToken); - req.putHeader("X-Sling-Tenant", slingTenant); + req.headers().add("X-Okapi-Token", okapiToken); + req.putHeader("X-Okapi-Tenant", okapiTenant); req.end(msg); } @@ -519,8 +519,8 @@ public void useItWithGet3(TestContext context, Async async) { context.assertEquals(200, response.statusCode()); String headers = response.headers().entries().toString(); System.out.println("useWithGet3 headers " + headers); - // context.assertTrue(headers.matches(".*X-Sling-Trace=GET auth:202.*")); - context.assertTrue(headers.matches(".*X-Sling-Trace=GET sample-module2:200.*")); + // context.assertTrue(headers.matches(".*X-Okapi-Trace=GET auth:202.*")); + context.assertTrue(headers.matches(".*X-Okapi-Trace=GET sample-module2:200.*")); response.handler(x -> { context.assertEquals("It works", x.toString()); }); @@ -528,8 +528,8 @@ public void useItWithGet3(TestContext context, Async async) { deleteTenant(context, async); }); }); - req.headers().add("X-Sling-Token", slingToken); - req.putHeader("X-Sling-Tenant", slingTenant); + req.headers().add("X-Okapi-Token", okapiToken); + req.putHeader("X-Okapi-Tenant", okapiTenant); req.end(); } diff --git a/okapi-core/src/test/java/com/indexdata/okapi/conduit/ProcessModuleHandleTest.java b/okapi-core/src/test/java/com/indexdata/okapi/conduit/ProcessModuleHandleTest.java index 762eeaab1..eff01f6c3 100644 --- a/okapi-core/src/test/java/com/indexdata/okapi/conduit/ProcessModuleHandleTest.java +++ b/okapi-core/src/test/java/com/indexdata/okapi/conduit/ProcessModuleHandleTest.java @@ -3,7 +3,7 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.conduit; +package com.indexdata.okapi.conduit; import org.junit.Test; diff --git a/okapi-core/src/test/java/com/indexdata/okapi/conduit/TenantTest.java b/okapi-core/src/test/java/com/indexdata/okapi/conduit/TenantTest.java index 8f7eb8829..4e2f37f58 100644 --- a/okapi-core/src/test/java/com/indexdata/okapi/conduit/TenantTest.java +++ b/okapi-core/src/test/java/com/indexdata/okapi/conduit/TenantTest.java @@ -3,9 +3,9 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling.conduit; +package com.indexdata.okapi.conduit; -import com.indexdata.sling.MainVerticle; +import com.indexdata.okapi.MainVerticle; import io.vertx.core.DeploymentOptions; import io.vertx.core.Vertx; import io.vertx.core.http.HttpClient; From 867f0ac456f6db6adcb839771c56fb634707c105 Mon Sep 17 00:00:00 2001 From: Nassib Nassar Date: Thu, 14 Jan 2016 14:59:48 -0500 Subject: [PATCH 09/10] Rename sling in okapi-sample-module --- okapi-sample-module/Dockerfile | 6 +++--- okapi-sample-module/pom.xml | 8 ++++---- .../src/main/java/com/indexdata/okapi/MainVerticle.java | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/okapi-sample-module/Dockerfile b/okapi-sample-module/Dockerfile index 83f6663aa..3ebe4caa6 100644 --- a/okapi-sample-module/Dockerfile +++ b/okapi-sample-module/Dockerfile @@ -1,14 +1,14 @@ ### # vert.x docker example using a Java verticle packaged as a fatjar # To build: -# docker build -t indexdata/sling-sample-module . +# docker build -t indexdata/okapi-sample-module . # To run: -# docker run -t -i -p 8080:8080 indexdata/sling-sample-module +# docker run -t -i -p 8080:8080 indexdata/okapi-sample-module ### FROM java:8 -ENV VERTICLE_FILE sling-sample-module-fat.jar +ENV VERTICLE_FILE okapi-sample-module-fat.jar # Set the location of the verticles ENV VERTICLE_HOME /usr/verticles diff --git a/okapi-sample-module/pom.xml b/okapi-sample-module/pom.xml index 082a668dd..84e7c9dd8 100644 --- a/okapi-sample-module/pom.xml +++ b/okapi-sample-module/pom.xml @@ -4,12 +4,12 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.indexdata.sling - sling + com.indexdata.okapi + okapi 1.0-SNAPSHOT - sling-sample-module + okapi-sample-module @@ -54,7 +54,7 @@ implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> io.vertx.core.Starter - com.indexdata.sling.MainVerticle + com.indexdata.okapi.MainVerticle diff --git a/okapi-sample-module/src/main/java/com/indexdata/okapi/MainVerticle.java b/okapi-sample-module/src/main/java/com/indexdata/okapi/MainVerticle.java index d1f820170..74d50a3ad 100644 --- a/okapi-sample-module/src/main/java/com/indexdata/okapi/MainVerticle.java +++ b/okapi-sample-module/src/main/java/com/indexdata/okapi/MainVerticle.java @@ -3,7 +3,7 @@ * All rights reserved. * See the file LICENSE for details. */ -package com.indexdata.sling; +package com.indexdata.okapi; import io.vertx.core.AbstractVerticle; import io.vertx.core.Future; From 0ae910bae148ffa6b4307a85f0455d20ac4f8e1f Mon Sep 17 00:00:00 2001 From: Nassib Nassar Date: Thu, 14 Jan 2016 15:01:39 -0500 Subject: [PATCH 10/10] Rename sling in top-level directory files --- README.md | 4 ++-- pom.xml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d9ca34216..d2d2be5d6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# sling -Sling core and modules +# okapi +Okapi core and modules Java 8 and Apache Maven 3 are required for compilation. The test suite must be able to bind to ports 9130 thru 9134 to succeed. diff --git a/pom.xml b/pom.xml index ead78ab63..80cbe4763 100644 --- a/pom.xml +++ b/pom.xml @@ -4,16 +4,16 @@ http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.indexdata.sling - sling + com.indexdata.okapi + okapi pom 1.0-SNAPSHOT - sling + okapi - sling-sample-module + okapi-sample-module auth - sling-core + okapi-core @@ -49,7 +49,7 @@ java -jar - ${basedir}/sling-core/target/sling-core-fat.jar + ${basedir}/okapi-core/target/okapi-core-fat.jar