[jboss-cvs] JBossAS SVN: r89365 - in projects/jboss-osgi/projects/bundles/blueprint/trunk: testsuite and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon May 25 08:04:29 EDT 2009 

Author: thomas.diesler at jboss.com
Date: 2009-05-25 08:04:29 -0400 (Mon, 25 May 2009)
New Revision: 89365

Added:
   projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.classpath
   projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.project
   projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.settings/
   projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.settings/org.eclipse.jdt.core.prefs
   projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.settings/org.maven.ide.eclipse.prefs
   projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/
Modified:
   projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
   projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/
   projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/pom.xml
   projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java
Log:
Register BlueprintContext

Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml	2009-05-25 12:04:08 UTC (rev 89364)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml	2009-05-25 12:04:29 UTC (rev 89365)
@@ -31,7 +31,7 @@
     <version.jboss.osgi.runtime.felix>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix>
     <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
     <version.jboss.common.core.bundle>2.2.11-SNAPSHOT</version.jboss.common.core.bundle>
-    <version.jbossxb.bundle>2.0.0-SNAPSHOT</version.jbossxb.bundle>
+    <version.jbossxb.bundle>2.0.1-SNAPSHOT</version.jbossxb.bundle>
     <version.osgi>r4v41</version.osgi>
   </properties>
 


Property changes on: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite
___________________________________________________________________
Name: svn:ignore
   + target


Added: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.classpath
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.classpath	                        (rev 0)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.classpath	2009-05-25 12:04:29 UTC (rev 89365)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Added: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.project
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.project	                        (rev 0)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.project	2009-05-25 12:04:29 UTC (rev 89365)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>jboss-osgi-blueprint-testsuite</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+	</natures>
+</projectDescription>

Added: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.settings/org.eclipse.jdt.core.prefs	                        (rev 0)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.settings/org.eclipse.jdt.core.prefs	2009-05-25 12:04:29 UTC (rev 89365)
@@ -0,0 +1,5 @@
+#Mon May 25 10:32:34 CEST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5

Added: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.settings/org.maven.ide.eclipse.prefs	                        (rev 0)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.settings/org.maven.ide.eclipse.prefs	2009-05-25 12:04:29 UTC (rev 89365)
@@ -0,0 +1,9 @@
+#Mon May 25 10:32:27 CEST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1

Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/pom.xml	2009-05-25 12:04:08 UTC (rev 89364)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/pom.xml	2009-05-25 12:04:29 UTC (rev 89365)
@@ -150,11 +150,11 @@
             <!--
               Implement URLStreamHandlerService
               https://jira.jboss.org/jira/browse/JBOSGI-75 
-            -->
             <property>
               <name>java.protocol.handler.pkgs</name>
               <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value>
             </property>
+            -->
             <property>
               <name>test.archive.directory</name>
               <value>${project.build.directory}/test-libs</value>

Copied: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context (from rev 89261, projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/java/org/jboss/test/osgi/blueprint/context)


Property changes on: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java	2009-05-21 21:58:42 UTC (rev 89261)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java	2009-05-25 12:04:29 UTC (rev 89365)
@@ -24,11 +24,10 @@
 //$Id$
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import org.jboss.osgi.husky.BridgeFactory;
 import org.jboss.osgi.husky.annotation.ProvideContext;
-import org.jboss.osgi.spi.testing.HuskyCapability;
-import org.jboss.osgi.spi.testing.JMXCapability;
 import org.jboss.osgi.spi.testing.OSGiRuntime;
 import org.jboss.osgi.spi.testing.OSGiTestHelper;
 import org.junit.After;
@@ -37,6 +36,8 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.blueprint.context.BlueprintContext;
 
 /**
  * Blueprint parser tests
@@ -59,8 +60,6 @@
       {
          helper = new OSGiTestHelper();
          runtime = helper.getDefaultRuntime();
-         runtime.addCapability(new JMXCapability());
-         runtime.addCapability(new HuskyCapability());
          
          runtime.installBundle("context-basic.jar").start();
       }
@@ -86,5 +85,8 @@
       
       Bundle bundle = context.getBundle();
       assertEquals("context-basic", bundle.getSymbolicName());
+      
+      ServiceReference sref = context.getServiceReference(BlueprintContext.class.getName());
+      assertNotNull("BlueprintContext registered", sref);
    }
 }
\ No newline at end of file

More information about the jboss-cvs-commits mailing list