[haiku-commits] r35169 - in haiku/trunk/src/add-ons/kernel/file_systems/netfs: authentication_server netfs_server_prefs server shared
- From: superstippi@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 19 Jan 2010 17:57:59 +0100 (CET)
Author: stippi
Date: 2010-01-19 17:57:59 +0100 (Tue, 19 Jan 2010)
New Revision: 35169
Changeset: http://dev.haiku-os.org/changeset/35169/haiku
Added:
haiku/trunk/src/add-ons/kernel/file_systems/netfs/server/netfs_server.rdef
Modified:
haiku/trunk/src/add-ons/kernel/file_systems/netfs/authentication_server/authentication_server.rdef
haiku/trunk/src/add-ons/kernel/file_systems/netfs/netfs_server_prefs/Jamfile
haiku/trunk/src/add-ons/kernel/file_systems/netfs/netfs_server_prefs/NetFSServerPrefs.cpp
haiku/trunk/src/add-ons/kernel/file_systems/netfs/server/Jamfile
haiku/trunk/src/add-ons/kernel/file_systems/netfs/server/NetFSServer.cpp
haiku/trunk/src/add-ons/kernel/file_systems/netfs/shared/NetFSServerRosterDefs.cpp
Log:
* Renamed NetFSServer to netfs_server and added .rdef for running it in the
background.
* Renamed NetFSServerPrefs to netfs_server_prefs.
* Fixed copyright years in authentication_server.
Modified:
haiku/trunk/src/add-ons/kernel/file_systems/netfs/authentication_server/authentication_server.rdef
===================================================================
---
haiku/trunk/src/add-ons/kernel/file_systems/netfs/authentication_server/authentication_server.rdef
2010-01-19 16:05:19 UTC (rev 35168)
+++
haiku/trunk/src/add-ons/kernel/file_systems/netfs/authentication_server/authentication_server.rdef
2010-01-19 16:57:59 UTC (rev 35169)
@@ -15,7 +15,7 @@
internal = 0,
short_info = "authentication_server",
- long_info = "authentication_server ©2004-2009 Haiku, Inc"
+ long_info = "authentication_server ©2004-2010 Haiku, Inc"
};
resource vector_icon array {
Modified:
haiku/trunk/src/add-ons/kernel/file_systems/netfs/netfs_server_prefs/Jamfile
===================================================================
---
haiku/trunk/src/add-ons/kernel/file_systems/netfs/netfs_server_prefs/Jamfile
2010-01-19 16:05:19 UTC (rev 35168)
+++
haiku/trunk/src/add-ons/kernel/file_systems/netfs/netfs_server_prefs/Jamfile
2010-01-19 16:57:59 UTC (rev 35169)
@@ -6,9 +6,9 @@
SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
DEFINES += USER=1 ;
-DEFINES += DEBUG_APP="\\\"NetFSServerPrefs\\\"" ;
+DEFINES += DEBUG_APP="\\\"netfs_server_prefs\\\"" ;
-Application NetFSServerPrefs
+Application netfs_server_prefs
: DebugSupport.cpp
NetFSServerRosterDefs.cpp
Modified:
haiku/trunk/src/add-ons/kernel/file_systems/netfs/netfs_server_prefs/NetFSServerPrefs.cpp
===================================================================
---
haiku/trunk/src/add-ons/kernel/file_systems/netfs/netfs_server_prefs/NetFSServerPrefs.cpp
2010-01-19 16:05:19 UTC (rev 35168)
+++
haiku/trunk/src/add-ons/kernel/file_systems/netfs/netfs_server_prefs/NetFSServerPrefs.cpp
2010-01-19 16:57:59 UTC (rev 35169)
@@ -20,8 +20,8 @@
// usage
static const char* kUsage =
-"Usage: NetFSServerPrefs -h | --help\n"
-" NetFSServerPrefs <command>\n"
+"Usage: netfs_server_prefs -h | --help\n"
+" netfs_server_prefs <command>\n"
"options:\n"
" -h, --help - print this text\n"
"\n"
@@ -411,7 +411,7 @@
int
main(int argc, char** argv)
{
- BApplication app("application/x-vnd.yellowbites.NetFSServerPrefs");
+ BApplication app("application/x-vnd.haiku-netfs_server_prefs");
// parse first argument
int argi = 1;
Modified: haiku/trunk/src/add-ons/kernel/file_systems/netfs/server/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/netfs/server/Jamfile
2010-01-19 16:05:19 UTC (rev 35168)
+++ haiku/trunk/src/add-ons/kernel/file_systems/netfs/server/Jamfile
2010-01-19 16:57:59 UTC (rev 35169)
@@ -16,72 +16,76 @@
userlandfs shared ] ;
DEFINES += USER=1 ;
-DEFINES += DEBUG_APP="\\\"NetFSServer\\\"" ;
+DEFINES += DEBUG_APP="\\\"netfs_server\\\"" ;
-Application NetFSServer
- : DebugSupport.cpp
+Application netfs_server
+ :
+ DebugSupport.cpp
- driver_settings.c
- DriverSettings.cpp
- String.cpp
+ driver_settings.c
+ DriverSettings.cpp
+ String.cpp
- AbstractConnection.cpp
- AttrDirInfo.cpp
- Blocker.cpp
- BlockerPool.cpp
- Channel.cpp
- Connection.cpp
- ConnectionFactory.cpp
- EntryInfo.cpp
- FSObject.cpp
- InsecureChannel.cpp
- InsecureConnection.cpp
- NetAddress.cpp
- NetFSDefs.cpp
- NetFSServerRosterDefs.cpp
- NodeInfo.cpp
- PortChannel.cpp
- PortConnection.cpp
- Request.cpp
- RequestChannel.cpp
- RequestConnection.cpp
- RequestDumper.cpp
- RequestFactory.cpp
- RequestFlattener.cpp
- RequestHandler.cpp
- Requests.cpp
- RequestUnflattener.cpp
- ServerInfo.cpp
- ServerNodeID.cpp
- TaskManager.cpp
- ThreadLocal.cpp
+ AbstractConnection.cpp
+ AttrDirInfo.cpp
+ Blocker.cpp
+ BlockerPool.cpp
+ Channel.cpp
+ Connection.cpp
+ ConnectionFactory.cpp
+ EntryInfo.cpp
+ FSObject.cpp
+ InsecureChannel.cpp
+ InsecureConnection.cpp
+ NetAddress.cpp
+ NetFSDefs.cpp
+ NetFSServerRosterDefs.cpp
+ NodeInfo.cpp
+ PortChannel.cpp
+ PortConnection.cpp
+ Request.cpp
+ RequestChannel.cpp
+ RequestConnection.cpp
+ RequestDumper.cpp
+ RequestFactory.cpp
+ RequestFlattener.cpp
+ RequestHandler.cpp
+ Requests.cpp
+ RequestUnflattener.cpp
+ ServerInfo.cpp
+ ServerNodeID.cpp
+ TaskManager.cpp
+ ThreadLocal.cpp
- AttributeDirectory.cpp
- ClientConnection.cpp
- ClientVolume.cpp
- ConnectionListener.cpp
- ConnectionListenerFactory.cpp
- Directory.cpp
- Entry.cpp
- EntryRef.cpp
- FDManager.cpp
- GlobalBlockerPool.cpp
- InsecureConnectionListener.cpp
- Lockable.cpp
- NetFSServer.cpp
- Node.cpp
- NodeHandle.cpp
- NodeHandleMap.cpp
- NodeMonitor.cpp
- NodeMonitoringEvent.cpp
- Path.cpp
- PortConnectionListener.cpp
- QueryDomain.cpp
- RequestBufferReplacer.cpp
- SecurityContext.cpp
- StatisticsManager.cpp
- UserSecurityContext.cpp
- Volume.cpp
- VolumeManager.cpp
- : be $(TARGET_NETWORK_LIBS) $(TARGET_LIBSUPC++) libshared.a
+ AttributeDirectory.cpp
+ ClientConnection.cpp
+ ClientVolume.cpp
+ ConnectionListener.cpp
+ ConnectionListenerFactory.cpp
+ Directory.cpp
+ Entry.cpp
+ EntryRef.cpp
+ FDManager.cpp
+ GlobalBlockerPool.cpp
+ InsecureConnectionListener.cpp
+ Lockable.cpp
+ NetFSServer.cpp
+ Node.cpp
+ NodeHandle.cpp
+ NodeHandleMap.cpp
+ NodeMonitor.cpp
+ NodeMonitoringEvent.cpp
+ Path.cpp
+ PortConnectionListener.cpp
+ QueryDomain.cpp
+ RequestBufferReplacer.cpp
+ SecurityContext.cpp
+ StatisticsManager.cpp
+ UserSecurityContext.cpp
+ Volume.cpp
+ VolumeManager.cpp
+ :
+ be $(TARGET_NETWORK_LIBS) $(TARGET_LIBSUPC++) libshared.a
+ :
+ netfs_server.rdef
;
Modified:
haiku/trunk/src/add-ons/kernel/file_systems/netfs/server/NetFSServer.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/netfs/server/NetFSServer.cpp
2010-01-19 16:05:19 UTC (rev 35168)
+++ haiku/trunk/src/add-ons/kernel/file_systems/netfs/server/NetFSServer.cpp
2010-01-19 16:57:59 UTC (rev 35169)
@@ -41,11 +41,11 @@
#include "VolumeManager.h"
static const char* kSettingsDirName = "netfs";
-static const char* kSettingsFileName = "NetFSServer";
+static const char* kSettingsFileName = "netfs_server";
// usage
static const char* kUsage =
-"Usage: NetFSServer <options>\n"
+"Usage: netfs_server <options>\n"
"options:\n"
" --dont-broadcast - don't use broadcasting to announce the server's\n"
" availability to clients\n"
@@ -186,25 +186,26 @@
// constructor
NetFSServer::NetFSServer(bool useBroadcasting)
- : BApplication(kNetFSServerSignature),
- fSecurityContext(NULL),
- fConnectionListenerFactory(),
- fConnectionListener(NULL),
- fLock("netfs server"),
- fClientConnections(),
- fVolumeManager(NULL),
- fClosedConnections(),
- fClosedConnectionsSemaphore(-1),
- fConnectionListenerThread(-1),
- fConnectionDeleter(-1),
- fBroadcaster(-1),
- fBroadcastingSocket(-1),
- fBroadcasterSemaphore(-1),
- fServerInfoConnectionListener(-1),
- fServerInfoConnectionListenerSocket(-1),
- fServerInfoUpdated(0),
- fUseBroadcasting(useBroadcasting),
- fTerminating(false)
+ :
+ BApplication(kNetFSServerSignature),
+ fSecurityContext(NULL),
+ fConnectionListenerFactory(),
+ fConnectionListener(NULL),
+ fLock("netfs server"),
+ fClientConnections(),
+ fVolumeManager(NULL),
+ fClosedConnections(),
+ fClosedConnectionsSemaphore(-1),
+ fConnectionListenerThread(-1),
+ fConnectionDeleter(-1),
+ fBroadcaster(-1),
+ fBroadcastingSocket(-1),
+ fBroadcasterSemaphore(-1),
+ fServerInfoConnectionListener(-1),
+ fServerInfoConnectionListenerSocket(-1),
+ fServerInfoUpdated(0),
+ fUseBroadcasting(useBroadcasting),
+ fTerminating(false)
{
}
Added:
haiku/trunk/src/add-ons/kernel/file_systems/netfs/server/netfs_server.rdef
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/netfs/server/netfs_server.rdef
(rev 0)
+++ haiku/trunk/src/add-ons/kernel/file_systems/netfs/server/netfs_server.rdef
2010-01-19 16:57:59 UTC (rev 35169)
@@ -0,0 +1,21 @@
+/*
+ * netfs_server.rdef
+ */
+
+resource app_signature "application/x-vnd.haiku-netfs_server";
+
+resource app_flags B_EXCLUSIVE_LAUNCH|B_BACKGROUND_APP;
+
+resource app_version {
+ major = 1,
+ middle = 0,
+ minor = 0,
+
+ variety = B_APPV_ALPHA,
+ internal = 0,
+
+ short_info = "netfs_server",
+ long_info = "netfs_server ©2004-2010 Haiku, Inc"
+};
+
+
Modified:
haiku/trunk/src/add-ons/kernel/file_systems/netfs/shared/NetFSServerRosterDefs.cpp
===================================================================
---
haiku/trunk/src/add-ons/kernel/file_systems/netfs/shared/NetFSServerRosterDefs.cpp
2010-01-19 16:05:19 UTC (rev 35168)
+++
haiku/trunk/src/add-ons/kernel/file_systems/netfs/shared/NetFSServerRosterDefs.cpp
2010-01-19 16:57:59 UTC (rev 35169)
@@ -3,4 +3,4 @@
#include "NetFSServerRosterDefs.h"
const char* kNetFSServerSignature
- = "application/x-vnd.yellowbites.netfs-server";
+ = "application/x-vnd.haiku-netfs_server";
Other related posts:
