Mercurial > hg > openjdk > jdk9 > jaxws
changeset 750:7c829eba7814 jdk-9+156
8173604: Rename module 8173604 java.annotations.common to java.xml.ws.annoations
Reviewed-by: dfuchs, alanb, psandoz, mchung
| author | lancea |
|---|---|
| date | Sat, 04 Feb 2017 14:03:15 -0500 |
| parents | 83c33cc9f158 |
| children | 78a7ade93491 42993fcbd8f3 |
| files | src/java.annotations.common/share/classes/javax/annotation/Generated.java src/java.annotations.common/share/classes/javax/annotation/PostConstruct.java src/java.annotations.common/share/classes/javax/annotation/PreDestroy.java src/java.annotations.common/share/classes/javax/annotation/Resource.java src/java.annotations.common/share/classes/javax/annotation/Resources.java src/java.annotations.common/share/classes/module-info.java src/java.xml.ws.annotation/share/classes/javax/annotation/Generated.java src/java.xml.ws.annotation/share/classes/javax/annotation/PostConstruct.java src/java.xml.ws.annotation/share/classes/javax/annotation/PreDestroy.java src/java.xml.ws.annotation/share/classes/javax/annotation/Resource.java src/java.xml.ws.annotation/share/classes/javax/annotation/Resources.java src/java.xml.ws.annotation/share/classes/module-info.java src/java.xml.ws/share/classes/module-info.java |
| diffstat | 13 files changed, 446 insertions(+), 446 deletions(-) [+] |
line wrap: on
line diff
--- a/src/java.annotations.common/share/classes/javax/annotation/Generated.java Thu Feb 02 21:20:38 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package javax.annotation; -import java.lang.annotation.*; -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; - -/** - * The Generated annotation is used to mark source code that has been generated. - * It can also be used to differentiate user written code from generated code - * in a single file. When used, the value element must have the name of the - * code generator. The recommended convention is to use the fully qualified - * name of the code generator in the value field . - * <p>For example: com.company.package.classname. - * The date element is used to indicate the date the source was generated. - * The date element must follow the ISO 8601 standard. For example the date - * element would have the following value 2001-07-04T12:08:56.235-0700 - * which represents 2001-07-04 12:08:56 local time in the U.S. Pacific - * Time time zone.</p> - * <p>The comment element is a place holder for any comments that the code - * generator may want to include in the generated code.</p> - * - * @since 1.6, Common Annotations 1.0 - */ - -@Documented -@Retention(SOURCE) -@Target({PACKAGE, TYPE, ANNOTATION_TYPE, METHOD, CONSTRUCTOR, FIELD, - LOCAL_VARIABLE, PARAMETER}) -public @interface Generated { - /** - * The value element MUST have the name of the code generator. - * The recommended convention is to use the fully qualified name of the - * code generator. For example: com.acme.generator.CodeGen. - */ - String[] value(); - - /** - * Date when the source was generated. - */ - String date() default ""; - - /** - * A place holder for any comments that the code generator may want to - * include in the generated code. - */ - String comments() default ""; -}
--- a/src/java.annotations.common/share/classes/javax/annotation/PostConstruct.java Thu Feb 02 21:20:38 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package javax.annotation; - -import java.lang.annotation.*; -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; - -/** - * The PostConstruct annotation is used on a method that needs to be executed - * after dependency injection is done to perform any initialization. This - * method MUST be invoked before the class is put into service. This - * annotation MUST be supported on all classes that support dependency - * injection. The method annotated with PostConstruct MUST be invoked even - * if the class does not request any resources to be injected. Only one - * method can be annotated with this annotation. The method on which the - * PostConstruct annotation is applied MUST fulfill all of the following - * criteria: - * <ul> - * <li>The method MUST NOT have any parameters except in the case of - * interceptors in which case it takes an InvocationContext object as - * defined by the Interceptors specification.</li> - * <li>The method defined on an interceptor class MUST HAVE one of the - * following signatures: - * <p> - * void <METHOD>(InvocationContext) - * <p> - * Object <METHOD>(InvocationContext) throws Exception - * <p> - * <i>Note: A PostConstruct interceptor method must not throw application - * exceptions, but it may be declared to throw checked exceptions including - * the java.lang.Exception if the same interceptor method interposes on - * business or timeout methods in addition to lifecycle events. If a - * PostConstruct interceptor method returns a value, it is ignored by - * the container.</i> - * </li> - * <li>The method defined on a non-interceptor class MUST HAVE the - * following signature: - * <p> - * void <METHOD>() - * </li> - * <li>The method on which PostConstruct is applied MAY be public, protected, - * package private or private.</li> - * <li>The method MUST NOT be static except for the application client.</li> - * <li>The method MAY be final.</li> - * <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 - * even recover from them.</li></ul> - * - * @see javax.annotation.PreDestroy - * @see javax.annotation.Resource - * @since 1.6, Common Annotations 1.0 - */ -@Documented -@Retention (RUNTIME) -@Target(METHOD) -public @interface PostConstruct { -}
--- a/src/java.annotations.common/share/classes/javax/annotation/PreDestroy.java Thu Feb 02 21:20:38 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package javax.annotation; - -import java.lang.annotation.*; -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; - -/** - * The PreDestroy annotation is used on methods as a callback notification to - * signal that the instance is in the process of being removed by the - * container. The method annotated with PreDestroy is typically used to - * release resources that it has been holding. This annotation MUST be - * supported by all container managed objects that support PostConstruct - * except the application client container in Java EE 5. The method on which - * the PreDestroy annotation is applied MUST fulfill all of the following - * criteria: - * <ul> - * <li>The method MUST NOT have any parameters except in the case of - * interceptors in which case it takes an InvocationContext object as - * defined by the Interceptors specification.</li> - * <li>The method defined on an interceptor class MUST HAVE one of the - * following signatures: - * <p> - * void <METHOD>(InvocationContext) - * <p> - * Object <METHOD>(InvocationContext) throws Exception - * <p> - * <i>Note: A PreDestroy interceptor method must not throw application - * exceptions, but it may be declared to throw checked exceptions including - * the java.lang.Exception if the same interceptor method interposes on - * business or timeout methods in addition to lifecycle events. If a - * PreDestroy interceptor method returns a value, it is ignored by - * the container.</i> - * </li> - * <li>The method defined on a non-interceptor class MUST HAVE the - * following signature: - * <p> - * void <METHOD>() - * </li> - * <li>The method on which PreDestroy is applied MAY be public, protected, - * package private or private.</li> - * <li>The method MUST NOT be static.</li> - * <li>The method MAY be final.</li> - * <li>If the method throws an unchecked exception it is ignored except in the - * case of EJBs where the EJB can handle exceptions.</li> - * </ul> - * - * @see javax.annotation.PostConstruct - * @see javax.annotation.Resource - * @since 1.6, Common Annotations 1.0 - */ - -@Documented -@Retention (RUNTIME) -@Target(METHOD) -public @interface PreDestroy { -}
--- a/src/java.annotations.common/share/classes/javax/annotation/Resource.java Thu Feb 02 21:20:38 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,132 +0,0 @@ -/* - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package javax.annotation; - -import java.lang.annotation.*; -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; - -/** - * The Resource annotation marks a resource that is needed - * by the application. This annotation may be applied to an - * application component class, or to fields or methods of the - * component class. When the annotation is applied to a - * field or method, the container will inject an instance - * of the requested resource into the application component - * when the component is initialized. If the annotation is - * applied to the component class, the annotation declares a - * resource that the application will look up at runtime. <p> - * - * Even though this annotation is not marked Inherited, deployment - * tools are required to examine all superclasses of any component - * class to discover all uses of this annotation in all superclasses. - * All such annotation instances specify resources that are needed - * by the application component. Note that this annotation may - * appear on private fields and methods of superclasses; the container - * is required to perform injection in these cases as well. - * - * @since 1.6, Common Annotations 1.0 - */ -@Target({TYPE, FIELD, METHOD}) -@Retention(RUNTIME) -public @interface Resource { - /** - * The JNDI name of the resource. For field annotations, - * the default is the field name. For method annotations, - * the default is the JavaBeans property name corresponding - * to the method. For class annotations, there is no default - * and this must be specified. - */ - String name() default ""; - - /** - * The name of the resource that the reference points to. It can - * link to any compatible resource using the global JNDI names. - * - * @since 1.7, Common Annotations 1.1 - */ - - String lookup() default ""; - - /** - * The Java type of the resource. For field annotations, - * the default is the type of the field. For method annotations, - * the default is the type of the JavaBeans property. - * For class annotations, there is no default and this must be - * specified. - */ - Class<?> type() default java.lang.Object.class; - - /** - * The two possible authentication types for a resource. - */ - enum AuthenticationType { - CONTAINER, - APPLICATION - } - - /** - * The authentication type to use for this resource. - * This may be specified for resources representing a - * connection factory of any supported type, and must - * not be specified for resources of other types. - */ - AuthenticationType authenticationType() default AuthenticationType.CONTAINER; - - /** - * Indicates whether this resource can be shared between - * this component and other components. - * This may be specified for resources representing a - * connection factory of any supported type, and must - * not be specified for resources of other types. - */ - boolean shareable() default true; - - /** - * A product specific name that this resource should be mapped to. - * The name of this resource, as defined by the <code>name</code> - * element or defaulted, is a name that is local to the application - * component using the resource. (It's a name in the JNDI - * <code>java:comp/env</code> namespace.) Many application servers - * provide a way to map these local names to names of resources - * known to the application server. This mapped name is often a - * <i>global</i> JNDI name, but may be a name of any form. <p> - * - * Application servers are not required to support any particular - * form or type of mapped name, nor the ability to use mapped names. - * The mapped name is product-dependent and often installation-dependent. - * No use of a mapped name is portable. - */ - String mappedName() default ""; - - /** - * Description of this resource. The description is expected - * to be in the default language of the system on which the - * application is deployed. The description can be presented - * to the Deployer to help in choosing the correct resource. - */ - String description() default ""; -}
--- a/src/java.annotations.common/share/classes/javax/annotation/Resources.java Thu Feb 02 21:20:38 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package javax.annotation; -import java.lang.annotation.*; -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; - -/** - * This class is used to allow multiple resources declarations. - * - * @see javax.annotation.Resource - * @since 1.6, Common Annotations 1.0 - */ - -@Documented -@Retention(RUNTIME) -@Target(TYPE) -public @interface Resources { - /** - * Array used for multiple resource declarations. - */ - Resource[] value(); -}
--- a/src/java.annotations.common/share/classes/module-info.java Thu Feb 02 21:20:38 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/** - * Defines a subset of the Common Annotations API to support programs running - * on the Java SE Platform. - */ -module java.annotations.common { - exports javax.annotation; -} -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/java.xml.ws.annotation/share/classes/javax/annotation/Generated.java Sat Feb 04 14:03:15 2017 -0500 @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package javax.annotation; +import java.lang.annotation.*; +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.RetentionPolicy.*; + +/** + * The Generated annotation is used to mark source code that has been generated. + * It can also be used to differentiate user written code from generated code + * in a single file. When used, the value element must have the name of the + * code generator. The recommended convention is to use the fully qualified + * name of the code generator in the value field . + * <p>For example: com.company.package.classname. + * The date element is used to indicate the date the source was generated. + * The date element must follow the ISO 8601 standard. For example the date + * element would have the following value 2001-07-04T12:08:56.235-0700 + * which represents 2001-07-04 12:08:56 local time in the U.S. Pacific + * Time time zone.</p> + * <p>The comment element is a place holder for any comments that the code + * generator may want to include in the generated code.</p> + * + * @since 1.6, Common Annotations 1.0 + */ + +@Documented +@Retention(SOURCE) +@Target({PACKAGE, TYPE, ANNOTATION_TYPE, METHOD, CONSTRUCTOR, FIELD, + LOCAL_VARIABLE, PARAMETER}) +public @interface Generated { + /** + * The value element MUST have the name of the code generator. + * The recommended convention is to use the fully qualified name of the + * code generator. For example: com.acme.generator.CodeGen. + */ + String[] value(); + + /** + * Date when the source was generated. + */ + String date() default ""; + + /** + * A place holder for any comments that the code generator may want to + * include in the generated code. + */ + String comments() default ""; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/java.xml.ws.annotation/share/classes/javax/annotation/PostConstruct.java Sat Feb 04 14:03:15 2017 -0500 @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package javax.annotation; + +import java.lang.annotation.*; +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.RetentionPolicy.*; + +/** + * The PostConstruct annotation is used on a method that needs to be executed + * after dependency injection is done to perform any initialization. This + * method MUST be invoked before the class is put into service. This + * annotation MUST be supported on all classes that support dependency + * injection. The method annotated with PostConstruct MUST be invoked even + * if the class does not request any resources to be injected. Only one + * method can be annotated with this annotation. The method on which the + * PostConstruct annotation is applied MUST fulfill all of the following + * criteria: + * <ul> + * <li>The method MUST NOT have any parameters except in the case of + * interceptors in which case it takes an InvocationContext object as + * defined by the Interceptors specification.</li> + * <li>The method defined on an interceptor class MUST HAVE one of the + * following signatures: + * <p> + * void <METHOD>(InvocationContext) + * <p> + * Object <METHOD>(InvocationContext) throws Exception + * <p> + * <i>Note: A PostConstruct interceptor method must not throw application + * exceptions, but it may be declared to throw checked exceptions including + * the java.lang.Exception if the same interceptor method interposes on + * business or timeout methods in addition to lifecycle events. If a + * PostConstruct interceptor method returns a value, it is ignored by + * the container.</i> + * </li> + * <li>The method defined on a non-interceptor class MUST HAVE the + * following signature: + * <p> + * void <METHOD>() + * </li> + * <li>The method on which PostConstruct is applied MAY be public, protected, + * package private or private.</li> + * <li>The method MUST NOT be static except for the application client.</li> + * <li>The method MAY be final.</li> + * <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 + * even recover from them.</li></ul> + * + * @see javax.annotation.PreDestroy + * @see javax.annotation.Resource + * @since 1.6, Common Annotations 1.0 + */ +@Documented +@Retention (RUNTIME) +@Target(METHOD) +public @interface PostConstruct { +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/java.xml.ws.annotation/share/classes/javax/annotation/PreDestroy.java Sat Feb 04 14:03:15 2017 -0500 @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package javax.annotation; + +import java.lang.annotation.*; +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.RetentionPolicy.*; + +/** + * The PreDestroy annotation is used on methods as a callback notification to + * signal that the instance is in the process of being removed by the + * container. The method annotated with PreDestroy is typically used to + * release resources that it has been holding. This annotation MUST be + * supported by all container managed objects that support PostConstruct + * except the application client container in Java EE 5. The method on which + * the PreDestroy annotation is applied MUST fulfill all of the following + * criteria: + * <ul> + * <li>The method MUST NOT have any parameters except in the case of + * interceptors in which case it takes an InvocationContext object as + * defined by the Interceptors specification.</li> + * <li>The method defined on an interceptor class MUST HAVE one of the + * following signatures: + * <p> + * void <METHOD>(InvocationContext) + * <p> + * Object <METHOD>(InvocationContext) throws Exception + * <p> + * <i>Note: A PreDestroy interceptor method must not throw application + * exceptions, but it may be declared to throw checked exceptions including + * the java.lang.Exception if the same interceptor method interposes on + * business or timeout methods in addition to lifecycle events. If a + * PreDestroy interceptor method returns a value, it is ignored by + * the container.</i> + * </li> + * <li>The method defined on a non-interceptor class MUST HAVE the + * following signature: + * <p> + * void <METHOD>() + * </li> + * <li>The method on which PreDestroy is applied MAY be public, protected, + * package private or private.</li> + * <li>The method MUST NOT be static.</li> + * <li>The method MAY be final.</li> + * <li>If the method throws an unchecked exception it is ignored except in the + * case of EJBs where the EJB can handle exceptions.</li> + * </ul> + * + * @see javax.annotation.PostConstruct + * @see javax.annotation.Resource + * @since 1.6, Common Annotations 1.0 + */ + +@Documented +@Retention (RUNTIME) +@Target(METHOD) +public @interface PreDestroy { +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/java.xml.ws.annotation/share/classes/javax/annotation/Resource.java Sat Feb 04 14:03:15 2017 -0500 @@ -0,0 +1,132 @@ +/* + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package javax.annotation; + +import java.lang.annotation.*; +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.RetentionPolicy.*; + +/** + * The Resource annotation marks a resource that is needed + * by the application. This annotation may be applied to an + * application component class, or to fields or methods of the + * component class. When the annotation is applied to a + * field or method, the container will inject an instance + * of the requested resource into the application component + * when the component is initialized. If the annotation is + * applied to the component class, the annotation declares a + * resource that the application will look up at runtime. <p> + * + * Even though this annotation is not marked Inherited, deployment + * tools are required to examine all superclasses of any component + * class to discover all uses of this annotation in all superclasses. + * All such annotation instances specify resources that are needed + * by the application component. Note that this annotation may + * appear on private fields and methods of superclasses; the container + * is required to perform injection in these cases as well. + * + * @since 1.6, Common Annotations 1.0 + */ +@Target({TYPE, FIELD, METHOD}) +@Retention(RUNTIME) +public @interface Resource { + /** + * The JNDI name of the resource. For field annotations, + * the default is the field name. For method annotations, + * the default is the JavaBeans property name corresponding + * to the method. For class annotations, there is no default + * and this must be specified. + */ + String name() default ""; + + /** + * The name of the resource that the reference points to. It can + * link to any compatible resource using the global JNDI names. + * + * @since 1.7, Common Annotations 1.1 + */ + + String lookup() default ""; + + /** + * The Java type of the resource. For field annotations, + * the default is the type of the field. For method annotations, + * the default is the type of the JavaBeans property. + * For class annotations, there is no default and this must be + * specified. + */ + Class<?> type() default java.lang.Object.class; + + /** + * The two possible authentication types for a resource. + */ + enum AuthenticationType { + CONTAINER, + APPLICATION + } + + /** + * The authentication type to use for this resource. + * This may be specified for resources representing a + * connection factory of any supported type, and must + * not be specified for resources of other types. + */ + AuthenticationType authenticationType() default AuthenticationType.CONTAINER; + + /** + * Indicates whether this resource can be shared between + * this component and other components. + * This may be specified for resources representing a + * connection factory of any supported type, and must + * not be specified for resources of other types. + */ + boolean shareable() default true; + + /** + * A product specific name that this resource should be mapped to. + * The name of this resource, as defined by the <code>name</code> + * element or defaulted, is a name that is local to the application + * component using the resource. (It's a name in the JNDI + * <code>java:comp/env</code> namespace.) Many application servers + * provide a way to map these local names to names of resources + * known to the application server. This mapped name is often a + * <i>global</i> JNDI name, but may be a name of any form. <p> + * + * Application servers are not required to support any particular + * form or type of mapped name, nor the ability to use mapped names. + * The mapped name is product-dependent and often installation-dependent. + * No use of a mapped name is portable. + */ + String mappedName() default ""; + + /** + * Description of this resource. The description is expected + * to be in the default language of the system on which the + * application is deployed. The description can be presented + * to the Deployer to help in choosing the correct resource. + */ + String description() default ""; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/java.xml.ws.annotation/share/classes/javax/annotation/Resources.java Sat Feb 04 14:03:15 2017 -0500 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package javax.annotation; +import java.lang.annotation.*; +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.RetentionPolicy.*; + +/** + * This class is used to allow multiple resources declarations. + * + * @see javax.annotation.Resource + * @since 1.6, Common Annotations 1.0 + */ + +@Documented +@Retention(RUNTIME) +@Target(TYPE) +public @interface Resources { + /** + * Array used for multiple resource declarations. + */ + Resource[] value(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/java.xml.ws.annotation/share/classes/module-info.java Sat Feb 04 14:03:15 2017 -0500 @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * Defines a subset of the Common Annotations API to support programs running + * on the Java SE Platform. + */ +module java.xml.ws.annotation { + exports javax.annotation; +} +
--- a/src/java.xml.ws/share/classes/module-info.java Thu Feb 02 21:20:38 2017 +0000 +++ b/src/java.xml.ws/share/classes/module-info.java Sat Feb 04 14:03:15 2017 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,7 +31,7 @@ requires transitive java.activation; requires transitive java.xml; requires transitive java.xml.bind; - requires java.annotations.common; + requires java.xml.ws.annotation; requires java.desktop; requires java.logging; requires java.management;