[jboss-cvs] JBossAS SVN: r96946 - in projects/jboss-osgi/trunk: testsuite and 4 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Nov 25 08:19:45 EST 2009


Author: thomas.diesler at jboss.com
Date: 2009-11-25 08:19:45 -0500 (Wed, 25 Nov 2009)
New Revision: 96946

Added:
   projects/jboss-osgi/trunk/testsuite/example/src/test/resources/equinox-debug.properties
Modified:
   projects/jboss-osgi/trunk/pom.xml
   projects/jboss-osgi/trunk/testsuite/example/pom.xml
   projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml
   projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties
   projects/jboss-osgi/trunk/testsuite/functional/pom.xml
   projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
examples run on embedded equinox

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2009-11-25 12:49:11 UTC (rev 96945)
+++ projects/jboss-osgi/trunk/pom.xml	2009-11-25 13:19:45 UTC (rev 96946)
@@ -43,7 +43,7 @@
 
   <!-- Properties -->
   <properties>
-    <version.apache.felix.configadmin>1.0.10</version.apache.felix.configadmin>
+    <version.apache.felix.configadmin>1.2.4</version.apache.felix.configadmin>
     <version.apache.felix.core>1.4.0</version.apache.felix.core>
     <version.apache.felix.eventadmin>1.0.0</version.apache.felix.eventadmin>
     <version.apache.felix.log>1.0.0</version.apache.felix.log>

Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml	2009-11-25 12:49:11 UTC (rev 96945)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml	2009-11-25 13:19:45 UTC (rev 96946)
@@ -186,17 +186,9 @@
                 <exclude>org/jboss/test/osgi/example/interceptor/**</exclude>
                 <exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude>
                 <exclude>org/jboss/test/osgi/example/webapp/WebAppInterceptorTestCase.class</exclude>
-                <!-- -->
+                <!-- [JBOSGI-211] Cannot run Microcontainer, Blueprint example on Equinox -->
                 <exclude>org/jboss/test/osgi/example/blueprint/**</exclude>
-                <exclude>org/jboss/test/osgi/example/http/**</exclude>
-                <exclude>org/jboss/test/osgi/example/interceptor/**</exclude>
-                <exclude>org/jboss/test/osgi/example/jmx/**</exclude>
-                <exclude>org/jboss/test/osgi/example/jndi/**</exclude>
-                <exclude>org/jboss/test/osgi/example/jta/**</exclude>
                 <exclude>org/jboss/test/osgi/example/microcontainer/**</exclude>
-                <exclude>org/jboss/test/osgi/example/simple/**</exclude>
-                <exclude>org/jboss/test/osgi/example/webapp/**</exclude>
-                <exclude>org/jboss/test/osgi/example/xml/**</exclude>
               </excludes>
             </configuration>
           </plugin>

Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml	2009-11-25 12:49:11 UTC (rev 96945)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml	2009-11-25 13:19:45 UTC (rev 96946)
@@ -15,6 +15,7 @@
       <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
       <includes>
         <include>org.eclipse.equinox:org.eclipse.osgi.services:jar</include>
+        <include>org.eclipse.equinox:org.eclipse.osgi.util:jar</include>
       </includes>
       <useStrictFiltering>false</useStrictFiltering>
       <scope>provided</scope>

Added: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/equinox-debug.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/equinox-debug.properties	                        (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/equinox-debug.properties	2009-11-25 13:19:45 UTC (rev 96946)
@@ -0,0 +1,9 @@
+#
+# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
+# 
+# $Id$
+#
+
+# Equinox debug properties 
+org.eclipse.osgi/debug=true
+org.eclipse.osgi/debug/loader=false


Property changes on: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/equinox-debug.properties
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties	2009-11-25 12:49:11 UTC (rev 96945)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties	2009-11-25 13:19:45 UTC (rev 96946)
@@ -5,9 +5,7 @@
 #
 
 # Equinox properties 
-org.eclipse.osgi/debug=true
-org.eclipse.osgi/debug/loader=true
-osgi.support.class.certificate=false
+# osgi.debug=target/test-classes/equinox-debug.properties
 
 # Properties to configure the Framework
 org.osgi.framework.storage=${basedir}/target/osgi-store
@@ -36,11 +34,12 @@
     org.jboss.util.id, \
     org.jboss.util.threadpool, \
     org.jboss.util.propertyeditor, \
-  	org.osgi.framework;version\=1.4
+  	org.osgi.framework;version=1.4
      
 # Bundles that need to be installed with the Framework automatically 
 org.jboss.osgi.spi.framework.autoInstall=\
-	file://${test.archive.directory}/bundles/org.eclipse.osgi.services.jar
+	file://${test.archive.directory}/bundles/org.eclipse.osgi.services.jar \
+	file://${test.archive.directory}/bundles/org.eclipse.osgi.util.jar \
 
 # Bundles that need to be started automatically 
 org.jboss.osgi.spi.framework.autoStart=\

Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml	2009-11-25 12:49:11 UTC (rev 96945)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml	2009-11-25 13:19:45 UTC (rev 96946)
@@ -208,11 +208,6 @@
             <configuration>
               <excludes>
                 <exclude>${target.container.excludes}</exclude>
-                <exclude>org/jboss/test/osgi/capabilities/**</exclude>
-                <exclude>org/jboss/test/osgi/jbosgi38/**</exclude>
-                <exclude>org/jboss/test/osgi/jbosgi142/**</exclude>
-                <exclude>org/jboss/test/osgi/jbosgi143/**</exclude>
-                <exclude>org/jboss/test/osgi/jbosgi151/**</exclude>
               </excludes>
             </configuration>
           </plugin>

Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml	2009-11-25 12:49:11 UTC (rev 96945)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml	2009-11-25 13:19:45 UTC (rev 96946)
@@ -60,21 +60,6 @@
     <!-- Bundle Dependencies -->
     <dependency>
       <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.configadmin</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.log</artifactId>
       <scope>provided</scope>
       <exclusions>
@@ -225,6 +210,24 @@
         </dependency>
       </dependencies>
     </profile>
+    <profile>
+      <id>framework-equinox-default</id>
+      <activation>
+        <property>
+          <name>!framework</name>
+        </property>
+      </activation>
+      <properties>
+        <jboss.osgi.framework.properties>jboss-osgi-equinox.properties</jboss.osgi.framework.properties>
+      </properties>
+      <dependencies>
+        <dependency>
+          <groupId>org.jboss.osgi.runtime</groupId>
+          <artifactId>jboss-osgi-runtime-equinox</artifactId>
+          <scope>provided</scope>
+        </dependency>
+      </dependencies>
+    </profile>
 
     <!--
       Name: framework-felix 
@@ -276,10 +279,10 @@
       </dependencies>
     </profile>
     <profile>
-      <id>framework-default</id>
+      <id>framework-jbossmc-default</id>
       <activation>
         <property>
-          <name>!framework</name>
+          <name>xframework</name>
         </property>
       </activation>
       <dependencies>
@@ -296,6 +299,37 @@
       </dependencies>
     </profile>
 
+    <profile>
+      <id>config-admin</id>
+      <activation>
+        <!-- activeByDefault>true</activeByDefault -->
+        <property>
+          <name>user.home</name>
+        </property>
+      </activation>
+      <dependencies>
+        <!-- 
+          Contains classes from org.osgi.util.tracker that must come after
+          the framework provided ones. Equinox chokes with SecurityException.  
+        -->
+        <dependency>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>org.apache.felix.configadmin</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>
+      </dependencies>
+    </profile>
+    
     <!--
       Name: embedded-testing 
       Descr: Setup for embedded integration testing




More information about the jboss-cvs-commits mailing list