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/11 19:19:08 UTC
svn commit: r1752203 - in
/felix/trunk/tools/org.apache.felix.scr.annotations/src/main/java/org/apache/felix:
scr/annotations/Component.java
scrplugin/processing/SCRAnnotationProcessor.java
scrplugin/processing/SlingAnnotationProcessor.java
Author: cziegeler
Date: Mon Jul 11 19:19:08 2016
New Revision: 1752203
URL: http://svn.apache.org/viewvc?rev=1752203&view=rev
Log:
FELIX-5304 : SERVICE_PID property should not be created
Modified:
felix/trunk/tools/org.apache.felix.scr.annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
felix/trunk/tools/org.apache.felix.scr.annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java
felix/trunk/tools/org.apache.felix.scr.annotations/src/main/java/org/apache/felix/scrplugin/processing/SlingAnnotationProcessor.java
Modified: felix/trunk/tools/org.apache.felix.scr.annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
URL: http://svn.apache.org/viewvc/felix/trunk/tools/org.apache.felix.scr.annotations/src/main/java/org/apache/felix/scr/annotations/Component.java?rev=1752203&r1=1752202&r2=1752203&view=diff
==============================================================================
--- felix/trunk/tools/org.apache.felix.scr.annotations/src/main/java/org/apache/felix/scr/annotations/Component.java (original)
+++ felix/trunk/tools/org.apache.felix.scr.annotations/src/main/java/org/apache/felix/scr/annotations/Component.java Mon Jul 11 19:19:08 2016
@@ -124,8 +124,10 @@ public @interface Component {
/**
* Generated <code>service.pid</code> property by default, if none declared
* explicitly.
+ * @deprecated This property is handled by the Declarative Service Implementation
+ * therefore it should never be created by hand.
*/
- boolean createPid() default true;
+ boolean createPid() default false;
/**
* Set the metatype factory pid property (only for non factory components).
Modified: felix/trunk/tools/org.apache.felix.scr.annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/felix/trunk/tools/org.apache.felix.scr.annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java?rev=1752203&r1=1752202&r2=1752203&view=diff
==============================================================================
--- felix/trunk/tools/org.apache.felix.scr.annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java (original)
+++ felix/trunk/tools/org.apache.felix.scr.annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java Mon Jul 11 19:19:08 2016
@@ -65,6 +65,7 @@ public class SCRAnnotationProcessor impl
/**
* @see org.apache.felix.scrplugin.annotations.AnnotationProcessor#getName()
*/
+ @Override
public String getName() {
return "Apache Felix SCR Annotation Processor";
}
@@ -74,6 +75,7 @@ public class SCRAnnotationProcessor impl
* @throws SCRDescriptorFailureException
* @see org.apache.felix.scrplugin.annotations.AnnotationProcessor#process(org.apache.felix.scrplugin.annotations.ScannedClass, org.apache.felix.scrplugin.description.ClassDescription)
*/
+ @Override
public void process(final ScannedClass scannedClass, final ClassDescription describedClass)
throws SCRDescriptorFailureException, SCRDescriptorException {
@@ -177,6 +179,7 @@ public class SCRAnnotationProcessor impl
/**
* @see org.apache.felix.scrplugin.annotations.AnnotationProcessor#getRanking()
*/
+ @Override
public int getRanking() {
return 1000;
}
@@ -194,7 +197,7 @@ public class SCRAnnotationProcessor impl
final boolean classIsAbstract = Modifier.isAbstract(scannedClass.getScannedClass().getModifiers());
component.setAbstract(cad.getBooleanValue("componentAbstract", classIsAbstract));
- component.setCreatePid(cad.getBooleanValue("createPid", true));
+ component.setCreatePid(false); // always set to false
component.setName(cad.getStringValue("name", scannedClass.getScannedClass().getName()));
Modified: felix/trunk/tools/org.apache.felix.scr.annotations/src/main/java/org/apache/felix/scrplugin/processing/SlingAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/felix/trunk/tools/org.apache.felix.scr.annotations/src/main/java/org/apache/felix/scrplugin/processing/SlingAnnotationProcessor.java?rev=1752203&r1=1752202&r2=1752203&view=diff
==============================================================================
--- felix/trunk/tools/org.apache.felix.scr.annotations/src/main/java/org/apache/felix/scrplugin/processing/SlingAnnotationProcessor.java (original)
+++ felix/trunk/tools/org.apache.felix.scr.annotations/src/main/java/org/apache/felix/scrplugin/processing/SlingAnnotationProcessor.java Mon Jul 11 19:19:08 2016
@@ -44,6 +44,7 @@ public class SlingAnnotationProcessor im
/**
* @see org.apache.felix.scrplugin.annotations.AnnotationProcessor#getName()
*/
+ @Override
public String getName() {
return "Apache Sling Annotation Processor";
}
@@ -51,6 +52,7 @@ public class SlingAnnotationProcessor im
/**
* @see org.apache.felix.scrplugin.annotations.AnnotationProcessor#process(org.apache.felix.scrplugin.annotations.ScannedClass, org.apache.felix.scrplugin.description.ClassDescription)
*/
+ @Override
public void process(final ScannedClass scannedClass,
final ClassDescription describedClass)
throws SCRDescriptorFailureException, SCRDescriptorException {
@@ -74,6 +76,7 @@ public class SlingAnnotationProcessor im
/**
* @see org.apache.felix.scrplugin.annotations.AnnotationProcessor#getRanking()
*/
+ @Override
public int getRanking() {
return 500;
}
@@ -96,6 +99,8 @@ public class SlingAnnotationProcessor im
cd.setCreateMetatype(metatype);
+ cd.setCreatePid(false); // always set to false
+
classDescription.add(cd);
}
@@ -198,9 +203,9 @@ public class SlingAnnotationProcessor im
if (metatype) {
pdPattern.setPrivate(true);
}
- classDescription.add(pdPattern);
+ classDescription.add(pdPattern);
}
-
+
// property scope
final String[] scopes;
final Object val = cad.getValue("scope");