move to common (not the best place, though)

diff --git a/org.glite.jp.primary/Makefile b/org.glite.jp.primary/Makefile
index 7696978..b55915b 100644 (file)
--- a/org.glite.jp.primary/Makefile
+++ b/org.glite.jp.primary/Makefile
@@ -66,7 +66,7 @@ sample_jobs:=sample_job_aborted  sample_job_cleared  sample_job_tagged_done  sam
 plugins:=glite-jp-ftpdauth.la glite-jp-classad.la glite-jp-sandbox.la
 
 SRCS:= bones_server.c soap_ops.c \
-       new_ftp_backend.c file_plugin.c utils.c\
+       new_ftp_backend.c file_plugin.c \
        feed.c authz.c attrs.c \
        tags.c\
        is_client.c \

diff --git a/org.glite.jp.primary/src/attrs.c b/org.glite.jp.primary/src/attrs.c
index f6655ee..d4cc5b5 100644 (file)
--- a/org.glite.jp.primary/src/attrs.c
+++ b/org.glite.jp.primary/src/attrs.c
@@ -10,10 +10,10 @@
 #include "glite/jp/attr.h"
 #include "glite/jp/backend.h"
 #include "glite/jp/file_plugin.h"
+#include "glite/jp/builtin_plugins.h"
 
 #include "feed.h"
 #include "attrs.h"
-#include "builtin_plugins.h"
 
 static struct {
        char *namespace;

diff --git a/org.glite.jp.primary/src/builtin_plugins.h b/org.glite.jp.primary/src/builtin_plugins.h
deleted file mode 100644 (file)
index 70d900b..0000000
--- a/org.glite.jp.primary/src/builtin_plugins.h
+++ /dev/null
@@ -1,8 +0,0 @@
-
-#define GLITE_JP_FILETYPE_TAGS   "urn:org.glite.jp.primary:tags"
-#define GLITE_JP_FILETYPE_LB     "urn:org.glite.jp.primary:lb"
-#define GLITE_JP_FILETYPE_CLASSAD "urn:org.glite.jp.primary:classad"
-#define GLITE_JP_FILETYPE_ISB    "urn:org.glite.jp.primary:isb"
-#define GLITE_JP_FILETYPE_OSB    "urn:org.glite.jp.primary:osb"
-
-#define GLITE_JP_FPLUG_TAGS_APPEND     0

diff --git a/org.glite.jp.primary/src/classad_plugin.c b/org.glite.jp.primary/src/classad_plugin.c
index 1858b67..36e92e0 100644 (file)
--- a/org.glite.jp.primary/src/classad_plugin.c
+++ b/org.glite.jp.primary/src/classad_plugin.c
@@ -21,8 +21,7 @@
 
 #include "glite/jp/file_plugin.h"
 #include "glite/jp/backend.h"
-
-#include "builtin_plugins.h"
+#include "glite/jp/builtin_plugins.h"
 
 //#define INITIAL_NUMBER_EVENTS 100
 //#define INITIAL_NUMBER_STATES EDG_WLL_NUMBER_OF_STATCODES

diff --git a/org.glite.jp.primary/src/feed.c b/org.glite.jp.primary/src/feed.c
index 1f3904c..35e3f96 100644 (file)
--- a/org.glite.jp.primary/src/feed.c
+++ b/org.glite.jp.primary/src/feed.c
@@ -12,9 +12,9 @@
 #include "glite/jp/strmd5.h"
 #include "glite/jp/known_attr.h"
 #include "glite/jp/file_plugin.h"
+#include "glite/jp/builtin_plugins.h"
 
 #include "feed.h"
-#include "builtin_plugins.h"
 #include "is_client.h"
 #include "backend_private.h"
 

diff --git a/org.glite.jp.primary/src/file_plugin.c b/org.glite.jp.primary/src/file_plugin.c
index 2c27f93..ccb1433 100644 (file)
--- a/org.glite.jp.primary/src/file_plugin.c
+++ b/org.glite.jp.primary/src/file_plugin.c
@@ -5,7 +5,7 @@
 #include <errno.h>
 
 #include <glite/jp/types.h>
-#include "file_plugin.h"
+#include "glite/jp/file_plugin.h"
 
 static struct option opts[] = {
        { "plugin", 1, NULL, 'p' },

diff --git a/org.glite.jp.primary/src/sandbox_plugin.c b/org.glite.jp.primary/src/sandbox_plugin.c
index 0d59c3b..7a1559a 100644 (file)
--- a/org.glite.jp.primary/src/sandbox_plugin.c
+++ b/org.glite.jp.primary/src/sandbox_plugin.c
@@ -15,7 +15,7 @@
 #include "glite/jp/backend.h"
 
 #include "glite/jp/file_plugin.h"
-#include "builtin_plugins.h"
+#include "glite/jp/builtin_plugins.h"
 
 #define ALLOC_CHUNK    3
 

diff --git a/org.glite.jp.primary/src/soap_ops.c b/org.glite.jp.primary/src/soap_ops.c
index c6a7604..b67788c 100644 (file)
--- a/org.glite.jp.primary/src/soap_ops.c
+++ b/org.glite.jp.primary/src/soap_ops.c
@@ -19,8 +19,8 @@
 #include "jptype_map.h"
 #include "glite/security/glite_gscompat.h"
 
-#include "file_plugin.h"
-#include "builtin_plugins.h"
+#include "glite/jp/file_plugin.h"
+#include "glite/jp/builtin_plugins.h"
 
 /* the same as ServerLib.c but without WITH_NOGLOBAL which breaks the soap_env_ctx trick */
 #define SOAP_FMAC3 static