Author: ningjiang
Date: Sun Jun 22 20:37:24 2008
New Revision: 670440
URL: http://svn.apache.org/viewvc?rev=670440&view=rev
Log:
Fixed some CS error
Removed:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/SpringInstrumentationAgent.java
Modified:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/ConditionalExceptionProcessor.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java
Modified:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/ConditionalExceptionProcessor.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/ConditionalExceptionProcessor.java?rev=670440&r1=670439&r2=670440&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/ConditionalExceptionProcessor.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/ConditionalExceptionProcessor.java
Sun Jun 22 20:37:24 2008
@@ -37,8 +37,8 @@
public void process(Exchange exchange) throws Exception {
setCount(getCount() + 1);
- AbstractTransactionTest.assertTrue("Expected only 2 calls to process()
but encountered " +
- getCount() + ". There should be 1 for intentionally triggered
rollback, and 1 for redelivery.",
+ AbstractTransactionTest.assertTrue("Expected only 2 calls to process()
but encountered "
+ + getCount() + ". There should be 1 for intentionally triggered
rollback, and 1 for redelivery.",
getCount() <= 2);
// should be printed 2 times due to one re-delivery after one failure
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java?rev=670440&r1=670439&r2=670440&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
Sun Jun 22 20:37:24 2008
@@ -27,14 +27,14 @@
/**
* Test that verifies JMX is enabled by default.
- *
+ *
* @version $Revision$
*
*/
public class DefaultJMXAgentTest extends SpringTestSupport {
-
+
protected MBeanServerConnection mbsc;
- protected long sleepForConnection = 0;
+ protected long sleepForConnection;
@Override
protected void setUp() throws Exception {
@@ -43,25 +43,25 @@
Thread.sleep(sleepForConnection);
mbsc = getMBeanConnection();
}
-
+
@Override
protected void tearDown() throws Exception {
releaseMBeanServers();
mbsc = null;
super.tearDown();
}
-
+
protected String getDomainName() {
return DefaultInstrumentationAgent.DEFAULT_DOMAIN;
}
-
+
@SuppressWarnings("unchecked")
protected void releaseMBeanServers() {
- List<MBeanServer> servers =
+ List<MBeanServer> servers =
(List<MBeanServer>)MBeanServerFactory.findMBeanServer(null);
for (MBeanServer server : servers) {
- MBeanServerFactory.releaseMBeanServer(server);
+ MBeanServerFactory.releaseMBeanServer(server);
}
}
@@ -73,11 +73,11 @@
protected ClassPathXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/defaultJmxConfig.xml");
}
-
+
@SuppressWarnings("unchecked")
protected MBeanServerConnection getMBeanConnection() throws Exception {
if (mbsc == null) {
- List<MBeanServer> servers =
+ List<MBeanServer> servers =
(List<MBeanServer>)MBeanServerFactory.findMBeanServer(null);
for (MBeanServer server : servers) {
Modified:
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java?rev=670440&r1=670439&r2=670440&view=diff
==============================================================================
---
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java
(original)
+++
activemq/camel/trunk/examples/camel-example-spring-jms/src/main/java/org/apache/camel/example/client/CamelClientEndpoint.java
Sun Jun 22 20:37:24 2008
@@ -34,6 +34,9 @@
* Requires that the JMS broker is running, as well as CamelServer
*/
public final class CamelClientEndpoint {
+ private CamelClientEndpoint() {
+ //Helper class
+ }
// START SNIPPET: e1
public static void main(final String[] args) throws Exception {
