From 0e08b01ed4e5cc747b89ab0f7d8242b967f8c695 Mon Sep 17 00:00:00 2001
From: Thomas Diesler <thomas.diesler@jboss.com>
Date: Tue, 5 Jul 2011 16:48:56 +0200
Subject: [PATCH] [JBOSGI-474] Add Apache Felix SCR to distro

---
 distribution/installer/pom.xml                |  4 ++
 .../installer/install-definition.xml          | 15 +++---
 pom.xml                                       | 48 ++++++++++++++++---
 .../example/scripts/assembly-bundles.xml      |  1 +
 .../resources/jboss-osgi-framework.properties |  3 +-
 testsuite/pom.xml                             | 35 ++------------
 6 files changed, 63 insertions(+), 43 deletions(-)

diff --git a/distribution/installer/pom.xml b/distribution/installer/pom.xml
index 204db45a..ea11d097 100644
--- a/distribution/installer/pom.xml
+++ b/distribution/installer/pom.xml
@@ -152,6 +152,10 @@
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.metatype</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.scr</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.webconsole</artifactId>
diff --git a/distribution/installer/src/main/resources/installer/install-definition.xml b/distribution/installer/src/main/resources/installer/install-definition.xml
index 2aa3d329..69a8d2c8 100644
--- a/distribution/installer/src/main/resources/installer/install-definition.xml
+++ b/distribution/installer/src/main/resources/installer/install-definition.xml
@@ -160,10 +160,11 @@
         <!-- default -->
         <include name="jboss-osgi-common-core.jar" />
         <include name="jboss-osgi-jmx.jar" />
-        <include name="org.apache.felix.configadmin.jar" />
-        <include name="org.apache.felix.eventadmin.jar" />
         <include name="org.apache.aries.jmx.jar" />
         <include name="org.apache.aries.util.jar" />
+        <include name="org.apache.felix.configadmin.jar" />
+        <include name="org.apache.felix.eventadmin.jar" />
+        <include name="org.apache.felix.scr.jar" />
       </fileset>
 
       <!-- Server Web -->
@@ -175,11 +176,12 @@
         <!-- default -->
         <include name="jboss-osgi-common-core.jar" />
         <include name="jboss-osgi-jmx.jar" />
+        <include name="org.apache.aries.jmx.jar" />
+        <include name="org.apache.aries.util.jar" />
         <include name="org.apache.felix.configadmin.jar" />
         <include name="org.apache.felix.eventadmin.jar" />
+        <include name="org.apache.felix.scr.jar" />
         <include name="org.apache.felix.webconsole.jar" />
-        <include name="org.apache.aries.jmx.jar" />
-        <include name="org.apache.aries.util.jar" />
         <!-- web -->
         <include name="org.apache.felix.metatype.jar" />
         <include name="jboss-osgi-http.jar" />
@@ -196,11 +198,12 @@
         <!-- default -->
         <include name="jboss-osgi-common-core.jar" />
         <include name="jboss-osgi-jmx.jar" />
+        <include name="org.apache.aries.jmx.jar" />
+        <include name="org.apache.aries.util.jar" />
         <include name="org.apache.felix.configadmin.jar" />
         <include name="org.apache.felix.eventadmin.jar" />
+        <include name="org.apache.felix.scr.jar" />
         <include name="org.apache.felix.webconsole.jar" />
-        <include name="org.apache.aries.jmx.jar" />
-        <include name="org.apache.aries.util.jar" />
         <!-- web -->
         <include name="org.apache.felix.metatype.jar" />
         <include name="jboss-osgi-http.jar" />
diff --git a/pom.xml b/pom.xml
index 0f2a46cf..0c1e270a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
+<!--                                                                        -->
+<!-- JBoss, the OpenSource J2EE webOS                                       -->
+<!--                                                                        -->
+<!-- Distributable under LGPL license.                                      -->
+<!-- See terms of license at http://www.gnu.org.                            -->
+<!--                                                                        -->
 <!-- ====================================================================== -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -49,6 +49,7 @@
     <version.apache.felix.eventadmin>1.2.6</version.apache.felix.eventadmin>
     <version.apache.felix.log>1.0.0</version.apache.felix.log>
     <version.apache.felix.metatype>1.0.4</version.apache.felix.metatype>
+    <version.apache.felix.scr>1.6.0</version.apache.felix.scr>
     <version.apache.felix.webconsole>3.1.6.SP1</version.apache.felix.webconsole>
     <version.aqute.bnd.sp>0.0.365.SP1</version.aqute.bnd.sp>
     <version.izpack>4.3.1</version.izpack>
@@ -318,16 +319,51 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.eventadmin</artifactId>
         <version>${version.apache.felix.eventadmin}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.log</artifactId>
         <version>${version.apache.felix.log}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.metatype</artifactId>
         <version>${version.apache.felix.metatype}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.scr</artifactId>
+        <version>${version.apache.felix.scr}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.felix</groupId>
diff --git a/testsuite/example/scripts/assembly-bundles.xml b/testsuite/example/scripts/assembly-bundles.xml
index 7dc09b73..31eb6ca8 100644
--- a/testsuite/example/scripts/assembly-bundles.xml
+++ b/testsuite/example/scripts/assembly-bundles.xml
@@ -31,6 +31,7 @@
         <include>*:org.apache.felix.eventadmin:jar</include>
         <include>*:org.apache.felix.log:jar</include>
         <include>*:org.apache.felix.metatype:jar</include>
+        <include>*:org.apache.felix.scr:jar</include>
       </includes>
       <useStrictFiltering>true</useStrictFiltering>
       <scope>provided</scope>
diff --git a/testsuite/example/src/test/resources/jboss-osgi-framework.properties b/testsuite/example/src/test/resources/jboss-osgi-framework.properties
index 3d594f47..5dd44de4 100644
--- a/testsuite/example/src/test/resources/jboss-osgi-framework.properties
+++ b/testsuite/example/src/test/resources/jboss-osgi-framework.properties
@@ -40,4 +40,5 @@ org.jboss.osgi.auto.start=\
 	file://${test.archive.directory}/bundles/jboss-osgi-jndi.jar, \
 	file://${test.archive.directory}/bundles/jbosgi-webapp.jar, \
 	file://${test.archive.directory}/bundles/jboss-osgi-xerces.jar, \
-	file://${test.archive.directory}/bundles/org.apache.felix.eventadmin.jar
\ No newline at end of file
+	file://${test.archive.directory}/bundles/org.apache.felix.eventadmin.jar, \
+	file://${test.archive.directory}/bundles/org.apache.felix.scr.jar
\ No newline at end of file
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index e5f1e9cd..11f6f512 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -69,16 +69,6 @@
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.log</artifactId>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.osgi.core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.osgi.compendium</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <!-- Contains classes from org.osgi.util.tracker that must come after 
       the framework provided ones. Equinox chokes with SecurityException. <dependency> 
@@ -88,31 +78,16 @@
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.eventadmin</artifactId>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.osgi</groupId>
-          <artifactId>org.osgi.core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.osgi</groupId>
-          <artifactId>org.osgi.compendium</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.metatype</artifactId>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.osgi.core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.osgi.compendium</artifactId>
-        </exclusion>
-      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.scr</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.arquillian.osgi</groupId>