Merge pull request #5278 from bjhargrave/issues/5198

Remove old enroute
bndtools · Jun 7, 2022 · b09493d · b09493d
2 parents aab8139 + 86218eb
commit b09493d
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 424 deletions.
diff --git a/biz.aQute.bnd/bnd.bnd b/biz.aQute.bnd/bnd.bnd
@@ -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/*, \
@@ -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.*,\
@@ -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.
 
@@ -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"
diff --git a/biz.aQute.bnd/enroute b/biz.aQute.bnd/enroute
diff --git a/biz.aQute.bnd/src/aQute/bnd/enroute/commands/EnrouteCommand.java b/biz.aQute.bnd/src/aQute/bnd/enroute/commands/EnrouteCommand.java
diff --git a/biz.aQute.bnd/src/aQute/bnd/enroute/commands/EnrouteOptions.java b/biz.aQute.bnd/src/aQute/bnd/enroute/commands/EnrouteOptions.java
diff --git a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
@@ -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;
@@ -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
 	 */

diff --git a/biz.aQute.bnd/templates/enroute.zip b/biz.aQute.bnd/templates/enroute.zip
diff --git a/biz.aQute.bnd/testruns/newindex.bndrun b/biz.aQute.bnd/testruns/newindex.bndrun
diff --git a/biz.aQute.bndlib.tests/test/test/BuilderTest.java b/biz.aQute.bndlib.tests/test/test/BuilderTest.java
@@ -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.