JAL-3032 adds Java 8 functionality (1/2)

 the "::" operator
 lambda expressions
 java.util.function.*
 java.util.stream.*
 default methods in interfaces

diff --git a/srcjar/org/apache/log4j/Appender.java b/srcjar2/org/apache/log4j/Appender.java
similarity index 100%
rename from srcjar/org/apache/log4j/Appender.java
rename to srcjar2/org/apache/log4j/Appender.java

diff --git a/srcjar/org/apache/log4j/AppenderSkeleton.java b/srcjar2/org/apache/log4j/AppenderSkeleton.java
similarity index 100%
rename from srcjar/org/apache/log4j/AppenderSkeleton.java
rename to srcjar2/org/apache/log4j/AppenderSkeleton.java

diff --git a/srcjar/org/apache/log4j/AsyncAppender.java b/srcjar2/org/apache/log4j/AsyncAppender.java
similarity index 100%
rename from srcjar/org/apache/log4j/AsyncAppender.java
rename to srcjar2/org/apache/log4j/AsyncAppender.java

diff --git a/srcjar/org/apache/log4j/BasicConfigurator.java b/srcjar2/org/apache/log4j/BasicConfigurator.java
similarity index 100%
rename from srcjar/org/apache/log4j/BasicConfigurator.java
rename to srcjar2/org/apache/log4j/BasicConfigurator.java

diff --git a/srcjar/org/apache/log4j/Category.java b/srcjar2/org/apache/log4j/Category.java
similarity index 100%
rename from srcjar/org/apache/log4j/Category.java
rename to srcjar2/org/apache/log4j/Category.java

diff --git a/srcjar/org/apache/log4j/CategoryKey.java b/srcjar2/org/apache/log4j/CategoryKey.java
similarity index 100%
rename from srcjar/org/apache/log4j/CategoryKey.java
rename to srcjar2/org/apache/log4j/CategoryKey.java

diff --git a/srcjar/org/apache/log4j/ConsoleAppender.java b/srcjar2/org/apache/log4j/ConsoleAppender.java
similarity index 100%
rename from srcjar/org/apache/log4j/ConsoleAppender.java
rename to srcjar2/org/apache/log4j/ConsoleAppender.java

diff --git a/srcjar/org/apache/log4j/DailyRollingFileAppender.java b/srcjar2/org/apache/log4j/DailyRollingFileAppender.java
similarity index 100%
rename from srcjar/org/apache/log4j/DailyRollingFileAppender.java
rename to srcjar2/org/apache/log4j/DailyRollingFileAppender.java

diff --git a/srcjar/org/apache/log4j/DefaultCategoryFactory.java b/srcjar2/org/apache/log4j/DefaultCategoryFactory.java
similarity index 100%
rename from srcjar/org/apache/log4j/DefaultCategoryFactory.java
rename to srcjar2/org/apache/log4j/DefaultCategoryFactory.java

diff --git a/srcjar/org/apache/log4j/DefaultThrowableRenderer.java b/srcjar2/org/apache/log4j/DefaultThrowableRenderer.java
similarity index 100%
rename from srcjar/org/apache/log4j/DefaultThrowableRenderer.java
rename to srcjar2/org/apache/log4j/DefaultThrowableRenderer.java

diff --git a/srcjar/org/apache/log4j/Dispatcher.java b/srcjar2/org/apache/log4j/Dispatcher.java
similarity index 100%
rename from srcjar/org/apache/log4j/Dispatcher.java
rename to srcjar2/org/apache/log4j/Dispatcher.java

diff --git a/srcjar/org/apache/log4j/EnhancedPatternLayout.java b/srcjar2/org/apache/log4j/EnhancedPatternLayout.java
similarity index 100%
rename from srcjar/org/apache/log4j/EnhancedPatternLayout.java
rename to srcjar2/org/apache/log4j/EnhancedPatternLayout.java

diff --git a/srcjar/org/apache/log4j/EnhancedThrowableRenderer.java b/srcjar2/org/apache/log4j/EnhancedThrowableRenderer.java
similarity index 100%
rename from srcjar/org/apache/log4j/EnhancedThrowableRenderer.java
rename to srcjar2/org/apache/log4j/EnhancedThrowableRenderer.java

diff --git a/srcjar/org/apache/log4j/FileAppender.java b/srcjar2/org/apache/log4j/FileAppender.java
similarity index 100%
rename from srcjar/org/apache/log4j/FileAppender.java
rename to srcjar2/org/apache/log4j/FileAppender.java

diff --git a/srcjar/org/apache/log4j/HTMLLayout.java b/srcjar2/org/apache/log4j/HTMLLayout.java
similarity index 100%
rename from srcjar/org/apache/log4j/HTMLLayout.java
rename to srcjar2/org/apache/log4j/HTMLLayout.java

diff --git a/srcjar/org/apache/log4j/Hierarchy.java b/srcjar2/org/apache/log4j/Hierarchy.java
similarity index 100%
rename from srcjar/org/apache/log4j/Hierarchy.java
rename to srcjar2/org/apache/log4j/Hierarchy.java

diff --git a/srcjar/org/apache/log4j/Layout.java b/srcjar2/org/apache/log4j/Layout.java
similarity index 100%
rename from srcjar/org/apache/log4j/Layout.java
rename to srcjar2/org/apache/log4j/Layout.java

diff --git a/srcjar/org/apache/log4j/Level.java b/srcjar2/org/apache/log4j/Level.java
similarity index 100%
rename from srcjar/org/apache/log4j/Level.java
rename to srcjar2/org/apache/log4j/Level.java

diff --git a/srcjar/org/apache/log4j/LogMF.java b/srcjar2/org/apache/log4j/LogMF.java
similarity index 100%
rename from srcjar/org/apache/log4j/LogMF.java
rename to srcjar2/org/apache/log4j/LogMF.java

diff --git a/srcjar/org/apache/log4j/LogManager.java b/srcjar2/org/apache/log4j/LogManager.java
similarity index 100%
rename from srcjar/org/apache/log4j/LogManager.java
rename to srcjar2/org/apache/log4j/LogManager.java

diff --git a/srcjar/org/apache/log4j/LogSF.java b/srcjar2/org/apache/log4j/LogSF.java
similarity index 100%
rename from srcjar/org/apache/log4j/LogSF.java
rename to srcjar2/org/apache/log4j/LogSF.java

diff --git a/srcjar/org/apache/log4j/LogXF.java b/srcjar2/org/apache/log4j/LogXF.java
similarity index 100%
rename from srcjar/org/apache/log4j/LogXF.java
rename to srcjar2/org/apache/log4j/LogXF.java

diff --git a/srcjar/org/apache/log4j/Logger.java b/srcjar2/org/apache/log4j/Logger.java
similarity index 100%
rename from srcjar/org/apache/log4j/Logger.java
rename to srcjar2/org/apache/log4j/Logger.java

diff --git a/srcjar/org/apache/log4j/MDC.java b/srcjar2/org/apache/log4j/MDC.java
similarity index 100%
rename from srcjar/org/apache/log4j/MDC.java
rename to srcjar2/org/apache/log4j/MDC.java

diff --git a/srcjar/org/apache/log4j/NDC.java b/srcjar2/org/apache/log4j/NDC.java
similarity index 100%
rename from srcjar/org/apache/log4j/NDC.java
rename to srcjar2/org/apache/log4j/NDC.java

diff --git a/srcjar/org/apache/log4j/PatternLayout.java b/srcjar2/org/apache/log4j/PatternLayout.java
similarity index 100%
rename from srcjar/org/apache/log4j/PatternLayout.java
rename to srcjar2/org/apache/log4j/PatternLayout.java

diff --git a/srcjar/org/apache/log4j/Priority.java b/srcjar2/org/apache/log4j/Priority.java
similarity index 100%
rename from srcjar/org/apache/log4j/Priority.java
rename to srcjar2/org/apache/log4j/Priority.java

diff --git a/srcjar/org/apache/log4j/PropertyConfigurator.java b/srcjar2/org/apache/log4j/PropertyConfigurator.java
similarity index 100%
rename from srcjar/org/apache/log4j/PropertyConfigurator.java
rename to srcjar2/org/apache/log4j/PropertyConfigurator.java

diff --git a/srcjar/org/apache/log4j/ProvisionNode.java b/srcjar2/org/apache/log4j/ProvisionNode.java
similarity index 100%
rename from srcjar/org/apache/log4j/ProvisionNode.java
rename to srcjar2/org/apache/log4j/ProvisionNode.java

diff --git a/srcjar/org/apache/log4j/README_SWINGJS.txt b/srcjar2/org/apache/log4j/README_SWINGJS.txt
similarity index 100%
rename from srcjar/org/apache/log4j/README_SWINGJS.txt
rename to srcjar2/org/apache/log4j/README_SWINGJS.txt

diff --git a/srcjar/org/apache/log4j/RollingFileAppender.java b/srcjar2/org/apache/log4j/RollingFileAppender.java
similarity index 100%
rename from srcjar/org/apache/log4j/RollingFileAppender.java
rename to srcjar2/org/apache/log4j/RollingFileAppender.java

diff --git a/srcjar/org/apache/log4j/SimpleLayout.java b/srcjar2/org/apache/log4j/SimpleLayout.java
similarity index 100%
rename from srcjar/org/apache/log4j/SimpleLayout.java
rename to srcjar2/org/apache/log4j/SimpleLayout.java

diff --git a/srcjar/org/apache/log4j/TTCCLayout.java b/srcjar2/org/apache/log4j/TTCCLayout.java
similarity index 100%
rename from srcjar/org/apache/log4j/TTCCLayout.java
rename to srcjar2/org/apache/log4j/TTCCLayout.java

diff --git a/srcjar/org/apache/log4j/WriterAppender.java b/srcjar2/org/apache/log4j/WriterAppender.java
similarity index 100%
rename from srcjar/org/apache/log4j/WriterAppender.java
rename to srcjar2/org/apache/log4j/WriterAppender.java

diff --git a/srcjar/org/apache/log4j/config/PropertyGetter.java b/srcjar2/org/apache/log4j/config/PropertyGetter.java
similarity index 100%
rename from srcjar/org/apache/log4j/config/PropertyGetter.java
rename to srcjar2/org/apache/log4j/config/PropertyGetter.java

diff --git a/srcjar/org/apache/log4j/config/PropertyPrinter.java b/srcjar2/org/apache/log4j/config/PropertyPrinter.java
similarity index 100%
rename from srcjar/org/apache/log4j/config/PropertyPrinter.java
rename to srcjar2/org/apache/log4j/config/PropertyPrinter.java

diff --git a/srcjar/org/apache/log4j/config/PropertySetter.java b/srcjar2/org/apache/log4j/config/PropertySetter.java
similarity index 100%
rename from srcjar/org/apache/log4j/config/PropertySetter.java
rename to srcjar2/org/apache/log4j/config/PropertySetter.java

diff --git a/srcjar/org/apache/log4j/config/PropertySetterException.java b/srcjar2/org/apache/log4j/config/PropertySetterException.java
similarity index 100%
rename from srcjar/org/apache/log4j/config/PropertySetterException.java
rename to srcjar2/org/apache/log4j/config/PropertySetterException.java

diff --git a/srcjar/org/apache/log4j/config/package.html b/srcjar2/org/apache/log4j/config/package.html
similarity index 100%
rename from srcjar/org/apache/log4j/config/package.html
rename to srcjar2/org/apache/log4j/config/package.html

diff --git a/srcjar/org/apache/log4j/helpers/AbsoluteTimeDateFormat.java b/srcjar2/org/apache/log4j/helpers/AbsoluteTimeDateFormat.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/AbsoluteTimeDateFormat.java
rename to srcjar2/org/apache/log4j/helpers/AbsoluteTimeDateFormat.java

diff --git a/srcjar/org/apache/log4j/helpers/AppenderAttachableImpl.java b/srcjar2/org/apache/log4j/helpers/AppenderAttachableImpl.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/AppenderAttachableImpl.java
rename to srcjar2/org/apache/log4j/helpers/AppenderAttachableImpl.java

diff --git a/srcjar/org/apache/log4j/helpers/BoundedFIFO.java b/srcjar2/org/apache/log4j/helpers/BoundedFIFO.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/BoundedFIFO.java
rename to srcjar2/org/apache/log4j/helpers/BoundedFIFO.java

diff --git a/srcjar/org/apache/log4j/helpers/CountingQuietWriter.java b/srcjar2/org/apache/log4j/helpers/CountingQuietWriter.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/CountingQuietWriter.java
rename to srcjar2/org/apache/log4j/helpers/CountingQuietWriter.java

diff --git a/srcjar/org/apache/log4j/helpers/CyclicBuffer.java b/srcjar2/org/apache/log4j/helpers/CyclicBuffer.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/CyclicBuffer.java
rename to srcjar2/org/apache/log4j/helpers/CyclicBuffer.java

diff --git a/srcjar/org/apache/log4j/helpers/DateLayout.java b/srcjar2/org/apache/log4j/helpers/DateLayout.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/DateLayout.java
rename to srcjar2/org/apache/log4j/helpers/DateLayout.java

diff --git a/srcjar/org/apache/log4j/helpers/DateTimeDateFormat.java b/srcjar2/org/apache/log4j/helpers/DateTimeDateFormat.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/DateTimeDateFormat.java
rename to srcjar2/org/apache/log4j/helpers/DateTimeDateFormat.java

diff --git a/srcjar/org/apache/log4j/helpers/FileWatchdog.java b/srcjar2/org/apache/log4j/helpers/FileWatchdog.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/FileWatchdog.java
rename to srcjar2/org/apache/log4j/helpers/FileWatchdog.java

diff --git a/srcjar/org/apache/log4j/helpers/FormattingInfo.java b/srcjar2/org/apache/log4j/helpers/FormattingInfo.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/FormattingInfo.java
rename to srcjar2/org/apache/log4j/helpers/FormattingInfo.java

diff --git a/srcjar/org/apache/log4j/helpers/ISO8601DateFormat.java b/srcjar2/org/apache/log4j/helpers/ISO8601DateFormat.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/ISO8601DateFormat.java
rename to srcjar2/org/apache/log4j/helpers/ISO8601DateFormat.java

diff --git a/srcjar/org/apache/log4j/helpers/Loader.java b/srcjar2/org/apache/log4j/helpers/Loader.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/Loader.java
rename to srcjar2/org/apache/log4j/helpers/Loader.java

diff --git a/srcjar/org/apache/log4j/helpers/LogLog.java b/srcjar2/org/apache/log4j/helpers/LogLog.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/LogLog.java
rename to srcjar2/org/apache/log4j/helpers/LogLog.java

diff --git a/srcjar/org/apache/log4j/helpers/MDCKeySetExtractor.java b/srcjar2/org/apache/log4j/helpers/MDCKeySetExtractor.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/MDCKeySetExtractor.java
rename to srcjar2/org/apache/log4j/helpers/MDCKeySetExtractor.java

diff --git a/srcjar/org/apache/log4j/helpers/NullEnumeration.java b/srcjar2/org/apache/log4j/helpers/NullEnumeration.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/NullEnumeration.java
rename to srcjar2/org/apache/log4j/helpers/NullEnumeration.java

diff --git a/srcjar/org/apache/log4j/helpers/OnlyOnceErrorHandler.java b/srcjar2/org/apache/log4j/helpers/OnlyOnceErrorHandler.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/OnlyOnceErrorHandler.java
rename to srcjar2/org/apache/log4j/helpers/OnlyOnceErrorHandler.java

diff --git a/srcjar/org/apache/log4j/helpers/OptionConverter.java b/srcjar2/org/apache/log4j/helpers/OptionConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/OptionConverter.java
rename to srcjar2/org/apache/log4j/helpers/OptionConverter.java

diff --git a/srcjar/org/apache/log4j/helpers/PatternConverter.java b/srcjar2/org/apache/log4j/helpers/PatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/PatternConverter.java
rename to srcjar2/org/apache/log4j/helpers/PatternConverter.java

diff --git a/srcjar/org/apache/log4j/helpers/PatternParser.java b/srcjar2/org/apache/log4j/helpers/PatternParser.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/PatternParser.java
rename to srcjar2/org/apache/log4j/helpers/PatternParser.java

diff --git a/srcjar/org/apache/log4j/helpers/QuietWriter.java b/srcjar2/org/apache/log4j/helpers/QuietWriter.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/QuietWriter.java
rename to srcjar2/org/apache/log4j/helpers/QuietWriter.java

diff --git a/srcjar/org/apache/log4j/helpers/RelativeTimeDateFormat.java b/srcjar2/org/apache/log4j/helpers/RelativeTimeDateFormat.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/RelativeTimeDateFormat.java
rename to srcjar2/org/apache/log4j/helpers/RelativeTimeDateFormat.java

diff --git a/srcjar/org/apache/log4j/helpers/SyslogQuietWriter.java b/srcjar2/org/apache/log4j/helpers/SyslogQuietWriter.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/SyslogQuietWriter.java
rename to srcjar2/org/apache/log4j/helpers/SyslogQuietWriter.java

diff --git a/srcjar/org/apache/log4j/helpers/SyslogWriter.java b/srcjar2/org/apache/log4j/helpers/SyslogWriter.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/SyslogWriter.java
rename to srcjar2/org/apache/log4j/helpers/SyslogWriter.java

diff --git a/srcjar/org/apache/log4j/helpers/ThreadLocalMap.java b/srcjar2/org/apache/log4j/helpers/ThreadLocalMap.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/ThreadLocalMap.java
rename to srcjar2/org/apache/log4j/helpers/ThreadLocalMap.java

diff --git a/srcjar/org/apache/log4j/helpers/Transform.java b/srcjar2/org/apache/log4j/helpers/Transform.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/Transform.java
rename to srcjar2/org/apache/log4j/helpers/Transform.java

diff --git a/srcjar/org/apache/log4j/helpers/UtilLoggingLevel.java b/srcjar2/org/apache/log4j/helpers/UtilLoggingLevel.java
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/UtilLoggingLevel.java
rename to srcjar2/org/apache/log4j/helpers/UtilLoggingLevel.java

diff --git a/srcjar/org/apache/log4j/helpers/package.html b/srcjar2/org/apache/log4j/helpers/package.html
similarity index 100%
rename from srcjar/org/apache/log4j/helpers/package.html
rename to srcjar2/org/apache/log4j/helpers/package.html

diff --git a/srcjar/org/apache/log4j/jdbc/JDBCAppender.java b/srcjar2/org/apache/log4j/jdbc/JDBCAppender.java
similarity index 100%
rename from srcjar/org/apache/log4j/jdbc/JDBCAppender.java
rename to srcjar2/org/apache/log4j/jdbc/JDBCAppender.java

diff --git a/srcjar/org/apache/log4j/jdbc/package.html b/srcjar2/org/apache/log4j/jdbc/package.html
similarity index 100%
rename from srcjar/org/apache/log4j/jdbc/package.html
rename to srcjar2/org/apache/log4j/jdbc/package.html

diff --git a/srcjar/org/apache/log4j/jmx/AbstractDynamicMBean.java b/srcjar2/org/apache/log4j/jmx/AbstractDynamicMBean.java
similarity index 100%
rename from srcjar/org/apache/log4j/jmx/AbstractDynamicMBean.java
rename to srcjar2/org/apache/log4j/jmx/AbstractDynamicMBean.java

diff --git a/srcjar/org/apache/log4j/jmx/Agent.java b/srcjar2/org/apache/log4j/jmx/Agent.java
similarity index 100%
rename from srcjar/org/apache/log4j/jmx/Agent.java
rename to srcjar2/org/apache/log4j/jmx/Agent.java

diff --git a/srcjar/org/apache/log4j/jmx/AppenderDynamicMBean.java b/srcjar2/org/apache/log4j/jmx/AppenderDynamicMBean.java
similarity index 100%
rename from srcjar/org/apache/log4j/jmx/AppenderDynamicMBean.java
rename to srcjar2/org/apache/log4j/jmx/AppenderDynamicMBean.java

diff --git a/srcjar/org/apache/log4j/jmx/HierarchyDynamicMBean.java b/srcjar2/org/apache/log4j/jmx/HierarchyDynamicMBean.java
similarity index 100%
rename from srcjar/org/apache/log4j/jmx/HierarchyDynamicMBean.java
rename to srcjar2/org/apache/log4j/jmx/HierarchyDynamicMBean.java

diff --git a/srcjar/org/apache/log4j/jmx/LayoutDynamicMBean.java b/srcjar2/org/apache/log4j/jmx/LayoutDynamicMBean.java
similarity index 100%
rename from srcjar/org/apache/log4j/jmx/LayoutDynamicMBean.java
rename to srcjar2/org/apache/log4j/jmx/LayoutDynamicMBean.java

diff --git a/srcjar/org/apache/log4j/jmx/LoggerDynamicMBean.java b/srcjar2/org/apache/log4j/jmx/LoggerDynamicMBean.java
similarity index 100%
rename from srcjar/org/apache/log4j/jmx/LoggerDynamicMBean.java
rename to srcjar2/org/apache/log4j/jmx/LoggerDynamicMBean.java

diff --git a/srcjar/org/apache/log4j/jmx/MethodUnion.java b/srcjar2/org/apache/log4j/jmx/MethodUnion.java
similarity index 100%
rename from srcjar/org/apache/log4j/jmx/MethodUnion.java
rename to srcjar2/org/apache/log4j/jmx/MethodUnion.java

diff --git a/srcjar/org/apache/log4j/jmx/package.html b/srcjar2/org/apache/log4j/jmx/package.html
similarity index 100%
rename from srcjar/org/apache/log4j/jmx/package.html
rename to srcjar2/org/apache/log4j/jmx/package.html

diff --git a/srcjar/org/apache/log4j/net/JMSAppender.java b/srcjar2/org/apache/log4j/net/JMSAppender.java
similarity index 100%
rename from srcjar/org/apache/log4j/net/JMSAppender.java
rename to srcjar2/org/apache/log4j/net/JMSAppender.java

diff --git a/srcjar/org/apache/log4j/net/JMSSink.java b/srcjar2/org/apache/log4j/net/JMSSink.java
similarity index 100%
rename from srcjar/org/apache/log4j/net/JMSSink.java
rename to srcjar2/org/apache/log4j/net/JMSSink.java

diff --git a/srcjar/org/apache/log4j/net/SMTPAppender.java b/srcjar2/org/apache/log4j/net/SMTPAppender.java
similarity index 100%
rename from srcjar/org/apache/log4j/net/SMTPAppender.java
rename to srcjar2/org/apache/log4j/net/SMTPAppender.java

diff --git a/srcjar/org/apache/log4j/net/SimpleSocketServer.java b/srcjar2/org/apache/log4j/net/SimpleSocketServer.java
similarity index 100%
rename from srcjar/org/apache/log4j/net/SimpleSocketServer.java
rename to srcjar2/org/apache/log4j/net/SimpleSocketServer.java

diff --git a/srcjar/org/apache/log4j/net/SocketAppender.java b/srcjar2/org/apache/log4j/net/SocketAppender.java
similarity index 100%
rename from srcjar/org/apache/log4j/net/SocketAppender.java
rename to srcjar2/org/apache/log4j/net/SocketAppender.java

diff --git a/srcjar/org/apache/log4j/net/SocketHubAppender.java b/srcjar2/org/apache/log4j/net/SocketHubAppender.java
similarity index 100%
rename from srcjar/org/apache/log4j/net/SocketHubAppender.java
rename to srcjar2/org/apache/log4j/net/SocketHubAppender.java

diff --git a/srcjar/org/apache/log4j/net/SocketNode.java b/srcjar2/org/apache/log4j/net/SocketNode.java
similarity index 100%
rename from srcjar/org/apache/log4j/net/SocketNode.java
rename to srcjar2/org/apache/log4j/net/SocketNode.java

diff --git a/srcjar/org/apache/log4j/net/SocketServer.java b/srcjar2/org/apache/log4j/net/SocketServer.java
similarity index 100%
rename from srcjar/org/apache/log4j/net/SocketServer.java
rename to srcjar2/org/apache/log4j/net/SocketServer.java

diff --git a/srcjar/org/apache/log4j/net/SyslogAppender.java b/srcjar2/org/apache/log4j/net/SyslogAppender.java
similarity index 100%
rename from srcjar/org/apache/log4j/net/SyslogAppender.java
rename to srcjar2/org/apache/log4j/net/SyslogAppender.java

diff --git a/srcjar/org/apache/log4j/net/TelnetAppender.java b/srcjar2/org/apache/log4j/net/TelnetAppender.java
similarity index 100%
rename from srcjar/org/apache/log4j/net/TelnetAppender.java
rename to srcjar2/org/apache/log4j/net/TelnetAppender.java

diff --git a/srcjar/org/apache/log4j/net/ZeroConfSupport.java b/srcjar2/org/apache/log4j/net/ZeroConfSupport.java
similarity index 100%
rename from srcjar/org/apache/log4j/net/ZeroConfSupport.java
rename to srcjar2/org/apache/log4j/net/ZeroConfSupport.java

diff --git a/srcjar/org/apache/log4j/net/package.html b/srcjar2/org/apache/log4j/net/package.html
similarity index 100%
rename from srcjar/org/apache/log4j/net/package.html
rename to srcjar2/org/apache/log4j/net/package.html

diff --git a/srcjar/org/apache/log4j/nt/NTEventLogAppender.java b/srcjar2/org/apache/log4j/nt/NTEventLogAppender.java
similarity index 100%
rename from srcjar/org/apache/log4j/nt/NTEventLogAppender.java
rename to srcjar2/org/apache/log4j/nt/NTEventLogAppender.java

diff --git a/srcjar/org/apache/log4j/nt/package.html b/srcjar2/org/apache/log4j/nt/package.html
similarity index 100%
rename from srcjar/org/apache/log4j/nt/package.html
rename to srcjar2/org/apache/log4j/nt/package.html

diff --git a/srcjar/org/apache/log4j/or/DefaultRenderer.java b/srcjar2/org/apache/log4j/or/DefaultRenderer.java
similarity index 100%
rename from srcjar/org/apache/log4j/or/DefaultRenderer.java
rename to srcjar2/org/apache/log4j/or/DefaultRenderer.java

diff --git a/srcjar/org/apache/log4j/or/ObjectRenderer.java b/srcjar2/org/apache/log4j/or/ObjectRenderer.java
similarity index 100%
rename from srcjar/org/apache/log4j/or/ObjectRenderer.java
rename to srcjar2/org/apache/log4j/or/ObjectRenderer.java

diff --git a/srcjar/org/apache/log4j/or/RendererMap.java b/srcjar2/org/apache/log4j/or/RendererMap.java
similarity index 100%
rename from srcjar/org/apache/log4j/or/RendererMap.java
rename to srcjar2/org/apache/log4j/or/RendererMap.java

diff --git a/srcjar/org/apache/log4j/or/ThreadGroupRenderer.java b/srcjar2/org/apache/log4j/or/ThreadGroupRenderer.java
similarity index 100%
rename from srcjar/org/apache/log4j/or/ThreadGroupRenderer.java
rename to srcjar2/org/apache/log4j/or/ThreadGroupRenderer.java

diff --git a/srcjar/org/apache/log4j/or/jms/MessageRenderer.java b/srcjar2/org/apache/log4j/or/jms/MessageRenderer.java
similarity index 100%
rename from srcjar/org/apache/log4j/or/jms/MessageRenderer.java
rename to srcjar2/org/apache/log4j/or/jms/MessageRenderer.java

diff --git a/srcjar/org/apache/log4j/or/jms/package.html b/srcjar2/org/apache/log4j/or/jms/package.html
similarity index 100%
rename from srcjar/org/apache/log4j/or/jms/package.html
rename to srcjar2/org/apache/log4j/or/jms/package.html

diff --git a/srcjar/org/apache/log4j/or/package.html b/srcjar2/org/apache/log4j/or/package.html
similarity index 100%
rename from srcjar/org/apache/log4j/or/package.html
rename to srcjar2/org/apache/log4j/or/package.html

diff --git a/srcjar/org/apache/log4j/or/sax/AttributesRenderer.java b/srcjar2/org/apache/log4j/or/sax/AttributesRenderer.java
similarity index 100%
rename from srcjar/org/apache/log4j/or/sax/AttributesRenderer.java
rename to srcjar2/org/apache/log4j/or/sax/AttributesRenderer.java

diff --git a/srcjar/org/apache/log4j/or/sax/package.html b/srcjar2/org/apache/log4j/or/sax/package.html
similarity index 100%
rename from srcjar/org/apache/log4j/or/sax/package.html
rename to srcjar2/org/apache/log4j/or/sax/package.html

diff --git a/srcjar/org/apache/log4j/package.html b/srcjar2/org/apache/log4j/package.html
similarity index 100%
rename from srcjar/org/apache/log4j/package.html
rename to srcjar2/org/apache/log4j/package.html

diff --git a/srcjar/org/apache/log4j/pattern/BridgePatternConverter.java b/srcjar2/org/apache/log4j/pattern/BridgePatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/BridgePatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/BridgePatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/BridgePatternParser.java b/srcjar2/org/apache/log4j/pattern/BridgePatternParser.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/BridgePatternParser.java
rename to srcjar2/org/apache/log4j/pattern/BridgePatternParser.java

diff --git a/srcjar/org/apache/log4j/pattern/CachedDateFormat.java b/srcjar2/org/apache/log4j/pattern/CachedDateFormat.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/CachedDateFormat.java
rename to srcjar2/org/apache/log4j/pattern/CachedDateFormat.java

diff --git a/srcjar/org/apache/log4j/pattern/ClassNamePatternConverter.java b/srcjar2/org/apache/log4j/pattern/ClassNamePatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/ClassNamePatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/ClassNamePatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/DatePatternConverter.java b/srcjar2/org/apache/log4j/pattern/DatePatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/DatePatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/DatePatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/FileDatePatternConverter.java b/srcjar2/org/apache/log4j/pattern/FileDatePatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/FileDatePatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/FileDatePatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/FileLocationPatternConverter.java b/srcjar2/org/apache/log4j/pattern/FileLocationPatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/FileLocationPatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/FileLocationPatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/FormattingInfo.java b/srcjar2/org/apache/log4j/pattern/FormattingInfo.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/FormattingInfo.java
rename to srcjar2/org/apache/log4j/pattern/FormattingInfo.java

diff --git a/srcjar/org/apache/log4j/pattern/FullLocationPatternConverter.java b/srcjar2/org/apache/log4j/pattern/FullLocationPatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/FullLocationPatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/FullLocationPatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/IntegerPatternConverter.java b/srcjar2/org/apache/log4j/pattern/IntegerPatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/IntegerPatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/IntegerPatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/LevelPatternConverter.java b/srcjar2/org/apache/log4j/pattern/LevelPatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/LevelPatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/LevelPatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/LineLocationPatternConverter.java b/srcjar2/org/apache/log4j/pattern/LineLocationPatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/LineLocationPatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/LineLocationPatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/LineSeparatorPatternConverter.java b/srcjar2/org/apache/log4j/pattern/LineSeparatorPatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/LineSeparatorPatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/LineSeparatorPatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/LiteralPatternConverter.java b/srcjar2/org/apache/log4j/pattern/LiteralPatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/LiteralPatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/LiteralPatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/LogEvent.java b/srcjar2/org/apache/log4j/pattern/LogEvent.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/LogEvent.java
rename to srcjar2/org/apache/log4j/pattern/LogEvent.java

diff --git a/srcjar/org/apache/log4j/pattern/LoggerPatternConverter.java b/srcjar2/org/apache/log4j/pattern/LoggerPatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/LoggerPatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/LoggerPatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/LoggingEventPatternConverter.java b/srcjar2/org/apache/log4j/pattern/LoggingEventPatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/LoggingEventPatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/LoggingEventPatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/MessagePatternConverter.java b/srcjar2/org/apache/log4j/pattern/MessagePatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/MessagePatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/MessagePatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/MethodLocationPatternConverter.java b/srcjar2/org/apache/log4j/pattern/MethodLocationPatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/MethodLocationPatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/MethodLocationPatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/NDCPatternConverter.java b/srcjar2/org/apache/log4j/pattern/NDCPatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/NDCPatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/NDCPatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/NameAbbreviator.java b/srcjar2/org/apache/log4j/pattern/NameAbbreviator.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/NameAbbreviator.java
rename to srcjar2/org/apache/log4j/pattern/NameAbbreviator.java

diff --git a/srcjar/org/apache/log4j/pattern/NamePatternConverter.java b/srcjar2/org/apache/log4j/pattern/NamePatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/NamePatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/NamePatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/PatternConverter.java b/srcjar2/org/apache/log4j/pattern/PatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/PatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/PatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/PatternParser.java b/srcjar2/org/apache/log4j/pattern/PatternParser.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/PatternParser.java
rename to srcjar2/org/apache/log4j/pattern/PatternParser.java

diff --git a/srcjar/org/apache/log4j/pattern/PropertiesPatternConverter.java b/srcjar2/org/apache/log4j/pattern/PropertiesPatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/PropertiesPatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/PropertiesPatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/RelativeTimePatternConverter.java b/srcjar2/org/apache/log4j/pattern/RelativeTimePatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/RelativeTimePatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/RelativeTimePatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/SequenceNumberPatternConverter.java b/srcjar2/org/apache/log4j/pattern/SequenceNumberPatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/SequenceNumberPatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/SequenceNumberPatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/ThreadPatternConverter.java b/srcjar2/org/apache/log4j/pattern/ThreadPatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/ThreadPatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/ThreadPatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/ThrowableInformationPatternConverter.java b/srcjar2/org/apache/log4j/pattern/ThrowableInformationPatternConverter.java
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/ThrowableInformationPatternConverter.java
rename to srcjar2/org/apache/log4j/pattern/ThrowableInformationPatternConverter.java

diff --git a/srcjar/org/apache/log4j/pattern/package.html b/srcjar2/org/apache/log4j/pattern/package.html
similarity index 100%
rename from srcjar/org/apache/log4j/pattern/package.html
rename to srcjar2/org/apache/log4j/pattern/package.html

diff --git a/srcjar/org/apache/log4j/rewrite/MapRewritePolicy.java b/srcjar2/org/apache/log4j/rewrite/MapRewritePolicy.java
similarity index 100%
rename from srcjar/org/apache/log4j/rewrite/MapRewritePolicy.java
rename to srcjar2/org/apache/log4j/rewrite/MapRewritePolicy.java

diff --git a/srcjar/org/apache/log4j/rewrite/PropertyRewritePolicy.java b/srcjar2/org/apache/log4j/rewrite/PropertyRewritePolicy.java
similarity index 100%
rename from srcjar/org/apache/log4j/rewrite/PropertyRewritePolicy.java
rename to srcjar2/org/apache/log4j/rewrite/PropertyRewritePolicy.java

diff --git a/srcjar/org/apache/log4j/rewrite/ReflectionRewritePolicy.java b/srcjar2/org/apache/log4j/rewrite/ReflectionRewritePolicy.java
similarity index 100%
rename from srcjar/org/apache/log4j/rewrite/ReflectionRewritePolicy.java
rename to srcjar2/org/apache/log4j/rewrite/ReflectionRewritePolicy.java

diff --git a/srcjar/org/apache/log4j/rewrite/RewriteAppender.java b/srcjar2/org/apache/log4j/rewrite/RewriteAppender.java
similarity index 100%
rename from srcjar/org/apache/log4j/rewrite/RewriteAppender.java
rename to srcjar2/org/apache/log4j/rewrite/RewriteAppender.java

diff --git a/srcjar/org/apache/log4j/rewrite/RewritePolicy.java b/srcjar2/org/apache/log4j/rewrite/RewritePolicy.java
similarity index 100%
rename from srcjar/org/apache/log4j/rewrite/RewritePolicy.java
rename to srcjar2/org/apache/log4j/rewrite/RewritePolicy.java

diff --git a/srcjar/org/apache/log4j/spi/AppenderAttachable.java b/srcjar2/org/apache/log4j/spi/AppenderAttachable.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/AppenderAttachable.java
rename to srcjar2/org/apache/log4j/spi/AppenderAttachable.java

diff --git a/srcjar/org/apache/log4j/spi/Configurator.java b/srcjar2/org/apache/log4j/spi/Configurator.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/Configurator.java
rename to srcjar2/org/apache/log4j/spi/Configurator.java

diff --git a/srcjar/org/apache/log4j/spi/DefaultRepositorySelector.java b/srcjar2/org/apache/log4j/spi/DefaultRepositorySelector.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/DefaultRepositorySelector.java
rename to srcjar2/org/apache/log4j/spi/DefaultRepositorySelector.java

diff --git a/srcjar/org/apache/log4j/spi/ErrorCode.java b/srcjar2/org/apache/log4j/spi/ErrorCode.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/ErrorCode.java
rename to srcjar2/org/apache/log4j/spi/ErrorCode.java

diff --git a/srcjar/org/apache/log4j/spi/ErrorHandler.java b/srcjar2/org/apache/log4j/spi/ErrorHandler.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/ErrorHandler.java
rename to srcjar2/org/apache/log4j/spi/ErrorHandler.java

diff --git a/srcjar/org/apache/log4j/spi/Filter.java b/srcjar2/org/apache/log4j/spi/Filter.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/Filter.java
rename to srcjar2/org/apache/log4j/spi/Filter.java

diff --git a/srcjar/org/apache/log4j/spi/HierarchyEventListener.java b/srcjar2/org/apache/log4j/spi/HierarchyEventListener.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/HierarchyEventListener.java
rename to srcjar2/org/apache/log4j/spi/HierarchyEventListener.java

diff --git a/srcjar/org/apache/log4j/spi/LocationInfo.java b/srcjar2/org/apache/log4j/spi/LocationInfo.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/LocationInfo.java
rename to srcjar2/org/apache/log4j/spi/LocationInfo.java

diff --git a/srcjar/org/apache/log4j/spi/LoggerFactory.java b/srcjar2/org/apache/log4j/spi/LoggerFactory.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/LoggerFactory.java
rename to srcjar2/org/apache/log4j/spi/LoggerFactory.java

diff --git a/srcjar/org/apache/log4j/spi/LoggerRepository.java b/srcjar2/org/apache/log4j/spi/LoggerRepository.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/LoggerRepository.java
rename to srcjar2/org/apache/log4j/spi/LoggerRepository.java

diff --git a/srcjar/org/apache/log4j/spi/LoggingEvent.java b/srcjar2/org/apache/log4j/spi/LoggingEvent.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/LoggingEvent.java
rename to srcjar2/org/apache/log4j/spi/LoggingEvent.java

diff --git a/srcjar/org/apache/log4j/spi/NOPLogger.java b/srcjar2/org/apache/log4j/spi/NOPLogger.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/NOPLogger.java
rename to srcjar2/org/apache/log4j/spi/NOPLogger.java

diff --git a/srcjar/org/apache/log4j/spi/NOPLoggerRepository.java b/srcjar2/org/apache/log4j/spi/NOPLoggerRepository.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/NOPLoggerRepository.java
rename to srcjar2/org/apache/log4j/spi/NOPLoggerRepository.java

diff --git a/srcjar/org/apache/log4j/spi/NullWriter.java b/srcjar2/org/apache/log4j/spi/NullWriter.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/NullWriter.java
rename to srcjar2/org/apache/log4j/spi/NullWriter.java

diff --git a/srcjar/org/apache/log4j/spi/OptionHandler.java b/srcjar2/org/apache/log4j/spi/OptionHandler.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/OptionHandler.java
rename to srcjar2/org/apache/log4j/spi/OptionHandler.java

diff --git a/srcjar/org/apache/log4j/spi/RendererSupport.java b/srcjar2/org/apache/log4j/spi/RendererSupport.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/RendererSupport.java
rename to srcjar2/org/apache/log4j/spi/RendererSupport.java

diff --git a/srcjar/org/apache/log4j/spi/RepositorySelector.java b/srcjar2/org/apache/log4j/spi/RepositorySelector.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/RepositorySelector.java
rename to srcjar2/org/apache/log4j/spi/RepositorySelector.java

diff --git a/srcjar/org/apache/log4j/spi/RootCategory.java b/srcjar2/org/apache/log4j/spi/RootCategory.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/RootCategory.java
rename to srcjar2/org/apache/log4j/spi/RootCategory.java

diff --git a/srcjar/org/apache/log4j/spi/RootLogger.java b/srcjar2/org/apache/log4j/spi/RootLogger.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/RootLogger.java
rename to srcjar2/org/apache/log4j/spi/RootLogger.java

diff --git a/srcjar/org/apache/log4j/spi/ThrowableInformation.java b/srcjar2/org/apache/log4j/spi/ThrowableInformation.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/ThrowableInformation.java
rename to srcjar2/org/apache/log4j/spi/ThrowableInformation.java

diff --git a/srcjar/org/apache/log4j/spi/ThrowableRenderer.java b/srcjar2/org/apache/log4j/spi/ThrowableRenderer.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/ThrowableRenderer.java
rename to srcjar2/org/apache/log4j/spi/ThrowableRenderer.java

diff --git a/srcjar/org/apache/log4j/spi/ThrowableRendererSupport.java b/srcjar2/org/apache/log4j/spi/ThrowableRendererSupport.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/ThrowableRendererSupport.java
rename to srcjar2/org/apache/log4j/spi/ThrowableRendererSupport.java

diff --git a/srcjar/org/apache/log4j/spi/TriggeringEventEvaluator.java b/srcjar2/org/apache/log4j/spi/TriggeringEventEvaluator.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/TriggeringEventEvaluator.java
rename to srcjar2/org/apache/log4j/spi/TriggeringEventEvaluator.java

diff --git a/srcjar/org/apache/log4j/spi/VectorWriter.java b/srcjar2/org/apache/log4j/spi/VectorWriter.java
similarity index 100%
rename from srcjar/org/apache/log4j/spi/VectorWriter.java
rename to srcjar2/org/apache/log4j/spi/VectorWriter.java

diff --git a/srcjar/org/apache/log4j/spi/package.html b/srcjar2/org/apache/log4j/spi/package.html
similarity index 100%
rename from srcjar/org/apache/log4j/spi/package.html
rename to srcjar2/org/apache/log4j/spi/package.html

diff --git a/srcjar/org/apache/log4j/varia/DenyAllFilter.java b/srcjar2/org/apache/log4j/varia/DenyAllFilter.java
similarity index 100%
rename from srcjar/org/apache/log4j/varia/DenyAllFilter.java
rename to srcjar2/org/apache/log4j/varia/DenyAllFilter.java

diff --git a/srcjar/org/apache/log4j/varia/ExternallyRolledFileAppender.java b/srcjar2/org/apache/log4j/varia/ExternallyRolledFileAppender.java
similarity index 100%
rename from srcjar/org/apache/log4j/varia/ExternallyRolledFileAppender.java
rename to srcjar2/org/apache/log4j/varia/ExternallyRolledFileAppender.java

diff --git a/srcjar/org/apache/log4j/varia/FallbackErrorHandler.java b/srcjar2/org/apache/log4j/varia/FallbackErrorHandler.java
similarity index 100%
rename from srcjar/org/apache/log4j/varia/FallbackErrorHandler.java
rename to srcjar2/org/apache/log4j/varia/FallbackErrorHandler.java

diff --git a/srcjar/org/apache/log4j/varia/LevelMatchFilter.java b/srcjar2/org/apache/log4j/varia/LevelMatchFilter.java
similarity index 100%
rename from srcjar/org/apache/log4j/varia/LevelMatchFilter.java
rename to srcjar2/org/apache/log4j/varia/LevelMatchFilter.java

diff --git a/srcjar/org/apache/log4j/varia/LevelRangeFilter.java b/srcjar2/org/apache/log4j/varia/LevelRangeFilter.java
similarity index 100%
rename from srcjar/org/apache/log4j/varia/LevelRangeFilter.java
rename to srcjar2/org/apache/log4j/varia/LevelRangeFilter.java

diff --git a/srcjar/org/apache/log4j/varia/NullAppender.java b/srcjar2/org/apache/log4j/varia/NullAppender.java
similarity index 100%
rename from srcjar/org/apache/log4j/varia/NullAppender.java
rename to srcjar2/org/apache/log4j/varia/NullAppender.java

diff --git a/srcjar/org/apache/log4j/varia/ReloadingPropertyConfigurator.java b/srcjar2/org/apache/log4j/varia/ReloadingPropertyConfigurator.java
similarity index 100%
rename from srcjar/org/apache/log4j/varia/ReloadingPropertyConfigurator.java
rename to srcjar2/org/apache/log4j/varia/ReloadingPropertyConfigurator.java

diff --git a/srcjar/org/apache/log4j/varia/Roller.java b/srcjar2/org/apache/log4j/varia/Roller.java
similarity index 100%
rename from srcjar/org/apache/log4j/varia/Roller.java
rename to srcjar2/org/apache/log4j/varia/Roller.java

diff --git a/srcjar/org/apache/log4j/varia/StringMatchFilter.java b/srcjar2/org/apache/log4j/varia/StringMatchFilter.java
similarity index 100%
rename from srcjar/org/apache/log4j/varia/StringMatchFilter.java
rename to srcjar2/org/apache/log4j/varia/StringMatchFilter.java

diff --git a/srcjar/org/apache/log4j/varia/package.html b/srcjar2/org/apache/log4j/varia/package.html
similarity index 100%
rename from srcjar/org/apache/log4j/varia/package.html
rename to srcjar2/org/apache/log4j/varia/package.html

diff --git a/srcjar/org/apache/log4j/xml/DOMConfigurator.java b/srcjar2/org/apache/log4j/xml/DOMConfigurator.java
similarity index 100%
rename from srcjar/org/apache/log4j/xml/DOMConfigurator.java
rename to srcjar2/org/apache/log4j/xml/DOMConfigurator.java

diff --git a/srcjar/org/apache/log4j/xml/Log4jEntityResolver.java b/srcjar2/org/apache/log4j/xml/Log4jEntityResolver.java
similarity index 100%
rename from srcjar/org/apache/log4j/xml/Log4jEntityResolver.java
rename to srcjar2/org/apache/log4j/xml/Log4jEntityResolver.java

diff --git a/srcjar/org/apache/log4j/xml/SAXErrorHandler.java b/srcjar2/org/apache/log4j/xml/SAXErrorHandler.java
similarity index 100%
rename from srcjar/org/apache/log4j/xml/SAXErrorHandler.java
rename to srcjar2/org/apache/log4j/xml/SAXErrorHandler.java

diff --git a/srcjar/org/apache/log4j/xml/UnrecognizedElementHandler.java b/srcjar2/org/apache/log4j/xml/UnrecognizedElementHandler.java
similarity index 100%
rename from srcjar/org/apache/log4j/xml/UnrecognizedElementHandler.java
rename to srcjar2/org/apache/log4j/xml/UnrecognizedElementHandler.java

diff --git a/srcjar/org/apache/log4j/xml/XMLLayout.java b/srcjar2/org/apache/log4j/xml/XMLLayout.java
similarity index 100%
rename from srcjar/org/apache/log4j/xml/XMLLayout.java
rename to srcjar2/org/apache/log4j/xml/XMLLayout.java

diff --git a/srcjar/org/apache/log4j/xml/package.html b/srcjar2/org/apache/log4j/xml/package.html
similarity index 100%
rename from srcjar/org/apache/log4j/xml/package.html
rename to srcjar2/org/apache/log4j/xml/package.html

diff --git a/srcjar/org/json/simple/ItemList.java b/srcjar2/org/json/simple/ItemList.java
similarity index 100%
rename from srcjar/org/json/simple/ItemList.java
rename to srcjar2/org/json/simple/ItemList.java

diff --git a/srcjar/org/json/simple/JSONArray.java b/srcjar2/org/json/simple/JSONArray.java
similarity index 100%
rename from srcjar/org/json/simple/JSONArray.java
rename to srcjar2/org/json/simple/JSONArray.java

diff --git a/srcjar/org/json/simple/JSONAware.java b/srcjar2/org/json/simple/JSONAware.java
similarity index 100%
rename from srcjar/org/json/simple/JSONAware.java
rename to srcjar2/org/json/simple/JSONAware.java

diff --git a/srcjar/org/json/simple/JSONObject.java b/srcjar2/org/json/simple/JSONObject.java
similarity index 100%
rename from srcjar/org/json/simple/JSONObject.java
rename to srcjar2/org/json/simple/JSONObject.java

diff --git a/srcjar/org/json/simple/JSONStreamAware.java b/srcjar2/org/json/simple/JSONStreamAware.java
similarity index 100%
rename from srcjar/org/json/simple/JSONStreamAware.java
rename to srcjar2/org/json/simple/JSONStreamAware.java

diff --git a/srcjar/org/json/simple/JSONValue.java b/srcjar2/org/json/simple/JSONValue.java
similarity index 100%
rename from srcjar/org/json/simple/JSONValue.java
rename to srcjar2/org/json/simple/JSONValue.java

diff --git a/srcjar/org/json/simple/README.txt b/srcjar2/org/json/simple/README.txt
similarity index 100%
rename from srcjar/org/json/simple/README.txt
rename to srcjar2/org/json/simple/README.txt

diff --git a/srcjar/org/json/simple/parser/ContainerFactory.java b/srcjar2/org/json/simple/parser/ContainerFactory.java
similarity index 100%
rename from srcjar/org/json/simple/parser/ContainerFactory.java
rename to srcjar2/org/json/simple/parser/ContainerFactory.java

diff --git a/srcjar/org/json/simple/parser/ContentHandler.java b/srcjar2/org/json/simple/parser/ContentHandler.java
similarity index 100%
rename from srcjar/org/json/simple/parser/ContentHandler.java
rename to srcjar2/org/json/simple/parser/ContentHandler.java

diff --git a/srcjar/org/json/simple/parser/JSONParser.java b/srcjar2/org/json/simple/parser/JSONParser.java
similarity index 100%
rename from srcjar/org/json/simple/parser/JSONParser.java
rename to srcjar2/org/json/simple/parser/JSONParser.java

diff --git a/srcjar/org/json/simple/parser/ParseException.java b/srcjar2/org/json/simple/parser/ParseException.java
similarity index 100%
rename from srcjar/org/json/simple/parser/ParseException.java
rename to srcjar2/org/json/simple/parser/ParseException.java

diff --git a/srcjar/org/json/simple/parser/Yylex.java b/srcjar2/org/json/simple/parser/Yylex.java
similarity index 100%
rename from srcjar/org/json/simple/parser/Yylex.java
rename to srcjar2/org/json/simple/parser/Yylex.java

diff --git a/srcjar/org/json/simple/parser/Yytoken.java b/srcjar2/org/json/simple/parser/Yytoken.java
similarity index 100%
rename from srcjar/org/json/simple/parser/Yytoken.java
rename to srcjar2/org/json/simple/parser/Yytoken.java

diff --git a/swingjs/ver/net.sf.j2s.core.3.1.1.jar b/swingjs/ver/3.1.1/net.sf.j2s.core.3.1.1.jar
similarity index 100%
rename from swingjs/ver/net.sf.j2s.core.3.1.1.jar
rename to swingjs/ver/3.1.1/net.sf.j2s.core.3.1.1.jar

diff --git a/swingjs/ver/net.sf.j2s.core_3.2.1.jar b/swingjs/ver/3.2.1/net.sf.j2s.core_3.2.1.jar
similarity index 100%
rename from swingjs/ver/net.sf.j2s.core_3.2.1.jar
rename to swingjs/ver/3.2.1/net.sf.j2s.core_3.2.1.jar