Merge pull request #94 from OpenKMIP/maint/reorg-server-code

Reorganizing the server code

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

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
 

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.

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__))
 

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):