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 2014/01/17 14:27:47 UTC
svn commit: r1559099 - in
/felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin:
SCRDescriptorGenerator.java xml/MetaTypeIO.java
Author: cziegeler
Date: Fri Jan 17 13:27:47 2014
New Revision: 1559099
URL: http://svn.apache.org/r1559099
Log:
FELIX-4378 : generate a metatype properties file if label/description are missing on @Component or @Property
Modified:
felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java
felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
Modified: felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java?rev=1559099&r1=1559098&r2=1559099&view=diff
==============================================================================
--- felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java (original)
+++ felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java Fri Jan 17 13:27:47 2014
@@ -224,7 +224,7 @@ public class SCRDescriptorGenerator {
}
// and generate files
- result.setMetatypeFiles(MetaTypeIO.generateDescriptors(module, this.options, this.logger));
+ result.setMetatypeFiles(MetaTypeIO.generateDescriptors(module, this.project, this.options, this.logger));
result.setScrFiles(ComponentDescriptorIO.generateDescriptorFiles(module, this.options, logger));
return result;
@@ -310,13 +310,9 @@ public class SCRDescriptorGenerator {
ocd.setId( componentDesc.getName() );
if ( componentDesc.getLabel() != null ) {
ocd.setName( componentDesc.getLabel() );
- } else {
- ocd.setName( "%" + componentDesc.getName() + ".name");
}
if ( componentDesc.getDescription() != null ) {
ocd.setDescription( componentDesc.getDescription() );
- } else {
- ocd.setDescription( "%" + componentDesc.getName() + ".description");
}
// Factory pid
@@ -525,13 +521,9 @@ public class SCRDescriptorGenerator {
if (pd.getLabel() != null ) {
ad.setName(pd.getLabel());
- } else {
- ad.setName("%" + pd.getName() + ".name");
}
if (pd.getDescription() != null ) {
ad.setDescription(pd.getDescription());
- } else {
- ad.setDescription("%" + pd.getName() + ".description");
}
if ( pd.getUnbounded() == PropertyUnbounded.DEFAULT ) {
Modified: felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java?rev=1559099&r1=1559098&r2=1559099&view=diff
==============================================================================
--- felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java (original)
+++ felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java Fri Jan 17 13:27:47 2014
@@ -31,6 +31,7 @@ import javax.xml.transform.TransformerEx
import org.apache.felix.scrplugin.Log;
import org.apache.felix.scrplugin.Options;
+import org.apache.felix.scrplugin.Project;
import org.apache.felix.scrplugin.SCRDescriptorException;
import org.apache.felix.scrplugin.helper.ComponentContainer;
import org.apache.felix.scrplugin.helper.ComponentContainerUtil;
@@ -78,6 +79,7 @@ public class MetaTypeIO {
private static final String OPTION_ELEMENT_QNAME = OPTION_ELEMENT;
public static List<String> generateDescriptors(final DescriptionContainer module,
+ final Project project,
final Options options,
final Log logger)
throws SCRDescriptorException {
@@ -93,6 +95,9 @@ public class MetaTypeIO {
final File parentDir = mtDir.getParentFile();
if (components.size() > 0) {
+ // check for metatype.properties
+ final File mtProps = new File(project.getClassesDirectory(), "OSGI-INF" + File.separator + "metatype" + File.separator + "metatype.properties");
+ final boolean oldStyle = mtProps.exists();
mtDir.mkdirs();
final List<String> fileNames = new ArrayList<String>();
@@ -107,16 +112,44 @@ public class MetaTypeIO {
for(final ComponentContainer cc : ccc.components) {
final MetatypeContainer mc = cc.getMetatypeContainer();
+ if ( mc.getName() == null ) {
+ if ( oldStyle ) {
+ mc.setName( "%" + cc.getComponentDescription().getName() + ".name");
+ } else {
+ mc.setName("Component " + cc.getComponentDescription().getName());
+ }
+ }
if ( mc.getName() != null && mc.getName().startsWith("%") ) {
allInlined = false;
}
+ if ( mc.getDescription() == null ) {
+ if ( oldStyle ) {
+ mc.setDescription("%" + cc.getComponentDescription().getName() + ".description");
+ } else {
+ mc.setDescription("Description for " + cc.getComponentDescription().getName());
+ }
+ }
if ( mc.getDescription() != null && mc.getDescription().startsWith("%") ) {
allInlined = false;
}
for(final MetatypeAttributeDefinition mad : mc.getProperties()) {
+ if ( mad.getName() == null ) {
+ if ( oldStyle ) {
+ mad.setName("%" + mad.getId() + ".name");
+ } else {
+ mad.setName("Property " + mad.getId());
+ }
+ }
if ( mad.getName() != null && mad.getName().startsWith("%") ) {
allInlined = false;
}
+ if ( mad.getDescription() == null ) {
+ if ( oldStyle ) {
+ mad.setDescription("%" + mad.getId() + ".description");
+ } else {
+ mad.setDescription("Description for " + mad.getId());
+ }
+ }
if ( mad.getDescription() != null && mad.getDescription().startsWith("%") ) {
allInlined = false;
}