[jboss-cvs] JBossAS SVN: r94638 - in projects/interceptors/trunk: jboss-interceptor and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Oct 10 10:15:46 EDT 2009
Author: marius.bogoevici
Date: 2009-10-10 10:15:46 -0400 (Sat, 10 Oct 2009)
New Revision: 94638
Modified:
projects/interceptors/trunk/jboss-interceptor-api/pom.xml
projects/interceptors/trunk/jboss-interceptor/pom.xml
projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/DirectClassInterceptionHandler.java
projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptorInvocationContext.java
projects/interceptors/trunk/pom.xml
Log:
Structural changes, fixed InterceptionContext implementors.
Modified: projects/interceptors/trunk/jboss-interceptor/pom.xml
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/pom.xml 2009-10-10 06:24:45 UTC (rev 94637)
+++ projects/interceptors/trunk/jboss-interceptor/pom.xml 2009-10-10 14:15:46 UTC (rev 94638)
@@ -11,6 +11,7 @@
</parent>
<artifactId>jboss-interceptor</artifactId>
+ <name>JBoss EJB 3.1 Interceptor Library</name>
<dependencies>
<dependency>
@@ -26,11 +27,18 @@
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
</dependencies>
</project>
Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/DirectClassInterceptionHandler.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/DirectClassInterceptionHandler.java 2009-10-10 06:24:45 UTC (rev 94637)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/DirectClassInterceptionHandler.java 2009-10-10 14:15:46 UTC (rev 94638)
@@ -156,6 +156,12 @@
{
delegateInvocationContext.setParameters(params);
}
+
+ public Object getTimer()
+ {
+ return delegateInvocationContext.getTimer();
+ }
+
}
}
Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptorInvocationContext.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptorInvocationContext.java 2009-10-10 06:24:45 UTC (rev 94637)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptorInvocationContext.java 2009-10-10 14:15:46 UTC (rev 94638)
@@ -40,14 +40,26 @@
private InterceptionChain interceptionChain;
+ private Object timer;
+
public InterceptorInvocationContext(InterceptionChain interceptionChain, Object target, Method targetMethod, Object[] parameters)
{
this.interceptionChain = interceptionChain;
this.method = targetMethod;
this.parameters = parameters;
this.target = target;
+ this.timer = null;
}
+ public InterceptorInvocationContext(InterceptionChain interceptionChain, Object target, Method targetMethod, Object timer)
+ {
+ this.interceptionChain = interceptionChain;
+ this.method = targetMethod;
+ this.timer = timer;
+ this.target = target;
+ this.parameters = null;
+ }
+
public Map<String, Object> getContextData()
{
return contextData;
@@ -89,4 +101,10 @@
if (method != null)
this.parameters = params;
}
+
+ public Object getTimer()
+ {
+ return timer;
+ }
+
}
Modified: projects/interceptors/trunk/jboss-interceptor-api/pom.xml
===================================================================
--- projects/interceptors/trunk/jboss-interceptor-api/pom.xml 2009-10-10 06:24:45 UTC (rev 94637)
+++ projects/interceptors/trunk/jboss-interceptor-api/pom.xml 2009-10-10 14:15:46 UTC (rev 94638)
@@ -10,4 +10,5 @@
<groupId>org.jboss.interceptor</groupId>
<artifactId>jboss-interceptor-api</artifactId>
<version>3.1.0-SNAPSHOT</version>
+ <name>EJB 3.1 Interceptor API</name>
</project>
\ No newline at end of file
Modified: projects/interceptors/trunk/pom.xml
===================================================================
--- projects/interceptors/trunk/pom.xml 2009-10-10 06:24:45 UTC (rev 94637)
+++ projects/interceptors/trunk/pom.xml 2009-10-10 14:15:46 UTC (rev 94638)
@@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
+
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
@@ -13,9 +13,10 @@
<groupId>org.jboss.interceptor</groupId>
<artifactId>jboss-interceptor-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <name>JBoss Interceptors</name>
- <description>JBoss Interceptors</description>
+ <name>JBoss Interceptors Parent</name>
+ <description>JBoss Interceptors Parent</description>
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/interceptors/trunk/</connection>
@@ -24,7 +25,7 @@
</scm>
<properties>
- <version.interceptor.api>3.1</version.interceptor.api>
+ <version.interceptor.api>3.1.0-SNAPSHOT</version.interceptor.api>
<version.javassist>3.11.0.GA</version.javassist>
<version.junit>4.5</version.junit>
</properties>
@@ -75,7 +76,8 @@
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<!--testFailureIgnore>true</testFailureIgnore-->
<includes>
- <include>org/jboss/test/**/*TestCase.java</include>
+ <include>org/jboss/interceptor/**/*TestCase.java</include>
+ <include>org/jboss/interceptor/**/*Test.java</include>
</includes>
</configuration>
</plugin>
@@ -171,7 +173,22 @@
<artifactId>jboss-interceptor-api</artifactId>
<version>${version.interceptor.api}</version>
</dependency>
+
<dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ <version>3.1.0</version>
+ <scope>test</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
@@ -186,4 +203,5 @@
</dependencies>
</dependencyManagement>
+
</project>
More information about the jboss-cvs-commits
mailing list