qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject svn commit: r1779606 - in /qpid/java/trunk: pom.xml qpid-systests-parent/pom.xml systests/qpid-systests-jms_2.0/pom.xml
Date Fri, 20 Jan 2017 11:27:30 GMT
Author: kwall
Date: Fri Jan 20 11:27:30 2017
New Revision: 1779606

URL: http://svn.apache.org/viewvc?rev=1779606&view=rev
Log:
QPID-7609: [Java Broker] Enable persistent profiles for AMQP 1-0 systests.

Modified:
    qpid/java/trunk/pom.xml
    qpid/java/trunk/qpid-systests-parent/pom.xml
    qpid/java/trunk/systests/qpid-systests-jms_2.0/pom.xml

Modified: qpid/java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/pom.xml?rev=1779606&r1=1779605&r2=1779606&view=diff
==============================================================================
--- qpid/java/trunk/pom.xml (original)
+++ qpid/java/trunk/pom.xml Fri Jan 20 11:27:30 2017
@@ -81,7 +81,7 @@
     <java.target>1.7</java.target>
 
     <!-- enforcer plugin config properties -->
-    <supported-test-profiles-regex>(java-mms.0-9|java-mms.0-9-1|java-mms.0-10|java-mms.1-0|java-bdb.0-9|java-bdb.0-9-1|java-bdb.0-10|java-dby.0-9|java-dby.0-9-1|java-dby.0-10|java-dby-mem.0-9|java-dby-mem.0-9-1|java-dby-mem.0-10|cpp|java-json.0-9-1|java-json.0-10)</supported-test-profiles-regex>
+    <supported-test-profiles-regex>(java-mms.0-9|java-mms.0-9-1|java-mms.0-10|java-mms.1-0|java-bdb.0-9|java-bdb.0-9-1|java-bdb.0-10|java-bdb.1-0|java-dby.0-9|java-dby.0-9-1|java-dby.0-10|java-dby.1-0|java-dby-mem.0-9|java-dby-mem.0-9-1|java-dby-mem.0-10|cpp|java-json.0-9-1|java-json.0-10|java-json.1-0)</supported-test-profiles-regex>
 
     <!-- surefire forked jvm arguments -->
     <argLine>-Xmx512m</argLine>
@@ -422,6 +422,35 @@
               <fail>true</fail>
             </configuration>
           </execution>
+          <execution>
+            <id>enforce-enableAmqp10</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <evaluateBeanshell>
+                  <condition><![CDATA[
+                    boolean enableAmqp10Set = System.getProperties().stringPropertyNames().contains("enableAmqp1-0");
+                    boolean amqp10Profile = java.util.regex.Pattern.matches("java-.*\\.1-0",
"${profile}");
+
+                    if (amqp10Profile && !enableAmqp10Set)
+                    {
+                      return false;
+                    }
+                    else if (!amqp10Profile && enableAmqp10Set)
+                    {
+                      return false;
+                    }
+                    return true;
+                  ]]>
+                  </condition>
+                  <message>System property 'enableAmqp1-0' must be set only when running
a 1-0 test profile. You appear to be running '${profile}'.</message>
+                </evaluateBeanshell>
+              </rules>
+              <fail>true</fail>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
 
@@ -787,6 +816,68 @@
       </properties>
     </profile>
 
+    <profile>
+      <id>java-bdb.1-0</id>
+      <activation>
+        <property>
+          <name>profile</name>
+          <value>java-bdb.1-0</value>
+        </property>
+      </activation>
+      <properties>
+        <profile>java-bdb.1-0</profile>
+        <profile.specific.excludes>JavaPersistentExcludes JavaBDBExcludes Java10Excludes
Java10BrokenTestsExcludes Java10UninvestigatedTestsExcludes</profile.specific.excludes>
+        <profile.broker.version>v1_0</profile.broker.version>
+        <profile.test.amqp_port_protocols>["AMQP_1_0"]</profile.test.amqp_port_protocols>
+        <profile.broker.persistent>true</profile.broker.persistent>
+        <profile.virtualhostnode.type>BDB</profile.virtualhostnode.type>
+        <profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
+        <profile.java.naming.factory.initial>org.apache.qpid.jms.jndi.JmsInitialContextFactory</profile.java.naming.factory.initial>
+        <profile.java.naming.provider.url>test-profiles${file.separator}test-provider-1-0.properties</profile.java.naming.provider.url>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>java-dby.1-0</id>
+      <activation>
+        <property>
+          <name>profile</name>
+          <value>java-dby.1-0</value>
+        </property>
+      </activation>
+      <properties>
+        <profile>java-dby.1-0</profile>
+        <profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes Java10Excludes
Java10BrokenTestsExcludes Java10UninvestigatedTestsExcludes</profile.specific.excludes>
+        <profile.broker.version>v1_0</profile.broker.version>
+        <profile.test.amqp_port_protocols>["AMQP_1_0"]</profile.test.amqp_port_protocols>
+        <profile.broker.persistent>true</profile.broker.persistent>
+        <profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
+        <profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
+        <profile.java.naming.factory.initial>org.apache.qpid.jms.jndi.JmsInitialContextFactory</profile.java.naming.factory.initial>
+        <profile.java.naming.provider.url>test-profiles${file.separator}test-provider-1-0.properties</profile.java.naming.provider.url>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>java-json.1-0</id>
+      <activation>
+        <property>
+          <name>profile</name>
+          <value>java-json.1-0</value>
+        </property>
+      </activation>
+      <properties>
+        <profile>java-json.1-0</profile>
+        <profile.specific.excludes>JavaPersistentExcludes JavaJsonExcludes Java10Excludes
Java10BrokenTestsExcludes Java10UninvestigatedTestsExcludes</profile.specific.excludes>
+        <profile.broker.version>v1_0</profile.broker.version>
+        <profile.test.amqp_port_protocols>["AMQP_1_0"]</profile.test.amqp_port_protocols>
+        <profile.broker.persistent>true</profile.broker.persistent>
+        <profile.virtualhostnode.type>JSON</profile.virtualhostnode.type>
+        <profile.virtualhostnode.context.blueprint>{"type":"DERBY","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
+        <profile.java.naming.factory.initial>org.apache.qpid.jms.jndi.JmsInitialContextFactory</profile.java.naming.factory.initial>
+        <profile.java.naming.provider.url>test-profiles${file.separator}test-provider-1-0.properties</profile.java.naming.provider.url>
+      </properties>
+    </profile>
     <!--
     Split store profiles.
     Virtual host configuration can be overridden by setting blueprint property like below

Modified: qpid/java/trunk/qpid-systests-parent/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/qpid-systests-parent/pom.xml?rev=1779606&r1=1779605&r2=1779606&view=diff
==============================================================================
--- qpid/java/trunk/qpid-systests-parent/pom.xml (original)
+++ qpid/java/trunk/qpid-systests-parent/pom.xml Fri Jan 20 11:27:30 2017
@@ -236,11 +236,10 @@
 
   <profiles>
     <profile>
-      <id>java-mms.1-0</id>
+      <id>addQpidJmsClientIfNecessary</id>
       <activation>
         <property>
-          <name>profile</name>
-          <value>java-mms.1-0</value>
+          <name>enableAmqp1-0</name>
         </property>
       </activation>
       <dependencies>
@@ -256,8 +255,7 @@
       <id>addJms11IfNecessary</id>
       <activation>
         <property>
-          <name>profile</name>
-          <value>!java-mms.1-0</value>
+          <name>!enableAmqp1-0</name>
         </property>
       </activation>
       <dependencies>

Modified: qpid/java/trunk/systests/qpid-systests-jms_2.0/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/qpid-systests-jms_2.0/pom.xml?rev=1779606&r1=1779605&r2=1779606&view=diff
==============================================================================
--- qpid/java/trunk/systests/qpid-systests-jms_2.0/pom.xml (original)
+++ qpid/java/trunk/systests/qpid-systests-jms_2.0/pom.xml Fri Jan 20 11:27:30 2017
@@ -53,6 +53,23 @@
       </exclusions>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.qpid</groupId>
+      <artifactId>qpid-bdbstore</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>com.sleepycat</groupId>
+      <artifactId>je</artifactId>
+      <version>${bdb-version}</version>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
+
+
     <!-- TODO remove the following JMS 1.1 exclusion and the explict JMS 2.0 inclusion
once the released qpid-jms-client depends on JMS 2.0 -->
     <dependency>
       <groupId>org.apache.qpid</groupId>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message