Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Synchronise SLF4J plugin to Eclipse Platform #28

Merged
merged 1 commit into from
Nov 16, 2022
Merged

Synchronise SLF4J plugin to Eclipse Platform #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ....launch.rwt/src/org/eclipse/rap/tools/launch/rwt/internal/delegate/RWTLaunchDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public String[] getClasspath( ILaunchConfiguration configuration ) throws CoreEx
list.add( BundleFileLocator.locate( "org.eclipse.jetty.util.ajax" ) ); //$NON-NLS-1$
list.add( BundleFileLocator.locate( "org.eclipse.jetty.webapp" ) ); //$NON-NLS-1$
list.add( BundleFileLocator.locate( "org.eclipse.jetty.xml" ) ); //$NON-NLS-1$
list.add( BundleFileLocator.locate( "org.slf4j.api" ) ); //$NON-NLS-1$
list.add( BundleFileLocator.locate( "slf4j.api" ) ); //$NON-NLS-1$
mknauer marked this conversation as resolved.
Show resolved Hide resolved
return list.toArray( new String[0] );
}

Expand Down
2 changes: 1 addition & 1 deletion ...ap.tools.templates/src/org/eclipse/rap/tools/templates/internal/rap/basic_launch.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<setEntry value="org.osgi.util.position"/>
<setEntry value="org.osgi.util.promise"/>
<setEntry value="org.osgi.util.xml"/>
<setEntry value="org.slf4j.api"/>
<setEntry value="slf4j.api"/>
</setAttribute>
<setAttribute key="selected_workspace_bundles">
<setEntry value="${pluginId}@default:default"/>
Expand Down
2 changes: 1 addition & 1 deletion ...e.rap.tools.templates/src/org/eclipse/rap/tools/templates/internal/rap/e4_launch.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
<setEntry value="org.osgi.util.position"/>
<setEntry value="org.osgi.util.promise"/>
<setEntry value="org.osgi.util.xml"/>
<setEntry value="org.slf4j.api"/>
<setEntry value="slf4j.api"/>
</setAttribute>
<setAttribute key="selected_workspace_bundles">
<setEntry value="${pluginId}@default:default"/>
Expand Down
2 changes: 1 addition & 1 deletion ...ools.templates/src/org/eclipse/rap/tools/templates/internal/rap/workbench_launch.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<setEntry value="org.osgi.util.position"/>
<setEntry value="org.osgi.util.promise"/>
<setEntry value="org.osgi.util.xml"/>
<setEntry value="org.slf4j.api"/>
<setEntry value="slf4j.api"/>
</setAttribute>
<setAttribute key="selected_workspace_bundles">
<setEntry value="${pluginId}@default:default"/>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.rap.tools.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
unpack="false"/>

<plugin
id="org.slf4j.api"
id="slf4j.api"
download-size="0"
install-size="0"
version="0.0.0"
Expand Down
1 change: 0 additions & 1 deletion ...t.test/src/org/eclipse/rap/tools/launch/rwt/internal/delegate/RWTLaunchDelegate_Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ public void testGetClasspath() throws CoreException {
"org.eclipse.jetty.util.ajax",
"org.eclipse.jetty.webapp",
"org.eclipse.jetty.xml",
"org.slf4j.api",
};
for( String bundle : bundles ) {
boolean found = false;
Expand Down