Merge branch 'R3_3_branch' of cvs:/home/git/ice into R3_3_branch

Conflicts:

	java/resources/IceGridAdmin/icegridadmin_content_dyn.html
	java/resources/IceGridAdmin/icegridadmin_content_static.html

1 files changed, 62 insertions, 0 deletions

diff --git a/cpp/include/Slice/FileTracker.h b/cpp/include/Slice/FileTracker.h
new file mode 100644
index 00000000000..944774d809b
--- /dev/null
+++ b/cpp/include/Slice/FileTracker.h
@@ -0,0 +1,62 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef FILE_TRACKER_H
+#define FILE_TRACKER_H
+
+#include <IceUtil/Shared.h>
+#include <Slice/Parser.h>
+
+namespace Slice
+{
+
+class SLICE_API FileException : public ::IceUtil::Exception
+{
+public:
+
+    FileException(const char*, int, const std::string&);
+    ~FileException() throw();
+    virtual std::string ice_name() const;
+    virtual void ice_print(std::ostream&) const;
+    virtual ::IceUtil::Exception* ice_clone() const;
+    virtual void ice_throw() const;
+
+    std::string reason() const;
+
+private:
+
+    static const char* _name;
+    const std::string _reason;
+};
+
+class FileTracker;
+typedef IceUtil::Handle<FileTracker> FileTrackerPtr;
+
+class SLICE_API FileTracker : public ::IceUtil::SimpleShared
+{
+public:
+
+    FileTracker();
+    ~FileTracker();
+
+    static FileTrackerPtr instance();
+
+    void addFile(const std::string&);
+    void addDirectory(const std::string&);
+
+    void cleanup();
+
+private:
+
+    std::list<std::pair< std::string, bool> > _files;
+};
+
+}
+
+#endif