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 14:34:43 UTC
svn commit: r1504097 - in /felix/trunk/scrplugin/scrtask: changelog.txt
src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java
Author: cziegeler
Date: Wed Jul 17 12:34:42 2013
New Revision: 1504097
URL: http://svn.apache.org/r1504097
Log: (empty)
Modified:
felix/trunk/scrplugin/scrtask/changelog.txt
felix/trunk/scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java
Modified: felix/trunk/scrplugin/scrtask/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/scrtask/changelog.txt?rev=1504097&r1=1504096&r2=1504097&view=diff
==============================================================================
--- felix/trunk/scrplugin/scrtask/changelog.txt (original)
+++ felix/trunk/scrplugin/scrtask/changelog.txt Wed Jul 17 12:34:42 2013
@@ -1,3 +1,10 @@
+Changes from 1.8.0 to 1.7.0
+---------------------------
+** Improvement
+ * [FELIX-4101] - Create metatype.properties file when description and label are inlined
+ * [FELIX-4126] - Discontinue creation of single XML descriptor files
+
+
Changes from 1.7.0 to 1.6.0
---------------------------
** Bug
Modified: felix/trunk/scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java?rev=1504097&r1=1504096&r2=1504097&view=diff
==============================================================================
--- felix/trunk/scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java (original)
+++ felix/trunk/scrplugin/scrtask/src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java Wed Jul 17 12:34:42 2013
@@ -49,16 +49,6 @@ public class SCRDescriptorTask extends M
private Path classpath;
/**
- * 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 generateAccessors = true;
@@ -92,8 +82,6 @@ public class SCRDescriptorTask extends M
scrLog.debug( " implicitFileset: " + getImplicitFileSet() );
scrLog.debug( " outputDirectory: " + destdir );
scrLog.debug( " classpath: " + classpath );
- scrLog.debug( " finalName: " + finalName );
- scrLog.debug( " metaTypeName: " + metaTypeName );
scrLog.debug( " generateAccessors: " + generateAccessors );
scrLog.debug( " strictMode: " + strictMode );
scrLog.debug( " specVersion: " + specVersion );
@@ -110,8 +98,6 @@ public class SCRDescriptorTask extends M
// create options
final Options options = new Options();
options.setOutputDirectory(destdir);
- options.setSCRName(finalName);
- options.setMetaTypeName(metaTypeName);
options.setGenerateAccessors(generateAccessors);
options.setStrictMode(strictMode);
options.setProperties(new HashMap<String, String>());
@@ -196,24 +182,20 @@ public class SCRDescriptorTask extends M
return this.classpath;
}
-
public void setClasspath( Path classPath ) {
createClasspath().add( classPath );
}
-
public void setClasspathRef( Reference classpathRef ) {
if ( classpathRef != null && classpathRef.getReferencedObject() instanceof Path ) {
createClasspath().add( ( Path ) classpathRef.getReferencedObject() );
}
}
-
public void setSrcdir( File srcdir ) {
getImplicitFileSet().setDir( srcdir );
}
-
public void setDestdir( File outputDirectory ) {
this.destdir = outputDirectory;
if ( destdir != null ) {
@@ -223,22 +205,10 @@ public class SCRDescriptorTask extends M
}
}
-
- public void setFinalName( String finalName ) {
- this.finalName = finalName;
- }
-
-
- public void setMetaTypeName( String metaTypeName ) {
- this.metaTypeName = metaTypeName;
- }
-
-
public void setGenerateAccessors( boolean generateAccessors ) {
this.generateAccessors = generateAccessors;
}
-
public void setStrictMode( boolean strictMode ) {
this.strictMode = strictMode;
}