-
Notifications
You must be signed in to change notification settings - Fork 188
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for platform URLs in automatic manifest generation plugins
PDE allows the definition of extraClassPathJars what is very similar to bnd -classpath, one usually uses a platform:/<reference to project>/<somejar>. Currently there are two issues: 1) the tycho-compile does not understand these 2) bnd tries to resolve them with httpclient This adds the code to correctly resolve them in a similar way as Tycho does for extraClassPathJars.
- Loading branch information
Showing
6 changed files
with
294 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2024 Christoph Läubrich and others. | ||
| * This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License 2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * Christoph Läubrich - initial API and implementation | ||
| *******************************************************************************/ | ||
| package tools; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Map.Entry; | ||
| import java.util.TreeMap; | ||
| import java.util.jar.JarFile; | ||
|
|
||
| /** | ||
| * prints a list of packages from a jar that can be used inside | ||
| * tycho-maven-plugin/src/main/resources/META-INF/maven/extension.xml | ||
| */ | ||
| public class ExportArtifact { | ||
| public static void main(String[] args) throws IOException { | ||
| Map<String, List<String>> packages = new TreeMap<>(); | ||
| try (JarFile jarFile = new JarFile(args[0])) { | ||
| jarFile.stream().forEach(entry -> { | ||
| String name = entry.getName(); | ||
| if (name.endsWith(".class")) { | ||
| int lastIndexOf = name.lastIndexOf('/'); | ||
| if (lastIndexOf > 0) { | ||
| String pkg = name.substring(0, lastIndexOf).replace('/', '.'); | ||
| packages.computeIfAbsent(pkg, x -> new ArrayList<>()).add(name); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
| for (Entry<String, List<String>> pkg : packages.entrySet()) { | ||
| if (pkg.getValue().isEmpty()) { | ||
| continue; | ||
| } | ||
| System.out.println("<exportedPackage>" + pkg.getKey() + "</exportedPackage>"); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
tycho-core/src/main/java/org/eclipse/tycho/core/bnd/BndPluginManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2024 Christoph Läubrich and others. | ||
| * This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License 2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * Christoph Läubrich - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.tycho.core.bnd; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| import org.codehaus.plexus.component.annotations.Component; | ||
| import org.codehaus.plexus.component.annotations.Requirement; | ||
|
|
||
| import aQute.bnd.build.Workspace; | ||
| import aQute.bnd.service.RepositoryPlugin; | ||
|
|
||
| /** | ||
| * Manager that collects BndPlugins in the plexus domain and installs them into a workspace | ||
| */ | ||
| @Component(role = BndPluginManager.class) | ||
| public class BndPluginManager { | ||
| @Requirement | ||
| private Map<String, RepositoryPlugin> repositoryPlugins; | ||
|
|
||
| public void setupWorkspace(Workspace ws) { | ||
| repositoryPlugins.values().forEach(ws::addBasicPlugin); | ||
| ws.refresh(); | ||
| } | ||
| } |
Oops, something went wrong.