servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r890665 - in /servicemix/components: components-pom/trunk/pom.xml engines/servicemix-exec/trunk/pom.xml engines/servicemix-exec/trunk/src/test/java/org/apache/servicemix/exec/tests/smx4/ExecTest.java
Date Tue, 15 Dec 2009 06:31:49 GMT
Author: ccustine
Date: Tue Dec 15 06:31:49 2009
New Revision: 890665

URL: http://svn.apache.org/viewvc?rev=890665&view=rev
Log:
Fixed some pax-exam tests in the servicemix-exec test skeleton

Modified:
    servicemix/components/components-pom/trunk/pom.xml
    servicemix/components/engines/servicemix-exec/trunk/pom.xml
    servicemix/components/engines/servicemix-exec/trunk/src/test/java/org/apache/servicemix/exec/tests/smx4/ExecTest.java

Modified: servicemix/components/components-pom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/components-pom/trunk/pom.xml?rev=890665&r1=890664&r2=890665&view=diff
==============================================================================
--- servicemix/components/components-pom/trunk/pom.xml (original)
+++ servicemix/components/components-pom/trunk/pom.xml Tue Dec 15 06:31:49 2009
@@ -463,6 +463,11 @@
             <outputDirectory>${basedir}/eclipse-classes</outputDirectory>
           </configuration>
         </plugin>
+        <plugin>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>maven-paxexam-plugin</artifactId>
+            <version>${pax-exam-version}</version>
+      </plugin>
       </plugins>
     </pluginManagement>
     <plugins>

Modified: servicemix/components/engines/servicemix-exec/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-exec/trunk/pom.xml?rev=890665&r1=890664&r2=890665&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-exec/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-exec/trunk/pom.xml Tue Dec 15 06:31:49 2009
@@ -170,14 +170,30 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<forkMode>always</forkMode>
-				</configuration>
-			</plugin>
-		</plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <forkMode>always</forkMode>
+                    <excludes>
+                        <!-- exclude abstract test classes -->
+                        <exclude>**/Abstract*.*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>maven-paxexam-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-config</id>
+                        <goals>
+                            <goal>generate-depends-file</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
 	</build>
 
 </project>

Modified: servicemix/components/engines/servicemix-exec/trunk/src/test/java/org/apache/servicemix/exec/tests/smx4/ExecTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-exec/trunk/src/test/java/org/apache/servicemix/exec/tests/smx4/ExecTest.java?rev=890665&r1=890664&r2=890665&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-exec/trunk/src/test/java/org/apache/servicemix/exec/tests/smx4/ExecTest.java
(original)
+++ servicemix/components/engines/servicemix-exec/trunk/src/test/java/org/apache/servicemix/exec/tests/smx4/ExecTest.java
Tue Dec 15 06:31:49 2009
@@ -23,10 +23,8 @@
 import static org.ops4j.pax.exam.CoreOptions.bootClasspathLibrary;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.profile;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.repositories;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.localRepository;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -48,19 +46,22 @@
  */
 @RunWith(JUnit4TestRunner.class)
 public class ExecTest {
-    
+
+    private static MavenArtifactProvisionOption execUrl;
+
     @Inject
     protected BundleContext bundleContext;
 
     @Test
     public void test() throws Exception {
-        MavenArtifactProvisionOption execUrl = CoreOptions.mavenBundle().groupId("org.apache.servicemix").artifactId("servicemix-exec").versionAsInProject();
-        Bundle execBundle = bundleContext.installBundle(execUrl.getURL());
+        Bundle execBundle = bundleContext.installBundle(System.getProperty("servicemix.exec.url"));
         System.out.println(execBundle);
     }
 
     @Configuration
     public static Option[] configuration() {
+        execUrl = CoreOptions.mavenBundle().groupId("org.apache.servicemix").artifactId("servicemix-exec").versionAsInProject();
+
         Option[] options = options(
                 // this is how you set the default log level when using pax logging (logProfile)
                 systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
@@ -69,6 +70,7 @@
                 systemProperty("karaf.base").value("target/karaf.home"),
                 systemProperty("karaf.startLocalConsole").value("false"),
                 systemProperty("karaf.startRemoteShell").value("false"),
+                systemProperty("servicemix.exec.url").value(execUrl.getURL()),
                 
                 // define maven repository
                 repositories(
@@ -88,6 +90,10 @@
                 // log
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
                 mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
+
+                //mvn: url handler
+                mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
+
                 // felix config admin
                 mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
                 // felix preference service
@@ -108,8 +114,8 @@
                 scanFeatures("mvn:org.apache.felix.karaf/apache-felix-karaf/1.2.0/xml/features",
"obr", "wrapper"),
                 
                 // load smx nmr feature (jbi)
-                scanFeatures("mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/1.0.0/xml/features",
"jbi"),
-                
+                scanFeatures("mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/1.1.0-SNAPSHOT/xml/features",
"jbi"),
+
                 // start felix framework
                 felix());
         return options;



Mime
View raw message