[jboss-cvs] JBossAS SVN: r64621 - in projects/aop/trunk: aop/src/main/org/jboss/aop/advice/annotation and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 16 09:03:59 EDT 2007
Author: flavia.rainone at jboss.com
Date: 2007-08-16 09:03:59 -0400 (Thu, 16 Aug 2007)
New Revision: 64621
Modified:
projects/aop/trunk/aop/build-tests-jdk14.xml
projects/aop/trunk/aop/build.xml
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/AnnotatedParameterAdviceInfo.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/AssignabilityAlgorithm.java
projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/VariableNode.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgAspectGenerics.java
projects/aop/trunk/build/build-thirdparty.xml
Log:
[JBAOP-415] Removed try/catch blocks related to jdk14 failures: new jboss-retro-1.1.2 fixes the failures.
Modified: projects/aop/trunk/aop/build-tests-jdk14.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk14.xml 2007-08-16 13:03:30 UTC (rev 64620)
+++ projects/aop/trunk/aop/build-tests-jdk14.xml 2007-08-16 13:03:59 UTC (rev 64621)
@@ -178,7 +178,7 @@
<path id="jbossretrort.classpath">
<path refid="jboss/backport.concurrent.classpath"/>
- <pathelement path="${org/jboss/jboss.retro.lib}/jbossretro-rt.jar"/>
+ <pathelement path="${org/jboss/jboss.retro.lib}/jboss-retro-rt.jar"/>
<path refid="jboss.microcontainer14.classpath"/>
<path refid="jboss/common.core.14.classpath"/>
</path>
Modified: projects/aop/trunk/aop/build.xml
===================================================================
--- projects/aop/trunk/aop/build.xml 2007-08-16 13:03:30 UTC (rev 64620)
+++ projects/aop/trunk/aop/build.xml 2007-08-16 13:03:59 UTC (rev 64621)
@@ -177,10 +177,6 @@
<!-- Packages to include when generating api documentation -->
<property name="javadoc.packages" value="org.jbos.aop.*"/>
- <!-- TEMPORARY HACK TO RENAME THE NEW JBOSS RETRO JARS TO THE WAY THEY WERE, WITHOUT STUPID VERSION NUMBERS -->
- <copy file="${org/jboss/jboss.retro.lib}/jboss-retro-1.1.1.jar" tofile="${org/jboss/jboss.retro.lib}/jbossretro.jar"/>
- <copy file="${org/jboss/jboss.retro.lib}/jboss-retro-1.1.1-rt.jar" tofile="${org/jboss/jboss.retro.lib}/jbossretro-rt.jar"/>
-
</target>
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/AnnotatedParameterAdviceInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/AnnotatedParameterAdviceInfo.java 2007-08-16 13:03:30 UTC (rev 64620)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/AnnotatedParameterAdviceInfo.java 2007-08-16 13:03:59 UTC (rev 64621)
@@ -558,8 +558,6 @@
public final boolean internalValidate(AdviceMethodProperties properties)
{
- try
- {
if (index != -1 && !AssignabilityAlgorithm.VARIABLE_TARGET.isAssignable(
method.getGenericParameterTypes()[index],
(Type)rule.getAssignableFrom(properties), hierarchy))
@@ -569,21 +567,6 @@
AdviceMethodFactory.appendMatchingMessage(((Class) rule.getAssignableFrom(properties)).getName());
return false;
}
- }
- // TODO this is a temporary fix until JBBUILD-384 is done
- catch (RuntimeException e)
- {
- if (index != -1 && !AssignabilityAlgorithm.VARIABLE_TARGET.isAssignable(
- method.getParameterTypes()[index],
- (Type)rule.getAssignableFrom(properties), hierarchy))
- {
- AdviceMethodFactory.appendNewMatchingMessage(method, rule);
- AdviceMethodFactory.appendNewMatchingMessage(method, rule);
- AdviceMethodFactory.appendMatchingMessage("-annotated parameter is not assignable from expected type ");
- AdviceMethodFactory.appendMatchingMessage(((Class) rule.getAssignableFrom(properties)).getName());
- return false;
- }
- }
return true;
}
@@ -652,16 +635,7 @@
public final boolean internalValidate(AdviceMethodProperties properties)
{
Type[] expectedTypes = (Type[]) rule.getAssignableFrom(properties);
- Type[] adviceTypes = null;
- try
- {
- adviceTypes = method.getGenericParameterTypes();
- }
- // TODO this is a temporary fix until JBBUILD-384 is done
- catch (RuntimeException e)
- {
- adviceTypes = method.getParameterTypes();
- }
+ Type[] adviceTypes = method.getGenericParameterTypes();
if (indexesLength > 0 && expectedTypes.length == 0)
{
AdviceMethodFactory.appendNewMatchingMessage(method, "joinpoint has no arguments; unexpected ");
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/AssignabilityAlgorithm.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/AssignabilityAlgorithm.java 2007-08-16 13:03:30 UTC (rev 64620)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/AssignabilityAlgorithm.java 2007-08-16 13:03:59 UTC (rev 64621)
@@ -100,17 +100,10 @@
VariableHierarchy variableHierarchy)
{
// special case, check fromType
- try
- {
if (fromType instanceof WildcardType)
{
return isAssignable(type, (WildcardType) fromType, variableHierarchy);
}
- } catch (NoClassDefFoundError e)
- {
- // TODO this is a temporary fix until JBBUILD-384 is done
- // do nothing
- }
if (isVariableOperationApplicable(type, fromType))
{
return addBound(type, fromType, variableHierarchy);
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/VariableNode.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/VariableNode.java 2007-08-16 13:03:30 UTC (rev 64620)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/annotation/assignability/VariableNode.java 2007-08-16 13:03:59 UTC (rev 64621)
@@ -262,8 +262,6 @@
private static boolean isSame(Type argument, Type fromArgument, boolean argumentAssigned)
{
- try
- {
if (argument instanceof WildcardType)
{
WildcardType wildcard = (WildcardType) argument;
@@ -328,9 +326,6 @@
return false;
}
}
- }
- // TODO this is a temporary fix until JBBUILD-384 is done
- catch (NoClassDefFoundError e) {}
return argument.equals(fromArgument); // TODO check this works correctly
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgAspectGenerics.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgAspectGenerics.java 2007-08-16 13:03:30 UTC (rev 64620)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgAspectGenerics.java 2007-08-16 13:03:59 UTC (rev 64621)
@@ -212,7 +212,7 @@
public void after5(@Arg Collection<Object> arg)
{
- //Assert.fail("This advice should never be executed");
+ Assert.fail("This advice should never be executed");
}
public void after6(@Arg Collection arg)
@@ -237,7 +237,7 @@
public void throwing2(@Arg Collection<SubValue> arg, @Thrown Throwable t)
{
- //Assert.fail("This advice should never be executed");
+ Assert.fail("This advice should never be executed");
}
public void throwing3(@Arg Collection arg, @Thrown Throwable t)
@@ -292,7 +292,7 @@
public void finally5(@Arg Collection<Interface> arg)
{
- //Assert.fail("This advice should never be executed");
+ Assert.fail("This advice should never be executed");
}
public void finally6(@Arg Collection arg)
Modified: projects/aop/trunk/build/build-thirdparty.xml
===================================================================
--- projects/aop/trunk/build/build-thirdparty.xml 2007-08-16 13:03:30 UTC (rev 64620)
+++ projects/aop/trunk/build/build-thirdparty.xml 2007-08-16 13:03:59 UTC (rev 64621)
@@ -53,7 +53,7 @@
<componentref name="jboss/common-logging-jdk" version="2.0.2.GA"/>
<componentref name="jboss/common-logging-log4j" version="2.0.2.GA"/>
<componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
- <componentref name="org/jboss/jboss-retro" version="1.1.1"/>
+ <componentref name="org/jboss/jboss-retro" version="1.1.2"/>
<componentref name="jboss/integration" version="snapshot"/>
<componentref name="jboss/microcontainer" version="snapshot-classloader"/>
<componentref name="jboss/microcontainer14" version="2.0.0.Beta3"/>
More information about the jboss-cvs-commits
mailing list