geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1542188 - in /geronimo/specs/trunk/geronimo-interceptor_1.2_spec: ./ src/main/java/javax/interceptor/
Date Fri, 15 Nov 2013 07:03:53 GMT
Author: rmannibucau
Date: Fri Nov 15 07:03:52 2013
New Revision: 1542188

URL: http://svn.apache.org/r1542188
Log:
GERONIMO-6463 JSR 318 (interceptor 1.2)

Added:
    geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/AroundConstruct.java
Modified:
    geronimo/specs/trunk/geronimo-interceptor_1.2_spec/NOTICE
    geronimo/specs/trunk/geronimo-interceptor_1.2_spec/pom.xml
    geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/ExcludeClassInterceptors.java
    geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/ExcludeDefaultInterceptors.java
    geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/Interceptor.java
    geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/Interceptors.java
    geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/InvocationContext.java

Modified: geronimo/specs/trunk/geronimo-interceptor_1.2_spec/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-interceptor_1.2_spec/NOTICE?rev=1542188&r1=1542187&r2=1542188&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-interceptor_1.2_spec/NOTICE (original)
+++ geronimo/specs/trunk/geronimo-interceptor_1.2_spec/NOTICE Fri Nov 15 07:03:52 2013
@@ -1,5 +1,5 @@
 Apache Geronimo 
-Copyright 2003-2011 The Apache Software Foundation
+Copyright 2003-2013 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Modified: geronimo/specs/trunk/geronimo-interceptor_1.2_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-interceptor_1.2_spec/pom.xml?rev=1542188&r1=1542187&r2=1542188&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-interceptor_1.2_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-interceptor_1.2_spec/pom.xml Fri Nov 15 07:03:52 2013
@@ -31,28 +31,28 @@
     </parent>
 
     <groupId>org.apache.geronimo.specs</groupId>
-    <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+    <artifactId>geronimo-interceptor_1.2_spec</artifactId>
     <packaging>bundle</packaging>
-    <name>Apache Geronimo Interceptor Spec 1.1</name>
-    <version>1.1-SNAPSHOT</version>
-    <description>Interceptor API 1.1</description>
+    <name>Apache Geronimo Interceptor Spec 1.2</name>
+    <version>1.0-SNAPSHOT</version>
+    <description>Interceptor API 1.2</description>
 
-    <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
+    <url>http://geronimo.apache.org/maven/${siteId}/${project.version}</url>
     <distributionManagement>
         <site>
             <id>apache-website</id>
-            <url>${site.deploy.url}/maven/${siteId}/${version}</url>
+            <url>${site.deploy.url}/maven/${siteId}/${project.version}</url>
         </site>
     </distributionManagement>
 
     <properties>
-        <siteId>specs/${artifactId}</siteId>
+        <siteId>specs/${project.artifactId}</siteId>
     </properties>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-interceptor_1.1_spec/</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-interceptor_1.1_spec/</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-interceptor_1.1_spec/</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-interceptor_1.2_spec/</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-interceptor_1.2_spec/</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-interceptor_1.2_spec/</url>
     </scm>
 
     <build>
@@ -62,7 +62,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Export-Package>javax.interceptor*;version=1.1</Export-Package>
+                        <Export-Package>javax.interceptor*;version=1.2</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

Added: geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/AroundConstruct.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/AroundConstruct.java?rev=1542188&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/AroundConstruct.java
(added)
+++ geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/AroundConstruct.java
Fri Nov 15 07:03:52 2013
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF 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.
+ */
+
+//
+// This source code implements specifications defined by the Java
+// Community Process. In order to remain compliant with the specification
+// DO NOT add / change / or delete method signatures!
+//
+package javax.interceptor;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface AroundConstruct {
+}

Modified: geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/ExcludeClassInterceptors.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/ExcludeClassInterceptors.java?rev=1542188&r1=1542187&r2=1542188&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/ExcludeClassInterceptors.java
(original)
+++ geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/ExcludeClassInterceptors.java
Fri Nov 15 07:03:52 2013
@@ -32,7 +32,7 @@ import java.lang.annotation.RetentionPol
 /**
  * @version $Rev$ $Date$
  */
-@Target({ElementType.METHOD})
+@Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ExcludeClassInterceptors {
 }

Modified: geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/ExcludeDefaultInterceptors.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/ExcludeDefaultInterceptors.java?rev=1542188&r1=1542187&r2=1542188&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/ExcludeDefaultInterceptors.java
(original)
+++ geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/ExcludeDefaultInterceptors.java
Fri Nov 15 07:03:52 2013
@@ -32,7 +32,7 @@ import java.lang.annotation.RetentionPol
 /**
  * @version $Rev$ $Date$
  */
-@Target({ElementType.TYPE, ElementType.METHOD})
+@Target({ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ExcludeDefaultInterceptors {
 }

Modified: geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/Interceptor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/Interceptor.java?rev=1542188&r1=1542187&r2=1542188&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/Interceptor.java
(original)
+++ geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/Interceptor.java
Fri Nov 15 07:03:52 2013
@@ -35,5 +35,15 @@ import java.lang.annotation.Target;
 @Documented
 public @interface Interceptor
 {
+    public static class Priority {
+        int PLATFORM_BEFORE = 0;
+        int LIBRARY_BEFORE = 1000;
+        int APPLICATION = 2000;
+        int LIBRARY_AFTER = 3000;
+        int PLATFORM_AFTER = 4000;
 
+        private Priority() {
+            // no-op
+        }
+    }
 }

Modified: geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/Interceptors.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/Interceptors.java?rev=1542188&r1=1542187&r2=1542188&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/Interceptors.java
(original)
+++ geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/Interceptors.java
Fri Nov 15 07:03:52 2013
@@ -32,7 +32,7 @@ import java.lang.annotation.RetentionPol
 /**
  * @version $Rev$ $Date$
  */
-@Target({ElementType.TYPE, ElementType.METHOD})
+@Target({ElementType.TYPE, ElementType.METHOD, ElementType.CONSTRUCTOR})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Interceptors {
     Class[] value();

Modified: geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/InvocationContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/InvocationContext.java?rev=1542188&r1=1542187&r2=1542188&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/InvocationContext.java
(original)
+++ geronimo/specs/trunk/geronimo-interceptor_1.2_spec/src/main/java/javax/interceptor/InvocationContext.java
Fri Nov 15 07:03:52 2013
@@ -25,24 +25,28 @@
 
 package javax.interceptor;
 
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
+import java.util.Map;
 
 /**
  * @version $Rev$ $Date$
  */
 public interface InvocationContext {
 
-    public Object getTarget();
+    Object getTarget();
 
-    public Method getMethod();
+    Method getMethod();
 
-    public Object[] getParameters();
+    Constructor<?> getConstructor();
 
-    public void setParameters(Object[] parameters);
+    Object[] getParameters();
 
-    public java.util.Map<String,Object> getContextData();
+    void setParameters(Object[] parameters);
 
-    public Object proceed() throws Exception;
+    Map<String,Object> getContextData();
 
-    public Object getTimer();
+    Object proceed() throws Exception;
+
+    Object getTimer();
 }



Mime
View raw message