svn commit: r589906 - in /logging/log4cxx/trunk/src/main: cpp/loader.cpp cpp/loggingevent.cpp cpp/triggeringpolicy.cpp include/log4cxx/helpers/loader.h

[ca...@apache.org]

Author: carnold
Date: Mon Oct 29 16:20:52 2007
New Revision: 589906

URL: http://svn.apache.org/viewvc?rev=589906&view=rev
Log:
LOGCXX-103: Much of CVS HEAD seems #if 0 out, especially ResourceBundle stuff

Modified:
    logging/log4cxx/trunk/src/main/cpp/loader.cpp
    logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp
    logging/log4cxx/trunk/src/main/cpp/triggeringpolicy.cpp
    logging/log4cxx/trunk/src/main/include/log4cxx/helpers/loader.h

Modified: logging/log4cxx/trunk/src/main/cpp/loader.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/loader.cpp?rev=589906&r1=589905&r2=589906&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/loader.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/loader.cpp Mon Oct 29 16:20:52 2007
@@ -59,38 +59,8 @@
    return Class::forName(clazz);
 }
 
-#if 0
-File Loader::getResource(const LogString& name)
-{
-        File path(name);
-        if (path.exists()) {
-          return path;
-        }
-        return File();
-   std::wstring path;
-        std::string name;
-   struct stat buff;
-
-        Transcoder::append(wname.data(), wname.length(), name);
-
-   if (stat(name.c_str(), &buff) == 0)
-   {
-      path = wname;
-   }
-
-   return path;
-}
-#endif
-
 
 InputStreamPtr Loader::getResourceAsStream(const LogString& name) {
-#if 0
-  String path = getResource(name);
-  if (path.empty())
-  {
-    return 0;
-  }
-#endif
 
   try {
     return new FileInputStream(name);

Modified: logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp?rev=589906&r1=589905&r2=589906&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/loggingevent.cpp Mon Oct 29 16:20:52 2007
@@ -23,7 +23,6 @@
 #include <log4cxx/helpers/socketinputstream.h>
 #include <log4cxx/helpers/loglog.h>
 #include <log4cxx/helpers/system.h>
-#include <log4cxx/helpers/loader.h>
 #include <log4cxx/helpers/socket.h>
 #include <log4cxx/helpers/aprinitializer.h>
 #include <log4cxx/helpers/threadspecificdata.h>

Modified: logging/log4cxx/trunk/src/main/cpp/triggeringpolicy.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/triggeringpolicy.cpp?rev=589906&r1=589905&r2=589906&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/triggeringpolicy.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/triggeringpolicy.cpp Mon Oct 29 16:20:52 2007
@@ -21,38 +21,3 @@
 using namespace log4cxx::rolling;
 
 IMPLEMENT_LOG4CXX_OBJECT(TriggeringPolicy)
-
-
- #if 0
-package org.apache.log4j.rolling;
-
-import org.apache.log4j.Appender;
-import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.OptionHandler;
-
-import java.io.File;
-
-
-/**
- * A <code>TriggeringPolicy</code> controls the conditions under which rollover
- * occurs. Such conditions include time of day, file size, an
- * external event, the log request or a combination thereof.
- *
- * @author Ceki G&uuml;lc&uuml;
- * @since 1.3
- * */
-public interface TriggeringPolicy {
-    /**
-     * Should rolllover be triggered at this time?
-     *
-     * @param appender A reference to the appender.
-     * @param event A reference to the currently event.
-     * @param file A reference to the currently active log file.
-     * @param fileLength Length of the file in bytes.
-     * @return true if a rollover should occur.
-     */
-    public boolean isTriggeringEvent(final Appender appender,
-        final LoggingEvent event, final File file, final long fileLength);
-}
-
-#endif

Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/loader.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/loader.h?rev=589906&r1=589905&r2=589906&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/loader.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/loader.h Mon Oct 29 16:20:52 2007
@@ -34,8 +34,6 @@
                 {
                 public:
                         static const Class& loadClass(const LogString& clazz);
-//  TODO
-//       static LogString getResource(const LogString& name);
 
                         static InputStreamPtr getResourceAsStream(
                                                          const LogString& name);