From a04a014a8aa4929e2c1edfbabd703a3e105247a2 Mon Sep 17 00:00:00 2001
From: Peter Hamilton <peter.hamilton@jhuapl.edu>
Date: Tue, 29 Sep 2015 14:22:03 -0400
Subject: [PATCH] Reorganizing the server code

This change creates a new subpackage under services, server, which now
holds all of the software server related code. References to different
pieces of the server code base are updated accordingly.
---
 kmip/core/server.py                             |  2 +-
 kmip/services/kmip_client.py                    |  2 +-
 kmip/services/server/__init__.py                | 14 ++++++++++++++
 kmip/services/{ => server}/kmip_protocol.py     |  0
 kmip/services/{ => server}/kmip_server.py       |  4 ++--
 kmip/services/{ => server}/processor.py         |  0
 kmip/{core => services/server}/repo/__init__.py |  0
 kmip/{core => services/server}/repo/mem_repo.py |  2 +-
 kmip/{core => services/server}/repo/repo.py     |  0
 9 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 kmip/services/server/__init__.py
 rename kmip/services/{ => server}/kmip_protocol.py (100%)
 rename kmip/services/{ => server}/kmip_server.py (97%)
 rename kmip/services/{ => server}/processor.py (100%)
 rename kmip/{core => services/server}/repo/__init__.py (100%)
 rename kmip/{core => services/server}/repo/mem_repo.py (96%)
 rename kmip/{core => services/server}/repo/repo.py (100%)

diff --git a/kmip/core/server.py b/kmip/core/server.py
index 4751291..c5576f6 100644
--- a/kmip/core/server.py
+++ b/kmip/core/server.py
@@ -40,8 +40,8 @@ from kmip.core.objects import KeyBlock
 from kmip.core.objects import KeyMaterial
 from kmip.core.objects import KeyValue
 from kmip.core.objects import TemplateAttribute
-from kmip.core.repo.mem_repo import MemRepo
 from kmip.core.secrets import SymmetricKey
+from kmip.services.server.repo.mem_repo import MemRepo
 from kmip.services.results import CreateResult
 from kmip.services.results import DestroyResult
 from kmip.services.results import GetResult
diff --git a/kmip/services/kmip_client.py b/kmip/services/kmip_client.py
index 435b915..0cfbf9d 100644
--- a/kmip/services/kmip_client.py
+++ b/kmip/services/kmip_client.py
@@ -58,7 +58,7 @@ from kmip.core.messages.payloads import rekey_key_pair
 from kmip.core.messages.payloads import register
 from kmip.core.messages.payloads import revoke
 
-from kmip.services.kmip_protocol import KMIPProtocol
+from kmip.services.server.kmip_protocol import KMIPProtocol
 
 from kmip.core.config_helper import ConfigHelper
 
diff --git a/kmip/services/server/__init__.py b/kmip/services/server/__init__.py
new file mode 100644
index 0000000..417e2f9
--- /dev/null
+++ b/kmip/services/server/__init__.py
@@ -0,0 +1,14 @@
+# Copyright (c) 2015 The Johns Hopkins University/Applied Physics Laboratory
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
diff --git a/kmip/services/kmip_protocol.py b/kmip/services/server/kmip_protocol.py
similarity index 100%
rename from kmip/services/kmip_protocol.py
rename to kmip/services/server/kmip_protocol.py
diff --git a/kmip/services/kmip_server.py b/kmip/services/server/kmip_server.py
similarity index 97%
rename from kmip/services/kmip_server.py
rename to kmip/services/server/kmip_server.py
index 70bf333..23a5ca7 100644
--- a/kmip/services/kmip_server.py
+++ b/kmip/services/server/kmip_server.py
@@ -21,8 +21,8 @@ import ssl
 from kmip.core.config_helper import ConfigHelper
 from kmip.core.server import KMIPImpl
 
-from kmip.services.kmip_protocol import KMIPProtocolFactory
-from kmip.services.processor import Processor
+from kmip.services.server.kmip_protocol import KMIPProtocolFactory
+from kmip.services.server.processor import Processor
 
 FILE_PATH = os.path.dirname(os.path.abspath(__file__))
 
diff --git a/kmip/services/processor.py b/kmip/services/server/processor.py
similarity index 100%
rename from kmip/services/processor.py
rename to kmip/services/server/processor.py
diff --git a/kmip/core/repo/__init__.py b/kmip/services/server/repo/__init__.py
similarity index 100%
rename from kmip/core/repo/__init__.py
rename to kmip/services/server/repo/__init__.py
diff --git a/kmip/core/repo/mem_repo.py b/kmip/services/server/repo/mem_repo.py
similarity index 96%
rename from kmip/core/repo/mem_repo.py
rename to kmip/services/server/repo/mem_repo.py
index 1db2979..62c7fca 100644
--- a/kmip/core/repo/mem_repo.py
+++ b/kmip/services/server/repo/mem_repo.py
@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from kmip.core.repo.repo import ManagedObjectRepo
+from kmip.services.server.repo.repo import ManagedObjectRepo
 
 
 class MemRepo(ManagedObjectRepo):
diff --git a/kmip/core/repo/repo.py b/kmip/services/server/repo/repo.py
similarity index 100%
rename from kmip/core/repo/repo.py
rename to kmip/services/server/repo/repo.py