geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1659326 - /geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/
Date Thu, 12 Feb 2015 17:16:21 GMT
Author: rmannibucau
Date: Thu Feb 12 17:16:21 2015
New Revision: 1659326

URL: http://svn.apache.org/r1659326
Log:
Applying mtaylor PR to fix JMS 2 API compliancy - thanks a lot Martyn

Removed:
    geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSFormatRuntimeException.java
Modified:
    geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSConnectionFactoryDefinition.java
    geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSConnectionFactoryDefinitions.java
    geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSDestinationDefinition.java
    geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSDestinationDefinitions.java
    geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/MessageConsumer.java
    geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/MessageProducer.java
    geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/Session.java

Modified: geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSConnectionFactoryDefinition.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSConnectionFactoryDefinition.java?rev=1659326&r1=1659325&r2=1659326&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSConnectionFactoryDefinition.java
(original)
+++ geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSConnectionFactoryDefinition.java
Thu Feb 12 17:16:21 2015
@@ -26,7 +26,7 @@ import static java.lang.annotation.Eleme
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 @Retention(RUNTIME)
-@Target({METHOD, FIELD, PARAMETER, TYPE})
+@Target(TYPE)
 public @interface JMSConnectionFactoryDefinition {
     String name();
 
@@ -47,4 +47,8 @@ public @interface JMSConnectionFactoryDe
     int maxPoolSize() default -1;
 
     int minPoolSize() default -1;
+
+    String description() default "";
+
+    String interfaceName() default "";
 }

Modified: geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSConnectionFactoryDefinitions.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSConnectionFactoryDefinitions.java?rev=1659326&r1=1659325&r2=1659326&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSConnectionFactoryDefinitions.java
(original)
+++ geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSConnectionFactoryDefinitions.java
Thu Feb 12 17:16:21 2015
@@ -26,7 +26,7 @@ import static java.lang.annotation.Eleme
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 @Retention(RUNTIME)
-@Target({METHOD, FIELD, PARAMETER, TYPE})
+@Target(TYPE)
 public @interface JMSConnectionFactoryDefinitions {
     JMSConnectionFactoryDefinition[] value();
 }

Modified: geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSDestinationDefinition.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSDestinationDefinition.java?rev=1659326&r1=1659325&r2=1659326&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSDestinationDefinition.java
(original)
+++ geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSDestinationDefinition.java
Thu Feb 12 17:16:21 2015
@@ -26,7 +26,7 @@ import static java.lang.annotation.Eleme
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 @Retention(RUNTIME)
-@Target({METHOD, FIELD, PARAMETER, TYPE})
+@Target(TYPE)
 public @interface JMSDestinationDefinition {
     String interfaceName();
 
@@ -39,4 +39,6 @@ public @interface JMSDestinationDefiniti
     String destinationName() default "";
 
     String[] properties() default {};
+
+    String description() default "";
 }

Modified: geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSDestinationDefinitions.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSDestinationDefinitions.java?rev=1659326&r1=1659325&r2=1659326&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSDestinationDefinitions.java
(original)
+++ geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/JMSDestinationDefinitions.java
Thu Feb 12 17:16:21 2015
@@ -26,7 +26,7 @@ import static java.lang.annotation.Eleme
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 @Retention(RUNTIME)
-@Target({METHOD, FIELD, PARAMETER, TYPE})
+@Target(TYPE)
 public @interface JMSDestinationDefinitions {
-    JMSConnectionFactoryDefinition[] value();
+    JMSDestinationDefinition[] value();
 }

Modified: geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/MessageConsumer.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/MessageConsumer.java?rev=1659326&r1=1659325&r2=1659326&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/MessageConsumer.java
(original)
+++ geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/MessageConsumer.java
Thu Feb 12 17:16:21 2015
@@ -28,7 +28,7 @@ package javax.jms;
 /**
  * @version $Rev: 467553 $ $Date: 2006-10-25 00:01:51 -0400 (Wed, 25 Oct 2006) $
  */
-public interface MessageConsumer {
+public interface MessageConsumer extends AutoCloseable {
     String getMessageSelector() throws JMSException;
 
     MessageListener getMessageListener() throws JMSException;

Modified: geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/MessageProducer.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/MessageProducer.java?rev=1659326&r1=1659325&r2=1659326&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/MessageProducer.java
(original)
+++ geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/MessageProducer.java
Thu Feb 12 17:16:21 2015
@@ -28,7 +28,7 @@ package javax.jms;
 /**
  * @version $Rev: 467553 $ $Date: 2006-10-25 00:01:51 -0400 (Wed, 25 Oct 2006) $
  */
-public interface MessageProducer {
+public interface MessageProducer extends AutoCloseable {
     void setDisableMessageID(boolean value) throws JMSException;
 
     boolean getDisableMessageID() throws JMSException;

Modified: geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/Session.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/Session.java?rev=1659326&r1=1659325&r2=1659326&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/Session.java (original)
+++ geronimo/specs/trunk/geronimo-jms_2.0_spec/src/main/java/javax/jms/Session.java Thu Feb
12 17:16:21 2015
@@ -30,7 +30,7 @@ import java.io.Serializable;
 /**
  * @version $Rev: 467553 $ $Date: 2006-10-25 00:01:51 -0400 (Wed, 25 Oct 2006) $
  */
-public interface Session extends Runnable {
+public interface Session extends Runnable, AutoCloseable {
     static final int AUTO_ACKNOWLEDGE = 1;
 
     static final int CLIENT_ACKNOWLEDGE = 2;



Mime
View raw message