Author: rpopma
Date: Mon Feb 17 14:52:04 2014
New Revision: 1569015
URL: http://svn.apache.org/r1569015
Log:
LOG4J2-346 added osgi bundles for slf4j-impl and log4j-to-slf4j
Added:
logging/log4j/log4j2/trunk/log4j-osgi/log4j-to-slf4j/
logging/log4j/log4j2/trunk/log4j-osgi/log4j-to-slf4j/pom.xml (with props)
logging/log4j/log4j2/trunk/log4j-osgi/slf4j-to-log4j/
logging/log4j/log4j2/trunk/log4j-osgi/slf4j-to-log4j/pom.xml (with props)
Modified:
logging/log4j/log4j2/trunk/log4j-osgi/pom.xml
Added: logging/log4j/log4j2/trunk/log4j-osgi/log4j-to-slf4j/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-osgi/log4j-to-slf4j/pom.xml?rev=1569015&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-osgi/log4j-to-slf4j/pom.xml (added)
+++ logging/log4j/log4j2/trunk/log4j-osgi/log4j-to-slf4j/pom.xml Mon Feb 17
14:52:04 2014
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>2.0-rc2-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
+ <groupId>org.apache.logging.log4j.osgi</groupId>
+ <artifactId>log4j-to-slf4j-bundle</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Log4j to SLF4J</name>
+ <description>Apache Log4j bridge to SLF4J.</description>
+ <properties>
+ <log4jParentDir>${basedir}/../..</log4jParentDir>
+ <docLabel>Core Documentation</docLabel>
+ <projectDir>/core</projectDir>
+ <osgi.export>
+ org.apache.logging.slf4j.*
+ </osgi.export>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-sources</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <mkdir dir="target/classes" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <!--
+ dummy entry to stop bundle plugin from picking up jar config and
reporting
+ WARNING: Duplicate name in Manifest
+ See http://markmail.org/message/mpkl24wk3jrjhhjg
+ -->
+ <archive>
+ <forced>true</forced>
+ </archive>
+ <excludeDependencies>false</excludeDependencies>
+ <instructions>
+ <!-- stops the "uses" clauses being added to "Export-Package"
manifest entry -->
+ <_nouses>true</_nouses>
+ <!-- Stop the JAVA_1_n_HOME variables from being treated as
headers by Bnd -->
+
<_removeheaders>JAVA_1_3_HOME,JAVA_1_4_HOME,JAVA_1_5_HOME,JAVA_1_6_HOME,JAVA_1_7_HOME</_removeheaders>
+ <Bundle-SymbolicName>${osgi.symbolicName}</Bundle-SymbolicName>
+ <Export-Package>${osgi.export}</Export-Package>
+ <Private-Package>${osgi.private}</Private-Package>
+ <Import-Package>${osgi.import}</Import-Package>
+
<DynamicImport-Package>${osgi.dynamicImport}</DynamicImport-Package>
+ <Bundle-DocURL>${project.url}</Bundle-DocURL>
+
<Fragment-Host>org.apache.logging.log4j-api;bundle-version=${project.version}</Fragment-Host>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>cleanVersions</goal>
+ </goals>
+ <configuration>
+ <versions>
+ <project.version.osgi>${project.version}</project.version.osgi>
+ </versions>
+ </configuration>
+ </execution>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <!-- http://www.yourkit.com/docs/80/help/agent.jsp -->
+ <id>yourkit</id>
+
+ <properties>
+
<yourkit.home>/Applications/YourKit_Java_Profiler_8.0.17.app</yourkit.home>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>com.yourkit</groupId>
+ <artifactId>yjp-controller-api-redist</artifactId>
+ <version>8.0.17</version>
+ <scope>system</scope>
+
<systemPath>${yourkit.home}/lib/yjp-controller-api-redist.jar</systemPath>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+
<argLine>-agentpath:"${yourkit.home}/bin/mac/libyjpagent.jnilib"</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
+
Propchange: logging/log4j/log4j2/trunk/log4j-osgi/log4j-to-slf4j/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: logging/log4j/log4j2/trunk/log4j-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-osgi/pom.xml?rev=1569015&r1=1569014&r2=1569015&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-osgi/pom.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-osgi/pom.xml Mon Feb 17 14:52:04 2014
@@ -1,52 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>2.0-rc2-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
- <groupId>org.apache.logging.log4j.osgi</groupId>
- <artifactId>log4j-osgi</artifactId>
- <packaging>pom</packaging>
- <name>Apache Log4J Core OSGi Bundles</name>
- <description>Apache Log4J OSGi Bundles</description>
- <properties>
- <log4jParentDir>${basedir}/..</log4jParentDir>
- <docLabel>Core Documentation</docLabel>
- <projectDir>/core</projectDir>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
- </dependencies>
- <modules>
- <module>core-osgi-async</module>
- <module>core-osgi-jpa</module>
- <module>core-osgi-legacy-api</module>
- <module>core-osgi-net</module>
- <module>core-osgi-nosql-couchdb</module>
- <module>core-osgi-nosql-mongodb</module>
- <module>core-osgi-reduced</module>
- </modules>
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>2.0-rc2-SNAPSHOT</version>
+ <relativePath>../</relativePath>
+ </parent>
+ <groupId>org.apache.logging.log4j.osgi</groupId>
+ <artifactId>log4j-osgi</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Log4J Core OSGi Bundles</name>
+ <description>Apache Log4J OSGi Bundles</description>
+ <properties>
+ <log4jParentDir>${basedir}/..</log4jParentDir>
+ <docLabel>Core Documentation</docLabel>
+ <projectDir>/core</projectDir>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
+ </dependencies>
+ <modules>
+ <module>core-osgi-async</module>
+ <module>core-osgi-jpa</module>
+ <module>core-osgi-legacy-api</module>
+ <module>core-osgi-net</module>
+ <module>core-osgi-nosql-couchdb</module>
+ <module>core-osgi-nosql-mongodb</module>
+ <module>core-osgi-reduced</module>
+ <module>log4j-to-slf4j</module>
+ <module>slf4j-to-log4j</module>
+ </modules>
+</project>
+
Added: logging/log4j/log4j2/trunk/log4j-osgi/slf4j-to-log4j/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-osgi/slf4j-to-log4j/pom.xml?rev=1569015&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-osgi/slf4j-to-log4j/pom.xml (added)
+++ logging/log4j/log4j2/trunk/log4j-osgi/slf4j-to-log4j/pom.xml Mon Feb 17
14:52:04 2014
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>2.0-rc2-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
+ <groupId>org.apache.logging.log4j.osgi</groupId>
+ <artifactId>log4j-slf4j-impl-bundle</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Log4j for SLF4J</name>
+ <description>Apache SLF4J-Log4j Adapter.</description>
+ <properties>
+ <log4jParentDir>${basedir}/../..</log4jParentDir>
+ <docLabel>Log4j 2 SLF4J Binding</docLabel>
+ <projectDir>/log4j-slf4j-impl</projectDir>
+ <osgi.export>
+ org.apache.logging.slf4j.*,
+ org.slf4j.helpers.*,
+ org.slf4j.impl.*
+ </osgi.export>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-sources</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <mkdir dir="target/classes" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <!--
+ dummy entry to stop bundle plugin from picking up jar config and
reporting
+ WARNING: Duplicate name in Manifest
+ See http://markmail.org/message/mpkl24wk3jrjhhjg
+ -->
+ <archive>
+ <forced>true</forced>
+ </archive>
+ <excludeDependencies>false</excludeDependencies>
+ <instructions>
+ <!-- stops the "uses" clauses being added to "Export-Package"
manifest entry -->
+ <_nouses>true</_nouses>
+ <!-- Stop the JAVA_1_n_HOME variables from being treated as
headers by Bnd -->
+
<_removeheaders>JAVA_1_3_HOME,JAVA_1_4_HOME,JAVA_1_5_HOME,JAVA_1_6_HOME,JAVA_1_7_HOME</_removeheaders>
+ <Bundle-SymbolicName>${osgi.symbolicName}</Bundle-SymbolicName>
+ <Export-Package>${osgi.export}</Export-Package>
+ <Private-Package>${osgi.private}</Private-Package>
+ <Import-Package>${osgi.import}</Import-Package>
+
<DynamicImport-Package>${osgi.dynamicImport}</DynamicImport-Package>
+ <Bundle-DocURL>${project.url}</Bundle-DocURL>
+
<Fragment-Host>org.apache.logging.log4j-api;bundle-version=${project.version}</Fragment-Host>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>cleanVersions</goal>
+ </goals>
+ <configuration>
+ <versions>
+ <project.version.osgi>${project.version}</project.version.osgi>
+ </versions>
+ </configuration>
+ </execution>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <!-- http://www.yourkit.com/docs/80/help/agent.jsp -->
+ <id>yourkit</id>
+
+ <properties>
+
<yourkit.home>/Applications/YourKit_Java_Profiler_8.0.17.app</yourkit.home>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>com.yourkit</groupId>
+ <artifactId>yjp-controller-api-redist</artifactId>
+ <version>8.0.17</version>
+ <scope>system</scope>
+
<systemPath>${yourkit.home}/lib/yjp-controller-api-redist.jar</systemPath>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+
<argLine>-agentpath:"${yourkit.home}/bin/mac/libyjpagent.jnilib"</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
+
Propchange: logging/log4j/log4j2/trunk/log4j-osgi/slf4j-to-log4j/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
