You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2016/03/28 11:51:26 UTC
svn commit: r1736850 - in /qpid/java/trunk: broker-plugins/management-http/
broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/
broker-plugins/management-http/src/main/java/resources/
broker-plugins/management-http/sr...
Author: lquack
Date: Mon Mar 28 09:51:26 2016
New Revision: 1736850
URL: http://svn.apache.org/viewvc?rev=1736850&view=rev
Log:
QPID-6983: Revert unintendent changes with work in progress committed by mistake
Removed:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/QueryTab.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/query/
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showQueryTab.html
Modified:
qpid/java/trunk/broker-plugins/management-http/pom.xml
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/DojoHelper.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/FormWidgetMixin.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html
qpid/java/trunk/broker-plugins/management-http/src/main/resources-maven/dojoconfig.properties
qpid/java/trunk/client/example/src/main/java/org/apache/qpid/example/Hello.java
qpid/java/trunk/systests/pom.xml
Modified: qpid/java/trunk/broker-plugins/management-http/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/pom.xml?rev=1736850&r1=1736849&r2=1736850&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/pom.xml (original)
+++ qpid/java/trunk/broker-plugins/management-http/pom.xml Mon Mar 28 09:51:26 2016
@@ -31,8 +31,6 @@
<properties>
<dojo-version>1.10.3</dojo-version>
- <dstore-version>1.1.1</dstore-version>
- <dgrid-version>1.0.0</dgrid-version>
</properties>
<dependencies>
@@ -94,30 +92,6 @@
<type>zip</type>
</dependency>
- <dependency>
- <groupId>org.webjars.bower</groupId>
- <artifactId>dstore</artifactId>
- <version>${dstore-version}</version>
- <exclusions>
- <exclusion>
- <artifactId>dojo</artifactId>
- <groupId>org.webjars.bower</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.webjars.bower</groupId>
- <artifactId>dgrid</artifactId>
- <version>${dgrid-version}</version>
- <exclusions>
- <exclusion>
- <artifactId>dojo</artifactId>
- <groupId>org.webjars.bower</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
<!-- test dependencies -->
<dependency>
<groupId>org.apache.qpid</groupId>
@@ -125,7 +99,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/DojoHelper.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/DojoHelper.java?rev=1736850&r1=1736849&r2=1736850&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/DojoHelper.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/DojoHelper.java Mon Mar 28 09:51:26 2016
@@ -37,14 +37,11 @@ public class DojoHelper
public static final String DOJO_PATH_PROPERTY = "dojo-path";
public static final String DIJIT_PATH_PROPERTY = "dijit-path";
public static final String DOJOX_PATH_PROPERTY = "dojox-path";
- public static final String DGRID_PATH_PROPERTY = "dgrid-path";
- public static final String DSTORE_PATH_PROPERTY = "dstore-path";
+
private static String _version = "undefined";
private static String _dojoPath = "/dojo-undefined/dojo";
private static String _dijitPath = "/dojo-undefined/dijit";
private static String _dojoxPath = "/dojo-undefined/dojox";
- private static String _dgridPath = "/META-INF/resources/webjars/dgrid/dgrid-undefined";
- private static String _dstorePath = "/META-INF/resources/webjars/dstore/dstore-undefined";
// Loads the value from the properties file.
static
@@ -91,8 +88,6 @@ public class DojoHelper
_dojoPath = props.getProperty(DOJO_PATH_PROPERTY, _dojoPath);
_dijitPath = props.getProperty(DIJIT_PATH_PROPERTY, _dijitPath);
_dojoxPath = props.getProperty(DOJOX_PATH_PROPERTY, _dojoxPath);
- _dgridPath = props.getProperty(DGRID_PATH_PROPERTY, _dgridPath);
- _dstorePath = props.getProperty(DSTORE_PATH_PROPERTY, _dstorePath);
}
}
catch (IOException e)
@@ -121,15 +116,4 @@ public class DojoHelper
{
return _dojoxPath;
}
-
- public static String getDstorePath()
- {
- return _dstorePath;
- }
-
- public static String getDgridPath()
- {
- return _dgridPath;
- }
-
}
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1736850&r1=1736849&r2=1736850&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java Mon Mar 28 09:51:26 2016
@@ -300,8 +300,6 @@ public class HttpManagement extends Abst
root.addServlet(new ServletHolder(new FileServlet(DojoHelper.getDojoPath(), true)), "/dojo/dojo/*");
root.addServlet(new ServletHolder(new FileServlet(DojoHelper.getDijitPath(), true)), "/dojo/dijit/*");
root.addServlet(new ServletHolder(new FileServlet(DojoHelper.getDojoxPath(), true)), "/dojo/dojox/*");
- root.addServlet(new ServletHolder(new FileServlet(DojoHelper.getDgridPath(), true)), "/dojo/dgrid/*");
- root.addServlet(new ServletHolder(new FileServlet(DojoHelper.getDstorePath(), true)), "/dojo/dstore/*");
for(String pattern : STATIC_FILE_TYPES)
{
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css?rev=1736850&r1=1736849&r2=1736850&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css Mon Mar 28 09:51:26 2016
@@ -18,6 +18,9 @@
* under the License.
*
*/
+* {
+ outline: none !important;
+}
html, body {
height: 100%;
@@ -243,12 +246,12 @@ div .messages {
}
.alignLeft {
- float: left !important;
+ float: left;
display: inline-block;
}
.alignRight {
- float: right !important;
+ float: right;
display: inline-block;
}
@@ -356,59 +359,4 @@ div .messages {
background-size: 1em;
width:100%;
height:100%;
-}
-
-.queryDefaultField
-{
- width: 7em;
-}
-
-.querySearchField
-{
- width: 20%;
-}
-
-.dgrid-column-selected
-{
- width: 2em;
-}
-
-.dgrid-column-attributeName
-{
- width: auto;
-}
-
-.compactGrid
-{
- height:20em;
-}
-.criteriaPanelTitle
-{
- padding:0px !important;
-}
-
-.criteriaPanelTitleText
-{
- vertical-align: middle !important;
-}
-.criteriaPanelTitleButton
-{
- margin: 0px !important;
-}
-.criteriaControl
-{
- margin-bottom: 5px !important;
-}
-
-.criteriaControl.dijitTextBoxReadOnly
-{
- width:100%;
-}
-
-.criteriaControl.dijitTextBoxReadOnly,
-.claro .criteriaControl.dijitTextBoxReadOnly,
-.claro .criteriaControl.dijitTextBoxReadOnlyFocused .dijitInputContainer
-{
- background-color: #efefef !important;
- background-image: none !important;
-}
+}
\ No newline at end of file
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html?rev=1736850&r1=1736849&r2=1736850&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html Mon Mar 28 09:51:26 2016
@@ -27,9 +27,6 @@
<link rel="stylesheet" href="dojo/dojox/grid/enhanced/resources/EnhancedGrid_rtl.css">
<link rel="stylesheet" href="dojo/dojox/form/resources/CheckedMultiSelect.css">
<link rel="stylesheet" href="dojo/dojox/form/resources/FileInput.css" />
- <link rel="stylesheet" href="dojo/dijit/themes/claro/document.css">
- <link rel="stylesheet" href="dojo/dgrid/css/dgrid.css">
- <link rel="stylesheet" href="dojo/dgrid/css/skins/claro.css">
<link rel="stylesheet" href="css/common.css" media="screen">
<script>
function getContextPath()
@@ -53,9 +50,7 @@
{ name:"dojo", location:"dojo/dojo" },
{ name:"dijit", location:"dojo/dijit" },
{ name:"dojox", location:"dojo/dojox" },
- { name:"qpid", location:"js/qpid" },
- { name:"dgrid", location:"dojo/dgrid" },
- { name:"dstore", location:"dojo/dstore" }
+ { name:"qpid", location:"js/qpid" }
]
};
@@ -88,7 +83,6 @@
], function(parser, query, ConsoleHelper, Management, util, treeView, controller, updater, entities, registry, dom){
parser.parse();
qpidManagementHelper = ConsoleHelper;
- qpidManagementHelper.controller = controller;
management = new Management("",util.xhrErrorHandler);
management.authenticate().then(function(data)
{
@@ -136,8 +130,6 @@
<div data-dojo-type="dijit.MenuItem" data-dojo-props="onClick: function(){qpidManagementHelper.showAPI();}">REST API</div>
<div data-dojo-type="dijit.MenuItem"
data-dojo-props="iconClass: 'helpIcon', onClick: function(){qpidManagementHelper.showHelp();}">Help</div>
- <div data-dojo-type="dijit.MenuItem"
- data-dojo-props="iconClass: 'dijitIconApplication', onClick: function(){qpidManagementHelper.controller.show('queryTab');}">Query</div>
</div>
</div>
</div>
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/FormWidgetMixin.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/FormWidgetMixin.js?rev=1736850&r1=1736849&r2=1736850&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/FormWidgetMixin.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/FormWidgetMixin.js Mon Mar 28 09:51:26 2016
@@ -97,7 +97,6 @@ define(["dojo/_base/declare"], function(
{
this._hasBeenBlurred = false;
this._setValueAttr(this._resetValue, true);
- },
- focus: function() {}
+ }
});
});
\ No newline at end of file
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js?rev=1736850&r1=1736849&r2=1736850&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js Mon Mar 28 09:51:26 2016
@@ -541,101 +541,5 @@ define(["dojo/_base/lang",
return deferred.promise;
};
- // summary:
- // Sends query request
- // query: query Object?
- // is a JSON object specifying the hierarchy
- // It can have the following fields:
- // where: String?
- // sql like expression containing 'where' conditions
- // select: String?
- // coma separated list of fields to select
- // category: String?
- // category of the object
- // virtualhost: String?
- // virtualhost name
- //
- // requestOptions: Object?
- // is optional request settings
- //
- // returns: promise of type dojo.promise.Promise
- // Promise returned by dojo.request.xhr with modified then method allowing to use default error handler if none is specified.
- Management.prototype.query = function(query, requestOptions)
- {
- var url = "api/latest/" + (query.parent && query.parent.type === "virtualhost" ?
- "queryvhost/" + this.objectToPath({parent: query.parent}) :
- "querybroker") + (query.category ? "/" + query.category : "");
- url = this.getFullUrl(url);
- var request = {url: url};
-
- if (requestOptions)
- {
- lang.mixin(request,requestOptions);
- }
-
- // id should be selected always
- var select = "id";
- if (query.select)
- {
- select = select + "," + query.select;
- }
- var parameters = {select: select};
- if (query.where)
- {
- parameters.where=query.where
- }
- request.query = parameters;
- var promise = this.get(request);
- if (query.select && query.transformIntoObjects)
- {
- var deferred = new Deferred();
- promise.then( function(data)
- {
- if (data)
- {
- var transformed = [];
- try
- {
- if (data.results)
- {
- var headers = select.split(",");
- for (var i in headers)
- {
- headers[i] = headers[i].replace(/^\s+|\s+$/gm,'');
- }
- for (var r in data.results)
- {
- var results = data.results[r];
- var object = {};
- for (var i in headers)
- {
- var headerName = headers[i];
- var headerValue = results[i];
- object[headerName] = headerValue;
- }
- transformed.push(object);
- }
- }
- }
- finally
- {
- deferred.resolve(transformed);
- }
- }
- else
- {
- deferred.reject({message: "User identifier is not found!"
- + " Authentication failed!"});
- }
- },
- function(error)
- {
- deferred.reject(error);
- });
- return deferred.promise;
- }
- return promise;
- };
-
return Management;
});
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js?rev=1736850&r1=1736849&r2=1736850&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js Mon Mar 28 09:51:26 2016
@@ -163,15 +163,6 @@ define(["dojo/parser",
editVirtualHost.show(that.management, that.modelObj);
});
- that.addQueryButton = registry.byNode(query(".addQuery", containerNode)[0]);
- that.addQueryButton.on("click",
- function(e)
- {
- that.controller.show('queryTab', '', that.modelObj);
- }
- );
-
-
that.vhostUpdater.update(function(){updater.add( that.vhostUpdater );});
});
};
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js?rev=1736850&r1=1736849&r2=1736850&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js Mon Mar 28 09:51:26 2016
@@ -39,12 +39,10 @@ define(["dojo/dom",
"qpid/management/PreferencesProvider",
"qpid/management/VirtualHostNode",
"qpid/management/Logger",
- "qpid/management/QueryTab",
"dojo/ready",
- "dojox/uuid/generateRandomUuid",
"dojo/domReady!"],
function (dom, registry, ContentPane, CheckBox, entities, Broker, VirtualHost, Exchange, Queue, Connection, AuthProvider,
- GroupProvider, Group, KeyStore, TrustStore, AccessControlProvider, Port, Plugin, PreferencesProvider, VirtualHostNode, Logger, QueryTab, ready) {
+ GroupProvider, Group, KeyStore, TrustStore, AccessControlProvider, Port, Plugin, PreferencesProvider, VirtualHostNode, Logger, ready) {
var controller = {};
var constructors = { broker: Broker, virtualhost: VirtualHost, exchange: Exchange,
@@ -53,8 +51,7 @@ define(["dojo/dom",
group: Group, keystore: KeyStore, truststore: TrustStore,
accesscontrolprovider: AccessControlProvider, port: Port,
plugin: Plugin, preferencesprovider: PreferencesProvider,
- virtualhostnode: VirtualHostNode, brokerlogger: Logger, virtualhostlogger: Logger,
- queryTab: QueryTab};
+ virtualhostnode: VirtualHostNode, brokerlogger: Logger, virtualhostlogger: Logger};
var tabDiv = dom.byId("managedViews");
@@ -81,7 +78,7 @@ define(["dojo/dom",
}
var that = this;
- var objId = (parent ? generateName(parent) + "/" : "") + objType + ":" + (name ? name : "-" + dojox.uuid.generateRandomUuid());
+ var objId = (parent ? generateName(parent) + "/" : "") + objType + ":" + name;
var obj = this.viewedObjects[ objId ];
if(obj) {
@@ -107,7 +104,7 @@ define(["dojo/dom",
});
this.tabContainer.addChild( contentPane );
var userPreferences = this.management.userPreferences;
- if (objType != "broker" && name)
+ if (objType != "broker")
{
var preferencesCheckBox = new dijit.form.CheckBox({
checked: userPreferences.isTabStored(obj.tabData),
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html?rev=1736850&r1=1736849&r2=1736850&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html Mon Mar 28 09:51:26 2016
@@ -115,15 +115,11 @@
</div>
<div class="dijitDialogPaneActionBar">
- <button data-dojo-type="dijit.form.Button" class="addQuery alignLeft">Query</button>
- <div class="alignRight">
- <button data-dojo-type="dijit.form.Button" class="startButton" type="button" data-dojo-props="disabled: true">Start</button>
- <button data-dojo-type="dijit.form.Button" class="stopButton" type="button" data-dojo-props="disabled: true">Stop</button>
- <button data-dojo-type="dijit.form.Button" class="editButton" type="button" data-dojo-props="disabled: true">Edit</button>
- <button data-dojo-type="dijit.form.Button" class="downloadButton" type="button" data-dojo-props="disabled: true">Download</button>
- <button data-dojo-type="dijit.form.Button" class="deleteButton" data-dojo-props="iconClass: 'dijitIconDelete'">Delete</button>
- </div>
- <div class="clear"></div>
+ <button data-dojo-type="dijit.form.Button" class="startButton" type="button" data-dojo-props="disabled: true">Start</button>
+ <button data-dojo-type="dijit.form.Button" class="stopButton" type="button" data-dojo-props="disabled: true">Stop</button>
+ <button data-dojo-type="dijit.form.Button" class="editButton" type="button" data-dojo-props="disabled: true">Edit</button>
+ <button data-dojo-type="dijit.form.Button" class="downloadButton" type="button" data-dojo-props="disabled: true">Download</button>
+ <button data-dojo-type="dijit.form.Button" class="deleteButton" data-dojo-props="iconClass: 'dijitIconDelete'">Delete</button>
</div>
<br/>
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/resources-maven/dojoconfig.properties
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/resources-maven/dojoconfig.properties?rev=1736850&r1=1736849&r2=1736850&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/resources-maven/dojoconfig.properties (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/resources-maven/dojoconfig.properties Mon Mar 28 09:51:26 2016
@@ -22,6 +22,4 @@ dojo-version=${dojo-version}
dojo-path=/dojo-${dojo-version}/dojo
dijit-path=/dojo-${dojo-version}/dijit
dojox-path=/dojo-${dojo-version}/dojox
-dgrid-path=/META-INF/resources/webjars/dgrid/${dgrid-version}
-dstore-path=/META-INF/resources/webjars/dstore/${dstore-version}
Modified: qpid/java/trunk/client/example/src/main/java/org/apache/qpid/example/Hello.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/example/src/main/java/org/apache/qpid/example/Hello.java?rev=1736850&r1=1736849&r2=1736850&view=diff
==============================================================================
--- qpid/java/trunk/client/example/src/main/java/org/apache/qpid/example/Hello.java (original)
+++ qpid/java/trunk/client/example/src/main/java/org/apache/qpid/example/Hello.java Mon Mar 28 09:51:26 2016
@@ -23,7 +23,6 @@ package org.apache.qpid.example;
import java.io.InputStream;
import java.util.Properties;
-import java.util.Random;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
@@ -35,9 +34,6 @@ import javax.jms.TextMessage;
import javax.naming.Context;
import javax.naming.InitialContext;
-import org.apache.qpid.client.AMQDestination;
-import org.apache.qpid.configuration.ClientProperties;
-
public class Hello
{
@@ -48,24 +44,16 @@ public class Hello
public static void main(String[] args)
{
- System.setProperty(ClientProperties.DEST_SYNTAX, AMQDestination.DestSyntax.BURL.name());
- System.setProperty(ClientProperties.AMQP_VERSION, "0-9");
Hello hello = new Hello();
- for(int i =0; i<100;i++)
- {
-
- hello.runTest("test-" + i);
- }
+ hello.runTest();
}
- private void runTest(String queueName)
+ private void runTest()
{
try (InputStream resourceAsStream = this.getClass().getResourceAsStream("hello.properties"))
{
Properties properties = new Properties();
- //properties.load(resourceAsStream);
- properties.put("java.naming.factory.initial", "org.apache.qpid.jndi.PropertiesFileInitialContextFactory");
- properties.put("connectionfactory.qpidConnectionfactory", "amqp://guest:guest@clientid/?brokerlist='tcp://localhost:5672'");
+ properties.load(resourceAsStream);
Context context = new InitialContext(properties);
ConnectionFactory connectionFactory = (ConnectionFactory) context.lookup("qpidConnectionfactory");
@@ -73,20 +61,16 @@ public class Hello
connection.start();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- Destination destination = session.createQueue(queueName);
+ Destination destination = (Destination) context.lookup("topicExchange");
MessageProducer messageProducer = session.createProducer(destination);
MessageConsumer messageConsumer = session.createConsumer(destination);
- Random rn = new Random();
- for (int i=0;i< rn.nextInt(10);i++)
- {
- TextMessage message = session.createTextMessage("Hello world! from " + queueName);
- messageProducer.send(message);
- }
+ TextMessage message = session.createTextMessage("Hello world!");
+ messageProducer.send(message);
- //message = (TextMessage)messageConsumer.receive();
- // System.out.println(message.getText());
+ message = (TextMessage)messageConsumer.receive();
+ System.out.println(message.getText());
connection.close();
context.close();
Modified: qpid/java/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/pom.xml?rev=1736850&r1=1736849&r2=1736850&view=diff
==============================================================================
--- qpid/java/trunk/systests/pom.xml (original)
+++ qpid/java/trunk/systests/pom.xml Mon Mar 28 09:51:26 2016
@@ -173,11 +173,6 @@
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <version>${geronimo-servlet-version}</version>
- </dependency>
</dependencies>
<build>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org