Author: jmesnil Date: 2010-01-06 04:29:49 -0500 (Wed, 06 Jan 2010) New Revision: 8725 Added: trunk/src/main/org/hornetq/api/core/management/Operation.java trunk/src/main/org/hornetq/api/core/management/Parameter.java Removed: trunk/src/main/org/hornetq/core/server/management/Operation.java trunk/src/main/org/hornetq/core/server/management/Parameter.java Modified: trunk/src/main/org/hornetq/api/core/management/AddressControl.java trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java trunk/src/main/org/hornetq/api/core/management/QueueControl.java trunk/src/main/org/hornetq/api/jms/management/DestinationControl.java trunk/src/main/org/hornetq/api/jms/management/JMSQueueControl.java trunk/src/main/org/hornetq/api/jms/management/JMSServerControl.java trunk/src/main/org/hornetq/api/jms/management/TopicControl.java trunk/src/main/org/hornetq/core/management/impl/MBeanInfoHelper.java Log: HORNETQ-258: Public vs. Private API * moved Operation and Parameter annotations to api.core.management package Modified: trunk/src/main/org/hornetq/api/core/management/AddressControl.java =================================================================== --- trunk/src/main/org/hornetq/api/core/management/AddressControl.java 2010-01-06 09:14:32 UTC (rev 8724) +++ trunk/src/main/org/hornetq/api/core/management/AddressControl.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -13,8 +13,6 @@ package org.hornetq.api.core.management; -import org.hornetq.core.server.management.Operation; -import org.hornetq.core.server.management.Parameter; /** * An AddressControl is used to manage an address. Modified: trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java =================================================================== --- trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-01-06 09:14:32 UTC (rev 8724) +++ trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -17,8 +17,6 @@ import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.management.Operation; -import org.hornetq.core.server.management.Parameter; /** * A HornetQServerControl is used to manage HornetQ servers. Copied: trunk/src/main/org/hornetq/api/core/management/Operation.java (from rev 8724, trunk/src/main/org/hornetq/core/server/management/Operation.java) =================================================================== --- trunk/src/main/org/hornetq/api/core/management/Operation.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/management/Operation.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -0,0 +1,43 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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. + */ + +package org.hornetq.api.core.management; + +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; + +import javax.management.MBeanOperationInfo; + +/** + * Info for a MBean Operation. + * + * This annotation is used only for methods which can be invoked + * through a GUI. + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * @version <tt>$Revision$</tt> + * + */ +(a)Retention(RetentionPolicy.RUNTIME) +(a)Target(ElementType.METHOD) +@Inherited +public @interface Operation +{ + String desc(); + + int impact() default MBeanOperationInfo.INFO; +} Copied: trunk/src/main/org/hornetq/api/core/management/Parameter.java (from rev 8724, trunk/src/main/org/hornetq/core/server/management/Parameter.java) =================================================================== --- trunk/src/main/org/hornetq/api/core/management/Parameter.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/management/Parameter.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -0,0 +1,36 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat 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. + */ + +package org.hornetq.api.core.management; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Info for a MBean Operation Parameter. + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * @version <tt>$Revision$</tt> + * + */ +(a)Retention(RetentionPolicy.RUNTIME) +(a)Target(ElementType.PARAMETER) +public @interface Parameter +{ + String name(); + + String desc() default "N/A"; +} Modified: trunk/src/main/org/hornetq/api/core/management/QueueControl.java =================================================================== --- trunk/src/main/org/hornetq/api/core/management/QueueControl.java 2010-01-06 09:14:32 UTC (rev 8724) +++ trunk/src/main/org/hornetq/api/core/management/QueueControl.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -17,8 +17,6 @@ import javax.management.MBeanOperationInfo; -import org.hornetq.core.server.management.Operation; -import org.hornetq.core.server.management.Parameter; /** * A QueueControl is used to manage a queue. Modified: trunk/src/main/org/hornetq/api/jms/management/DestinationControl.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/management/DestinationControl.java 2010-01-06 09:14:32 UTC (rev 8724) +++ trunk/src/main/org/hornetq/api/jms/management/DestinationControl.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -15,8 +15,8 @@ import javax.management.MBeanOperationInfo; -import org.hornetq.core.server.management.Operation; -import org.hornetq.core.server.management.Parameter; +import org.hornetq.api.core.management.Operation; +import org.hornetq.api.core.management.Parameter; /** * A DestinationControl is used to manage a JMS Destination. Modified: trunk/src/main/org/hornetq/api/jms/management/JMSQueueControl.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/management/JMSQueueControl.java 2010-01-06 09:14:32 UTC (rev 8724) +++ trunk/src/main/org/hornetq/api/jms/management/JMSQueueControl.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -17,8 +17,8 @@ import javax.management.MBeanOperationInfo; -import org.hornetq.core.server.management.Operation; -import org.hornetq.core.server.management.Parameter; +import org.hornetq.api.core.management.Operation; +import org.hornetq.api.core.management.Parameter; /** * A JMSQueueControl is used to manage a JMS queue. Modified: trunk/src/main/org/hornetq/api/jms/management/JMSServerControl.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/management/JMSServerControl.java 2010-01-06 09:14:32 UTC (rev 8724) +++ trunk/src/main/org/hornetq/api/jms/management/JMSServerControl.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -19,8 +19,8 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.core.server.management.Operation; -import org.hornetq.core.server.management.Parameter; +import org.hornetq.api.core.management.Operation; +import org.hornetq.api.core.management.Parameter; import org.hornetq.spi.core.remoting.ConnectorFactory; /** Modified: trunk/src/main/org/hornetq/api/jms/management/TopicControl.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/management/TopicControl.java 2010-01-06 09:14:32 UTC (rev 8724) +++ trunk/src/main/org/hornetq/api/jms/management/TopicControl.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -17,8 +17,8 @@ import javax.management.MBeanOperationInfo; -import org.hornetq.core.server.management.Operation; -import org.hornetq.core.server.management.Parameter; +import org.hornetq.api.core.management.Operation; +import org.hornetq.api.core.management.Parameter; /** * A TopicControl is used to manage a JMS Topic. Modified: trunk/src/main/org/hornetq/core/management/impl/MBeanInfoHelper.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/MBeanInfoHelper.java 2010-01-06 09:14:32 UTC (rev 8724) +++ trunk/src/main/org/hornetq/core/management/impl/MBeanInfoHelper.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -21,8 +21,8 @@ import javax.management.MBeanOperationInfo; import javax.management.MBeanParameterInfo; -import org.hornetq.core.server.management.Operation; -import org.hornetq.core.server.management.Parameter; +import org.hornetq.api.core.management.Operation; +import org.hornetq.api.core.management.Parameter; /** * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> Deleted: trunk/src/main/org/hornetq/core/server/management/Operation.java =================================================================== --- trunk/src/main/org/hornetq/core/server/management/Operation.java 2010-01-06 09:14:32 UTC (rev 8724) +++ trunk/src/main/org/hornetq/core/server/management/Operation.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -1,43 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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. - */ - -package org.hornetq.core.server.management; - -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; - -import javax.management.MBeanOperationInfo; - -/** - * Info for a MBean Operation. - * - * This annotation is used only for methods which can be invoked - * through a GUI. - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * - * @version <tt>$Revision$</tt> - * - */ -(a)Retention(RetentionPolicy.RUNTIME) -(a)Target(ElementType.METHOD) -@Inherited -public @interface Operation -{ - String desc(); - - int impact() default MBeanOperationInfo.INFO; -} Deleted: trunk/src/main/org/hornetq/core/server/management/Parameter.java =================================================================== --- trunk/src/main/org/hornetq/core/server/management/Parameter.java 2010-01-06 09:14:32 UTC (rev 8724) +++ trunk/src/main/org/hornetq/core/server/management/Parameter.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -1,36 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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. - */ - -package org.hornetq.core.server.management; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Info for a MBean Operation Parameter. - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * - * @version <tt>$Revision$</tt> - * - */ -(a)Retention(RetentionPolicy.RUNTIME) -(a)Target(ElementType.PARAMETER) -public @interface Parameter -{ - String name(); - - String desc() default "N/A"; -}