Author: manaRH
Date: 2013-06-04 06:29:19 -0400 (Tue, 04 Jun 2013)
New Revision: 15543
Modified:
branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/util/cdk/MethodBindingToMethodExpression.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/Component.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/AnnotationDeploymentHandler.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/ClassDescriptor.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/DeploymentStrategy.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/GroovyDeploymentHandler.java
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/init/DependencyManager.java
Log:
bz961249, JBSEAM-5111
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/Component.java
===================================================================
---
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/Component.java
2013-06-04 10:28:59 UTC (rev 15542)
+++
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/Component.java
2013-06-04 10:29:19 UTC (rev 15543)
@@ -88,10 +88,10 @@
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.Events;
import org.jboss.seam.core.Expressions;
+import org.jboss.seam.core.Expressions.MethodExpression;
+import org.jboss.seam.core.Expressions.ValueExpression;
import org.jboss.seam.core.Init;
import org.jboss.seam.core.Mutable;
-import org.jboss.seam.core.Expressions.MethodExpression;
-import org.jboss.seam.core.Expressions.ValueExpression;
import org.jboss.seam.databinding.DataBinder;
import org.jboss.seam.databinding.DataSelector;
import org.jboss.seam.ejb.SeamInterceptor;
@@ -102,12 +102,12 @@
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
import org.jboss.seam.util.Conversions;
+import org.jboss.seam.util.Conversions.PropertyValue;
import org.jboss.seam.util.Naming;
import org.jboss.seam.util.ProxyFactory;
import org.jboss.seam.util.Reflections;
import org.jboss.seam.util.SortItem;
import org.jboss.seam.util.Sorter;
-import org.jboss.seam.util.Conversions.PropertyValue;
import org.jboss.seam.web.Parameters;
/**
@@ -964,7 +964,7 @@
{
addInterceptor(new Interceptor(interceptorInstance, this));
}
- catch (NoClassDefFoundError e)
+ catch (LinkageError e)
{
log.debug("Unable to load interceptor " +
interceptorInstance.getClass(), e);
}
@@ -1085,7 +1085,7 @@
interceptorInstance = clazz.newInstance();
}
- catch (NoClassDefFoundError e)
+ catch (LinkageError e)
{
log.debug("Unable to load interceptor " + interceptorName, e);
}
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java
===================================================================
---
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java
2013-06-04 10:28:59 UTC (rev 15542)
+++
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/contexts/Contexts.java
2013-06-04 10:29:19 UTC (rev 15543)
@@ -124,7 +124,7 @@
}
}
}
- catch (NoClassDefFoundError e)
+ catch (LinkageError e)
{
// do nothing as this context is supposed to be active only with
JSF view layer
}
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/AnnotationDeploymentHandler.java
===================================================================
---
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/AnnotationDeploymentHandler.java
2013-06-04 10:28:59 UTC (rev 15542)
+++
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/AnnotationDeploymentHandler.java
2013-06-04 10:29:19 UTC (rev 15543)
@@ -63,7 +63,7 @@
{
log.warn("could not load annotation class: " + classname, cnfe);
}
- catch (NoClassDefFoundError ncdfe)
+ catch (LinkageError ncdfe)
{
log.warn("could not load annotation class (missing dependency): "
+ classname, ncdfe);
}
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/ClassDescriptor.java
===================================================================
---
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/ClassDescriptor.java
2013-06-04 10:28:59 UTC (rev 15542)
+++
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/ClassDescriptor.java
2013-06-04 10:29:19 UTC (rev 15543)
@@ -36,7 +36,7 @@
{
log.debug("could not load class: " + classname, cnfe);
}
- catch (NoClassDefFoundError ncdfe)
+ catch (LinkageError ncdfe)
{
log.debug("could not load class (missing dependency): " + classname,
ncdfe);
}
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/DeploymentStrategy.java
===================================================================
---
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/DeploymentStrategy.java
2013-06-04 10:28:59 UTC (rev 15542)
+++
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/DeploymentStrategy.java
2013-06-04 10:29:19 UTC (rev 15543)
@@ -126,7 +126,7 @@
{
log.trace("Unable to use " + className + " as scanner (class not
found)", e);
}
- catch (NoClassDefFoundError e)
+ catch (LinkageError e)
{
log.trace("Unable to use " + className + " as scanner (dependency not
found)", e);
}
@@ -190,7 +190,7 @@
{
log.trace("Unable to use " + className + " as a deployment handler
(class not found)", e);
}
- catch (NoClassDefFoundError e)
+ catch (LinkageError e)
{
log.trace("Unable to use " + className + " as a deployment handler
(dependency not found)", e);
}
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/GroovyDeploymentHandler.java
===================================================================
---
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/GroovyDeploymentHandler.java
2013-06-04 10:28:59 UTC (rev 15542)
+++
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/deployment/GroovyDeploymentHandler.java
2013-06-04 10:29:19 UTC (rev 15543)
@@ -111,7 +111,7 @@
log.debug("could not load groovy class: " + classname, cnfe);
}
- catch (NoClassDefFoundError ncdfe)
+ catch (LinkageError ncdfe)
{
log.debug("could not load groovy class (missing dependency): " +
classname, ncdfe);
Modified:
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/init/DependencyManager.java
===================================================================
---
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/init/DependencyManager.java
2013-06-04 10:28:59 UTC (rev 15542)
+++
branches/enterprise/WFK-2_1/jboss-seam/src/main/java/org/jboss/seam/init/DependencyManager.java
2013-06-04 10:29:19 UTC (rev 15543)
@@ -137,7 +137,7 @@
{
descriptor.getComponentClass().getClassLoader().loadClass(className);
}
- catch (NoClassDefFoundError e)
+ catch (LinkageError e)
{
return false;
}
Modified:
branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/util/cdk/MethodBindingToMethodExpression.java
===================================================================
---
branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/util/cdk/MethodBindingToMethodExpression.java
2013-06-04 10:28:59 UTC (rev 15542)
+++
branches/enterprise/WFK-2_1/jboss-seam-ui/src/main/java/org/jboss/seam/ui/util/cdk/MethodBindingToMethodExpression.java
2013-06-04 10:29:19 UTC (rev 15543)
@@ -274,7 +274,7 @@
{
return clazz.newInstance();
}
- catch(NoClassDefFoundError e)
+ catch(LinkageError e)
{
throw new FacesException(e);
}
_______________________________________________
seam-commits mailing list
[email protected]
https://lists.jboss.org/mailman/listinfo/seam-commits
