rearranging the commands into their own directory

diff --git a/json_gssapi/CMakeLists.txt b/json_gssapi/CMakeLists.txt
index da009af..317732d 100644 (file)
--- a/json_gssapi/CMakeLists.txt
+++ b/json_gssapi/CMakeLists.txt
@@ -2,20 +2,22 @@ cmake_minimum_required(VERSION 2.8)
 
 project(json_gssapi)
 
+include_directories(src/)
+
 add_executable(json_gssapi src/datamodel/GSSName.cpp
                            src/datamodel/GSSOID.cpp
                            src/datamodel/GSSOIDSet.cpp
                            src/datamodel/GSSBuffer.cpp
                            src/datamodel/GSSCredential.cpp
                            src/GSSException.cpp
-                           src/GSSGetMic.cpp
-                           src/GSSCreateSecContextCommand.cpp
-                           src/GSSCommand.cpp 
-                           src/GSSImportName.cpp
-                           src/GSSAcquireCred.cpp 
-                           src/GSSPseudoRandom.cpp
-                           src/GSSWrap.cpp  
-                           src/GSSUnwrap.cpp
+                           src/commands/GSSGetMic.cpp
+                           src/commands/GSSCreateSecContextCommand.cpp
+                           src/commands/GSSCommand.cpp 
+                           src/commands/GSSImportName.cpp
+                           src/commands/GSSAcquireCred.cpp 
+                           src/commands/GSSPseudoRandom.cpp
+                           src/commands/GSSWrap.cpp  
+                           src/commands/GSSUnwrap.cpp
                            src/util_json.cpp 
                            main.cpp)
 target_link_libraries(json_gssapi gssapi_krb5 jansson)

diff --git a/json_gssapi/src/CMakeLists.txt b/json_gssapi/src/CMakeLists.txt
index c97eb6f..dc56adb 100644 (file)
--- a/json_gssapi/src/CMakeLists.txt
+++ b/json_gssapi/src/CMakeLists.txt
@@ -1,2 +1,3 @@
 
-add_subdirectory(datamodel)
\ No newline at end of file
+add_subdirectory(datamodel)
+add_subdirectory(commands)
\ No newline at end of file

diff --git a/json_gssapi/src/commands/CMakeLists.txt b/json_gssapi/src/commands/CMakeLists.txt
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/json_gssapi/src/GSSAcquireCred.cpp b/json_gssapi/src/commands/GSSAcquireCred.cpp
similarity index 100%
rename from json_gssapi/src/GSSAcquireCred.cpp
rename to json_gssapi/src/commands/GSSAcquireCred.cpp

diff --git a/json_gssapi/src/GSSAcquireCred.h b/json_gssapi/src/commands/GSSAcquireCred.h
similarity index 100%
rename from json_gssapi/src/GSSAcquireCred.h
rename to json_gssapi/src/commands/GSSAcquireCred.h

diff --git a/json_gssapi/src/GSSCommand.cpp b/json_gssapi/src/commands/GSSCommand.cpp
similarity index 100%
rename from json_gssapi/src/GSSCommand.cpp
rename to json_gssapi/src/commands/GSSCommand.cpp

diff --git a/json_gssapi/src/GSSCommand.h b/json_gssapi/src/commands/GSSCommand.h
similarity index 100%
rename from json_gssapi/src/GSSCommand.h
rename to json_gssapi/src/commands/GSSCommand.h

diff --git a/json_gssapi/src/GSSCreateSecContextCommand.cpp b/json_gssapi/src/commands/GSSCreateSecContextCommand.cpp
similarity index 100%
rename from json_gssapi/src/GSSCreateSecContextCommand.cpp
rename to json_gssapi/src/commands/GSSCreateSecContextCommand.cpp

diff --git a/json_gssapi/src/GSSCreateSecContextCommand.h b/json_gssapi/src/commands/GSSCreateSecContextCommand.h
similarity index 100%
rename from json_gssapi/src/GSSCreateSecContextCommand.h
rename to json_gssapi/src/commands/GSSCreateSecContextCommand.h

diff --git a/json_gssapi/src/GSSGetMic.cpp b/json_gssapi/src/commands/GSSGetMic.cpp
similarity index 100%
rename from json_gssapi/src/GSSGetMic.cpp
rename to json_gssapi/src/commands/GSSGetMic.cpp

diff --git a/json_gssapi/src/GSSGetMic.h b/json_gssapi/src/commands/GSSGetMic.h
similarity index 100%
rename from json_gssapi/src/GSSGetMic.h
rename to json_gssapi/src/commands/GSSGetMic.h

diff --git a/json_gssapi/src/GSSImportName.cpp b/json_gssapi/src/commands/GSSImportName.cpp
similarity index 100%
rename from json_gssapi/src/GSSImportName.cpp
rename to json_gssapi/src/commands/GSSImportName.cpp

diff --git a/json_gssapi/src/GSSImportName.h b/json_gssapi/src/commands/GSSImportName.h
similarity index 100%
rename from json_gssapi/src/GSSImportName.h
rename to json_gssapi/src/commands/GSSImportName.h

diff --git a/json_gssapi/src/GSSPseudoRandom.cpp b/json_gssapi/src/commands/GSSPseudoRandom.cpp
similarity index 100%
rename from json_gssapi/src/GSSPseudoRandom.cpp
rename to json_gssapi/src/commands/GSSPseudoRandom.cpp

diff --git a/json_gssapi/src/GSSPseudoRandom.h b/json_gssapi/src/commands/GSSPseudoRandom.h
similarity index 100%
rename from json_gssapi/src/GSSPseudoRandom.h
rename to json_gssapi/src/commands/GSSPseudoRandom.h

diff --git a/json_gssapi/src/GSSUnwrap.cpp b/json_gssapi/src/commands/GSSUnwrap.cpp
similarity index 100%
rename from json_gssapi/src/GSSUnwrap.cpp
rename to json_gssapi/src/commands/GSSUnwrap.cpp

diff --git a/json_gssapi/src/GSSUnwrap.h b/json_gssapi/src/commands/GSSUnwrap.h
similarity index 100%
rename from json_gssapi/src/GSSUnwrap.h
rename to json_gssapi/src/commands/GSSUnwrap.h

diff --git a/json_gssapi/src/GSSWrap.cpp b/json_gssapi/src/commands/GSSWrap.cpp
similarity index 100%
rename from json_gssapi/src/GSSWrap.cpp
rename to json_gssapi/src/commands/GSSWrap.cpp

diff --git a/json_gssapi/src/GSSWrap.h b/json_gssapi/src/commands/GSSWrap.h
similarity index 100%
rename from json_gssapi/src/GSSWrap.h
rename to json_gssapi/src/commands/GSSWrap.h

diff --git a/json_gssapi/test/CMakeLists.txt b/json_gssapi/test/CMakeLists.txt
index e262b50..55620b6 100644 (file)
--- a/json_gssapi/test/CMakeLists.txt
+++ b/json_gssapi/test/CMakeLists.txt
@@ -1,4 +1,5 @@
 include_directories(${CMAKE_SOURCE_DIR}/src)
+include_directories(${CMAKE_SOURCE_DIR}/src/commands)
 
 add_executable(test GSSExceptionTest.cpp 
                     GSSAcquireCredTest.cpp 
@@ -16,15 +17,15 @@ add_executable(test GSSExceptionTest.cpp
                     GSSImportNameTest.cpp
                     command_mocks/MockImportName.cpp
                     test_run.cpp 
-                    ../src/GSSCreateSecContextCommand.cpp 
+                    ../src/commands/GSSCreateSecContextCommand.cpp 
                     ../src/util_json.cpp 
-                    ../src/GSSImportName.cpp
+                    ../src/commands/GSSImportName.cpp
                     ../src/GSSException.cpp
-                    ../src/GSSGetMic.cpp
-                    ../src/GSSAcquireCred.cpp
-                    ../src/GSSPseudoRandom.cpp
-                    ../src/GSSUnwrap.cpp
-                    ../src/GSSWrap.cpp
+                    ../src/commands/GSSGetMic.cpp
+                    ../src/commands/GSSAcquireCred.cpp
+                    ../src/commands/GSSPseudoRandom.cpp
+                    ../src/commands/GSSUnwrap.cpp
+                    ../src/commands/GSSWrap.cpp
                     ../src/datamodel/GSSBuffer.cpp
                     ../src/datamodel/GSSCredential.cpp
                     ../src/datamodel/GSSName.cpp