activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r1441437 - in /activemq/trunk: activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ activemq-karaf/src/main/resources/
Date Fri, 01 Feb 2013 13:08:28 GMT
Author: gtully
Date: Fri Feb  1 13:08:28 2013
New Revision: 1441437

URL: http://svn.apache.org/viewvc?rev=1441437&view=rev
Log:
fix up client feature itest

Modified:
    activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java
    activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java
    activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientBundleTest.java
    activemq/trunk/activemq-karaf/src/main/resources/features.xml

Modified: activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java?rev=1441437&r1=1441436&r2=1441437&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java
(original)
+++ activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java
Fri Feb  1 13:08:28 2013
@@ -156,6 +156,14 @@ public abstract class AbstractFeatureTes
             artifactId("standard").version(karafVersion()).type(type);
     }
 
+    public static Option[] configureBrokerStart(Option[] existingOptions) {
+        ArrayList<Option> newOptions = new ArrayList<Option>();
+        newOptions.addAll(Arrays.asList(existingOptions));
+        newOptions.add(replaceConfigurationFile("etc/org.apache.activemq.server-default.cfg",
new File(basedir + "/src/test/resources/org/apache/activemq/karaf/itest/org.apache.activemq.server.cfg")));
+        newOptions.add(replaceConfigurationFile("etc/activemq.xml", new File(basedir + "/src/test/resources/org/apache/activemq/karaf/itest/activemq.xml")));
+        return newOptions.toArray(new Option[]{});
+    }
+
     public static Option[] configure(String ...features) {
 
         ArrayList<String> f = new ArrayList<String>();
@@ -175,8 +183,6 @@ public abstract class AbstractFeatureTes
                 // override the config.properties (to fix pax-exam bug)
                 replaceConfigurationFile("etc/config.properties", new File(basedir+"/src/test/resources/org/apache/activemq/karaf/itest/config.properties")),
                 replaceConfigurationFile("etc/custom.properties", new File(basedir+"/src/test/resources/org/apache/activemq/karaf/itest/custom.properties")),
-                replaceConfigurationFile("etc/org.apache.activemq.server-default.cfg", new
File(basedir+"/src/test/resources/org/apache/activemq/karaf/itest/org.apache.activemq.server.cfg")),
-                replaceConfigurationFile("etc/activemq.xml", new File(basedir+"/src/test/resources/org/apache/activemq/karaf/itest/activemq.xml")),
                 replaceConfigurationFile("etc/org.ops4j.pax.logging.cfg", new File(basedir+"/src/test/resources/org/apache/activemq/karaf/itest/org.ops4j.pax.logging.cfg")),
                 scanFeatures(getActiveMQKarafFeatureUrl(), f.toArray(new String[f.size()]))};
 

Modified: activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java?rev=1441437&r1=1441436&r2=1441437&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java
(original)
+++ activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerFeatureTest.java
Fri Feb  1 13:08:28 2013
@@ -36,7 +36,7 @@ public class ActiveMQBrokerFeatureTest e
 
     @Configuration
     public static Option[] configure() {
-        return configure("activemq-broker");
+        return configureBrokerStart(configure("activemq-broker"));
     }
 
     @Test

Modified: activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientBundleTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientBundleTest.java?rev=1441437&r1=1441436&r2=1441437&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientBundleTest.java
(original)
+++ activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQClientBundleTest.java
Fri Feb  1 13:08:28 2013
@@ -35,7 +35,7 @@ public class ActiveMQClientBundleTest ex
     public void test() throws Exception {
         ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory();
         factory.getBrokerURL();
-    }
-
 
+        // todo: validate connection to remote broker
+    }
 }

Modified: activemq/trunk/activemq-karaf/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/features.xml?rev=1441437&r1=1441436&r2=1441437&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Fri Feb  1 13:08:28 2013
@@ -27,6 +27,9 @@
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
         <bundle dependency="true">mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
+        <!-- uber osgi bundle means client is not that lean, todo: introduce client osgi
bundle -->
+        <feature version="[3,4)">spring</feature>
+        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
     </feature>
 
     <feature resolver="(obr)" description="Spring support" version="3.1.3.RELEASE" name="spring">
@@ -61,8 +64,6 @@
         <bundle dependency="true">mvn:org.fusesource.hawtbuf/hawtbuf-proto/${hawtbuf-version}</bundle>
         <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
         <bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
-        <feature version="[3,4)">spring</feature>
-        <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
         <bundle>mvn:org.apache.activemq/activemq-karaf/${project.version}</bundle>
         <bundle dependency="true">mvn:org.scala-lang/scala-library/${scala-version}</bundle>
         <feature version="${project.version}">activemq-http</feature>



Mime
View raw message