You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/12/18 12:53:20 UTC
svn commit: r1220367 - in
/camel/trunk/camel-core/src/main/java/org/apache/camel: api/management/
api/management/mbean/ component/ component/log/ component/timer/
component/xslt/
Author: davsclaus
Date: Sun Dec 18 11:53:19 2011
New Revision: 1220367
URL: http://svn.apache.org/viewvc?rev=1220367&view=rev
Log:
CAMEL-4792: Polished JMX. Fixed LogEndpoint with start/stop should use doStart/doStop to ensure state is shown correctly in JMX. JMX annotations should not be @Inherited, as the mbean assembler need to be able to better pick the correct method, as JMX is very picky about this.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedAttribute.java
camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedNotification.java
camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedNotifications.java
camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedOperation.java
camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedResource.java
camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/NotificationSender.java
camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/NotificationSenderAware.java
camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedAttribute.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedAttribute.java?rev=1220367&r1=1220366&r2=1220367&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedAttribute.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedAttribute.java Sun Dec 18 11:53:19 2011
@@ -18,7 +18,6 @@ package org.apache.camel.api.management;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@@ -28,7 +27,6 @@ import java.lang.annotation.Target;
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
-@Inherited
@Documented
public @interface ManagedAttribute {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedNotification.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedNotification.java?rev=1220367&r1=1220366&r2=1220367&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedNotification.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedNotification.java Sun Dec 18 11:53:19 2011
@@ -18,14 +18,12 @@ package org.apache.camel.api.management;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
-@Inherited
@Documented
public @interface ManagedNotification {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedNotifications.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedNotifications.java?rev=1220367&r1=1220366&r2=1220367&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedNotifications.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedNotifications.java Sun Dec 18 11:53:19 2011
@@ -18,14 +18,12 @@ package org.apache.camel.api.management;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
-@Inherited
@Documented
public @interface ManagedNotifications {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedOperation.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedOperation.java?rev=1220367&r1=1220366&r2=1220367&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedOperation.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedOperation.java Sun Dec 18 11:53:19 2011
@@ -16,8 +16,8 @@
*/
package org.apache.camel.api.management;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
-@Inherited
+@Documented
public @interface ManagedOperation {
String description() default "";
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedResource.java?rev=1220367&r1=1220366&r2=1220367&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedResource.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/ManagedResource.java Sun Dec 18 11:53:19 2011
@@ -18,7 +18,6 @@ package org.apache.camel.api.management;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@@ -28,7 +27,6 @@ import java.lang.annotation.Target;
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
-@Inherited
@Documented
public @interface ManagedResource {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/NotificationSender.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/NotificationSender.java?rev=1220367&r1=1220366&r2=1220367&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/NotificationSender.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/NotificationSender.java Sun Dec 18 11:53:19 2011
@@ -22,5 +22,11 @@ import javax.management.Notification;
* To be implemented by classes that can send out notifications
*/
public interface NotificationSender {
+
+ /**
+ * Send notification
+ *
+ * @param notification notification to send
+ */
void sendNotification(Notification notification);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/NotificationSenderAware.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/NotificationSenderAware.java?rev=1220367&r1=1220366&r2=1220367&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/NotificationSenderAware.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/NotificationSenderAware.java Sun Dec 18 11:53:19 2011
@@ -17,9 +17,14 @@
package org.apache.camel.api.management;
/**
- * To be implemented by the user class to get a NotificationSender injected
- *
+ * To be implemented by the user class to get a {@link NotificationSender} injected
*/
public interface NotificationSenderAware {
+
+ /**
+ * {@link NotificationSender} to use for sending notifications.
+ *
+ * @param sender sender to use for sending notifications
+ */
void setNotificationSender(NotificationSender sender);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java?rev=1220367&r1=1220366&r2=1220367&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java Sun Dec 18 11:53:19 2011
@@ -29,7 +29,7 @@ public interface ManagedEndpointMBean {
@ManagedAttribute(description = "Singleton")
boolean isSingleton();
- @ManagedAttribute(description = "Service State")
+ @ManagedAttribute(description = "Endpoint State")
String getState();
}
\ No newline at end of file
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java?rev=1220367&r1=1220366&r2=1220367&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/ResourceEndpoint.java Sun Dec 18 11:53:19 2011
@@ -96,7 +96,7 @@ public abstract class ResourceEndpoint e
return contentCache;
}
- public synchronized void clearContentCache() {
+ public void clearContentCache() {
log.debug("Clearing resource: {} from the content cache", resourceUri);
buffer = null;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java?rev=1220367&r1=1220366&r2=1220367&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java Sun Dec 18 11:53:19 2011
@@ -40,17 +40,17 @@ public class LogEndpoint extends Process
super(endpointUri, component);
setLogger(logger);
}
-
+
@Override
- public void start() throws Exception {
+ protected void doStart() throws Exception {
ServiceHelper.startService(logger);
}
@Override
- public void stop() throws Exception {
+ protected void doStop() throws Exception {
ServiceHelper.stopService(logger);
}
-
+
public void setLogger(Processor logger) {
this.logger = logger;
// the logger is the processor
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java?rev=1220367&r1=1220366&r2=1220367&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java Sun Dec 18 11:53:19 2011
@@ -24,7 +24,6 @@ import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.Service;
import org.apache.camel.api.management.ManagedAttribute;
import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.impl.DefaultEndpoint;
@@ -34,7 +33,7 @@ import org.apache.camel.impl.DefaultEndp
*
* @version
*/
-@ManagedResource(description = "Managed Timer Endpoint")
+@ManagedResource(description = "Managed TimerEndpoint")
public class TimerEndpoint extends DefaultEndpoint {
private String timerName;
private Date time;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java?rev=1220367&r1=1220366&r2=1220367&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/xslt/XsltEndpoint.java Sun Dec 18 11:53:19 2011
@@ -32,7 +32,7 @@ import org.apache.camel.util.ResourceHel
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@ManagedResource(description = "XSLT Endpoint")
+@ManagedResource(description = "Managed XsltEndpoint")
public class XsltEndpoint extends ProcessorEndpoint {
private static final transient Logger LOG = LoggerFactory.getLogger(XsltEndpoint.class);