You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2013/07/17 15:50:18 UTC
svn commit: r1504138 - in /felix/trunk/scrplugin/bnd-scr-plugin: ./
src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java
Author: cziegeler
Date: Wed Jul 17 13:50:17 2013
New Revision: 1504138
URL: http://svn.apache.org/r1504138
Log:
FELIX-4135 : Bnd scrplugin contrib
Modified:
felix/trunk/scrplugin/bnd-scr-plugin/ (props changed)
felix/trunk/scrplugin/bnd-scr-plugin/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java
Propchange: felix/trunk/scrplugin/bnd-scr-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jul 17 13:50:17 2013
@@ -0,0 +1,5 @@
+.settings
+
+.classpath
+
+.project
Modified: felix/trunk/scrplugin/bnd-scr-plugin/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/bnd-scr-plugin/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java?rev=1504138&r1=1504137&r2=1504138&view=diff
==============================================================================
--- felix/trunk/scrplugin/bnd-scr-plugin/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java (original)
+++ felix/trunk/scrplugin/bnd-scr-plugin/src/main/java/org/apache/felix/scrplugin/bnd/SCRDescriptorBndPlugin.java Wed Jul 17 13:50:17 2013
@@ -51,7 +51,7 @@ import aQute.service.reporter.Reporter;
* The <code>SCRDescriptorBndPlugin</code> class is a <code>bnd</code> analyzer
* plugin which generates a service descriptor file based on annotations found
* in the sources.
- *
+ *
* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
*/
public class SCRDescriptorBndPlugin implements AnalyzerPlugin, Plugin {
@@ -108,16 +108,6 @@ public class SCRDescriptorBndPlugin impl
private BndLog log;
/**
- * Name of the generated descriptor.
- */
- private String finalName = "serviceComponents.xml";
-
- /**
- * Name of the generated meta type file.
- */
- private String metaTypeName = "metatype.xml";
-
- /**
* This flag controls the generation of the bind/unbind methods.
*/
private boolean generateAccessor = true;
@@ -134,11 +124,6 @@ public class SCRDescriptorBndPlugin impl
private SpecVersion specVersion;
/**
- * Do we must generate descriptors in separate files
- */
- private boolean generateSeparateDescriptors = true;
-
- /**
* Bnd plugin properties.
*/
private Map<String, String> properties;
@@ -185,13 +170,10 @@ public class SCRDescriptorBndPlugin impl
// create options
final Options options = new Options();
options.setOutputDirectory(destDir);
- options.setSCRName(finalName);
- options.setMetaTypeName(metaTypeName);
options.setGenerateAccessors(generateAccessor);
options.setStrictMode(strictMode);
options.setProperties(new HashMap<String, String>());
options.setSpecVersion(specVersion);
- options.setGenerateSeparateDescriptors(generateSeparateDescriptors);
final SCRDescriptorGenerator generator = new SCRDescriptorGenerator(
log);
@@ -244,8 +226,6 @@ public class SCRDescriptorBndPlugin impl
+ " directory.");
}
- finalName = parseOption(properties, FINALNAME, finalName);
- metaTypeName = parseOption(properties, METATYPENAME, metaTypeName);
generateAccessor = parseOption(properties, GENERATE_ACCESSOR,
generateAccessor);
strictMode = parseOption(properties, STRICT_MODE, strictMode);
@@ -255,16 +235,11 @@ public class SCRDescriptorBndPlugin impl
throw new IllegalArgumentException(
"Unknown spec version specified: " + version);
}
- generateSeparateDescriptors = parseOption(properties, GENSEPDESC,
- generateSeparateDescriptors);
if (log.isInfoEnabled()) {
log.info("Initialized Bnd ScrPlugin: destDir=" + destDir
- + ", finalName=" + finalName + ", metaTypeName="
- + metaTypeName + ", strictMode=" + strictMode
- + ", specVersion=" + specVersion
- + ", generateSeparateDescriptors="
- + generateSeparateDescriptors);
+ + ", strictMode=" + strictMode
+ + ", specVersion=" + specVersion);
}
}