You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2016/09/27 21:03:21 UTC
svn commit: r1762562 - in /qpid/java/trunk/tck: pom.xml
src/main/java/org/apache/qpid/tck/ManageQpidJMSResources.java
Author: kwall
Date: Tue Sep 27 21:03:21 2016
New Revision: 1762562
URL: http://svn.apache.org/viewvc?rev=1762562&view=rev
Log:
QPID-7433: [TCK Config] Bug fix to the overriding of parameters for ManageQpidJMSResources
Modified:
qpid/java/trunk/tck/pom.xml
qpid/java/trunk/tck/src/main/java/org/apache/qpid/tck/ManageQpidJMSResources.java
Modified: qpid/java/trunk/tck/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/tck/pom.xml?rev=1762562&r1=1762561&r2=1762562&view=diff
==============================================================================
--- qpid/java/trunk/tck/pom.xml (original)
+++ qpid/java/trunk/tck/pom.xml Tue Sep 27 21:03:21 2016
@@ -28,12 +28,11 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tck</artifactId>
+ <artifactId>qpid-tck</artifactId>
<name>Apache Qpid JMX TCK Configuration</name>
<description>Configuration for Oracle JMS TCK</description>
<properties>
- <tck.directory>/Users/keith/jmstck/</tck.directory>
<tck.broker-hostport>localhost:5672</tck.broker-hostport>
<tck.broker-virtualhostnode>default</tck.broker-virtualhostnode>
<tck.broker-virtualhost>default</tck.broker-virtualhost>
@@ -140,18 +139,6 @@
</build>
<profiles>
<profile>
- <id>selective-test-mode</id>
- <activation>
- <property>
- <name>test</name>
- </property>
- </activation>
- <properties>
- <tck.selective.test.arg>-tests</tck.selective.test.arg>
- <tck.selective.test.value>${test}</tck.selective.test.value>
- </properties>
- </profile>
- <profile>
<id>tck</id>
<activation>
<property>
@@ -328,6 +315,28 @@
<configuration>
<classpathScope>test</classpathScope>
<mainClass>org.apache.qpid.tck.ManageQpidJMSResources</mainClass>
+ <systemProperties>
+ <systemProperty>
+ <key>tck.manangement-url</key>
+ <value>${tck.manangement-url}</value>
+ </systemProperty>
+ <systemProperty>
+ <key>tck.manangement-username</key>
+ <value>${tck.manangement-username}</value>
+ </systemProperty>
+ <systemProperty>
+ <key>tck.manangement-password</key>
+ <value>${tck.manangement-password}</value>
+ </systemProperty>
+ <systemProperty>
+ <key>tck.manangement-api-queue</key>
+ <value>${tck.manangement-api-queue}</value>
+ </systemProperty>
+ <systemProperty>
+ <key>tck.manangement-api-topic</key>
+ <value>${tck.manangement-api-topic}</value>
+ </systemProperty>
+ </systemProperties>
</configuration>
</execution>
</executions>
@@ -346,6 +355,28 @@
<classpathScope>test</classpathScope>
<mainClass>org.apache.qpid.tck.ManageQpidJMSResources</mainClass>
<arguments><argument>--delete</argument></arguments>
+ <systemProperties>
+ <systemProperty>
+ <key>tck.manangement-url</key>
+ <value>${tck.manangement-url}</value>
+ </systemProperty>
+ <systemProperty>
+ <key>tck.manangement-username</key>
+ <value>${tck.manangement-username}</value>
+ </systemProperty>
+ <systemProperty>
+ <key>tck.manangement-password</key>
+ <value>${tck.manangement-password}</value>
+ </systemProperty>
+ <systemProperty>
+ <key>tck.manangement-api-queue</key>
+ <value>${tck.manangement-api-queue}</value>
+ </systemProperty>
+ <systemProperty>
+ <key>tck.manangement-api-topic</key>
+ <value>${tck.manangement-api-topic}</value>
+ </systemProperty>
+ </systemProperties>
</configuration>
</execution>
</executions>
Modified: qpid/java/trunk/tck/src/main/java/org/apache/qpid/tck/ManageQpidJMSResources.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/tck/src/main/java/org/apache/qpid/tck/ManageQpidJMSResources.java?rev=1762562&r1=1762561&r2=1762562&view=diff
==============================================================================
--- qpid/java/trunk/tck/src/main/java/org/apache/qpid/tck/ManageQpidJMSResources.java (original)
+++ qpid/java/trunk/tck/src/main/java/org/apache/qpid/tck/ManageQpidJMSResources.java Tue Sep 27 21:03:21 2016
@@ -93,7 +93,7 @@ public class ManageQpidJMSResources
_objectMapper = new ObjectMapper();
_objectMapper.configure(JsonParser.Feature.ALLOW_COMMENTS, true);
- _managementUser = System.getProperty("tck.manangement-user", "guest");
+ _managementUser = System.getProperty("tck.manangement-username", "guest");
_managementPassword = System.getProperty("tck.manangement-password", "guest");
_virtualhostnode = System.getProperty("tck.broker-virtualhostnode", "default");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org