Author: sseifert
Date: Thu May 21 07:47:03 2015
New Revision: 1680753
URL: http://svn.apache.org/r1680753
Log:
SLING-4470 introduce separate "logging-mock" project for default log
configuration in mock tests, remove compile-dependency on slf4j-simple
Added:
sling/trunk/testing/mocks/logging-mock/
sling/trunk/testing/mocks/logging-mock/README.txt (with props)
sling/trunk/testing/mocks/logging-mock/pom.xml (with props)
sling/trunk/testing/mocks/logging-mock/src/
sling/trunk/testing/mocks/logging-mock/src/main/
sling/trunk/testing/mocks/logging-mock/src/main/resources/
sling/trunk/testing/mocks/logging-mock/src/main/resources/simplelogger.properties
(with props)
Removed:
sling/trunk/testing/mocks/osgi-mock/src/main/resources/
Modified:
sling/trunk/testing/mocks/osgi-mock/pom.xml
sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml
sling/trunk/testing/mocks/sling-mock/pom.xml
Added: sling/trunk/testing/mocks/logging-mock/README.txt
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/logging-mock/README.txt?rev=1680753&view=auto
==============================================================================
--- sling/trunk/testing/mocks/logging-mock/README.txt (added)
+++ sling/trunk/testing/mocks/logging-mock/README.txt Thu May 21 07:47:03 2015
@@ -0,0 +1,5 @@
+Apache Sling Testing Mock Log Configuration
+
+Default simple SLF4J log configuration for Mock libraries.
+
+This is not a mock implementation but just a helper project to simplify set up
logging for a mock context.
\ No newline at end of file
Propchange: sling/trunk/testing/mocks/logging-mock/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/testing/mocks/logging-mock/README.txt
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Thu May 21 07:47:03 2015
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author
Propchange: sling/trunk/testing/mocks/logging-mock/README.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: sling/trunk/testing/mocks/logging-mock/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/logging-mock/pom.xml?rev=1680753&view=auto
==============================================================================
--- sling/trunk/testing/mocks/logging-mock/pom.xml (added)
+++ sling/trunk/testing/mocks/logging-mock/pom.xml Thu May 21 07:47:03 2015
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<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>
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>22</version>
+ <relativePath/>
+ </parent>
+
+ <artifactId>org.apache.sling.testing.logging-mock</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Sling Testing Mock Log Configuration</name>
+ <description>Default simple SLF4J log configuration for Mock
libraries.</description>
+
+ <properties>
+ <sling.java.version>6</sling.java.version>
+ </properties>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/logging-mock</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/logging-mock</developerConnection>
+
<url>http://svn.apache.org/viewvc/sling/trunk/testing/mocks/logging-mock</url>
+ </scm>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+
+ </plugins>
+ </build>
+
+</project>
Propchange: sling/trunk/testing/mocks/logging-mock/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/testing/mocks/logging-mock/pom.xml
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Thu May 21 07:47:03 2015
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author
Propchange: sling/trunk/testing/mocks/logging-mock/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
sling/trunk/testing/mocks/logging-mock/src/main/resources/simplelogger.properties
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/logging-mock/src/main/resources/simplelogger.properties?rev=1680753&view=auto
==============================================================================
---
sling/trunk/testing/mocks/logging-mock/src/main/resources/simplelogger.properties
(added)
+++
sling/trunk/testing/mocks/logging-mock/src/main/resources/simplelogger.properties
Thu May 21 07:47:03 2015
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+org.slf4j.simpleLogger.defaultLogLevel=warn
Propchange:
sling/trunk/testing/mocks/logging-mock/src/main/resources/simplelogger.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sling/trunk/testing/mocks/logging-mock/src/main/resources/simplelogger.properties
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Thu May 21 07:47:03 2015
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author
Propchange:
sling/trunk/testing/mocks/logging-mock/src/main/resources/simplelogger.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: sling/trunk/testing/mocks/osgi-mock/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/pom.xml?rev=1680753&r1=1680752&r2=1680753&view=diff
==============================================================================
--- sling/trunk/testing/mocks/osgi-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/osgi-mock/pom.xml Thu May 21 07:47:03 2015
@@ -86,7 +86,7 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>slf4j-api</artifactId>
<scope>compile</scope>
</dependency>
@@ -101,6 +101,12 @@
<artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.testing.logging-mock</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified: sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml?rev=1680753&r1=1680752&r2=1680753&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml Thu May 21 07:47:03
2015
@@ -91,6 +91,12 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.testing.logging-mock</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified: sling/trunk/testing/mocks/sling-mock/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1680753&r1=1680752&r2=1680753&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock/pom.xml Thu May 21 07:47:03 2015
@@ -202,6 +202,12 @@
<version>1.9.5</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.testing.logging-mock</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
