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

Remove old enroute #5278

Merged
merged 3 commits into from Jun 7, 2022
Merged

Remove old enroute #5278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90597b4
docs: Remove old enroute references from doc text
bjhargrave Jun 6, 2022
beff2ea
bnd: Remove old enroute command from cli
bjhargrave Jun 6, 2022
86218eb
bnd: Remove digests from bnd jar
bjhargrave Jun 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions biz.aQute.bnd/bnd.bnd
View file
Open in desktop
Expand Up @@ -21,7 +21,6 @@

-includeresource: \
${workspace}/LICENSE, \
templates=templates, \
@${repo;biz.aQute.bnd.util;latest}!/!META-INF/*, \
@${repo;biz.aQute.bndlib;latest}!/!META-INF/*, \
@${repo;biz.aQute.bnd.ant;latest}!/!META-INF/*, \
Expand All @@ -46,7 +45,6 @@ Import-Package: \
# by hand even though they are in bndlib. However, they are added
# and we can unfortunately not see those packages ...
-privatepackage: \
aQute.bnd.enroute.commands,\
aQute.bnd.main, \
org.objectweb.asm.*,\
org.jtwig.*,\
Expand All @@ -60,8 +58,6 @@ Import-Package: \
Main-Class: aQute.bnd.main.bnd
JPM-Command: bnd

-digests: MD5, SHA1

Bundle-Description: This command line utility is the Swiss army knife of OSGi. It provides you with a breadth \
of tools to understand and manage OSGi based systems. This project basically uses bndlib.

Expand Down Expand Up @@ -137,7 +133,7 @@ Bundle-Description: This command line utility is the Swiss army knife of OSGi. I
com.github.javaparser.javaparser-core;version=3.13


-builderignore: testdata, testruns, installers
-builderignore: testdata, installers

# Don't run tests in parallel with other projects claiming launchpad
-noparallel: launchpad;task="test"
5 changes: 0 additions & 5 deletions biz.aQute.bnd/enroute
View file
Open in desktop

This file was deleted.

199 changes: 0 additions & 199 deletions biz.aQute.bnd/src/aQute/bnd/enroute/commands/EnrouteCommand.java
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions biz.aQute.bnd/src/aQute/bnd/enroute/commands/EnrouteOptions.java
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions biz.aQute.bnd/src/aQute/bnd/main/bnd.java
View file
Open in desktop
Expand Up @@ -78,8 +78,6 @@
import aQute.bnd.build.Run;
import aQute.bnd.build.Workspace;
import aQute.bnd.buildtool.ToolManager;
import aQute.bnd.enroute.commands.EnrouteCommand;
import aQute.bnd.enroute.commands.EnrouteOptions;
import aQute.bnd.exceptions.Exceptions;
import aQute.bnd.exporter.subsystem.SubsystemExporter;
import aQute.bnd.header.Attrs;
Expand Down Expand Up @@ -1876,15 +1874,6 @@ public void _repo(repoOptions opts) throws Exception {
new RepoCommand(this, opts);
}

/**
* Run enroute commands
*/

@Description("OSGi enRoute commands to maintain bnd workspaces (create workspace, add project, etc)")
public void _enroute(EnrouteOptions opts) throws Exception {
new EnrouteCommand(this, opts);
}

/**
* Print out a JAR
*/
Expand Down
Binary file removed biz.aQute.bnd/templates/enroute.zip
View file
Open in desktop
Binary file not shown.
7 changes: 0 additions & 7 deletions biz.aQute.bnd/testruns/newindex.bndrun
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions biz.aQute.bndlib.tests/test/test/BuilderTest.java
View file
Open in desktop
Expand Up @@ -1182,63 +1182,6 @@ public void testGlobPackageNamesection() throws Exception {

}

/**
* Test the digests
*/

// @Test
// public void testDigests() throws Exception {
// Builder b = new Builder();
// b.addClasspath(IO.getFile("jar/osgi.jar"));
// b.setProperty(Constants.DIGESTS, "MD5, SHA1");
// b.setProperty(Constants.PRIVATE_PACKAGE, "*");
// Jar build = b.build();
// assertOk(b);
//
// Manifest m = build.getManifest();
// assertEquals(261, build.getResources().size());
//
// for (Entry<String,Resource> e : build.getResources().entrySet()) {
// System.out.println("Path " + e.getKey());
//
// Attributes attrs = m.getAttributes(e.getKey());
// assertNotNull(e.getKey(), attrs);
// boolean md5 = false, sha1 = false;
//
// for (Entry<Object,Object> ee : attrs.entrySet()) {
// String name = ee.getKey().toString().toLowerCase();
// if (name.endsWith("-digest")) {
// String value = ee.getValue().toString().trim();
// assertNotNull("original digest", value);
//
// byte[] original = Base64.decodeBase64(value);
// assertNotNull("original digest", original);
//
// String alg = name.substring(0, name.length() - 7);
// if (alg.equals("md5"))
// md5 = true;
// if (alg.equals("sha1"))
// sha1 = true;
//
// MessageDigest md = MessageDigest.getInstance(alg);
// InputStream in = e.getValue().openInputStream();
// byte[] buffer = new byte[8000];
// int size = in.read(buffer);
// while (size > 0) {
// md.update(buffer, 0, size);
// size = in.read(buffer);
// }
// byte calculated[] = md.digest();
// assertTrue("comparing digests " + e.getKey() + " " + value + " " +
// Base64.encodeBase64(calculated),
// Arrays.equals(original, calculated));
// }
// }
// assertTrue("expected md5", md5);
// assertTrue("expected sha1", sha1);
// }
// }

/**
* Check of the use of x- directives are not skipped. bnd allows x-
* directives in the import/export clauses but strips other ones.
Expand Down