initial checkin

11 files changed, 321 insertions, 0 deletions

diff --git a/bundles/runtime/org.eclipse.fx.core.log4j/.DS_Store b/bundles/runtime/org.eclipse.fx.core.log4j/.DS_Store
new file mode 100644
index 000000000..36f5dc2e2
--- /dev/null
+++ b/bundles/runtime/org.eclipse.fx.core.log4j/.DS_Store
diff --git a/bundles/runtime/org.eclipse.fx.core.log4j/.classpath b/bundles/runtime/org.eclipse.fx.core.log4j/.classpath
new file mode 100755
index 000000000..b1dabee38
--- /dev/null
+++ b/bundles/runtime/org.eclipse.fx.core.log4j/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/bundles/runtime/org.eclipse.fx.core.log4j/.gitignore b/bundles/runtime/org.eclipse.fx.core.log4j/.gitignore
new file mode 100644
index 000000000..934e0e06f
--- /dev/null
+++ b/bundles/runtime/org.eclipse.fx.core.log4j/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/bundles/runtime/org.eclipse.fx.core.log4j/.project b/bundles/runtime/org.eclipse.fx.core.log4j/.project
new file mode 100755
index 000000000..b10ccbc0d
--- /dev/null
+++ b/bundles/runtime/org.eclipse.fx.core.log4j/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.fx.core.log4j</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/runtime/org.eclipse.fx.core.log4j/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.core.log4j/META-INF/MANIFEST.MF
new file mode 100755
index 000000000..2c3992eb6
--- /dev/null
+++ b/bundles/runtime/org.eclipse.fx.core.log4j/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: %Bundle-Name

+Bundle-SymbolicName: org.eclipse.fx.core.log4j

+Bundle-Version: 0.8.1.qualifier

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Bundle-ActivationPolicy: lazy

+Require-Bundle: org.apache.log4j;bundle-version="1.2.15",

+ at.bestsolution.efxclipse.runtime.core;bundle-version="0.8.1"

+Service-Component: OSGI-INF/log4jlogger.xml

+Import-Package: javax.inject;version="1.0.0"

+Bundle-Vendor: %Bundle-Vendor

diff --git a/bundles/runtime/org.eclipse.fx.core.log4j/OSGI-INF/l10n/bundle.properties b/bundles/runtime/org.eclipse.fx.core.log4j/OSGI-INF/l10n/bundle.properties
new file mode 100755
index 000000000..80e5ee1f7
--- /dev/null
+++ b/bundles/runtime/org.eclipse.fx.core.log4j/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for at.bestsolution.efxclipse.runtime.log4j

+Bundle-Vendor = BestSolution.at

+Bundle-Name = Log4j Implementation of Logger
\ No newline at end of file
diff --git a/bundles/runtime/org.eclipse.fx.core.log4j/OSGI-INF/log4jlogger.xml b/bundles/runtime/org.eclipse.fx.core.log4j/OSGI-INF/log4jlogger.xml
new file mode 100755
index 000000000..e8edcb407
--- /dev/null
+++ b/bundles/runtime/org.eclipse.fx.core.log4j/OSGI-INF/log4jlogger.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.fx.core.log4j.log4jlogger">
+   <implementation class="org.eclipse.fx.core.log4j.Log4JLoggerFactory"/>
+   <property name="service.ranking" type="Integer" value="1"/>
+</scr:component>
diff --git a/bundles/runtime/org.eclipse.fx.core.log4j/build.properties b/bundles/runtime/org.eclipse.fx.core.log4j/build.properties
new file mode 100755
index 000000000..a65755cb2
--- /dev/null
+++ b/bundles/runtime/org.eclipse.fx.core.log4j/build.properties
@@ -0,0 +1,5 @@
+source.. = src/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               OSGI-INF/

diff --git a/bundles/runtime/org.eclipse.fx.core.log4j/pom.xml b/bundles/runtime/org.eclipse.fx.core.log4j/pom.xml
new file mode 100755
index 000000000..7e2f28143
--- /dev/null
+++ b/bundles/runtime/org.eclipse.fx.core.log4j/pom.xml
@@ -0,0 +1,34 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<name>e(fx)clipse - Runtime - Log4j</name>
+	<groupId>org.eclipse.fx.runtime</groupId>
+	<artifactId>org.eclipse.fx.core.log4j</artifactId>
+	<packaging>eclipse-plugin</packaging>
+
+	<parent>
+		<groupId>org.eclipse.fx</groupId>
+		<artifactId>releng</artifactId>
+		<relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
+		<version>0.8.1-SNAPSHOT</version>
+	</parent>
+
+	<build>
+		<resources>
+			<!-- to ensure that the feature lookup of the ui test works -->
+			<resource>
+				<directory>.</directory>
+				<includes>
+					<include>META-INF/</include>
+				</includes>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
\ No newline at end of file
diff --git a/bundles/runtime/org.eclipse.fx.core.log4j/src/org/eclipse/fx/core/log4j/Log4JLoggerFactory.java b/bundles/runtime/org.eclipse.fx.core.log4j/src/org/eclipse/fx/core/log4j/Log4JLoggerFactory.java
new file mode 100755
index 000000000..f1715783d
--- /dev/null
+++ b/bundles/runtime/org.eclipse.fx.core.log4j/src/org/eclipse/fx/core/log4j/Log4JLoggerFactory.java
@@ -0,0 +1,219 @@
+/*******************************************************************************

+ * Copyright (c) 2012 BestSolution.at and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     Tom Schindl<tom.schindl@bestsolution.at> - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.fx.core.log4j;

+

+import java.text.MessageFormat;

+

+import javax.inject.Provider;

+

+import at.bestsolution.efxclipse.runtime.core.log.Logger;

+import at.bestsolution.efxclipse.runtime.core.log.LoggerFactory;

+

+public class Log4JLoggerFactory implements LoggerFactory, Provider<LoggerFactory> {

+

+	@Override

+	public LoggerFactory get() {

+		return this;

+	}

+	

+	@Override

+	public Logger createLogger(String name) {

+		return new LoggerImpl(name);

+	}

+

+	static class LoggerImpl implements Logger {

+		private org.apache.log4j.Logger logger;

+		

+		private String name;

+		

+		public LoggerImpl(String name) {

+			this.name = name;

+		}

+		

+		private org.apache.log4j.Logger getLogger() {

+			if( logger == null ) {

+				logger = org.apache.log4j.Logger.getLogger(name);

+			}

+			return logger;

+		}

+		

+		private org.apache.log4j.Level toLog4JLevel(Level level) {

+			switch (level) {

+			case DEBUG:

+				return org.apache.log4j.Level.DEBUG;

+			case ERROR:

+				return org.apache.log4j.Level.ERROR;

+			case FATAL:

+				return org.apache.log4j.Level.FATAL;

+			case INFO:

+				return org.apache.log4j.Level.INFO;

+			case TRACE:

+				return org.apache.log4j.Level.TRACE;

+			case WARNING:

+				return org.apache.log4j.Level.WARN;

+			default:

+				return org.apache.log4j.Level.ERROR;

+			}

+		}

+		

+		@Override

+		public void log(Level level, String message) {

+			getLogger().log(toLog4JLevel(level), message);

+		}

+

+		@Override

+		public void log(Level level, String message, Throwable t) {

+			getLogger().log(toLog4JLevel(level), message, t);

+		}

+

+		@Override

+		public void logf(Level level, String pattern, Object... args) {

+			org.apache.log4j.Level log4jLevel = toLog4JLevel(level);

+			if( getLogger().isEnabledFor(log4jLevel) ) {

+				getLogger().log(log4jLevel, MessageFormat.format(pattern, args));

+			}

+		}

+

+		@Override

+		public void logf(Level level, String pattern, Throwable t, Object... args) {

+			org.apache.log4j.Level log4jLevel = toLog4JLevel(level);

+			if( getLogger().isEnabledFor(log4jLevel) ) {

+				getLogger().log(log4jLevel, MessageFormat.format(pattern, args), t);

+			}

+		}

+

+		@Override

+		public void trace(String message) {

+			log(Level.TRACE, message);

+		}

+

+		@Override

+		public void debug(String message) {

+			log(Level.DEBUG, message);

+		}

+

+		@Override

+		public void info(String message) {

+			log(Level.INFO,message);

+		}

+

+		@Override

+		public void warning(String message) {

+			log(Level.WARNING,message);

+		}

+

+		@Override

+		public void error(String message) {

+			log(Level.ERROR,message);

+		}

+

+		@Override

+		public void fatal(String message) {

+			log(Level.FATAL,message);

+		}

+

+		@Override

+		public void trace(String message, Throwable t) {

+			log(Level.TRACE,message,t);

+		}

+

+		@Override

+		public void debug(String message, Throwable t) {

+			log(Level.DEBUG,message,t);

+		}

+

+		@Override

+		public void info(String message, Throwable t) {

+			log(Level.INFO,message,t);

+		}

+

+		@Override

+		public void warning(String message, Throwable t) {

+			log(Level.WARNING,message,t);

+		}

+

+		@Override

+		public void error(String message, Throwable t) {

+			log(Level.ERROR,message,t);

+		}

+

+		@Override

+		public void fatal(String message, Throwable t) {

+			log(Level.FATAL,message,t);

+		}

+

+		@Override

+		public void tracef(String pattern, Object... args) {

+			logf(Level.TRACE, pattern, args);

+		}

+

+		@Override

+		public void debugf(String pattern, Object... args) {

+			logf(Level.DEBUG,pattern,args);

+		}

+

+		@Override

+		public void infof(String pattern, Object... args) {

+			logf(Level.INFO,pattern,args);

+		}

+

+		@Override

+		public void warningf(String pattern, Object... args) {

+			logf(Level.WARNING,pattern,args);

+		}

+

+		@Override

+		public void errorf(String pattern, Object... args) {

+			logf(Level.ERROR,pattern,args);

+		}

+

+		@Override

+		public void fatalf(String pattern, Object... args) {

+			logf(Level.FATAL,pattern,args);

+		}

+

+		@Override

+		public void tracef(String pattern, Throwable t, Object... args) {

+			logf(Level.TRACE,pattern,t,args);

+		}

+

+		@Override

+		public void debugf(String pattern, Throwable t, Object... args) {

+			logf(Level.DEBUG,pattern,t,args);

+		}

+

+		@Override

+		public void infof(String pattern, Throwable t, Object... args) {

+			logf(Level.INFO,pattern,t,args);

+		}

+

+		@Override

+		public void warningf(String pattern, Throwable t, Object... args) {

+			logf(Level.WARNING,pattern,t,args);

+		}

+

+		@Override

+		public void errorf(String pattern, Throwable t, Object... args) {

+			logf(Level.ERROR,pattern,t,args);

+		}

+

+		@Override

+		public void fatalf(String pattern, Throwable t, Object... args) {

+			logf(Level.FATAL,pattern,t,args);

+		}

+

+		@Override

+		public boolean isEnabled(Level level) {

+			return getLogger().isEnabledFor(toLog4JLevel(level));

+		}

+		

+	}

+}

diff --git a/releng/org.eclipse.fx.releng/pom.xml b/releng/org.eclipse.fx.releng/pom.xml
index 404230105..71ba79bba 100755
--- a/releng/org.eclipse.fx.releng/pom.xml
+++ b/releng/org.eclipse.fx.releng/pom.xml
@@ -30,6 +30,7 @@
 		<module>../../bundles/runtime/org.eclipse.fx.core</module>
 		<module>../../bundles/runtime/org.eclipse.fx.core.databinding</module>
 		<module>../../bundles/runtime/org.eclipse.fx.core.p2</module>
+		<module>../../bundles/runtime/org.eclipse.fx.core.log4j</module>
 		<!-- UI Modules -->
 		<module>../../bundles/runtime/org.eclipse.fx.ui.databinding</module>
 		<module>../../bundles/runtime/org.eclipse.fx.ui.application</module>