From 0236a88fb454682608c28f7c21716d9288b56bec Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Mon, 3 Mar 2014 09:38:27 +0100
Subject: added tweaked stork2-commons source

---
 .../test/resources/.svn/text-base/log4j.xml.svn-base  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 id/server/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base

(limited to 'id/server/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base')

diff --git a/id/server/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base b/id/server/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base
new file mode 100644
index 000000000..0ad2ea9a4
--- /dev/null
+++ b/id/server/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+	<appender name="MainLogger" class="org.apache.log4j.DailyRollingFileAppender">
+		<param name="File" value="stork-commons.log" />
+		<param name="DatePattern" value="'.'yyyy-MM-dd" />
+		<param name="Append" value="true" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%d{HH:mm:ss:SSS} - %p - %C{1} - %m%n" />
+		</layout>
+	</appender>
+
+	<root>
+		<priority value="info" />
+		<appender-ref ref="MainLogger" />
+	</root>
+
+</log4j:configuration>
-- 
cgit v1.2.3


From 0b3249e37b26e029c576127654dca31bff4a5a63 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Mon, 17 Mar 2014 18:23:52 +0100
Subject: removing old samlengine and storkcommons

---
 .../test/resources/.svn/text-base/log4j.xml.svn-base  | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 id/server/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base

(limited to 'id/server/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base')

diff --git a/id/server/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base b/id/server/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base
deleted file mode 100644
index 0ad2ea9a4..000000000
--- a/id/server/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-	<appender name="MainLogger" class="org.apache.log4j.DailyRollingFileAppender">
-		<param name="File" value="stork-commons.log" />
-		<param name="DatePattern" value="'.'yyyy-MM-dd" />
-		<param name="Append" value="true" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%d{HH:mm:ss:SSS} - %p - %C{1} - %m%n" />
-		</layout>
-	</appender>
-
-	<root>
-		<priority value="info" />
-		<appender-ref ref="MainLogger" />
-	</root>
-
-</log4j:configuration>
-- 
cgit v1.2.3


From e6144cfe09bb148638911660eeb492fee7ab8079 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Thu, 20 Mar 2014 11:43:22 +0100
Subject: fixed serializable issues in stork2-commons

---
 .../test/resources/.svn/text-base/log4j.xml.svn-base  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 id/server/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base

(limited to 'id/server/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base')

diff --git a/id/server/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base b/id/server/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base
new file mode 100644
index 000000000..0ad2ea9a4
--- /dev/null
+++ b/id/server/stork2-commons/src/test/resources/.svn/text-base/log4j.xml.svn-base
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+	<appender name="MainLogger" class="org.apache.log4j.DailyRollingFileAppender">
+		<param name="File" value="stork-commons.log" />
+		<param name="DatePattern" value="'.'yyyy-MM-dd" />
+		<param name="Append" value="true" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%d{HH:mm:ss:SSS} - %p - %C{1} - %m%n" />
+		</layout>
+	</appender>
+
+	<root>
+		<priority value="info" />
+		<appender-ref ref="MainLogger" />
+	</root>
+
+</log4j:configuration>
-- 
cgit v1.2.3