beagle r4457 - in trunk/beagle: BeagleClient beagled beagled/FileSystemQueryable beagled/IndexingServiceQueryable beagled/NautilusMetadataQueryable beagled/TomboyQueryable

[dbera svn gnome org]

Author: dbera
Date: Sun Feb  3 18:48:02 2008
New Revision: 4457
URL: http://svn.gnome.org/viewvc/beagle?rev=4457&view=rev

Log:
* Remove spurious whitespace.
* Adapt BeagleDaemon.cs and BuildIndex.cs to PathFinder changes.
* Remove System.Data from the required assemblies since we dont use it anymore.
* Change wrapper scripts to set the env variable to conf-data.

Modified:
   trunk/beagle/BeagleClient/Property.cs
   trunk/beagle/beagled/BeagleDaemon.cs
   trunk/beagle/beagled/BuildIndex.cs
   trunk/beagle/beagled/FileSystemQueryable/FileSystemQueryable.cs
   trunk/beagle/beagled/IndexingServiceQueryable/IndexingServiceQueryable.cs
   trunk/beagle/beagled/Makefile.am
   trunk/beagle/beagled/NautilusMetadataQueryable/NautilusMetadataQueryable.cs
   trunk/beagle/beagled/StaticQueryable.cs
   trunk/beagle/beagled/TomboyQueryable/TomboyQueryable.cs
   trunk/beagle/beagled/beagled.in
   trunk/beagle/beagled/wrapper.in

Modified: trunk/beagle/BeagleClient/Property.cs
==============================================================================
--- trunk/beagle/BeagleClient/Property.cs	(original)
+++ trunk/beagle/BeagleClient/Property.cs	Sun Feb  3 18:48:02 2008
@@ -34,7 +34,6 @@
 
 namespace Beagle {
 
-	
 	public enum PropertyType {
 		Text     = 1,
 		Keyword  = 2,

Modified: trunk/beagle/beagled/BeagleDaemon.cs
==============================================================================
--- trunk/beagle/beagled/BeagleDaemon.cs	(original)
+++ trunk/beagle/beagled/BeagleDaemon.cs	Sun Feb  3 18:48:02 2008
@@ -473,7 +473,7 @@
 
 			// Check if global configuration files are installed
 			if (! Conf.CheckGlobalConfig ()) {
-				Console.WriteLine ("Global configuration files not found in '{0}'", PathFinder.GlobalConfigDir);
+				Console.WriteLine ("Global configuration files not found in '{0}'", PathFinder.ConfigDataDir);
 				Environment.Exit (-1);
 			}
 

Modified: trunk/beagle/beagled/BuildIndex.cs
==============================================================================
--- trunk/beagle/beagled/BuildIndex.cs	(original)
+++ trunk/beagle/beagled/BuildIndex.cs	Sun Feb  3 18:48:02 2008
@@ -315,7 +315,8 @@
 				Environment.Exit (0);
 			}
 
-			string global_files_config = Path.Combine (PathFinder.GlobalConfigDir, Conf.Names.FilesQueryableConfig + ".xml");
+			string global_files_config = Path.Combine (PathFinder.ConfigDataDir, "config-files");
+			global_files_config = Path.Combine (global_files_config, Conf.Names.FilesQueryableConfig + ".xml");
 			if (! File.Exists (global_files_config)) {
 				Log.Error ("Global configuration file not found {0}", global_files_config);
 				Environment.Exit (0);

Modified: trunk/beagle/beagled/FileSystemQueryable/FileSystemQueryable.cs
==============================================================================
--- trunk/beagle/beagled/FileSystemQueryable/FileSystemQueryable.cs	(original)
+++ trunk/beagle/beagled/FileSystemQueryable/FileSystemQueryable.cs	Sun Feb  3 18:48:02 2008
@@ -38,7 +38,6 @@
 namespace Beagle.Daemon.FileSystemQueryable {
 
 	[QueryableFlavor (Name="Files", Domain=QueryDomain.Local | QueryDomain.Neighborhood, RequireInotify=false)]
-
 	public class FileSystemQueryable : LuceneQueryable {
 
 		static internal bool Debug = false;

Modified: trunk/beagle/beagled/IndexingServiceQueryable/IndexingServiceQueryable.cs
==============================================================================
--- trunk/beagle/beagled/IndexingServiceQueryable/IndexingServiceQueryable.cs	(original)
+++ trunk/beagle/beagled/IndexingServiceQueryable/IndexingServiceQueryable.cs	Sun Feb  3 18:48:02 2008
@@ -56,7 +56,6 @@
 namespace Beagle.Daemon.IndexingServiceQueryable {
 
 	[QueryableFlavor (Name="IndexingService", Domain=QueryDomain.Local, RequireInotify=false)]
-
 	public class IndexingServiceQueryable : LuceneQueryable {
 
 		public IndexingServiceQueryable () : base ("IndexingServiceIndex")

Modified: trunk/beagle/beagled/Makefile.am
==============================================================================
--- trunk/beagle/beagled/Makefile.am	(original)
+++ trunk/beagle/beagled/Makefile.am	Sun Feb  3 18:48:02 2008
@@ -500,8 +500,7 @@
 	$(SHARPZIPLIB_LIBS)					\
 	$(NDESK_DBUS_GLIB_LIBS)					\
 	-r:Mono.Data.Sqlite					\
-	-r:Mono.Posix						\
-	-r:System.Data
+	-r:Mono.Posix
 
 if ENABLE_AVAHI
 DAEMON_DLL_CSFLAGS += -define:ENABLE_AVAHI

Modified: trunk/beagle/beagled/NautilusMetadataQueryable/NautilusMetadataQueryable.cs
==============================================================================
--- trunk/beagle/beagled/NautilusMetadataQueryable/NautilusMetadataQueryable.cs	(original)
+++ trunk/beagle/beagled/NautilusMetadataQueryable/NautilusMetadataQueryable.cs	Sun Feb  3 18:48:02 2008
@@ -36,9 +36,7 @@
 
 namespace Beagle.Daemon.NautilusMetadataQueryable {
 
-
-	[QueryableFlavor (Name="NautilusMetadata", Domain=QueryDomain.Local, RequireInotify=false,
-			  DependsOn="Files")]
+	[QueryableFlavor (Name="NautilusMetadata", Domain=QueryDomain.Local, RequireInotify=false, DependsOn="Files")]
 	public class NautilusMetadataQueryable : ExternalMetadataQueryable, IIndexableGenerator  {
 
 		private string nautilus_dir;

Modified: trunk/beagle/beagled/StaticQueryable.cs
==============================================================================
--- trunk/beagle/beagled/StaticQueryable.cs	(original)
+++ trunk/beagle/beagled/StaticQueryable.cs	Sun Feb  3 18:48:02 2008
@@ -36,12 +36,10 @@
 
 namespace Beagle.Daemon {
 
-	
-
 	public class StaticQueryable : LuceneQueryable 	{
-		
+
 		protected TextCache text_cache;
-		
+
 		public StaticQueryable (string index_name, string index_path, bool read_only_mode) : base (index_path, read_only_mode)
 		{
 			Logger.Log.Debug ("Initializing static queryable: {0}", index_path);

Modified: trunk/beagle/beagled/TomboyQueryable/TomboyQueryable.cs
==============================================================================
--- trunk/beagle/beagled/TomboyQueryable/TomboyQueryable.cs	(original)
+++ trunk/beagle/beagled/TomboyQueryable/TomboyQueryable.cs	Sun Feb  3 18:48:02 2008
@@ -36,7 +36,6 @@
 namespace Beagle.Daemon.TomboyQueryable {
 
 	[QueryableFlavor (Name="Tomboy", Domain=QueryDomain.Local, RequireInotify=false)]
-
 	public class TomboyQueryable : LuceneFileQueryable, IIndexableGenerator  {
 
 		string tomboy_dir;

Modified: trunk/beagle/beagled/beagled.in
==============================================================================
--- trunk/beagle/beagled/beagled.in	(original)
+++ trunk/beagle/beagled/beagled.in	Sun Feb  3 18:48:02 2008
@@ -25,7 +25,7 @@
     fi
 
     if [ -z $BEAGLE_CONF_DIR ]; then
-	    export BEAGLE_CONF_DIR="../tools/config-files"
+	    export BEAGLE_CONF_DIR="../conf-data"
     fi
 
 else

Modified: trunk/beagle/beagled/wrapper.in
==============================================================================
--- trunk/beagle/beagled/wrapper.in	(original)
+++ trunk/beagle/beagled/wrapper.in	Sun Feb  3 18:48:02 2008
@@ -14,7 +14,7 @@
     export BEAGLE_FILTER_PATH="../Filters${BEAGLE_FILTER_PATH+:$BEAGLE_FILTER_PATH}"
 
     if [ -z $BEAGLE_CONF_DIR ]; then
-	    export BEAGLE_CONF_DIR="../tools/config-files"
+	    export BEAGLE_CONF_DIR="../conf-data"
     fi
 
 else