Remove OSGi variable names and comments.

Author: nedtwigg

atplug-plugin-gradle/src/main/java/com/diffplug/atplug/tooling/PlugGenerator.kt

@@ -108,7 +108,7 @@ class PlugGenerator internal constructor(toSearches: List<File>, toLinkAgainst:
 	/**
 	 * @param plugClass The class for which we are generating plugin metadata.
 	 * @param socketClass The interface which is the socket for the metadata.
-	 * @return A string containing the content of OSGI-INF as appropriate for clazz.
+	 * @return A string containing the content of ATPLUG-INF as appropriate for clazz.
 	 */
 	private fun <SocketT, PlugT : SocketT> generatePluginTyped(
 			plugClass: Class<PlugT>,
@@ -124,12 +124,12 @@ class PlugGenerator internal constructor(toSearches: List<File>, toLinkAgainst:
 
 	companion object {
 		/**
-		 * Returns a Map from a plugin's name to its OSGI-INF content.
+		 * Returns a Map from a plugin's name to its ATPLUG-INF content.
 		 *
 		 * @param toSearch a directory containing class files where we will look for plugin
 		 * implementations
 		 * @param toLinkAgainst the classes that these plugins implementations need
-		 * @return a map from component name to is OSGI-INF string content
+		 * @return a map from component name to is ATPLUG-INF string content
 		 */
 		fun generate(toSearch: List<File>, toLinkAgainst: Set<File>): SortedMap<String, String> {
 			return try {

atplug-plugin-gradle/src/main/java/com/diffplug/atplug/tooling/gradle/PlugGenerateTask.java

@@ -67,7 +67,7 @@ public abstract class PlugGenerateTask extends DefaultTask {
 	public PlugGenerateTask() {
 		this.getOutputs().upToDateWhen(unused -> {
 			Manifest manifest = loadManifest();
-			String componentsCmd = serviceComponents();
+			String componentsCmd = atplugComponents();
 			String componentsActual = manifest.getMainAttributes().getValue(PlugPlugin.SERVICE_COMPONENT);
 			return Objects.equals(componentsActual, componentsCmd);
 		});
@@ -125,7 +125,7 @@ public void build() throws Throwable {
 		// generate the metadata
 		SortedMap<String, String> result = generate();
 
-		// clean out the osgiInf folder, and put the map's content into the folder
+		// clean out the ATPLUG-INF folder, and put the map's content into the folder
 		FileMisc.cleanDir(getAtplugInfFolder());
 		for (Map.Entry<String, String> entry : result.entrySet()) {
 			File serviceFile = new File(getAtplugInfFolder(), entry.getKey() + PlugPlugin.DOT_JSON);
@@ -135,7 +135,7 @@ public void build() throws Throwable {
 		// the resources directory *needs* the Service-Component entry of the manifest to exist in order for tests to work
 		// so we'll get a manifest (empty if necessary, but preferably we'll load what already exists)
 		Manifest manifest = loadManifest();
-		String componentsCmd = serviceComponents();
+		String componentsCmd = atplugComponents();
 		String componentsActual = manifest.getMainAttributes().getValue(PlugPlugin.SERVICE_COMPONENT);
 		if (Objects.equals(componentsActual, componentsCmd)) {
 			return;
@@ -197,16 +197,16 @@ private SortedMap<String, String> generate() throws Throwable {
 		}
 	}
 
-	private String serviceComponents() {
-		return serviceComponents(getAtplugInfFolder());
+	private String atplugComponents() {
+		return atplugComponents(getAtplugInfFolder());
 	}
 
-	static String serviceComponents(File osgiInf) {
-		if (!osgiInf.isDirectory()) {
+	static String atplugComponents(File atplugInf) {
+		if (!atplugInf.isDirectory()) {
 			return null;
 		} else {
 			List<String> serviceComponents = new ArrayList<>();
-			for (File file : FileMisc.list(osgiInf)) {
+			for (File file : FileMisc.list(atplugInf)) {
 				if (file.getName().endsWith(PlugPlugin.DOT_JSON)) {
 					serviceComponents.add(PlugPlugin.ATPLUG_INF + file.getName());
 				}

atplug-plugin-gradle/src/main/java/com/diffplug/atplug/tooling/gradle/PlugPlugin.java

@@ -34,7 +34,7 @@
 
 /**
  * `plugGenerate` task uses `@Plug` to generate files
- * in `src/main/resources/OSGI-INF` as a dependency of
+ * in `src/main/resources/ATPLUG-INF` as a dependency of
  * `processResources`.
  */
 public class PlugPlugin implements Plugin<Project> {
@@ -91,7 +91,7 @@ static class SetServiceComponentHeader implements Serializable, Action<Task> {
 
 		@Override
 		public void execute(Task task) {
-			String serviceComponents = PlugGenerateTask.serviceComponents(atplugInfFolder);
+			String serviceComponents = PlugGenerateTask.atplugComponents(atplugInfFolder);
 			Jar jarTask = (Jar) task;
 			if (serviceComponents == null) {
 				jarTask.getManifest().getAttributes().remove(PlugPlugin.SERVICE_COMPONENT);