Author: pderop
Date: Sun Sep 2 19:51:11 2012
New Revision: 1380041
URL: http://svn.apache.org/viewvc?rev=1380041&view=rev
Log:
FELIX-3524: Added configuration-pid support in Scr shell info command.
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/Component.java
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java
Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/Component.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/Component.java?rev=1380041&r1=1380040&r2=1380041&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/Component.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/Component.java Sun Sep
2 19:51:11 2012
@@ -360,6 +360,16 @@ public interface Component
String getConfigurationPid();
/**
+ * Returns whether the configuration-pid has been declared in the
descriptor
+ * or not.
+ *
+ * @return whether the configuration-pid has method has been declared in
the descriptor
+ * or not.
+ * @since DS 1.2
+ */
+ boolean isConfigurationPidDeclared();
+
+ /**
* Enables this Component if it is disabled. If the Component is not
* currently {@link #STATE_DISABLED disabled} this method has no effect. If
* the Component is {@link #STATE_DESTROYED destroyed}, this method throws
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java?rev=1380041&r1=1380040&r2=1380041&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java
(original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java Sun
Sep 2 19:51:11 2012
@@ -230,6 +230,14 @@ class ScrCommand
}
out.println();
+ out.print("Configuration Pid: ");
+ out.print(component.getConfigurationPid());
+ if (component.isConfigurationPidDeclared())
+ {
+ out.print(" (declared in the descriptor)");
+ }
+ out.println();
+
if (component.getFactory() != null)
{
out.print("Factory: ");
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java?rev=1380041&r1=1380040&r2=1380041&view=diff
==============================================================================
---
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
(original)
+++
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
Sun Sep 2 19:51:11 2012
@@ -552,6 +552,11 @@ public abstract class AbstractComponentM
return m_componentMetadata.getConfigurationPid();
}
+ public boolean isConfigurationPidDeclared()
+ {
+ return m_componentMetadata.isConfigurationPidDeclared();
+ }
+
public boolean isServiceFactory()
{
return m_componentMetadata.getServiceMetadata() != null
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java?rev=1380041&r1=1380040&r2=1380041&view=diff
==============================================================================
---
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java
(original)
+++
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/metadata/ComponentMetadata.java
Sun Sep 2 19:51:11 2012
@@ -448,6 +448,18 @@ public class ComponentMetadata
return getName();
}
+ /**
+ * Returns whether the configuration-pid has been declared in the
descriptor
+ * or not.
+ *
+ * @return whether the configuration-pid has method has been declared in
the descriptor
+ * or not.
+ * @since DS 1.2
+ */
+ public boolean isConfigurationPidDeclared()
+ {
+ return m_configurationPid != null;
+ }
/**
* Returns the value of the enabled flag
