You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2015/05/16 22:08:41 UTC
svn commit: r1679799 - in /directory/studio/trunk:
eclipse-target-platform/template/ features/rcp.feature/ p2repository/
plugins/slf4j-eclipselog/
plugins/slf4j-eclipselog/src/main/java/org/slf4j/impl/
tests/test.integration.core/ tests/test.integratio...
Author: seelmann
Date: Sat May 16 20:08:40 2015
New Revision: 1679799
URL: http://svn.apache.org/r1679799
Log:
DIRSTUDIO-1042:
* Convert slf4j-eclipselog from plugin to fragment
* Add fragment to product, update site, and tests plugins
Removed:
directory/studio/trunk/plugins/slf4j-eclipselog/src/main/java/org/slf4j/impl/Activator.java
directory/studio/trunk/tests/test.integration.ui/src/main/java/log4j.properties
Modified:
directory/studio/trunk/eclipse-target-platform/template/org.apache.directory.studio.eclipse-target-platform.target
directory/studio/trunk/features/rcp.feature/feature.xml
directory/studio/trunk/p2repository/category.xml
directory/studio/trunk/plugins/slf4j-eclipselog/pom-first.xml
directory/studio/trunk/plugins/slf4j-eclipselog/pom.xml
directory/studio/trunk/plugins/slf4j-eclipselog/src/main/java/org/slf4j/impl/EclipseLogLogger.java
directory/studio/trunk/tests/test.integration.core/pom.xml
directory/studio/trunk/tests/test.integration.ui/pom-first.xml
directory/studio/trunk/tests/test.integration.ui/pom.xml
Modified: directory/studio/trunk/eclipse-target-platform/template/org.apache.directory.studio.eclipse-target-platform.target
URL: http://svn.apache.org/viewvc/directory/studio/trunk/eclipse-target-platform/template/org.apache.directory.studio.eclipse-target-platform.target?rev=1679799&r1=1679798&r2=1679799&view=diff
==============================================================================
--- directory/studio/trunk/eclipse-target-platform/template/org.apache.directory.studio.eclipse-target-platform.target (original)
+++ directory/studio/trunk/eclipse-target-platform/template/org.apache.directory.studio.eclipse-target-platform.target Sat May 16 20:08:40 2015
@@ -19,7 +19,7 @@
@author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
-->
<?pde version="3.8"?>
-<target name="Apache Directory Studio Platform" sequenceNumber="136">
+<target name="Apache Directory Studio Platform" sequenceNumber="175">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -124,6 +124,8 @@
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
+ <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
+ <unit id="org.slf4j.log4j" version="1.7.2.v20130115-1340"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
</location>
Modified: directory/studio/trunk/features/rcp.feature/feature.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/features/rcp.feature/feature.xml?rev=1679799&r1=1679798&r2=1679799&view=diff
==============================================================================
--- directory/studio/trunk/features/rcp.feature/feature.xml (original)
+++ directory/studio/trunk/features/rcp.feature/feature.xml Sat May 16 20:08:40 2015
@@ -518,6 +518,14 @@ http://www.apache.org/licenses/
download-size="0"
install-size="0"
version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+
+ <plugin
+ id="org.slf4j.api"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
unpack="false"/>
</feature>
Modified: directory/studio/trunk/p2repository/category.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/p2repository/category.xml?rev=1679799&r1=1679798&r2=1679799&view=diff
==============================================================================
--- directory/studio/trunk/p2repository/category.xml (original)
+++ directory/studio/trunk/p2repository/category.xml Sat May 16 20:08:40 2015
@@ -15,5 +15,8 @@
<feature url="features/org.apache.directory.studio.openldap.feature_2.0.0.qualifier.jar" id="org.apache.directory.studio.openldap.feature" version="2.0.0.qualifier">
<category name="org.apache.directory.studio"/>
</feature>
+ <bundle id="org.apache.directory.studio.slf4j-eclipselog" version="2.0.0.qualifier">
+ <category name="org.apache.directory.studio"/>
+ </bundle>
<category-def name="org.apache.directory.studio" label="Apache Directory Studio"/>
</site>
Modified: directory/studio/trunk/plugins/slf4j-eclipselog/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/slf4j-eclipselog/pom-first.xml?rev=1679799&r1=1679798&r2=1679799&view=diff
==============================================================================
--- directory/studio/trunk/plugins/slf4j-eclipselog/pom-first.xml (original)
+++ directory/studio/trunk/plugins/slf4j-eclipselog/pom-first.xml Sat May 16 20:08:40 2015
@@ -30,7 +30,7 @@
<artifactId>org.apache.directory.studio.slf4j-eclipselog</artifactId>
<name>Apache Directory Studio SLF4J to Eclipse Log Binding</name>
<description>
- An slf4j logger binding that a forwards log entries to Eclipse log in '.metadata/.log'.
+ An slf4j logger binding that forwards log messages to Eclipse log in '.metadata/.log'.
</description>
<packaging>bundle</packaging>
@@ -46,8 +46,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId};singleton:=true</Bundle-SymbolicName>
<Bundle-Localization>plugin</Bundle-Localization>
- <Eclipse-LazyStart>true</Eclipse-LazyStart>
- <Bundle-Activator>org.slf4j.impl.Activator</Bundle-Activator>
+ <Fragment-Host>slf4j.api;bundle-version="[1.7.10,1.7.11)"</Fragment-Host>
<Export-Package>org.slf4j.impl</Export-Package>
@@ -56,6 +55,7 @@
<Require-Bundle>
slf4j.api,
+ org.slf4j.api,
org.eclipse.core.runtime
</Require-Bundle>
</instructions>
Modified: directory/studio/trunk/plugins/slf4j-eclipselog/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/slf4j-eclipselog/pom.xml?rev=1679799&r1=1679798&r2=1679799&view=diff
==============================================================================
--- directory/studio/trunk/plugins/slf4j-eclipselog/pom.xml (original)
+++ directory/studio/trunk/plugins/slf4j-eclipselog/pom.xml Sat May 16 20:08:40 2015
@@ -32,6 +32,6 @@
<packaging>eclipse-plugin</packaging>
<description>
- An slf4j logger binding that a forwards log entries to Eclipse log in '.metadata/.log'.
+ An slf4j logger binding that forwards log messages to Eclipse log in '.metadata/.log'.
</description>
</project>
Modified: directory/studio/trunk/plugins/slf4j-eclipselog/src/main/java/org/slf4j/impl/EclipseLogLogger.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/slf4j-eclipselog/src/main/java/org/slf4j/impl/EclipseLogLogger.java?rev=1679799&r1=1679798&r2=1679799&view=diff
==============================================================================
--- directory/studio/trunk/plugins/slf4j-eclipselog/src/main/java/org/slf4j/impl/EclipseLogLogger.java (original)
+++ directory/studio/trunk/plugins/slf4j-eclipselog/src/main/java/org/slf4j/impl/EclipseLogLogger.java Sat May 16 20:08:40 2015
@@ -21,7 +21,9 @@
package org.slf4j.impl;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
+import org.osgi.framework.Bundle;
import org.slf4j.helpers.MarkerIgnoringBase;
import org.slf4j.helpers.MessageFormatter;
@@ -40,15 +42,16 @@ public class EclipseLogLogger extends Ma
{
private static final long serialVersionUID = 1L;
+ private static final String SYMBOLIC_NAME = "org.apache.directory.studio.slf4j-eclipselog";
+
private void internalLog( int severity, String message, Throwable t )
{
- Activator activator = Activator.getDefault();
- if ( activator != null )
+ Bundle bundle = Platform.getBundle( SYMBOLIC_NAME );
+ if ( bundle != null )
{
- String symbolicName = activator.getBundle().getSymbolicName();
- Status status = new Status( severity, symbolicName, message, t );
- activator.getLog().log( status );
+ Status status = new Status( severity, SYMBOLIC_NAME, message, t );
+ Platform.getLog( bundle ).log( status );
}
}
Modified: directory/studio/trunk/tests/test.integration.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.core/pom.xml?rev=1679799&r1=1679798&r2=1679799&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.core/pom.xml (original)
+++ directory/studio/trunk/tests/test.integration.core/pom.xml Sat May 16 20:08:40 2015
@@ -31,4 +31,24 @@
<name>Apache Directory Studio Core Integration Tests</name>
<packaging>eclipse-test-plugin</packaging>
<description />
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <dependency-resolution>
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.directory.studio.slf4j-eclipselog</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: directory/studio/trunk/tests/test.integration.ui/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/pom-first.xml?rev=1679799&r1=1679798&r2=1679799&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/pom-first.xml (original)
+++ directory/studio/trunk/tests/test.integration.ui/pom-first.xml Sat May 16 20:08:40 2015
@@ -97,8 +97,6 @@
org.apache.directory.studio.rcp.help,
org.apache.directory.studio.schemaeditor,
org.apache.directory.studio.schemaeditor.help,
- org.apache.directory.studio.slf4j-eclipselog,
- org.apache.directory.studio.test.integration.core,
org.apache.directory.studio.valueeditors,
org.eclipse.core.runtime,
Modified: directory/studio/trunk/tests/test.integration.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/pom.xml?rev=1679799&r1=1679798&r2=1679799&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/pom.xml (original)
+++ directory/studio/trunk/tests/test.integration.ui/pom.xml Sat May 16 20:08:40 2015
@@ -64,12 +64,16 @@
<configuration>
<dependency-resolution>
<extraRequirements>
- <!-- TODO: more requirements required -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.directory.studio.slf4j-eclipselog</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
</extraRequirements>
</dependency-resolution>
</configuration>