Author: ggregory
Date: Tue May 13 19:24:09 2014
New Revision: 1594337
URL: http://svn.apache.org/r1594337
Log:
Move all classes from org.apache.logging.log4j.core.helpers.lang to
org.apache.logging.log4j.core.helpers.
Added:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/BundleResourceLoader.java
- copied, changed from r1593711,
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/lang/BundleResourceLoader.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/ClassLoaderResourceLoader.java
- copied, changed from r1593711,
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/lang/ClassLoaderResourceLoader.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/ResourceLoader.java
- copied, changed from r1593711,
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/lang/ResourceLoader.java
Removed:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/lang/BundleResourceLoader.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/lang/ClassLoaderResourceLoader.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/lang/ResourceLoader.java
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/osgi/Activator.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/osgi/Activator.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/osgi/Activator.java?rev=1594337&r1=1594336&r2=1594337&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/osgi/Activator.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/osgi/Activator.java
Tue May 13 19:24:09 2014
@@ -20,7 +20,7 @@ package org.apache.logging.log4j.core.co
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.plugins.util.PluginManager;
-import org.apache.logging.log4j.core.helpers.lang.BundleResourceLoader;
+import org.apache.logging.log4j.core.helpers.BundleResourceLoader;
import org.apache.logging.log4j.core.impl.Log4jContextFactory;
import org.apache.logging.log4j.simple.SimpleLoggerContextFactory;
import org.apache.logging.log4j.spi.LoggerContextFactory;
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java?rev=1594337&r1=1594336&r2=1594337&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginManager.java
Tue May 13 19:24:09 2014
@@ -25,12 +25,13 @@ import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentMap;
+
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor;
+import org.apache.logging.log4j.core.helpers.ClassLoaderResourceLoader;
import org.apache.logging.log4j.core.helpers.Closer;
import org.apache.logging.log4j.core.helpers.Loader;
-import org.apache.logging.log4j.core.helpers.lang.ClassLoaderResourceLoader;
-import org.apache.logging.log4j.core.helpers.lang.ResourceLoader;
+import org.apache.logging.log4j.core.helpers.ResourceLoader;
import org.apache.logging.log4j.status.StatusLogger;
/**
Copied:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/BundleResourceLoader.java
(from r1593711,
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/lang/BundleResourceLoader.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/BundleResourceLoader.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/BundleResourceLoader.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/lang/BundleResourceLoader.java&r1=1593711&r2=1594337&rev=1594337&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/lang/BundleResourceLoader.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/BundleResourceLoader.java
Tue May 13 19:24:09 2014
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.logging.log4j.core.helpers.lang;
+package org.apache.logging.log4j.core.helpers;
import java.io.IOException;
import java.net.URL;
Copied:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/ClassLoaderResourceLoader.java
(from r1593711,
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/lang/ClassLoaderResourceLoader.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/ClassLoaderResourceLoader.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/ClassLoaderResourceLoader.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/lang/ClassLoaderResourceLoader.java&r1=1593711&r2=1594337&rev=1594337&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/lang/ClassLoaderResourceLoader.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/ClassLoaderResourceLoader.java
Tue May 13 19:24:09 2014
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.logging.log4j.core.helpers.lang;
+package org.apache.logging.log4j.core.helpers;
import java.io.IOException;
import java.net.URL;
Copied:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/ResourceLoader.java
(from r1593711,
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/lang/ResourceLoader.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/ResourceLoader.java?p2=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/ResourceLoader.java&p1=logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/lang/ResourceLoader.java&r1=1593711&r2=1594337&rev=1594337&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/lang/ResourceLoader.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/helpers/ResourceLoader.java
Tue May 13 19:24:09 2014
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.logging.log4j.core.helpers.lang;
+package org.apache.logging.log4j.core.helpers;
import java.io.IOException;
import java.net.URL;
