apache · csantanapr · Nov 8, 2018 · Oct 17, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -81,9 +81,9 @@ jobs:
         - ./tests/performance/preparation/deploy.sh
         - TERM=dumb ./tests/performance/wrk_tests/latency.sh "https://172.17.0.1:10001" "$(cat ansible/files/auth.guest)" 2m
         - TERM=dumb ./tests/performance/wrk_tests/throughput.sh "https://172.17.0.1:10001" "$(cat ansible/files/auth.guest)" 4 2 2m
-        - OPENWHISK_HOST="172.17.0.1" CONNECTIONS="100" REQUESTS_PER_SEC="1" ./gradlew gatlingRun-ApiV1Simulation
-        - OPENWHISK_HOST="172.17.0.1" MEAN_RESPONSE_TIME="1000" API_KEY="$(cat ansible/files/auth.guest)" EXCLUDED_KINDS="python:default,java:default,swift:default" PAUSE_BETWEEN_INVOKES="100" ./gradlew gatlingRun-LatencySimulation
-        - OPENWHISK_HOST="172.17.0.1" API_KEY="$(cat ansible/files/auth.guest)" CONNECTIONS="100" REQUESTS_PER_SEC="1" ./gradlew gatlingRun-BlockingInvokeOneActionSimulation
+        - OPENWHISK_HOST="172.17.0.1" CONNECTIONS="100" REQUESTS_PER_SEC="1" ./gradlew gatlingRun-org.apache.openwhisk.ApiV1Simulation
+        - OPENWHISK_HOST="172.17.0.1" MEAN_RESPONSE_TIME="1000" API_KEY="$(cat ansible/files/auth.guest)" EXCLUDED_KINDS="python:default,java:default,swift:default" PAUSE_BETWEEN_INVOKES="100" ./gradlew gatlingRun-org.apache.openwhisk.LatencySimulation
+        - OPENWHISK_HOST="172.17.0.1" API_KEY="$(cat ansible/files/auth.guest)" CONNECTIONS="100" REQUESTS_PER_SEC="1" ./gradlew gatlingRun-org.apache.openwhisk.BlockingInvokeOneActionSimulation
         # The following configuration does not make much sense. But we do not have enough users. But it's good to verify, that the test is still working.
-        - OPENWHISK_HOST="172.17.0.1" USERS="1" REQUESTS_PER_SEC="1" ./gradlew gatlingRun-ColdBlockingInvokeSimulation
+        - OPENWHISK_HOST="172.17.0.1" USERS="1" REQUESTS_PER_SEC="1" ./gradlew gatlingRun-org.apache.openwhisk.ColdBlockingInvokeSimulation
       name: "Performance Tests"
diff --git a/ansible/group_vars/all b/ansible/group_vars/all
@@ -36,7 +36,7 @@ whisk:
     date: "{{ansible_date_time.iso8601}}"
 
 ##
-# configuration parameters related to support runtimes (see whisk.core.entity.ExecManifest for schema of the manifest).
+# configuration parameters related to support runtimes (see org.apache.openwhisk.core.entity.ExecManifest for schema of the manifest).
 # briefly the parameters are:
 #
 #   runtimes_registry: optional registry (with trailing slack) where to pull docker images from for runtimes and backbox images
@@ -199,7 +199,7 @@ invoker:
       name: "{{ __invoker_ssl_keyPrefix }}openwhisk-keystore.p12"
 
 userLogs:
-  spi: "{{ userLogs_spi | default('whisk.core.containerpool.logging.DockerToActivationLogStoreProvider') }}"
+  spi: "{{ userLogs_spi | default('org.apache.openwhisk.core.containerpool.logging.DockerToActivationLogStoreProvider') }}"
 
 nginx:
   confdir: "{{ config_root_dir }}/nginx"

diff --git a/common/scala/src/main/resources/reference.conf b/common/scala/src/main/resources/reference.conf
@@ -4,14 +4,14 @@
 include "s3-reference.conf"
 
 whisk.spi {
-  ArtifactStoreProvider = whisk.core.database.CouchDbStoreProvider
-  ActivationStoreProvider = whisk.core.database.ArtifactActivationStoreProvider
-  MessagingProvider = whisk.connector.kafka.KafkaMessagingProvider
-  ContainerFactoryProvider = whisk.core.containerpool.docker.DockerContainerFactoryProvider
-  LogStoreProvider = whisk.core.containerpool.logging.DockerToActivationLogStoreProvider
-  LoadBalancerProvider = whisk.core.loadBalancer.ShardingContainerPoolBalancer
-  EntitlementSpiProvider = whisk.core.entitlement.LocalEntitlementProvider
-  AuthenticationDirectiveProvider = whisk.core.controller.BasicAuthenticationDirective
+  ArtifactStoreProvider = org.apache.openwhisk.core.database.CouchDbStoreProvider
+  ActivationStoreProvider = org.apache.openwhisk.core.database.ArtifactActivationStoreProvider
+  MessagingProvider = org.apache.openwhisk.connector.kafka.KafkaMessagingProvider
+  ContainerFactoryProvider = org.apache.openwhisk.core.containerpool.docker.DockerContainerFactoryProvider
+  LogStoreProvider = org.apache.openwhisk.core.containerpool.logging.DockerToActivationLogStoreProvider
+  LoadBalancerProvider = org.apache.openwhisk.core.loadBalancer.ShardingContainerPoolBalancer
+  EntitlementSpiProvider = org.apache.openwhisk.core.entitlement.LocalEntitlementProvider
+  AuthenticationDirectiveProvider = org.apache.openwhisk.core.controller.BasicAuthenticationDirective
 }
 
 dispatchers {

diff --git a/...rc/main/scala/whisk/common/CausedBy.scala → ...rg/apache/openwhisk/common/CausedBy.scala b/...rc/main/scala/whisk/common/CausedBy.scala → ...rg/apache/openwhisk/common/CausedBy.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package whisk.common
+package org.apache.openwhisk.common
 
 /**
  * Helper to match on exceptions caused by other exceptions.

diff --git a/.../src/main/scala/whisk/common/Config.scala → .../org/apache/openwhisk/common/Config.scala b/.../src/main/scala/whisk/common/Config.scala → .../org/apache/openwhisk/common/Config.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package whisk.common
+package org.apache.openwhisk.common
 
 import scala.util.Try
 

diff --git a/...src/main/scala/whisk/common/Counter.scala → ...org/apache/openwhisk/common/Counter.scala b/...src/main/scala/whisk/common/Counter.scala → ...org/apache/openwhisk/common/Counter.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package whisk.common
+package org.apache.openwhisk.common
 
 import java.util.concurrent.atomic.AtomicLong
 

diff --git a/...cala/whisk/common/ForcibleSemaphore.scala → .../openwhisk/common/ForcibleSemaphore.scala b/...cala/whisk/common/ForcibleSemaphore.scala → .../openwhisk/common/ForcibleSemaphore.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package whisk.common
+package org.apache.openwhisk.common
 
 import java.util.concurrent.locks.AbstractQueuedSynchronizer
 

diff --git a/...a/src/main/scala/whisk/common/Https.scala → ...a/org/apache/openwhisk/common/Https.scala b/...a/src/main/scala/whisk/common/Https.scala → ...a/org/apache/openwhisk/common/Https.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package whisk.common
+package org.apache.openwhisk.common
 
 import java.io.{FileInputStream, InputStream}
 import java.security.{KeyStore, SecureRandom}

diff --git a/...src/main/scala/whisk/common/Logging.scala → ...org/apache/openwhisk/common/Logging.scala b/...src/main/scala/whisk/common/Logging.scala → ...org/apache/openwhisk/common/Logging.scala
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package whisk.common
+package org.apache.openwhisk.common
 
 import java.io.PrintStream
 import java.time.{Clock, Instant, ZoneId}
 import java.time.format.DateTimeFormatter
 import akka.event.Logging._
 import akka.event.LoggingAdapter
 import kamon.Kamon
-import whisk.core.entity.ControllerInstanceId
+import org.apache.openwhisk.core.entity.ControllerInstanceId
 
 trait Logging {
 

diff --git a/.../main/scala/whisk/common/RingBuffer.scala → .../apache/openwhisk/common/RingBuffer.scala b/.../main/scala/whisk/common/RingBuffer.scala → .../apache/openwhisk/common/RingBuffer.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package whisk.common
+package org.apache.openwhisk.common
 
 import org.apache.commons.collections.buffer.CircularFifoBuffer
 

diff --git a/...c/main/scala/whisk/common/Scheduler.scala → ...g/apache/openwhisk/common/Scheduler.scala b/...c/main/scala/whisk/common/Scheduler.scala → ...g/apache/openwhisk/common/Scheduler.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package whisk.common
+package org.apache.openwhisk.common
 
 import scala.concurrent.Future
 import scala.concurrent.duration._

diff --git a/...in/scala/whisk/common/TransactionId.scala → ...ache/openwhisk/common/TransactionId.scala b/...in/scala/whisk/common/TransactionId.scala → ...ache/openwhisk/common/TransactionId.scala
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package whisk.common
+package org.apache.openwhisk.common
 
 import java.time.{Clock, Duration, Instant}
 
 import akka.event.Logging.{DebugLevel, InfoLevel, LogLevel, WarningLevel}
 import akka.http.scaladsl.model.headers.RawHeader
 import pureconfig.loadConfigOrThrow
 import spray.json._
-import whisk.core.ConfigKeys
+import org.apache.openwhisk.core.ConfigKeys
 import pureconfig._
-import whisk.common.tracing.WhiskTracerProvider
+import org.apache.openwhisk.common.tracing.WhiskTracerProvider
 
 import scala.util.Try
 

diff --git a/.../main/scala/whisk/common/UserEvents.scala → .../apache/openwhisk/common/UserEvents.scala b/.../main/scala/whisk/common/UserEvents.scala → .../apache/openwhisk/common/UserEvents.scala
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package whisk.common
+package org.apache.openwhisk.common
 
 import pureconfig.loadConfigOrThrow
-import whisk.core.ConfigKeys
-import whisk.core.connector.{EventMessage, MessageProducer}
+import org.apache.openwhisk.core.ConfigKeys
+import org.apache.openwhisk.core.connector.{EventMessage, MessageProducer}
 
 object UserEvents {
 

diff --git a/.../common/tracing/OpenTracingProvider.scala → .../common/tracing/OpenTracingProvider.scala b/.../common/tracing/OpenTracingProvider.scala → .../common/tracing/OpenTracingProvider.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package whisk.common.tracing
+package org.apache.openwhisk.common.tracing
 
 import java.util.concurrent.TimeUnit
 
@@ -27,8 +27,8 @@ import io.opentracing.propagation.{Format, TextMapExtractAdapter, TextMapInjectA
 import io.opentracing.util.GlobalTracer
 import io.opentracing.{Span, SpanContext, Tracer}
 import pureconfig._
-import whisk.common.{LogMarkerToken, TransactionId}
-import whisk.core.ConfigKeys
+import org.apache.openwhisk.common.{LogMarkerToken, TransactionId}
+import org.apache.openwhisk.core.ConfigKeys
 import zipkin2.reporter.okhttp3.OkHttpSender
 import zipkin2.reporter.{AsyncReporter, Sender}
 

diff --git a/...nector/kafka/KafkaConsumerConnector.scala → ...nector/kafka/KafkaConsumerConnector.scala b/...nector/kafka/KafkaConsumerConnector.scala → ...nector/kafka/KafkaConsumerConnector.scala
@@ -15,20 +15,20 @@
  * limitations under the License.
  */
 
-package whisk.connector.kafka
+package org.apache.openwhisk.connector.kafka
 
 import akka.actor.ActorSystem
 import org.apache.kafka.clients.consumer.{ConsumerConfig, KafkaConsumer}
 import org.apache.kafka.common.TopicPartition
 import org.apache.kafka.common.errors.{RetriableException, WakeupException}
 import org.apache.kafka.common.serialization.ByteArrayDeserializer
 import pureconfig.loadConfigOrThrow
-import whisk.common.{Logging, LoggingMarkers, MetricEmitter, Scheduler}
-import whisk.connector.kafka.KafkaConfiguration._
-import whisk.core.ConfigKeys
-import whisk.core.connector.MessageConsumer
-import whisk.utils.Exceptions
-import whisk.utils.TimeHelpers._
+import org.apache.openwhisk.common.{Logging, LoggingMarkers, MetricEmitter, Scheduler}
+import org.apache.openwhisk.connector.kafka.KafkaConfiguration._
+import org.apache.openwhisk.core.ConfigKeys
+import org.apache.openwhisk.core.connector.MessageConsumer
+import org.apache.openwhisk.utils.Exceptions
+import org.apache.openwhisk.utils.TimeHelpers._
 
 import scala.collection.JavaConverters._
 import scala.concurrent.duration._

diff --git a/...nector/kafka/KafkaMessagingProvider.scala → ...nector/kafka/KafkaMessagingProvider.scala b/...nector/kafka/KafkaMessagingProvider.scala → ...nector/kafka/KafkaMessagingProvider.scala
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-package whisk.connector.kafka
+package org.apache.openwhisk.connector.kafka
 
 import java.util.Properties
 
 import akka.actor.ActorSystem
 import org.apache.kafka.clients.admin.{AdminClient, AdminClientConfig, NewTopic}
 import org.apache.kafka.common.errors.{RetriableException, TopicExistsException}
 import pureconfig._
-import whisk.common.{CausedBy, Logging}
-import whisk.core.{ConfigKeys, WhiskConfig}
-import whisk.core.connector.{MessageConsumer, MessageProducer, MessagingProvider}
-import whisk.core.entity.ByteSize
+import org.apache.openwhisk.common.{CausedBy, Logging}
+import org.apache.openwhisk.core.{ConfigKeys, WhiskConfig}
+import org.apache.openwhisk.core.connector.{MessageConsumer, MessageProducer, MessagingProvider}
+import org.apache.openwhisk.core.entity.ByteSize
 
 import scala.collection.JavaConverters._
 import scala.concurrent.duration._

diff --git a/...nector/kafka/KafkaProducerConnector.scala → ...nector/kafka/KafkaProducerConnector.scala b/...nector/kafka/KafkaProducerConnector.scala → ...nector/kafka/KafkaProducerConnector.scala
@@ -15,20 +15,20 @@
  * limitations under the License.
  */
 
-package whisk.connector.kafka
+package org.apache.openwhisk.connector.kafka
 
 import akka.actor.ActorSystem
 import akka.pattern.after
 import org.apache.kafka.clients.producer._
 import org.apache.kafka.common.errors._
 import org.apache.kafka.common.serialization.StringSerializer
 import pureconfig._
-import whisk.common.{Counter, Logging, TransactionId}
-import whisk.connector.kafka.KafkaConfiguration._
-import whisk.core.ConfigKeys
-import whisk.core.connector.{Message, MessageProducer}
-import whisk.core.entity.{ByteSize, UUIDs}
-import whisk.utils.Exceptions
+import org.apache.openwhisk.common.{Counter, Logging, TransactionId}
+import org.apache.openwhisk.connector.kafka.KafkaConfiguration._
+import org.apache.openwhisk.core.ConfigKeys
+import org.apache.openwhisk.core.connector.{Message, MessageProducer}
+import org.apache.openwhisk.core.entity.{ByteSize, UUIDs}
+import org.apache.openwhisk.utils.Exceptions
 
 import scala.collection.JavaConverters._
 import scala.concurrent.duration._

diff --git a/...c/main/scala/whisk/core/WhiskConfig.scala → ...g/apache/openwhisk/core/WhiskConfig.scala b/...c/main/scala/whisk/core/WhiskConfig.scala → ...g/apache/openwhisk/core/WhiskConfig.scala
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package whisk.core
+package org.apache.openwhisk.core
 
 import java.io.File
 
 import scala.io.Source
-import whisk.common.{Config, Logging}
+import org.apache.openwhisk.common.{Config, Logging}
 
 /**
  * A set of properties which might be needed to run a whisk microservice implemented

diff --git a/.../scala/whisk/core/connector/Message.scala → ...he/openwhisk/core/connector/Message.scala b/.../scala/whisk/core/connector/Message.scala → ...he/openwhisk/core/connector/Message.scala
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package whisk.core.connector
+package org.apache.openwhisk.core.connector
 
 import scala.util.Try
 import spray.json._
-import whisk.common.TransactionId
-import whisk.core.entity._
+import org.apache.openwhisk.common.TransactionId
+import org.apache.openwhisk.core.entity._
 
 /** Basic trait for messages that are sent on a message bus connector. */
 trait Message {

diff --git a/...hisk/core/connector/MessageConsumer.scala → ...hisk/core/connector/MessageConsumer.scala b/...hisk/core/connector/MessageConsumer.scala → ...hisk/core/connector/MessageConsumer.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package whisk.core.connector
+package org.apache.openwhisk.core.connector
 
 import scala.annotation.tailrec
 import scala.collection.immutable
@@ -26,8 +26,8 @@ import scala.util.Failure
 import org.apache.kafka.clients.consumer.CommitFailedException
 import akka.actor.FSM
 import akka.pattern.pipe
-import whisk.common.Logging
-import whisk.common.TransactionId
+import org.apache.openwhisk.common.Logging
+import org.apache.openwhisk.common.TransactionId
 
 trait MessageConsumer {
 

diff --git a/...hisk/core/connector/MessageProducer.scala → ...hisk/core/connector/MessageProducer.scala b/...hisk/core/connector/MessageProducer.scala → ...hisk/core/connector/MessageProducer.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package whisk.core.connector
+package org.apache.openwhisk.core.connector
 
 import scala.concurrent.Future
 

diff --git a/...sk/core/connector/MessagingProvider.scala → ...sk/core/connector/MessagingProvider.scala b/...sk/core/connector/MessagingProvider.scala → ...sk/core/connector/MessagingProvider.scala
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package whisk.core.connector
+package org.apache.openwhisk.core.connector
 
 import akka.actor.ActorSystem
 
 import scala.concurrent.duration.DurationInt
 import scala.concurrent.duration.FiniteDuration
-import whisk.common.Logging
-import whisk.core.WhiskConfig
-import whisk.core.entity.ByteSize
-import whisk.spi.Spi
+import org.apache.openwhisk.common.Logging
+import org.apache.openwhisk.core.WhiskConfig
+import org.apache.openwhisk.core.entity.ByteSize
+import org.apache.openwhisk.spi.Spi
 
 import scala.util.Try
 

diff --git a/...e/containerpool/AkkaContainerClient.scala → ...e/containerpool/AkkaContainerClient.scala b/...e/containerpool/AkkaContainerClient.scala → ...e/containerpool/AkkaContainerClient.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package whisk.core.containerpool
+package org.apache.openwhisk.core.containerpool
 
 import akka.actor.ActorSystem
 import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
@@ -40,15 +40,15 @@ import scala.concurrent.duration._
 import scala.util.Try
 import scala.util.control.NonFatal
 import spray.json._
-import whisk.common.Logging
-import whisk.common.LoggingMarkers.CONTAINER_CLIENT_RETRIES
-import whisk.common.MetricEmitter
-import whisk.common.TransactionId
-import whisk.core.entity.ActivationResponse.ContainerHttpError
-import whisk.core.entity.ActivationResponse._
-import whisk.core.entity.ByteSize
-import whisk.core.entity.size.SizeLong
-import whisk.http.PoolingRestClient
+import org.apache.openwhisk.common.Logging
+import org.apache.openwhisk.common.LoggingMarkers.CONTAINER_CLIENT_RETRIES
+import org.apache.openwhisk.common.MetricEmitter
+import org.apache.openwhisk.common.TransactionId
+import org.apache.openwhisk.core.entity.ActivationResponse.ContainerHttpError
+import org.apache.openwhisk.core.entity.ActivationResponse._
+import org.apache.openwhisk.core.entity.ByteSize
+import org.apache.openwhisk.core.entity.size.SizeLong
+import org.apache.openwhisk.http.PoolingRestClient
 
 /**
  * This HTTP client is used only in the invoker to communicate with the action container.