You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ha...@apache.org on 2014/02/06 03:58:16 UTC
[1/4] git commit: [AMQ-4174] Redirect back to queue overview after
delete/moving message Patch from Robert Balent applied
Updated Branches:
refs/heads/trunk 2e5a64652 -> dacc03747
[AMQ-4174] Redirect back to queue overview after delete/moving message
Patch from Robert Balent applied
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/3321f996
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/3321f996
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/3321f996
Branch: refs/heads/trunk
Commit: 3321f99643edc5ebc4bd8f4b9eaea90744fc6d60
Parents: 146fb12
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Feb 5 15:19:44 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Feb 5 15:19:44 2014 -0500
----------------------------------------------------------------------
.../java/org/apache/activemq/web/controller/CopyMessage.java | 2 +-
.../java/org/apache/activemq/web/controller/DeleteMessage.java | 2 +-
.../java/org/apache/activemq/web/controller/MoveMessage.java | 2 +-
activemq-web-console/src/main/webapp/message.jsp | 6 +++---
.../main/java/org/apache/activemq/web/DestinationFacade.java | 4 ++++
5 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/3321f996/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CopyMessage.java
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CopyMessage.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CopyMessage.java
index 3a82898..178eadd 100644
--- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CopyMessage.java
+++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CopyMessage.java
@@ -49,7 +49,7 @@ public class CopyMessage extends DestinationFacade implements Controller {
log.warn("No queue named: " + getPhysicalDestinationName());
}
}
- return redirectToBrowseView();
+ return redirectToDestinationView();
}
public String getMessageId() {
http://git-wip-us.apache.org/repos/asf/activemq/blob/3321f996/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java
index 1f060fe..d9bf009 100644
--- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java
+++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java
@@ -48,7 +48,7 @@ public class DeleteMessage extends DestinationFacade implements Controller {
log.warn("No queue named: " + getPhysicalDestinationName());
}
}
- return redirectToBrowseView();
+ return redirectToDestinationView();
}
public String getMessageId() {
http://git-wip-us.apache.org/repos/asf/activemq/blob/3321f996/activemq-web-console/src/main/java/org/apache/activemq/web/controller/MoveMessage.java
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/MoveMessage.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/MoveMessage.java
index 2155382..5a49165 100644
--- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/MoveMessage.java
+++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/MoveMessage.java
@@ -49,7 +49,7 @@ public class MoveMessage extends DestinationFacade implements Controller {
log.warn("No queue named: " + getPhysicalDestinationName());
}
}
- return redirectToBrowseView();
+ return redirectToDestinationView();
}
public String getMessageId() {
http://git-wip-us.apache.org/repos/asf/activemq/blob/3321f996/activemq-web-console/src/main/webapp/message.jsp
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/message.jsp b/activemq-web-console/src/main/webapp/message.jsp
index be4e14f..cc5ff0c 100644
--- a/activemq-web-console/src/main/webapp/message.jsp
+++ b/activemq-web-console/src/main/webapp/message.jsp
@@ -133,10 +133,10 @@ No message could be found for ID <c:out value="${requestContext.messageQuery.id}
</thead>
<tbody>
<tr>
- <td colspan="2"><a href="deleteMessage.action?JMSDestination=<c:out value="${row.JMSDestination}" />&messageId=${row.JMSMessageID}&secret=<c:out value='${sessionScope["secret"]}'/>">Delete</a></td>
+ <td colspan="2"><a href="deleteMessage.action?JMSDestination=<c:out value="${requestContext.messageQuery.JMSDestination}" />&messageId=${row.JMSMessageID}&secret=<c:out value='${sessionScope["secret"]}'/>">Delete</a></td>
</tr>
<tr class="odd">
- <td><a href="javascript:confirmAction('queue', 'copyMessage.action?destination=%target%&JMSDestination=<c:out value="${row.JMSDestination}" />&messageId=${row.JMSMessageID}&JMSDestinationType=queue&secret=<c:out value='${sessionScope["secret"]}'/>')">Copy</a></td>
+ <td><a href="javascript:confirmAction('queue', 'copyMessage.action?destination=%target%&JMSDestination=<c:out value="${requestContext.messageQuery.JMSDestination}" />&messageId=${row.JMSMessageID}&JMSDestinationType=queue&secret=<c:out value='${sessionScope["secret"]}'/>')">Copy</a></td>
<td rowspan="2">
<select id="queue">
<option value=""> -- Please select --</option>
@@ -150,7 +150,7 @@ No message could be found for ID <c:out value="${requestContext.messageQuery.id}
</tr>
<tr class="odd">
- <td><a href="javascript:confirmAction('queue', 'moveMessage.action?destination=%target%&JMSDestination=<c:out value="${row.JMSDestination}" />&messageId=${row.JMSMessageID}&JMSDestinationType=queue&secret=<c:out value='${sessionScope["secret"]}'/>')">Move</a></td>
+ <td><a href="javascript:confirmAction('queue', 'moveMessage.action?destination=%target%&JMSDestination=<c:out value="${requestContext.messageQuery.JMSDestination}" />&messageId=${row.JMSMessageID}&JMSDestinationType=queue&secret=<c:out value='${sessionScope["secret"]}'/>')">Move</a></td>
</tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/activemq/blob/3321f996/activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java
----------------------------------------------------------------------
diff --git a/activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java b/activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java
index 7e4e548..367f110 100644
--- a/activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java
+++ b/activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java
@@ -128,6 +128,10 @@ public class DestinationFacade {
return new ModelAndView("redirect:" + (isQueue() ? "queues.jsp" : "topics.jsp"));
}
+ protected ModelAndView redirectToDestinationView() {
+ return new ModelAndView("redirect:browse.jsp?JMSDestination=" + jmsDestination);
+ }
+
protected String getPhysicalDestinationName() {
return createDestination().getPhysicalName();
}
[3/4] git commit: Merge branch 'easy-fixes' of
https://github.com/dkulp/activemq into trunk
Posted by ha...@apache.org.
Merge branch 'easy-fixes' of https://github.com/dkulp/activemq into trunk
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/5f9aca83
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/5f9aca83
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/5f9aca83
Branch: refs/heads/trunk
Commit: 5f9aca837a14e719c94c330238c920997046ef90
Parents: 2e5a646 17d1489
Author: Hadrian Zbarcea <hz...@gmail.com>
Authored: Wed Feb 5 21:36:34 2014 -0500
Committer: Hadrian Zbarcea <hz...@gmail.com>
Committed: Wed Feb 5 21:36:34 2014 -0500
----------------------------------------------------------------------
activemq-web-console/pom.xml | 4 ++++
.../java/org/apache/activemq/web/controller/CopyMessage.java | 2 +-
.../java/org/apache/activemq/web/controller/DeleteMessage.java | 2 +-
.../java/org/apache/activemq/web/controller/MoveMessage.java | 2 +-
activemq-web-console/src/main/webapp/WEB-INF/activemq.xml | 1 +
activemq-web-console/src/main/webapp/message.jsp | 6 +++---
.../main/java/org/apache/activemq/web/DestinationFacade.java | 4 ++++
7 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[4/4] git commit: Revert version upgrade for mqtt-client as it is not
yet available in a public repo
Posted by ha...@apache.org.
Revert version upgrade for mqtt-client as it is not yet available in a public repo
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/dacc0374
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/dacc0374
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/dacc0374
Branch: refs/heads/trunk
Commit: dacc03747de6d53dfdf7f82a6619f92bb683686b
Parents: 5f9aca8
Author: Hadrian Zbarcea <hz...@gmail.com>
Authored: Wed Feb 5 21:58:09 2014 -0500
Committer: Hadrian Zbarcea <hz...@gmail.com>
Committed: Wed Feb 5 21:58:09 2014 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/dacc0374/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a40ade5..bed9ddd 100755
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
<leveldb-version>0.6</leveldb-version>
<leveldbjni-version>1.8</leveldbjni-version>
<log4j-version>1.2.17</log4j-version>
- <mqtt-client-version>1.8</mqtt-client-version>
+ <mqtt-client-version>1.7</mqtt-client-version>
<openjpa-version>1.2.0</openjpa-version>
<org-apache-derby-version>10.10.1.1</org-apache-derby-version>
<org.osgi.core-version>4.3.1</org.osgi.core-version>
[2/4] git commit: [AMQ-5029] embedded webconsole broker does not
resolve activemq.data system property
Posted by ha...@apache.org.
[AMQ-5029] embedded webconsole broker does not resolve activemq.data system property
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/17d1489c
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/17d1489c
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/17d1489c
Branch: refs/heads/trunk
Commit: 17d1489c62b6bc33b77bce38eeecdc357f9c61bf
Parents: 3321f99
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Feb 5 16:08:26 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Feb 5 16:08:26 2014 -0500
----------------------------------------------------------------------
activemq-web-console/pom.xml | 4 ++++
activemq-web-console/src/main/webapp/WEB-INF/activemq.xml | 1 +
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/17d1489c/activemq-web-console/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index e5f2e94..771ee02 100755
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -78,6 +78,10 @@
<name>webconsole.type</name>
<value>embedded</value>
</systemProperty>
+ <systemProperty>
+ <name>activemq.data</name>
+ <value>${project.build.directory}/activemq-data</value>
+ </systemProperty>
<!--
Use the following configuration to connect to a remote broker using JMX
http://git-wip-us.apache.org/repos/asf/activemq/blob/17d1489c/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
----------------------------------------------------------------------
diff --git a/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml b/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
index 4baf3b5..7203bef 100755
--- a/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
+++ b/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
@@ -25,6 +25,7 @@
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
+ <bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
<broker brokerName="web-console" useJmx="true" xmlns="http://activemq.apache.org/schema/core">