You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/02/29 14:18:44 UTC
svn commit: r1295090 - in /karaf/trunk: ./ assemblies/apache-karaf/
assemblies/features/standard/src/main/feature/ scr/ scr/command/
scr/command/src/main/java/org/apache/karaf/scr/command/
scr/command/src/main/java/org/apache/karaf/scr/command/action/ ...
Author: jbonofre
Date: Wed Feb 29 13:18:43 2012
New Revision: 1295090
URL: http://svn.apache.org/viewvc?rev=1295090&view=rev
Log:
[KARAF-1242] Fix the scr:list formatting and refactoring of the scr module (checkstyle and features)
Removed:
karaf/trunk/scr/feature/NOTICE
karaf/trunk/scr/feature/pom.xml
karaf/trunk/scr/feature/src/main/resources/features.xml
Modified:
karaf/trunk/assemblies/apache-karaf/pom.xml
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/pom.xml
karaf/trunk/scr/NOTICE
karaf/trunk/scr/command/NOTICE (contents, props changed)
karaf/trunk/scr/command/pom.xml
karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ActivateCommandComponent.java
karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/DeactivateCommandComponent.java
karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/DetailsCommandComponent.java
karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ListCommandComponent.java
karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ScrCommandConstants.java
karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ScrCommandSupport.java
karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ScrUtils.java
karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/ActivateAction.java
karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/DeactivateAction.java
karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/DetailsAction.java
karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/ListAction.java
karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/ScrActionSupport.java
karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/completer/ActivateCompleter.java
karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/completer/DeactivateCompleter.java
karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/completer/DetailsCompleter.java
karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/completer/ScrCompleterSupport.java
karaf/trunk/scr/examples/NOTICE
karaf/trunk/scr/examples/pom.xml
karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/component/ManagedComponent.java
karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/component/MetaTypeManagedComponent.java
karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/component/MetaTypeManagedComponentConfig.java
karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/component/SimpleComponent.java
karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/service/ExampleService.java
karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/service/provider/ExampleServiceProvider.java
karaf/trunk/scr/management/NOTICE
karaf/trunk/scr/management/pom.xml
karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/ScrServiceMBean.java
karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/internal/ScrServiceMBeanImpl.java
karaf/trunk/scr/pom.xml
Modified: karaf/trunk/assemblies/apache-karaf/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/pom.xml?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/assemblies/apache-karaf/pom.xml (original)
+++ karaf/trunk/assemblies/apache-karaf/pom.xml Wed Feb 29 13:18:43 2012
@@ -64,13 +64,6 @@
<type>xml</type>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.karaf.scr</groupId>
- <artifactId>org.apache.karaf.scr.feature</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
<!--
<dependency>
<groupId>org.apache.karaf.demos</groupId>
Modified: karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Wed Feb 29 13:18:43 2012
@@ -64,21 +64,6 @@
<bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
<bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo.annotation-spec.version}</bundle>
<bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/${geronimo.jaspic-spec.version}</bundle>
-<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle> -->
-<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-io/${jetty.version}</bundle> -->
-<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-http/${jetty.version}</bundle> -->
-<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-client/${jetty.version}</bundle> -->
-<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-continuation/${jetty.version}</bundle> -->
-<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-jmx/${jetty.version}</bundle> -->
-<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-server/${jetty.version}</bundle> -->
-<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-security/${jetty.version}</bundle> -->
-<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-servlet/${jetty.version}</bundle> -->
-<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-servlets/${jetty.version}</bundle> -->
-<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-xml/${jetty.version}</bundle> -->
-<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-webapp/${jetty.version}</bundle> -->
-<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-jndi/${jetty.version}</bundle> -->
-<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-plus/${jetty.version}</bundle> -->
-<!-- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-websocket/${jetty.version}</bundle> -->
<bundle start-level="30">mvn:org.eclipse.jetty.aggregate/jetty-all-server/${jetty.version}</bundle>
</feature>
@@ -188,4 +173,12 @@
<bundle start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.jasypt/${project.version}</bundle>
</feature>
+ <feature name="scr" description="Declarative Service support" version="${project.version}" resolver="(obr)">
+ <feature>eventadmin</feature>
+ <bundle dependency="true" start-level="30">mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle>
+ <bundle dependency="true" start-level="30">mvn:org.apache.felix/org.apache.felix.scr/${felix.scr.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.scr/org.apache.karaf.scr.command/${project.version}</bundle>
+ <bundle start-level="30">mvn:org.apache.karaf.scr/org.apache.karaf.scr.management/${project.version}</bundle>
+ </feature>
+
</features>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Wed Feb 29 13:18:43 2012
@@ -621,13 +621,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf.scr</groupId>
- <artifactId>org.apache.karaf.scr.feature</artifactId>
- <type>xml</type>
- <classifier>features</classifier>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.karaf.demos</groupId>
<artifactId>web</artifactId>
<version>${project.version}</version>
Modified: karaf/trunk/scr/NOTICE
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/NOTICE?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/NOTICE (original)
+++ karaf/trunk/scr/NOTICE Wed Feb 29 13:18:43 2012
@@ -1,5 +1,5 @@
Apache Karaf
-Copyright 2010 The Apache Software Foundation
+Copyright 2010-2012 The Apache Software Foundation
I. Included Software
Modified: karaf/trunk/scr/command/NOTICE
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/NOTICE?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/command/NOTICE (original)
+++ karaf/trunk/scr/command/NOTICE Wed Feb 29 13:18:43 2012
@@ -1,5 +1,5 @@
Apache Karaf
-Copyright 2010 The Apache Software Foundation
+Copyright 2010-2012 The Apache Software Foundation
I. Included Software
Propchange: karaf/trunk/scr/command/NOTICE
('svn:executable' removed)
Modified: karaf/trunk/scr/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/pom.xml?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/command/pom.xml (original)
+++ karaf/trunk/scr/command/pom.xml Wed Feb 29 13:18:43 2012
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,18 +18,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.karaf.scr</groupId>
<artifactId>scr</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.scr.command</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: SCR :: Shell Commands</name>
-
<description>Provides the OSGi SCR commands</description>
<properties>
Modified: karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ActivateCommandComponent.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ActivateCommandComponent.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ActivateCommandComponent.java (original)
+++ karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ActivateCommandComponent.java Wed Feb 29 13:18:43 2012
@@ -32,16 +32,10 @@ import aQute.bnd.annotation.component.De
import aQute.bnd.annotation.component.Reference;
/**
- * Karaf Shell Command used to activate a Declarative Service Component.
+ * Shell Command used to activate a Declarative Service Component.
*/
-@Component(
- provide=CompletableFunction.class,
- name = ActivateCommandComponent.COMPONENT_NAME,
- enabled = true,
- immediate = true,
- properties={
- ScrCommandConstants.OSGI_COMMAND_SCOPE_KEY+"="+ScrCommandConstants.SCR_COMMAND,
- ScrCommandConstants.OSGI_COMMAND_FUNCTION_KEY+"="+ScrCommandConstants.ACTIVATE_FUNCTION})
+@Component(provide=CompletableFunction.class, name = ActivateCommandComponent.COMPONENT_NAME, enabled = true, immediate = true,
+ properties={ ScrCommandConstants.OSGI_COMMAND_SCOPE_KEY+"="+ScrCommandConstants.SCR_COMMAND, ScrCommandConstants.OSGI_COMMAND_FUNCTION_KEY+"="+ScrCommandConstants.ACTIVATE_FUNCTION})
public class ActivateCommandComponent extends ScrCommandSupport {
public static final String COMPONENT_NAME = "ActivateCommand";
@@ -75,4 +69,5 @@ public class ActivateCommandComponent ex
public void setScrService(ScrService scrService) {
super.setScrService(scrService);
}
+
}
Modified: karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/DeactivateCommandComponent.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/DeactivateCommandComponent.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/DeactivateCommandComponent.java (original)
+++ karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/DeactivateCommandComponent.java Wed Feb 29 13:18:43 2012
@@ -32,16 +32,10 @@ import aQute.bnd.annotation.component.De
import aQute.bnd.annotation.component.Reference;
/**
- * Karaf Shell Command used to deactivate a Declarative Service Component.
+ * Shell Command used to deactivate a Declarative Service Component.
*/
-@Component(
- provide=CompletableFunction.class,
- name = DeactivateCommandComponent.COMPONENT_NAME,
- enabled = true,
- immediate = true,
- properties={
- ScrCommandConstants.OSGI_COMMAND_SCOPE_KEY+"="+ScrCommandConstants.SCR_COMMAND,
- ScrCommandConstants.OSGI_COMMAND_FUNCTION_KEY+"="+ScrCommandConstants.DEACTIVATE_FUNCTION})
+@Component(provide=CompletableFunction.class, name = DeactivateCommandComponent.COMPONENT_NAME, enabled = true, immediate = true,
+ properties={ ScrCommandConstants.OSGI_COMMAND_SCOPE_KEY+"="+ScrCommandConstants.SCR_COMMAND, ScrCommandConstants.OSGI_COMMAND_FUNCTION_KEY+"="+ScrCommandConstants.DEACTIVATE_FUNCTION})
public class DeactivateCommandComponent extends ScrCommandSupport {
public static final String COMPONENT_NAME = "DeactivateCommand";
@@ -75,4 +69,5 @@ public class DeactivateCommandComponent
public void setScrService(ScrService scrService) {
super.setScrService(scrService);
}
+
}
Modified: karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/DetailsCommandComponent.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/DetailsCommandComponent.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/DetailsCommandComponent.java (original)
+++ karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/DetailsCommandComponent.java Wed Feb 29 13:18:43 2012
@@ -32,24 +32,17 @@ import aQute.bnd.annotation.component.De
import aQute.bnd.annotation.component.Reference;
/**
- * Karaf Shell Command that prints the current state details of a given
+ * Shell Command that prints the current state details of a given
* Declarative Service Component.
*/
-@Component(
- provide=CompletableFunction.class,
- name = DetailsCommandComponent.COMPONENT_NAME,
- enabled = true,
- immediate = true,
- properties={
- ScrCommandConstants.OSGI_COMMAND_SCOPE_KEY+"="+ScrCommandConstants.SCR_COMMAND,
- ScrCommandConstants.OSGI_COMMAND_FUNCTION_KEY+"="+ScrCommandConstants.DETAILS_FUNCTION})
+@Component(provide=CompletableFunction.class, name = DetailsCommandComponent.COMPONENT_NAME, enabled = true, immediate = true,
+ properties={ ScrCommandConstants.OSGI_COMMAND_SCOPE_KEY+"="+ScrCommandConstants.SCR_COMMAND, ScrCommandConstants.OSGI_COMMAND_FUNCTION_KEY+"="+ScrCommandConstants.DETAILS_FUNCTION})
public class DetailsCommandComponent extends ScrCommandSupport {
public static final String COMPONENT_NAME = "DetailsCommand";
public static final String COMPONENT_LABEL = "Apache Karaf SCR Details Command";
-
@Override
public Class<? extends Action> getActionClass() {
return DetailsAction.class;
@@ -77,4 +70,5 @@ public class DetailsCommandComponent ext
public void setScrService(ScrService scrService) {
super.setScrService(scrService);
}
+
}
Modified: karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ListCommandComponent.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ListCommandComponent.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ListCommandComponent.java (original)
+++ karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ListCommandComponent.java Wed Feb 29 13:18:43 2012
@@ -30,23 +30,14 @@ import aQute.bnd.annotation.component.De
import aQute.bnd.annotation.component.Reference;
/**
- * Karaf Shell Command that lists the available Declarative Service Components.
+ * Shell Command that lists the available Declarative Service Components.
*/
-@Component(
- provide=CompletableFunction.class,
- name = ListCommandComponent.COMPONENT_NAME,
- enabled = true,
- immediate = true,
- properties={
- ScrCommandConstants.OSGI_COMMAND_SCOPE_KEY+"="+ScrCommandConstants.SCR_COMMAND,
- ScrCommandConstants.OSGI_COMMAND_FUNCTION_KEY+"="+ScrCommandConstants.LIST_FUNCTION})
+@Component(provide=CompletableFunction.class, name = ListCommandComponent.COMPONENT_NAME, enabled = true, immediate = true,
+ properties={ ScrCommandConstants.OSGI_COMMAND_SCOPE_KEY+"="+ScrCommandConstants.SCR_COMMAND, ScrCommandConstants.OSGI_COMMAND_FUNCTION_KEY+"="+ScrCommandConstants.LIST_FUNCTION})
public class ListCommandComponent extends ScrCommandSupport {
public static final String COMPONENT_NAME = "ListCommand";
- public static final String COMPONENT_LABEL =
- "Apache Karaf SCR List Command";
-
-
+ public static final String COMPONENT_LABEL = "Apache Karaf SCR List Command";
@Override
public Class<? extends Action> getActionClass() {
Modified: karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ScrCommandConstants.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ScrCommandConstants.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ScrCommandConstants.java (original)
+++ karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ScrCommandConstants.java Wed Feb 29 13:18:43 2012
@@ -17,6 +17,7 @@
package org.apache.karaf.scr.command;
public class ScrCommandConstants {
+
public static final String OSGI_COMMAND_SCOPE_KEY = "osgi.command.scope";
public static final String OSGI_COMMAND_FUNCTION_KEY = "osgi.command.function";
@@ -30,4 +31,5 @@ public class ScrCommandConstants {
public static final String DEACTIVATE_FUNCTION = "deactivate";
public static final String DETAILS_FUNCTION = "details";
+
}
Modified: karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ScrCommandSupport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ScrCommandSupport.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ScrCommandSupport.java (original)
+++ karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ScrCommandSupport.java Wed Feb 29 13:18:43 2012
@@ -32,11 +32,7 @@ import org.apache.karaf.shell.console.Co
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- *
- */
-public abstract class ScrCommandSupport extends AbstractCommand implements
- CompletableFunction {
+public abstract class ScrCommandSupport extends AbstractCommand implements CompletableFunction {
protected final Logger logger = LoggerFactory.getLogger(getClass().getName());
@@ -65,11 +61,6 @@ public abstract class ScrCommandSupport
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.karaf.shell.console.CompletableFunction#getCompleters()
- */
public List<Completer> getCompleters() {
List<Completer> completers = null;
Modified: karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ScrUtils.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ScrUtils.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ScrUtils.java (original)
+++ karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/ScrUtils.java Wed Feb 29 13:18:43 2012
@@ -71,4 +71,5 @@ public class ScrUtils {
return retVal;
}
+
}
Modified: karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/ActivateAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/ActivateAction.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/ActivateAction.java (original)
+++ karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/ActivateAction.java Wed Feb 29 13:18:43 2012
@@ -27,10 +27,7 @@ import org.apache.karaf.scr.command.ScrU
* Activates the given component by supplying its component name.
*
*/
-@Command(
- scope = ScrCommandConstants.SCR_COMMAND,
- name = ScrCommandConstants.ACTIVATE_FUNCTION,
- description = "Activates a Component for the given name")
+@Command(scope = ScrCommandConstants.SCR_COMMAND, name = ScrCommandConstants.ACTIVATE_FUNCTION, description = "Activates a Component for the given name")
public class ActivateAction extends ScrActionSupport {
@Argument(index = 0, name = "name", description = "The name of the Component to activate ", required = true, multiValued = false)
Modified: karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/DeactivateAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/DeactivateAction.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/DeactivateAction.java (original)
+++ karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/DeactivateAction.java Wed Feb 29 13:18:43 2012
@@ -26,10 +26,7 @@ import org.apache.karaf.scr.command.ScrC
* Deactivates the given component by supplying its component name.
*
*/
-@Command(
- scope = ScrCommandConstants.SCR_COMMAND,
- name = ScrCommandConstants.DEACTIVATE_FUNCTION,
- description = "Deactivates a Component for the given name")
+@Command(scope = ScrCommandConstants.SCR_COMMAND, name = ScrCommandConstants.DEACTIVATE_FUNCTION, description = "Deactivates a Component for the given name")
public class DeactivateAction extends ScrActionSupport {
@Argument(index = 0, name = "name", description = "The name of the Component to deactivate ", required = true, multiValued = false)
Modified: karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/DetailsAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/DetailsAction.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/DetailsAction.java (original)
+++ karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/DetailsAction.java Wed Feb 29 13:18:43 2012
@@ -30,10 +30,7 @@ import org.osgi.service.component.Compon
/**
* Displays the details associated with a given component by supplying its component name.
*/
-@Command(
- scope = ScrCommandConstants.SCR_COMMAND,
- name = ScrCommandConstants.DETAILS_FUNCTION,
- description = "Displays a list of available components")
+@Command(scope = ScrCommandConstants.SCR_COMMAND, name = ScrCommandConstants.DETAILS_FUNCTION, description = "Displays a list of available components")
public class DetailsAction extends ScrActionSupport {
@Argument(index = 0, name = "name", description = "The name of the Component to display the detials of", required = true, multiValued = false)
@@ -96,8 +93,8 @@ public class DetailsAction extends ScrAc
return null;
}
-
private void printDetail(String header, String value) {
System.out.println(getBoldString(header) + value);
}
+
}
Modified: karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/ListAction.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/ListAction.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/ListAction.java (original)
+++ karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/ListAction.java Wed Feb 29 13:18:43 2012
@@ -25,10 +25,7 @@ import org.apache.karaf.shell.commands.C
/**
* Lists all the components currently installed.
*/
-@Command(
- scope = ScrCommandConstants.SCR_COMMAND,
- name = ScrCommandConstants.LIST_FUNCTION,
- description = "Displays a list of available components")
+@Command(scope = ScrCommandConstants.SCR_COMMAND, name = ScrCommandConstants.LIST_FUNCTION, description = "Displays a list of available components")
public class ListAction extends ScrActionSupport {
@Override
@@ -49,4 +46,5 @@ public class ListAction extends ScrActio
}
return null;
}
+
}
Modified: karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/ScrActionSupport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/ScrActionSupport.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/ScrActionSupport.java (original)
+++ karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/action/ScrActionSupport.java Wed Feb 29 13:18:43 2012
@@ -55,7 +55,7 @@ public abstract class ScrActionSupport e
}
public String buildLeftPadBracketDisplay(String s, int max) {
- return String.format("%1$#" + max + "s", s);
+ return String.format("%1$-" + max + "s", s);
}
/**
Modified: karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/completer/ActivateCompleter.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/completer/ActivateCompleter.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/completer/ActivateCompleter.java (original)
+++ karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/completer/ActivateCompleter.java Wed Feb 29 13:18:43 2012
@@ -18,9 +18,6 @@ package org.apache.karaf.scr.command.com
import org.apache.felix.scr.Component;
-/**
- *
- */
public class ActivateCompleter extends ScrCompleterSupport {
/**
Modified: karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/completer/DeactivateCompleter.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/completer/DeactivateCompleter.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/completer/DeactivateCompleter.java (original)
+++ karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/completer/DeactivateCompleter.java Wed Feb 29 13:18:43 2012
@@ -18,9 +18,6 @@ package org.apache.karaf.scr.command.com
import org.apache.felix.scr.Component;
-/**
- *
- */
public class DeactivateCompleter extends ScrCompleterSupport {
/**
Modified: karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/completer/DetailsCompleter.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/completer/DetailsCompleter.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/completer/DetailsCompleter.java (original)
+++ karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/completer/DetailsCompleter.java Wed Feb 29 13:18:43 2012
@@ -18,9 +18,6 @@ package org.apache.karaf.scr.command.com
import org.apache.felix.scr.Component;
-/**
- *
- */
public class DetailsCompleter extends ScrCompleterSupport {
/**
Modified: karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/completer/ScrCompleterSupport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/completer/ScrCompleterSupport.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/completer/ScrCompleterSupport.java (original)
+++ karaf/trunk/scr/command/src/main/java/org/apache/karaf/scr/command/completer/ScrCompleterSupport.java Wed Feb 29 13:18:43 2012
@@ -23,16 +23,14 @@ import org.apache.felix.scr.ScrService;
import org.apache.karaf.shell.console.Completer;
import org.apache.karaf.shell.console.completer.StringsCompleter;
-/**
- *
- */
public abstract class ScrCompleterSupport implements Completer {
+
private ScrService scrService;
/**
* Overrides the super method noted below. See super documentation for
* details.
- *
+ *
* @see org.apache.karaf.shell.console.Completer#complete(java.lang.String,
* int, java.util.List)
*/
@@ -56,7 +54,7 @@ public abstract class ScrCompleterSuppor
/**
* Get the scrService Object associated with this instance of
* ScrCompleterSupport.
- *
+ *
* @return the scrService
*/
public ScrService getScrService() {
@@ -65,9 +63,8 @@ public abstract class ScrCompleterSuppor
/**
* Sets the scrService Object for this ScrCompleterSupport instance.
- *
- * @param scrService
- * the scrService to set
+ *
+ * @param scrService the scrService to set
*/
public void setScrService(ScrService scrService) {
this.scrService = scrService;
Modified: karaf/trunk/scr/examples/NOTICE
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/examples/NOTICE?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/examples/NOTICE (original)
+++ karaf/trunk/scr/examples/NOTICE Wed Feb 29 13:18:43 2012
@@ -1,5 +1,5 @@
Apache Karaf
-Copyright 2010 The Apache Software Foundation
+Copyright 2010-2012 The Apache Software Foundation
I. Included Software
Modified: karaf/trunk/scr/examples/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/examples/pom.xml?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/examples/pom.xml (original)
+++ karaf/trunk/scr/examples/pom.xml Wed Feb 29 13:18:43 2012
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,20 +18,25 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.karaf.scr</groupId>
<artifactId>scr</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.scr.examples</artifactId>
<packaging>bundle</packaging>
<name>Apache Karaf :: SCR :: Examples</name>
<description>Building SCR Components using the BND Annotation Libraries</description>
+
<properties>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
</properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -52,6 +55,7 @@
<artifactId>org.apache.karaf.main</artifactId>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -80,4 +84,5 @@
</plugin>
</plugins>
</build>
+
</project>
\ No newline at end of file
Modified: karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/component/ManagedComponent.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/component/ManagedComponent.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/component/ManagedComponent.java (original)
+++ karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/component/ManagedComponent.java Wed Feb 29 13:18:43 2012
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.karaf.scr.examples.component;
import java.util.Map;
@@ -11,9 +27,7 @@ import aQute.bnd.annotation.component.Co
import aQute.bnd.annotation.component.Deactivate;
import aQute.bnd.annotation.component.Reference;
-@Component(
- name = ManagedComponent.COMPONENT_NAME,
- configurationPolicy = ConfigurationPolicy.require)
+@Component(name = ManagedComponent.COMPONENT_NAME, configurationPolicy = ConfigurationPolicy.require)
public class ManagedComponent {
public static final String COMPONENT_NAME = "ManagedComponent";
@@ -30,13 +44,11 @@ public class ManagedComponent {
/**
* Called when all of the SCR Components required dependencies have been
- * satisfied
- *
+ * satisfied.
*/
@Activate
public void activate(final Map<String, ?> properties) {
- logService
- .log(LogService.LOG_INFO, "Activating the " + COMPONENT_LABEL);
+ logService.log(LogService.LOG_INFO, "Activating the " + COMPONENT_LABEL);
exampleService.setName((String) properties.get(COMPONENT_PROP_NAME));
exampleService.setSalutation((String) properties.get(COMPONENT_PROP_SALUTATION));
exampleService.printGreetings();
@@ -44,13 +56,11 @@ public class ManagedComponent {
/**
* Called when any of the SCR Components required dependencies become
- * unsatisfied
- *
+ * unsatisfied.
*/
@Deactivate
public void deactivate() {
- logService.log(LogService.LOG_INFO, "Dectivating the "
- + COMPONENT_LABEL);
+ logService.log(LogService.LOG_INFO, "Deactivating the " + COMPONENT_LABEL);
}
@Reference
@@ -70,4 +80,5 @@ public class ManagedComponent {
protected void unsetLogService(LogService logService) {
this.logService = logService;
}
+
}
Modified: karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/component/MetaTypeManagedComponent.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/component/MetaTypeManagedComponent.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/component/MetaTypeManagedComponent.java (original)
+++ karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/component/MetaTypeManagedComponent.java Wed Feb 29 13:18:43 2012
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.karaf.scr.examples.component;
import java.util.Map;
@@ -12,9 +28,7 @@ import aQute.bnd.annotation.component.De
import aQute.bnd.annotation.component.Reference;
import aQute.bnd.annotation.metatype.Configurable;
-@Component(
- name = MetaTypeManagedComponent.COMPONENT_NAME,
- designateFactory = MetaTypeManagedComponentConfig.class)
+@Component(name = MetaTypeManagedComponent.COMPONENT_NAME, designateFactory = MetaTypeManagedComponentConfig.class)
public class MetaTypeManagedComponent {
public static final String COMPONENT_NAME = "MetaTypeManagedComponent";
@@ -27,16 +41,13 @@ public class MetaTypeManagedComponent {
/**
* Called when all of the SCR Components required dependencies have been
- * satisfied
- *
+ * satisfied.
*/
@Activate
public void activate(final Map<String, ?> properties, ComponentContext componentContext) {
- logService
- .log(LogService.LOG_INFO, "Activating the " + COMPONENT_LABEL);
+ logService.log(LogService.LOG_INFO, "Activating the " + COMPONENT_LABEL);
- MetaTypeManagedComponentConfig config = Configurable.createConfigurable(
- MetaTypeManagedComponentConfig.class, properties);
+ MetaTypeManagedComponentConfig config = Configurable.createConfigurable(MetaTypeManagedComponentConfig.class, properties);
exampleService.setName(config.name());
exampleService.setSalutation(config.salutation());
@@ -47,13 +58,11 @@ public class MetaTypeManagedComponent {
/**
* Called when any of the SCR Components required dependencies become
- * unsatisfied
- *
+ * unsatisfied.
*/
@Deactivate
public void deactivate() {
- logService.log(LogService.LOG_INFO, "Dectivating the "
- + COMPONENT_LABEL);
+ logService.log(LogService.LOG_INFO, "Deactivating the " + COMPONENT_LABEL);
}
@Reference
@@ -73,4 +82,5 @@ public class MetaTypeManagedComponent {
protected void unsetLogService(LogService logService) {
this.logService = null;
}
+
}
Modified: karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/component/MetaTypeManagedComponentConfig.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/component/MetaTypeManagedComponentConfig.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/component/MetaTypeManagedComponentConfig.java (original)
+++ karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/component/MetaTypeManagedComponentConfig.java Wed Feb 29 13:18:43 2012
@@ -1,10 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.karaf.scr.examples.component;
-
public interface MetaTypeManagedComponentConfig {
+
String name();
String salutation();
Integer numberOfGreetings();
+
}
Modified: karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/component/SimpleComponent.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/component/SimpleComponent.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/component/SimpleComponent.java (original)
+++ karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/component/SimpleComponent.java Wed Feb 29 13:18:43 2012
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.karaf.scr.examples.component;
import org.apache.karaf.scr.examples.service.ExampleService;
@@ -21,13 +37,11 @@ public class SimpleComponent {
/**
* Called when all of the SCR Components required dependencies have been
- * satisfied
- *
+ * satisfied.
*/
@Activate
public void activate() {
- logService
- .log(LogService.LOG_INFO, "Activating the " + COMPONENT_LABEL);
+ logService.log(LogService.LOG_INFO, "Activating the " + COMPONENT_LABEL);
exampleService.setName("Scott");
exampleService.setSalutation("Hello");
exampleService.printGreetings();
@@ -35,13 +49,11 @@ public class SimpleComponent {
/**
* Called when any of the SCR Components required dependencies become
- * unsatisfied
- *
+ * unsatisfied.
*/
@Deactivate
public void deactivate() {
- logService.log(LogService.LOG_INFO, "Dectivating the "
- + COMPONENT_LABEL);
+ logService.log(LogService.LOG_INFO, "Deactivating the " + COMPONENT_LABEL);
}
@Reference
@@ -61,4 +73,5 @@ public class SimpleComponent {
protected void unsetLogService(LogService logService) {
this.logService = null;
}
+
}
Modified: karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/service/ExampleService.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/service/ExampleService.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/service/ExampleService.java (original)
+++ karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/service/ExampleService.java Wed Feb 29 13:18:43 2012
@@ -13,26 +13,12 @@
*/
package org.apache.karaf.scr.examples.service;
-/**
- *
- *
- */
public interface ExampleService {
- /**
- *
- */
void printGreetings();
- /**
- * @param salutation
- * the salutation to set
- */
void setSalutation(String salutation);
- /**
- * @param name
- * the name to set
- */
void setName(String name);
+
}
Modified: karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/service/provider/ExampleServiceProvider.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/service/provider/ExampleServiceProvider.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/service/provider/ExampleServiceProvider.java (original)
+++ karaf/trunk/scr/examples/src/main/java/org/apache/karaf/scr/examples/service/provider/ExampleServiceProvider.java Wed Feb 29 13:18:43 2012
@@ -19,10 +19,6 @@ import org.osgi.service.log.LogService;
import aQute.bnd.annotation.component.Component;
import aQute.bnd.annotation.component.Reference;
-
-/**
- *
- */
@Component
public class ExampleServiceProvider implements ExampleService {
Modified: karaf/trunk/scr/management/NOTICE
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/management/NOTICE?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/management/NOTICE (original)
+++ karaf/trunk/scr/management/NOTICE Wed Feb 29 13:18:43 2012
@@ -1,5 +1,5 @@
Apache Karaf
-Copyright 2010 The Apache Software Foundation
+Copyright 2010-2012 The Apache Software Foundation
I. Included Software
Modified: karaf/trunk/scr/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/management/pom.xml?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/management/pom.xml (original)
+++ karaf/trunk/scr/management/pom.xml Wed Feb 29 13:18:43 2012
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
@@ -28,6 +25,7 @@
<groupId>org.apache.karaf.scr</groupId>
<artifactId>scr</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.apache.karaf.scr.management</artifactId>
@@ -107,4 +105,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/ScrServiceMBean.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/ScrServiceMBean.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/ScrServiceMBean.java (original)
+++ karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/ScrServiceMBean.java Wed Feb 29 13:18:43 2012
@@ -17,6 +17,7 @@
package org.apache.karaf.scr.management;
public interface ScrServiceMBean {
+
String[] listComponents() throws Exception;
boolean isComponentActive(String componentName) throws Exception;
@@ -24,4 +25,5 @@ public interface ScrServiceMBean {
void activateComponent(String componentName) throws Exception;
void deactiveateComponent(String componentName) throws Exception;
+
}
Modified: karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/internal/ScrServiceMBeanImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/internal/ScrServiceMBeanImpl.java?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/internal/ScrServiceMBeanImpl.java (original)
+++ karaf/trunk/scr/management/src/main/java/org/apache/karaf/scr/management/internal/ScrServiceMBeanImpl.java Wed Feb 29 13:18:43 2012
@@ -35,15 +35,8 @@ import org.slf4j.LoggerFactory;
import aQute.bnd.annotation.component.Activate;
import aQute.bnd.annotation.component.Deactivate;
-/**
- *
- */
-@aQute.bnd.annotation.component.Component(
- name = ScrServiceMBeanImpl.COMPONENT_NAME,
- enabled = true,
- immediate = true)
-public class ScrServiceMBeanImpl extends StandardMBean implements
- ScrServiceMBean {
+@aQute.bnd.annotation.component.Component(name = ScrServiceMBeanImpl.COMPONENT_NAME, enabled = true, immediate = true)
+public class ScrServiceMBeanImpl extends StandardMBean implements ScrServiceMBean {
public static final String COMPONENT_NAME = "ScrServiceMBean";
@@ -96,10 +89,6 @@ public class ScrServiceMBeanImpl extends
}
}
- /**
- *
- * @see org.apache.karaf.scr.management.ScrServiceMBean#listComponents()
- */
public String[] listComponents() throws Exception {
Component[] components = safe(scrService.getComponents());
String[] componentNames = new String[components.length];
@@ -108,11 +97,7 @@ public class ScrServiceMBeanImpl extends
}
return componentNames;
}
-
- /**
- *
- * @see org.apache.karaf.scr.management.ScrServiceMBean#componentState(java.lang.String)
- */
+
public boolean isComponentActive(String componentName) throws Exception {
boolean state = false;
Component[] components = scrService.getComponents(componentName);
@@ -122,10 +107,6 @@ public class ScrServiceMBeanImpl extends
return state;
}
- /**
- *
- * @see org.apache.karaf.scr.management.ScrServiceMBean#activateComponent(java.lang.String)
- */
public void activateComponent(String componentName) throws Exception {
if (scrService.getComponents(componentName) != null) {
Component[] components = scrService.getComponents(componentName);
@@ -135,10 +116,6 @@ public class ScrServiceMBeanImpl extends
}
}
- /**
- *
- * @see org.apache.karaf.scr.management.ScrServiceMBean#deactiveateComponent(java.lang.String)
- */
public void deactiveateComponent(String componentName) throws Exception {
if (scrService.getComponents(componentName) != null) {
Component[] components = scrService.getComponents(componentName);
Modified: karaf/trunk/scr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/scr/pom.xml?rev=1295090&r1=1295089&r2=1295090&view=diff
==============================================================================
--- karaf/trunk/scr/pom.xml (original)
+++ karaf/trunk/scr/pom.xml Wed Feb 29 13:18:43 2012
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,12 +18,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.karaf.scr</groupId>
@@ -33,11 +33,9 @@
<packaging>pom</packaging>
<name>Apache Karaf :: Declarative Services (DS)</name>
-
<modules>
<module>command</module>
<module>management</module>
- <module>feature</module>
<module>examples</module>
</modules>