From 4040f479664c5e108c197d52ebfcf25a2cf1970f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Tue, 22 Apr 2008 11:46:07 +0000
Subject: [PATCH] Finalize migration from jp to jobid.

---
 org.glite.jp.common/test/base64_test.cpp   | 90 ------------------------------
 org.glite.jp.index/examples/jpis-test.c    |  2 +-
 org.glite.jp.index/src/db_ops.c            |  2 +-
 org.glite.jp.index/src/soap_ops.c          |  2 +-
 org.glite.jp.primary/src/feed.c            |  2 +-
 org.glite.jp.primary/src/new_ftp_backend.c |  2 +-
 6 files changed, 5 insertions(+), 95 deletions(-)
 delete mode 100644 org.glite.jp.common/test/base64_test.cpp

diff --git a/org.glite.jp.common/test/base64_test.cpp b/org.glite.jp.common/test/base64_test.cpp
deleted file mode 100644
index b104129..0000000
--- a/org.glite.jp.common/test/base64_test.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-#include <assert.h>
-#include <fstream>
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <cppunit/CompilerOutputter.h>
-#include <cppunit/XmlOutputter.h>
-#include <cppunit/TestRunner.h>
-#include <cppunit/TestResult.h>
-#include <cppunit/TestResultCollector.h>
-
-#include "strmd5.h"
-
-#include "types.h"
-#include "backend.h"
-
-class Base64Test: public  CppUnit::TestFixture
-{
-	CPPUNIT_TEST_SUITE(Base64Test);
-	CPPUNIT_TEST(test);
-	CPPUNIT_TEST_SUITE_END();
-public:
-	void test();
-};
-
-void Base64Test::test()
-{	
-	int	i;
-	unsigned char	in[2000], b[4000], out[2000];
-
-	srandom(0xDEAD);
-	in[0] = 'x';
-	for (i=1; i<2000; i++) {
-		char	s[20];
-		int	len;
-		sprintf(s,"%d",i);
-		in[i] = random() % 256;
-
-		std::cerr << '.';
-
-		base64_encode(in,i,(char *) b,sizeof b);
-		len = base64_decode((const char *) b,(char *) out,sizeof out);
-
-		CPPUNIT_ASSERT_MESSAGE(std::string("len"),i == len);
-		CPPUNIT_ASSERT_MESSAGE(std::string(s),!memcmp(in,out,i));
-	}
-	std::cerr << std::endl;
-}
-
-CPPUNIT_TEST_SUITE_REGISTRATION(Base64Test);
-
-
-int main (int argc,const char *argv[])
-{
-	CppUnit::Test *suite = CppUnit::TestFactoryRegistry::getRegistry().makeTest();
-
-	assert(argc == 2);
-	std::ofstream	xml(argv[1]);
-
-	CppUnit::TestResult controller;
-	CppUnit::TestResultCollector result;
-	controller.addListener( &result );
-
-	CppUnit::TestRunner runner;
-	runner.addTest(suite);
-	runner.run(controller);
-
-	CppUnit::XmlOutputter xout( &result, xml );
-	CppUnit::CompilerOutputter tout( &result, std::cout);
-	xout.write();
-	tout.write();
-
-	return result.wasSuccessful() ? 0 : 1 ;
-}
-
-/* fake to link */
-int glite_jppsbe_pread(
-        glite_jp_context_t ctx,
-        void *handle,
-        void *buf,
-        size_t nbytes,
-        off_t offset,
-        ssize_t *nbytes_ret
-)
-{
-	abort();
-}
-
-
diff --git a/org.glite.jp.index/examples/jpis-test.c b/org.glite.jp.index/examples/jpis-test.c
index 30e3e73..6a9f20a 100644
--- a/org.glite.jp.index/examples/jpis-test.c
+++ b/org.glite.jp.index/examples/jpis-test.c
@@ -5,7 +5,7 @@
 
 #include <glite/security/glite_gsplugin.h>
 #include <glite/security/glite_gss.h>
-#include "glite/jp/strmd5.h"
+#include "glite/jobid/strmd5.h"
 
 #include "jp_H.h"
 #include "jp_.nsmap"
diff --git a/org.glite.jp.index/src/db_ops.c b/org.glite.jp.index/src/db_ops.c
index a764e50..0bb18cd 100644
--- a/org.glite.jp.index/src/db_ops.c
+++ b/org.glite.jp.index/src/db_ops.c
@@ -10,11 +10,11 @@
 #include <ctype.h>
 
 #include <glite/lbu/trio.h>
+#include <glite/jobid/strmd5.h>
 #include <glite/jp/types.h>
 #include <glite/jp/context.h>
 #include <glite/jp/db.h>
 #include <glite/jp/attr.h>
-#include <glite/jp/strmd5.h>
 
 #include "conf.h"
 #include "context.h"
diff --git a/org.glite.jp.index/src/soap_ops.c b/org.glite.jp.index/src/soap_ops.c
index 9815146..350b372 100644
--- a/org.glite.jp.index/src/soap_ops.c
+++ b/org.glite.jp.index/src/soap_ops.c
@@ -3,9 +3,9 @@
 #include <assert.h>
 
 #include "glite/lbu/trio.h"
+#include "glite/jobid/strmd5.h"
 #include "glite/jp/types.h"
 #include "glite/jp/context.h"
-#include "glite/jp/strmd5.h"
 #include "glite/jp/attr.h"
 #include "glite/jp/known_attr.h"
 
diff --git a/org.glite.jp.primary/src/feed.c b/org.glite.jp.primary/src/feed.c
index 35e3f96..76a22e8 100644
--- a/org.glite.jp.primary/src/feed.c
+++ b/org.glite.jp.primary/src/feed.c
@@ -7,9 +7,9 @@
 #include <fcntl.h>
 #include <signal.h>
 
+#include "glite/jobid/strmd5.h"
 #include "glite/jp/types.h"
 #include "glite/jp/context.h"
-#include "glite/jp/strmd5.h"
 #include "glite/jp/known_attr.h"
 #include "glite/jp/file_plugin.h"
 #include "glite/jp/builtin_plugins.h"
diff --git a/org.glite.jp.primary/src/new_ftp_backend.c b/org.glite.jp.primary/src/new_ftp_backend.c
index 901441a..40da0c9 100644
--- a/org.glite.jp.primary/src/new_ftp_backend.c
+++ b/org.glite.jp.primary/src/new_ftp_backend.c
@@ -16,9 +16,9 @@
 
 #include "glite/lbu/trio.h"
 #include "glite/lbu/escape.h"
+#include "glite/jobid/strmd5.h"
 #include "glite/jp/types.h"
 #include "glite/jp/context.h"
-#include "glite/jp/strmd5.h"
 #include "glite/jp/known_attr.h"
 #include "glite/jp/attr.h"
 #include "glite/jp/db.h"
-- 
1.8.2.3