Move trace slime serialization too vespa.

16 files changed, 11 insertions, 29 deletions

diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index 49756f049ba..48b5e40ee30 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -3,7 +3,6 @@ vespa_define_module(
     DEPENDS
     fastos
     vespalib
-    staging_vespalib
     vespalog
     fnet
 
diff --git a/staging_vespalib/CMakeLists.txt b/staging_vespalib/CMakeLists.txt
index 0f08ddc6791..65cd8bb8630 100644
--- a/staging_vespalib/CMakeLists.txt
+++ b/staging_vespalib/CMakeLists.txt
@@ -43,6 +43,5 @@ vespa_define_module(
     src/vespa/vespalib/net
     src/vespa/vespalib/objects
     src/vespa/vespalib/stllike
-    src/vespa/vespalib/trace
     src/vespa/vespalib/util
 )
diff --git a/staging_vespalib/src/module.conf.rhel6 b/staging_vespalib/src/module.conf.rhel6
deleted file mode 100644
index 5867773215b..00000000000
--- a/staging_vespalib/src/module.conf.rhel6
+++ /dev/null
@@ -1,8 +0,0 @@
-module staging_vespalib
-require module fastos shared library fastos
-require module log shared library vespalog
-require module fastlib shared library fast
-require module vespalib shared library vespalib
-require module fnet shared library fnet
-require module boost
-provide library staging_vespalib
diff --git a/staging_vespalib/src/testlist.txt b/staging_vespalib/src/testlist.txt
index 3856ebba9b8..f29e51218ec 100644
--- a/staging_vespalib/src/testlist.txt
+++ b/staging_vespalib/src/testlist.txt
@@ -23,6 +23,5 @@ tests/shutdownguard
 tests/state_server
 tests/stllike
 tests/timer
-tests/trace
 tests/util/process_memory_stats
 tests/xmlserializable
diff --git a/staging_vespalib/src/tests/trace/.gitignore b/staging_vespalib/src/tests/trace/.gitignore
deleted file mode 100644
index 14ed55a124e..00000000000
--- a/staging_vespalib/src/tests/trace/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-staging_vespalib_trace_test_app
diff --git a/staging_vespalib/src/tests/trace/CMakeLists.txt b/staging_vespalib/src/tests/trace/CMakeLists.txt
deleted file mode 100644
index 9eeef16e6ea..00000000000
--- a/staging_vespalib/src/tests/trace/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(staging_vespalib_trace_test_app TEST
-    SOURCES
-    trace.cpp
-    DEPENDS
-    staging_vespalib
-)
-vespa_add_test(NAME staging_vespalib_trace_test_app COMMAND staging_vespalib_trace_test_app)
diff --git a/staging_vespalib/src/vespa/vespalib/CMakeLists.txt b/staging_vespalib/src/vespa/vespalib/CMakeLists.txt
index 640278a583b..6c5ad7b0dee 100644
--- a/staging_vespalib/src/vespa/vespalib/CMakeLists.txt
+++ b/staging_vespalib/src/vespa/vespalib/CMakeLists.txt
@@ -7,7 +7,6 @@ vespa_add_library(staging_vespalib
     $<TARGET_OBJECTS:staging_vespalib_vespalib_objects>
     $<TARGET_OBJECTS:staging_vespalib_vespalib_stllike>
     $<TARGET_OBJECTS:staging_vespalib_vespalib_net>
-    $<TARGET_OBJECTS:staging_vespalib_vespalib_trace>
     INSTALL lib64
     DEPENDS
 )
diff --git a/staging_vespalib/src/vespa/vespalib/trace/CMakeLists.txt b/staging_vespalib/src/vespa/vespalib/trace/CMakeLists.txt
deleted file mode 100644
index f2e583a2dfa..00000000000
--- a/staging_vespalib/src/vespa/vespalib/trace/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(staging_vespalib_vespalib_trace OBJECT
-    SOURCES
-    slime_trace_serializer.cpp
-    slime_trace_deserializer.cpp
-    DEPENDS
-)
diff --git a/vespalib/src/tests/trace/.gitignore b/vespalib/src/tests/trace/.gitignore
index 51b4ee1aef8..420e2121bba 100644
--- a/vespalib/src/tests/trace/.gitignore
+++ b/vespalib/src/tests/trace/.gitignore
@@ -1,4 +1,4 @@
 .depend
 Makefile
-trace_test
 vespalib_trace_test_app
+vespalib_trace_serialization_test_app
diff --git a/vespalib/src/tests/trace/CMakeLists.txt b/vespalib/src/tests/trace/CMakeLists.txt
index c87c3f1b3a8..f719222835e 100644
--- a/vespalib/src/tests/trace/CMakeLists.txt
+++ b/vespalib/src/tests/trace/CMakeLists.txt
@@ -6,3 +6,11 @@ vespa_add_executable(vespalib_trace_test_app TEST
     vespalib
 )
 vespa_add_test(NAME vespalib_trace_test_app COMMAND vespalib_trace_test_app)
+
+vespa_add_executable(staging_vespalib_trace_serialization_test_app TEST
+    SOURCES
+    trace_serialization.cpp
+    DEPENDS
+    vespalib
+)
+vespa_add_test(NAME staging_vespalib_trace_serialization_test_app COMMAND staging_vespalib_trace_serialization_test_app)
diff --git a/staging_vespalib/src/tests/trace/trace.cpp b/vespalib/src/tests/trace/trace_serialization.cpp
index a7896d43338..a7896d43338 100644
--- a/staging_vespalib/src/tests/trace/trace.cpp
+++ b/vespalib/src/tests/trace/trace_serialization.cpp
diff --git a/vespalib/src/vespa/vespalib/trace/CMakeLists.txt b/vespalib/src/vespa/vespalib/trace/CMakeLists.txt
index d114ed4d953..87cd9428494 100644
--- a/vespalib/src/vespa/vespalib/trace/CMakeLists.txt
+++ b/vespalib/src/vespa/vespalib/trace/CMakeLists.txt
@@ -3,5 +3,7 @@ vespa_add_library(vespalib_vespalib_trace OBJECT
     SOURCES
     trace.cpp
     tracenode.cpp
+    slime_trace_serializer.cpp
+    slime_trace_deserializer.cpp
     DEPENDS
 )
diff --git a/staging_vespalib/src/vespa/vespalib/trace/slime_trace_deserializer.cpp b/vespalib/src/vespa/vespalib/trace/slime_trace_deserializer.cpp
index fc28dfbb40b..fc28dfbb40b 100644
--- a/staging_vespalib/src/vespa/vespalib/trace/slime_trace_deserializer.cpp
+++ b/vespalib/src/vespa/vespalib/trace/slime_trace_deserializer.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/trace/slime_trace_deserializer.h b/vespalib/src/vespa/vespalib/trace/slime_trace_deserializer.h
index dc8c6dc5cff..dc8c6dc5cff 100644
--- a/staging_vespalib/src/vespa/vespalib/trace/slime_trace_deserializer.h
+++ b/vespalib/src/vespa/vespalib/trace/slime_trace_deserializer.h
diff --git a/staging_vespalib/src/vespa/vespalib/trace/slime_trace_serializer.cpp b/vespalib/src/vespa/vespalib/trace/slime_trace_serializer.cpp
index 4332d6bf045..4332d6bf045 100644
--- a/staging_vespalib/src/vespa/vespalib/trace/slime_trace_serializer.cpp
+++ b/vespalib/src/vespa/vespalib/trace/slime_trace_serializer.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/trace/slime_trace_serializer.h b/vespalib/src/vespa/vespalib/trace/slime_trace_serializer.h
index 3b50f0878bf..3b50f0878bf 100644
--- a/staging_vespalib/src/vespa/vespalib/trace/slime_trace_serializer.h
+++ b/vespalib/src/vespa/vespalib/trace/slime_trace_serializer.h