svn commit: r1355255 - /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java
Author: kwall
Date: Fri Jun 29 07:48:22 2012
New Revision: 1355255
URL: http://svn.apache.org/viewvc?rev=1355255view=rev
Log:
QPID-4094: Qpid MC misformats JMX notification dates
Fix date format string so date is properly formatted to the 24 hour clock.
Modified:
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java
Modified:
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java?rev=1355255r1=1355254r2=1355255view=diff
==
---
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java
(original)
+++
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/NotificationObject.java
Fri Jun 29 07:48:22 2012
@@ -35,7 +35,7 @@ public class NotificationObject
private String _message;
private Object _source;
private String _type; // INFO, WARN, etc
-private static final SimpleDateFormat dateFormat = new
SimpleDateFormat(hh:mm:ss dd/MM/yy z);
+private static final SimpleDateFormat dateFormat = new
SimpleDateFormat(HH:mm:ss dd/MM/yy z);
public NotificationObject(long seqNo, Date timeStamp, String message,
Object source, String type)
{
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1355313 - in /qpid/trunk/qpid/java/broker-plugins/management/src/main/java/resources/images: ./ qpid-logo.png
Author: robbie Date: Fri Jun 29 11:09:43 2012 New Revision: 1355313 URL: http://svn.apache.org/viewvc?rev=1355313view=rev Log: QPID-3999: add logo image which was missed during previous commit Added: qpid/trunk/qpid/java/broker-plugins/management/src/main/java/resources/images/ qpid/trunk/qpid/java/broker-plugins/management/src/main/java/resources/images/qpid-logo.png Added: qpid/trunk/qpid/java/broker-plugins/management/src/main/java/resources/images/qpid-logo.png URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management/src/main/java/resources/images/qpid-logo.png?rev=1355313view=auto == Files qpid/trunk/qpid/java/broker-plugins/management/src/main/java/resources/images/qpid-logo.png (added) and qpid/trunk/qpid/java/broker-plugins/management/src/main/java/resources/images/qpid-logo.png Fri Jun 29 11:09:43 2012 differ - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1355314 - /qpid/trunk/qpid/java/lib/poms/
Author: robbie Date: Fri Jun 29 11:09:59 2012 New Revision: 1355314 URL: http://svn.apache.org/viewvc?rev=1355314view=rev Log: QPID-3998: add dependency stubs for jetty components to fix the POM generation, ensuring the same set of deps gets composed as those that end up in the broker binary package Added: qpid/trunk/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml qpid/trunk/qpid/java/lib/poms/jetty-continuation-7.6.3.v20120416.xml qpid/trunk/qpid/java/lib/poms/jetty-http-7.6.3.v20120416.xml qpid/trunk/qpid/java/lib/poms/jetty-io-7.6.3.v20120416.xml qpid/trunk/qpid/java/lib/poms/jetty-security-7.6.3.v20120416.xml qpid/trunk/qpid/java/lib/poms/jetty-server-7.6.3.v20120416.xml qpid/trunk/qpid/java/lib/poms/jetty-servlet-7.6.3.v20120416.xml qpid/trunk/qpid/java/lib/poms/jetty-util-7.6.3.v20120416.xml qpid/trunk/qpid/java/lib/poms/jetty-websocket-7.6.3.v20120416.xml Added: qpid/trunk/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml?rev=1355314view=auto == --- qpid/trunk/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml (added) +++ qpid/trunk/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml Fri Jun 29 11:09:59 2012 @@ -0,0 +1,22 @@ +?xml version=1.0? +!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- +dep + groupIdorg.apache.geronimo.specs/groupId + artifactIdgeronimo-servlet_2.5_spec/artifactId + version1.2/version +/dep Added: qpid/trunk/qpid/java/lib/poms/jetty-continuation-7.6.3.v20120416.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/jetty-continuation-7.6.3.v20120416.xml?rev=1355314view=auto == --- qpid/trunk/qpid/java/lib/poms/jetty-continuation-7.6.3.v20120416.xml (added) +++ qpid/trunk/qpid/java/lib/poms/jetty-continuation-7.6.3.v20120416.xml Fri Jun 29 11:09:59 2012 @@ -0,0 +1,22 @@ +?xml version=1.0? +!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- +dep + groupIdorg.eclipse.jetty/groupId + artifactIdjetty-continuation/artifactId + version7.6.3.v20120416/version +/dep Added: qpid/trunk/qpid/java/lib/poms/jetty-http-7.6.3.v20120416.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/jetty-http-7.6.3.v20120416.xml?rev=1355314view=auto == --- qpid/trunk/qpid/java/lib/poms/jetty-http-7.6.3.v20120416.xml (added) +++ qpid/trunk/qpid/java/lib/poms/jetty-http-7.6.3.v20120416.xml Fri Jun 29 11:09:59 2012 @@ -0,0 +1,28 @@ +?xml version=1.0? +!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions
svn commit: r1355390 - in /qpid/trunk/qpid/java: bdbstore/jmx/build.xml broker-plugins/access-control/build.xml broker-plugins/firewall/build.xml broker-plugins/jmx/build.xml broker-plugins/management
Author: robbie
Date: Fri Jun 29 13:53:50 2012
New Revision: 1355390
URL: http://svn.apache.org/viewvc?rev=1355390view=rev
Log:
QPID-4098: generate maven release artifacts for the broker plugins
Modified:
qpid/trunk/qpid/java/bdbstore/jmx/build.xml
qpid/trunk/qpid/java/broker-plugins/access-control/build.xml
qpid/trunk/qpid/java/broker-plugins/firewall/build.xml
qpid/trunk/qpid/java/broker-plugins/jmx/build.xml
qpid/trunk/qpid/java/broker-plugins/management/build.xml
Modified: qpid/trunk/qpid/java/bdbstore/jmx/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/jmx/build.xml?rev=1355390r1=1355389r2=1355390view=diff
==
--- qpid/trunk/qpid/java/bdbstore/jmx/build.xml (original)
+++ qpid/trunk/qpid/java/bdbstore/jmx/build.xml Fri Jun 29 13:53:50 2012
@@ -17,11 +17,12 @@
- under the License.
--
project name=bdbstore-jmx default=build
-property name=module.depends value=common broker broker-plugins
broker-plugins/jmx management/common bdbstore /
+property name=module.depends value=common broker broker-plugins/jmx
management/common bdbstore /
property name=module.test.depends value=test broker/test common/test
management/common client systests bdbstore/test /
property name=module.manifest value=MANIFEST.MF /
property name=module.plugin value=true /
+property name=module.genpom value=true/
import file=../../module.xml /
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/build.xml?rev=1355390r1=1355389r2=1355390view=diff
==
--- qpid/trunk/qpid/java/broker-plugins/access-control/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/build.xml Fri Jun 29
13:53:50 2012
@@ -17,11 +17,14 @@
- under the License.
--
project name=Qpid Broker-Plugins Access Control default=build
-property name=module.depends value=common broker broker-plugins /
+property name=module.depends value=common broker /
property name=module.test.depends value=test common/test broker/test
management/common systests /
property name=module.manifest value=MANIFEST.MF /
property name=module.plugin value=true /
+property name=module.genpom value=true/
+
+property name=broker-plugins-access-control.libs value=/
import file=../../module.xml /
Modified: qpid/trunk/qpid/java/broker-plugins/firewall/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/firewall/build.xml?rev=1355390r1=1355389r2=1355390view=diff
==
--- qpid/trunk/qpid/java/broker-plugins/firewall/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/firewall/build.xml Fri Jun 29 13:53:50
2012
@@ -17,11 +17,14 @@
- under the License.
--
project name=Qpid Broker-Plugins Firewall default=build
-property name=module.depends value=common broker broker-plugins /
+property name=module.depends value=common broker /
property name=module.test.depends value=test broker/test common/test
management/common /
property name=module.manifest value=MANIFEST.MF /
property name=module.plugin value=true /
+property name=module.genpom value=true/
+
+property name=broker-plugins-firewall.libs value=/
import file=../../module.xml /
Modified: qpid/trunk/qpid/java/broker-plugins/jmx/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jmx/build.xml?rev=1355390r1=1355389r2=1355390view=diff
==
--- qpid/trunk/qpid/java/broker-plugins/jmx/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/jmx/build.xml Fri Jun 29 13:53:50 2012
@@ -31,11 +31,14 @@
/or
/condition
-property name=module.depends value=common broker broker-plugins
broker-plugins-jmx management/common /
+property name=module.depends value=common broker management/common /
property name=module.test.depends value=systests test broker/test
common/test management/common client ${systests.optional.depends} /
property name=module.manifest value=MANIFEST.MF /
property name=module.plugin value=true /
+property name=module.genpom value=true/
+
+property name=broker-plugins-jmx.libs value=/
import file=../../module.xml /
Modified: qpid/trunk/qpid/java/broker-plugins/management/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management/build.xml?rev=1355390r1=1355389r2=1355390view=diff
==
--- qpid/trunk/qpid/java/broker-plugins/management/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/management/build.xml
svn commit: r1355391 - in /qpid/trunk/qpid/java: bdbstore/jmx/build.xml broker-plugins/access-control/build.xml broker-plugins/firewall/build.xml broker-plugins/jmx/build.xml broker-plugins/management
Author: robbie Date: Fri Jun 29 13:54:07 2012 New Revision: 1355391 URL: http://svn.apache.org/viewvc?rev=1355391view=rev Log: QPID-4098: update POM generation for the plugins to mark the dependencies as being provided (by the broker itself) at runtime Modified: qpid/trunk/qpid/java/bdbstore/jmx/build.xml qpid/trunk/qpid/java/broker-plugins/access-control/build.xml qpid/trunk/qpid/java/broker-plugins/firewall/build.xml qpid/trunk/qpid/java/broker-plugins/jmx/build.xml qpid/trunk/qpid/java/broker-plugins/management/build.xml qpid/trunk/qpid/java/genpom Modified: qpid/trunk/qpid/java/bdbstore/jmx/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/jmx/build.xml?rev=1355391r1=1355390r2=1355391view=diff == --- qpid/trunk/qpid/java/bdbstore/jmx/build.xml (original) +++ qpid/trunk/qpid/java/bdbstore/jmx/build.xml Fri Jun 29 13:54:07 2012 @@ -23,6 +23,7 @@ property name=module.manifest value=MANIFEST.MF / property name=module.plugin value=true / property name=module.genpom value=true/ +property name=module.genpom.args value=-Sqpid-common=provided -Sqpid-broker=provided -Sqpid-broker-plugins-jmx=provided -Sqpid-management-common=provided -Sqpid-bdbstore=provided -Sje=provided/ import file=../../module.xml / Modified: qpid/trunk/qpid/java/broker-plugins/access-control/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/build.xml?rev=1355391r1=1355390r2=1355391view=diff == --- qpid/trunk/qpid/java/broker-plugins/access-control/build.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/access-control/build.xml Fri Jun 29 13:54:07 2012 @@ -23,6 +23,7 @@ property name=module.manifest value=MANIFEST.MF / property name=module.plugin value=true / property name=module.genpom value=true/ +property name=module.genpom.args value=-Sqpid-common=provided -Sqpid-broker=provided/ property name=broker-plugins-access-control.libs value=/ Modified: qpid/trunk/qpid/java/broker-plugins/firewall/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/firewall/build.xml?rev=1355391r1=1355390r2=1355391view=diff == --- qpid/trunk/qpid/java/broker-plugins/firewall/build.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/firewall/build.xml Fri Jun 29 13:54:07 2012 @@ -23,6 +23,7 @@ property name=module.manifest value=MANIFEST.MF / property name=module.plugin value=true / property name=module.genpom value=true/ +property name=module.genpom.args value=-Sqpid-common=provided -Sqpid-broker=provided/ property name=broker-plugins-firewall.libs value=/ Modified: qpid/trunk/qpid/java/broker-plugins/jmx/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jmx/build.xml?rev=1355391r1=1355390r2=1355391view=diff == --- qpid/trunk/qpid/java/broker-plugins/jmx/build.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/jmx/build.xml Fri Jun 29 13:54:07 2012 @@ -37,6 +37,7 @@ property name=module.manifest value=MANIFEST.MF / property name=module.plugin value=true / property name=module.genpom value=true/ +property name=module.genpom.args value=-Sqpid-common=provided -Sqpid-broker=provided -Sqpid-management-common=provided/ property name=broker-plugins-jmx.libs value=/ Modified: qpid/trunk/qpid/java/broker-plugins/management/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management/build.xml?rev=1355391r1=1355390r2=1355391view=diff == --- qpid/trunk/qpid/java/broker-plugins/management/build.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/management/build.xml Fri Jun 29 13:54:07 2012 @@ -23,6 +23,7 @@ property name=module.manifest value=MANIFEST.MF / property name=module.plugin value=true / property name=module.genpom value=true/ +property name=module.genpom.args value=-Sqpid-common=provided -Sqpid-broker=provided/ property name=broker-plugins-management.libs value=/ Modified: qpid/trunk/qpid/java/genpom URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/genpom?rev=1355391r1=1355390r2=1355391view=diff == --- qpid/trunk/qpid/java/genpom (original) +++ qpid/trunk/qpid/java/genpom Fri Jun 29 13:54:07 2012 @@ -111,8 +111,10 @@ for module in module_depends: groupId%s/groupId artifactId%s/artifactId version%s/version + scope%s/scope /dependency - % (opts.group, artifactId, opts.version)) + % (opts.group, artifactId, opts.version, +
svn commit: r1355394 - /qpid/branches/0.16/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
Author: shuston
Date: Fri Jun 29 14:01:44 2012
New Revision: 1355394
URL: http://svn.apache.org/viewvc?rev=1355394view=rev
Log:
NO-JIRA: Fix location of sessionreceiver project file.
Modified:
qpid/branches/0.16/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
Modified:
qpid/branches/0.16/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
URL:
http://svn.apache.org/viewvc/qpid/branches/0.16/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln?rev=1355394r1=1355393r2=1355394view=diff
==
---
qpid/branches/0.16/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
(original)
+++
qpid/branches/0.16/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln
Fri Jun 29 14:01:44 2012
@@ -21,7 +21,7 @@ Microsoft Visual Studio Solution File, F
Project({8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}) =
Org.Apache.Qpid.Messaging, ..\src\msvc9\org.apache.qpid.messaging.vcproj,
{AA5A3B83-5F98-406D-A01C-5A921467A57D}
EndProject
-Project({FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}) =
org.apache.qpid.messaging.sessionreceiver,
..\src\msvc9\sessionreceiver\org.apache.qpid.messaging.sessionreceiver.csproj,
{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}
+Project({FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}) =
org.apache.qpid.messaging.sessionreceiver,
..\src\sessionreceiver\msvc9\org.apache.qpid.messaging.sessionreceiver.csproj,
{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1355449 - /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
Author: kwall Date: Fri Jun 29 15:43:38 2012 New Revision: 1355449 URL: http://svn.apache.org/viewvc?rev=1355449view=rev Log: QPID-4099: Fix race condition in test FailoverBehaviourTest.testFlowControlFlagResetOnFailover Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java?rev=1355449r1=1355448r2=1355449view=diff == --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java Fri Jun 29 15:43:38 2012 @@ -894,7 +894,10 @@ public class FailoverBehaviourTest exten } assertTrue(Flow is not blocked, ((AMQSession?, ?) producerSession).isFlowBlocked()); -assertEquals(Unexpected number of sent messages, 4, counter.get()); +// Message counter could be 3 or 4 depending on the progression of producing thread relative +// to the receipt of the ChannelFlow. +final int currentCounter = counter.get(); +assertTrue(Unexpected number of sent messages, currentCounter == 3 || currentCounter == 4); killBroker(); startBroker(); - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
