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 2016/07/12 04:42:44 UTC
svn commit: r1752241 - in /felix/trunk/tools/org.apache.felix.scr.generator:
changelog.txt
src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java
src/main/java/org/apache/felix/scrplugin/description/ComponentDescription.java
Author: cziegeler
Date: Tue Jul 12 04:42:44 2016
New Revision: 1752241
URL: http://svn.apache.org/viewvc?rev=1752241&view=rev
Log:
FELIX-5304 : SERVICE_PID property should not be created
Modified:
felix/trunk/tools/org.apache.felix.scr.generator/changelog.txt
felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java
felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/description/ComponentDescription.java
Modified: felix/trunk/tools/org.apache.felix.scr.generator/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/tools/org.apache.felix.scr.generator/changelog.txt?rev=1752241&r1=1752240&r2=1752241&view=diff
==============================================================================
--- felix/trunk/tools/org.apache.felix.scr.generator/changelog.txt (original)
+++ felix/trunk/tools/org.apache.felix.scr.generator/changelog.txt Tue Jul 12 04:42:44 2016
@@ -1,3 +1,9 @@
+Changes from 1.15.0 to 1.14.0
+-----------------------------
+** Bug
+ * [FELIX-5304] - SERVICE_PID property should not be created
+
+
Changes from 1.14.0 to 1.13.0
-----------------------------
** Bug
Modified: felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java
URL: http://svn.apache.org/viewvc/felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java?rev=1752241&r1=1752240&r2=1752241&view=diff
==============================================================================
--- felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java (original)
+++ felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java Tue Jul 12 04:42:44 2016
@@ -431,16 +431,6 @@ public class SCRDescriptorGenerator {
// global properties
this.processGlobalProperties(desc, container.getProperties());
- // PID handling
- if ( componentDesc.isCreatePid() && !container.getProperties().containsKey(org.osgi.framework.Constants.SERVICE_PID)) {
- final PropertyDescription pid = new PropertyDescription(null);
- pid.setName( org.osgi.framework.Constants.SERVICE_PID );
- pid.setValue( componentDesc.getName() );
- pid.setType(PropertyType.String);
-
- container.getProperties().put(org.osgi.framework.Constants.SERVICE_PID, pid);
- }
-
// check lifecycle methods
if ( componentDesc.getActivate() == null ) {
final Validator.MethodResult result = Validator.findLifecycleMethod(project, container, "activate", true);
Modified: felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/description/ComponentDescription.java
URL: http://svn.apache.org/viewvc/felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/description/ComponentDescription.java?rev=1752241&r1=1752240&r2=1752241&view=diff
==============================================================================
--- felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/description/ComponentDescription.java (original)
+++ felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/description/ComponentDescription.java Tue Jul 12 04:42:44 2016
@@ -38,7 +38,7 @@ import org.apache.felix.scrplugin.annota
* <li>isAbstract : false</li>
* <li>isInherit : true</li>
* <li>createDs : true</li>
- * <li>createPid : true</li>
+ * <li>createPid : false (deprecated)</li>
* <li>createMetatype : false</li>
* <li>enabled : null</li>
* <li>immediate : null</li>
@@ -75,9 +75,6 @@ public class ComponentDescription extend
/** Create ds info */
private boolean createDs = true;
- /** Create pid */
- private boolean createPid = true;
-
/** Create metatype info. */
private boolean createMetatype = false;
@@ -192,12 +189,25 @@ public class ComponentDescription extend
this.createDs = createDs;
}
+ /**
+ * Deprecated - this will always return {@code false} as
+ * the pid property is handled by DS
+ * @return {@code false}
+ * @deprecated Do not use this anymore
+ */
+ @Deprecated
public boolean isCreatePid() {
- return createPid;
+ return false;
}
+ /**
+ * This will ignore the value provided.
+ * @param createPid Flag
+ * @deprecated Do not use this anymore
+ */
+ @Deprecated
public void setCreatePid(boolean createPid) {
- this.createPid = createPid;
+ // do nothing
}
public boolean isCreateMetatype() {
@@ -262,7 +272,7 @@ public class ComponentDescription extend
public String toString() {
return "ComponentDescription [name=" + name + ", label=" + label + ", description=" + description
+ ", configurationPolicy=" + configurationPolicy + ", isAbstract=" + isAbstract + ", isInherit="
- + isInherit + ", createDs=" + createDs + ", createPid=" + createPid + ", createMetatype="
+ + isInherit + ", createDs=" + createDs + ", createMetatype="
+ createMetatype + ", enabled=" + enabled + ", immediate=" + immediate + ", factory=" + factory
+ ", isSetMetatypeFactoryPid=" + isSetMetatypeFactoryPid + ", activate=" + activate + ", deactivate="
+ deactivate + ", modified=" + modified + ", specVersion=" + specVersion + ", configurationPid="
@@ -280,7 +290,6 @@ public class ComponentDescription extend
cd.setInherit(this.isInherit);
cd.setCreateDs(this.isCreateDs());
cd.setCreateMetatype(this.isCreateMetatype());
- cd.setCreatePid(this.isCreatePid());
cd.setEnabled(this.getEnabled());
cd.setImmediate(this.getImmediate());
cd.setFactory(this.getFactory());