Skip to content
Snippets Groups Projects
Commit 2e54393d authored by Lana Steuck's avatar Lana Steuck
Browse files

Merge

parents cfd81866 10d82f29
No related branches found
No related tags found
No related merge requests found
Showing
with 37 additions and 21 deletions
...@@ -127,7 +127,7 @@ public abstract class CommandMap { ...@@ -127,7 +127,7 @@ public abstract class CommandMap {
* @param mimeType the MIME type * @param mimeType the MIME type
* @param ds a DataSource for the data * @param ds a DataSource for the data
* @return the CommandInfo classes that represent the command Beans. * @return the CommandInfo classes that represent the command Beans.
* @since JAF 1.1 * @since 1.6, JAF 1.1
*/ */
public CommandInfo[] getPreferredCommands(String mimeType, DataSource ds) { public CommandInfo[] getPreferredCommands(String mimeType, DataSource ds) {
return getPreferredCommands(mimeType); return getPreferredCommands(mimeType);
...@@ -155,7 +155,7 @@ public abstract class CommandMap { ...@@ -155,7 +155,7 @@ public abstract class CommandMap {
* @param mimeType the MIME type * @param mimeType the MIME type
* @param ds a DataSource for the data * @param ds a DataSource for the data
* @return the CommandInfo objects representing all the commands. * @return the CommandInfo objects representing all the commands.
* @since JAF 1.1 * @since 1.6, JAF 1.1
*/ */
public CommandInfo[] getAllCommands(String mimeType, DataSource ds) { public CommandInfo[] getAllCommands(String mimeType, DataSource ds) {
return getAllCommands(mimeType); return getAllCommands(mimeType);
...@@ -183,7 +183,7 @@ public abstract class CommandMap { ...@@ -183,7 +183,7 @@ public abstract class CommandMap {
* @param cmdName the command name * @param cmdName the command name
* @param ds a DataSource for the data * @param ds a DataSource for the data
* @return the CommandInfo corresponding to the command. * @return the CommandInfo corresponding to the command.
* @since JAF 1.1 * @since 1.6, JAF 1.1
*/ */
public CommandInfo getCommand(String mimeType, String cmdName, public CommandInfo getCommand(String mimeType, String cmdName,
DataSource ds) { DataSource ds) {
...@@ -215,7 +215,7 @@ public abstract class CommandMap { ...@@ -215,7 +215,7 @@ public abstract class CommandMap {
* @param mimeType the MIME type * @param mimeType the MIME type
* @param ds a DataSource for the data * @param ds a DataSource for the data
* @return the DataContentHandler for the MIME type * @return the DataContentHandler for the MIME type
* @since JAF 1.1 * @since 1.6, JAF 1.1
*/ */
public DataContentHandler createDataContentHandler(String mimeType, public DataContentHandler createDataContentHandler(String mimeType,
DataSource ds) { DataSource ds) {
...@@ -228,7 +228,7 @@ public abstract class CommandMap { ...@@ -228,7 +228,7 @@ public abstract class CommandMap {
* null is returned. * null is returned.
* *
* @return array of MIME types as strings, or null if not supported * @return array of MIME types as strings, or null if not supported
* @since JAF 1.1 * @since 1.6, JAF 1.1
*/ */
public String[] getMimeTypes() { public String[] getMimeTypes() {
return null; return null;
......
...@@ -603,7 +603,7 @@ public class MailcapCommandMap extends CommandMap { ...@@ -603,7 +603,7 @@ public class MailcapCommandMap extends CommandMap {
* Get all the MIME types known to this command map. * Get all the MIME types known to this command map.
* *
* @return array of MIME types as strings * @return array of MIME types as strings
* @since JAF 1.1 * @since 1.6, JAF 1.1
*/ */
public synchronized String[] getMimeTypes() { public synchronized String[] getMimeTypes() {
List mtList = new ArrayList(); List mtList = new ArrayList();
...@@ -639,7 +639,7 @@ public class MailcapCommandMap extends CommandMap { ...@@ -639,7 +639,7 @@ public class MailcapCommandMap extends CommandMap {
* MIME type are returned. * MIME type are returned.
* *
* @return array of native command entries * @return array of native command entries
* @since JAF 1.1 * @since 1.6, JAF 1.1
*/ */
public synchronized String[] getNativeCommands(String mimeType) { public synchronized String[] getNativeCommands(String mimeType) {
List cmdList = new ArrayList(); List cmdList = new ArrayList();
......
...@@ -43,7 +43,7 @@ import static java.lang.annotation.RetentionPolicy.*; ...@@ -43,7 +43,7 @@ import static java.lang.annotation.RetentionPolicy.*;
* <p>The comment element is a place holder for any comments that the code * <p>The comment element is a place holder for any comments that the code
* generator may want to include in the generated code.</p> * generator may want to include in the generated code.</p>
* *
* @since Common Annotations 1.0 * @since 1.6, Common Annotations 1.0
*/ */
@Documented @Documented
......
...@@ -70,9 +70,10 @@ import static java.lang.annotation.RetentionPolicy.*; ...@@ -70,9 +70,10 @@ import static java.lang.annotation.RetentionPolicy.*;
* <li>If the method throws an unchecked exception the class MUST NOT be put into * <li>If the method throws an unchecked exception the class MUST NOT be put into
* service except in the case of EJBs where the EJB can handle exceptions and * service except in the case of EJBs where the EJB can handle exceptions and
* even recover from them.</li></ul> * even recover from them.</li></ul>
* @since Common Annotations 1.0 *
* @see javax.annotation.PreDestroy * @see javax.annotation.PreDestroy
* @see javax.annotation.Resource * @see javax.annotation.Resource
* @since 1.6, Common Annotations 1.0
*/ */
@Documented @Documented
@Retention (RUNTIME) @Retention (RUNTIME)
......
...@@ -72,7 +72,7 @@ import static java.lang.annotation.RetentionPolicy.*; ...@@ -72,7 +72,7 @@ import static java.lang.annotation.RetentionPolicy.*;
* *
* @see javax.annotation.PostConstruct * @see javax.annotation.PostConstruct
* @see javax.annotation.Resource * @see javax.annotation.Resource
* @since Common Annotations 1.0 * @since 1.6, Common Annotations 1.0
*/ */
@Documented @Documented
......
...@@ -48,7 +48,7 @@ import static java.lang.annotation.RetentionPolicy.*; ...@@ -48,7 +48,7 @@ import static java.lang.annotation.RetentionPolicy.*;
* appear on private fields and methods of superclasses; the container * appear on private fields and methods of superclasses; the container
* is required to perform injection in these cases as well. * is required to perform injection in these cases as well.
* *
* @since Common Annotations 1.0 * @since 1.6, Common Annotations 1.0
*/ */
@Target({TYPE, FIELD, METHOD}) @Target({TYPE, FIELD, METHOD})
@Retention(RUNTIME) @Retention(RUNTIME)
...@@ -66,7 +66,7 @@ public @interface Resource { ...@@ -66,7 +66,7 @@ public @interface Resource {
* The name of the resource that the reference points to. It can * The name of the resource that the reference points to. It can
* link to any compatible resource using the global JNDI names. * link to any compatible resource using the global JNDI names.
* *
* @since Common Annotations 1.1 * @since 1.7, Common Annotations 1.1
*/ */
String lookup() default ""; String lookup() default "";
......
...@@ -32,7 +32,7 @@ import static java.lang.annotation.RetentionPolicy.*; ...@@ -32,7 +32,7 @@ import static java.lang.annotation.RetentionPolicy.*;
* This class is used to allow multiple resources declarations. * This class is used to allow multiple resources declarations.
* *
* @see javax.annotation.Resource * @see javax.annotation.Resource
* @since Common Annotations 1.0 * @since 1.6, Common Annotations 1.0
*/ */
@Documented @Documented
......
...@@ -28,6 +28,9 @@ package javax.jws; ...@@ -28,6 +28,9 @@ package javax.jws;
import java.lang.annotation.*; import java.lang.annotation.*;
import static java.lang.annotation.ElementType.*; import static java.lang.annotation.ElementType.*;
/**
* @since 1.6
*/
@Retention(value=RetentionPolicy.RUNTIME) @Retention(value=RetentionPolicy.RUNTIME)
@Target({TYPE, METHOD, FIELD}) @Target({TYPE, METHOD, FIELD})
public @interface HandlerChain { public @interface HandlerChain {
......
...@@ -27,6 +27,9 @@ package javax.jws; ...@@ -27,6 +27,9 @@ package javax.jws;
import java.lang.annotation.*; import java.lang.annotation.*;
import static java.lang.annotation.ElementType.*; import static java.lang.annotation.ElementType.*;
/**
* @since 1.6
*/
@Retention(value=RetentionPolicy.RUNTIME) @Retention(value=RetentionPolicy.RUNTIME)
@Target({METHOD}) @Target({METHOD})
public @interface Oneway { public @interface Oneway {
......
...@@ -27,6 +27,9 @@ package javax.jws; ...@@ -27,6 +27,9 @@ package javax.jws;
import java.lang.annotation.*; import java.lang.annotation.*;
import static java.lang.annotation.ElementType.*; import static java.lang.annotation.ElementType.*;
/**
* @since 1.6
*/
@Retention(value=RetentionPolicy.RUNTIME) @Retention(value=RetentionPolicy.RUNTIME)
@Target({METHOD}) @Target({METHOD})
public @interface WebMethod { public @interface WebMethod {
......
...@@ -27,6 +27,9 @@ package javax.jws; ...@@ -27,6 +27,9 @@ package javax.jws;
import java.lang.annotation.*; import java.lang.annotation.*;
import static java.lang.annotation.ElementType.*; import static java.lang.annotation.ElementType.*;
/**
* @since 1.6
*/
@Retention(value=RetentionPolicy.RUNTIME) @Retention(value=RetentionPolicy.RUNTIME)
@Target({PARAMETER}) @Target({PARAMETER})
public @interface WebParam { public @interface WebParam {
......
...@@ -27,6 +27,9 @@ package javax.jws; ...@@ -27,6 +27,9 @@ package javax.jws;
import java.lang.annotation.*; import java.lang.annotation.*;
import static java.lang.annotation.ElementType.*; import static java.lang.annotation.ElementType.*;
/**
* @since 1.6
*/
@Retention(value=RetentionPolicy.RUNTIME) @Retention(value=RetentionPolicy.RUNTIME)
@Target({METHOD}) @Target({METHOD})
public @interface WebResult { public @interface WebResult {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment