You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2011/03/09 22:13:18 UTC
svn commit: r1079999 - in /openwebbeans/trunk:
webbeans-impl/src/main/java/org/apache/webbeans/annotation/
webbeans-impl/src/main/java/org/apache/webbeans/boot/
webbeans-impl/src/main/java/org/apache/webbeans/container/
webbeans-impl/src/main/java/org/...
Author: struberg
Date: Wed Mar 9 21:13:18 2011
New Revision: 1079999
URL: http://svn.apache.org/viewvc?rev=1079999&view=rev
Log:
OWB-543 get rid of Exception declarations in methods
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerObjectFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/BeansXmlAnnotationDB.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultScannerService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java
openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/scanner/EJBMetaDataDiscoveryImpl.java
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/mock/TCKMetaDataDiscoveryImpl.java
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java?rev=1079999&r1=1079998&r2=1079999&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java Wed Mar 9 21:13:18 2011
@@ -19,6 +19,7 @@
package org.apache.webbeans.annotation;
import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.HashMap;
@@ -77,7 +78,8 @@ public class WebBeansAnnotation implemen
* @param args method arguments
* @throws Exception if any exception occurs
*/
- public Object invoke(Object self, Method m, Method proceed, Object[] args) throws Exception
+ public Object invoke(Object self, Method m, Method proceed, Object[] args)
+ throws InvocationTargetException, IllegalAccessException
{
WebBeansAnnotation anno = (WebBeansAnnotation) self;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java?rev=1079999&r1=1079998&r2=1079999&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java Wed Mar 9 21:13:18 2011
@@ -44,7 +44,7 @@ public class Bootstrap
this.containerLifecycle = WebBeansContext.getInstance().getService(ContainerLifecycle.class);
}
- public void start() throws Exception
+ public void start() throws InterruptedException
{
log.info(OWBLogConst.INFO_0005);
long begin = System.currentTimeMillis();
@@ -69,7 +69,7 @@ public class Bootstrap
log.info(OWBLogConst.INFO_0009);
}
- public static void main(String []args) throws Exception
+ public static void main(String []args)
{
Bootstrap boot = new Bootstrap();
boot.init(System.getProperties());
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerObjectFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerObjectFactory.java?rev=1079999&r1=1079998&r2=1079999&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerObjectFactory.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerObjectFactory.java Wed Mar 9 21:13:18 2011
@@ -28,7 +28,7 @@ import org.apache.webbeans.config.WebBea
public class ManagerObjectFactory implements ObjectFactory
{
- public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable<?, ?> environment) throws Exception
+ public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable<?, ?> environment)
{
return new InjectableBeanManager(WebBeansContext.getInstance().getBeanManagerImpl());
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java?rev=1079999&r1=1079998&r2=1079999&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java Wed Mar 9 21:13:18 2011
@@ -105,7 +105,7 @@ public abstract class AbstractMetaDataDi
initAnnotationDB();
}
- abstract protected void configure() throws Exception;
+ abstract protected void configure();
/**
* Find the base paths of all available resources with the given
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/BeansXmlAnnotationDB.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/BeansXmlAnnotationDB.java?rev=1079999&r1=1079998&r2=1079999&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/BeansXmlAnnotationDB.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/BeansXmlAnnotationDB.java Wed Mar 9 21:13:18 2011
@@ -100,7 +100,7 @@ public class BeansXmlAnnotationDB extend
{
// Maps a resource (Ex: .jar) to a beans.xml location
populateResourceToBeansXml(urls);
- String currentBeansXml = null;
+ String currentBeansXml;
for (int i = 0; i < urls.length; i++)
{
currentBeansXml = beansXmlResources.get(urls[i]);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java?rev=1079999&r1=1079998&r2=1079999&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java Wed Mar 9 21:13:18 2011
@@ -262,7 +262,7 @@ public class DefaultContextsService exte
}
- private void startApplicationContext(Object instance) throws Exception
+ private void startApplicationContext(Object instance)
{
ApplicationContext ctx = new ApplicationContext();
ctx.setActive(true);
@@ -271,7 +271,7 @@ public class DefaultContextsService exte
}
- private void startConversationContext(Object object) throws Exception
+ private void startConversationContext(Object object)
{
ConversationContext ctx = new ConversationContext();
ctx.setActive(true);
@@ -281,7 +281,7 @@ public class DefaultContextsService exte
}
- private void startRequestContext(Object instance) throws Exception
+ private void startRequestContext(Object instance)
{
RequestContext ctx = new RequestContext();
@@ -291,7 +291,7 @@ public class DefaultContextsService exte
}
- private void startSessionContext(Object instance) throws Exception
+ private void startSessionContext(Object instance)
{
SessionContext ctx = new SessionContext();
ctx.setActive(true);
@@ -300,7 +300,7 @@ public class DefaultContextsService exte
}
- private void startSingletonContext(Object object) throws Exception
+ private void startSingletonContext(Object object)
{
SingletonContext ctx = new SingletonContext();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultScannerService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultScannerService.java?rev=1079999&r1=1079998&r2=1079999&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultScannerService.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultScannerService.java Wed Mar 9 21:13:18 2011
@@ -21,6 +21,7 @@ package org.apache.webbeans.corespi.se;
import java.io.IOException;
import org.apache.webbeans.corespi.scanner.AbstractMetaDataDiscovery;
+import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.util.WebBeansUtil;
public class DefaultScannerService extends AbstractMetaDataDiscovery
@@ -31,20 +32,27 @@ public class DefaultScannerService exten
super();
}
- protected void configure() throws Exception
+ protected void configure()
{
configureAnnotationDB();
}
- private void configureAnnotationDB() throws IOException
+ private void configureAnnotationDB()
{
ClassLoader loader = WebBeansUtil.getCurrentClassLoader();
//Store collection of beans.xml's before scanning archives
String[] urlPaths = findBeansXmlBases(META_INF_BEANS_XML, loader);
-
- this.getAnnotationDB().scanArchives(urlPaths);
+
+ try
+ {
+ this.getAnnotationDB().scanArchives(urlPaths);
+ }
+ catch (IOException e)
+ {
+ throw new WebBeansConfigurationException("Error while scanning the JAR archives", e);
+ }
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java?rev=1079999&r1=1079998&r2=1079999&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java Wed Mar 9 21:13:18 2011
@@ -40,7 +40,7 @@ public class OpenWebBeansTestMetaDataDis
}
@Override
- protected void configure() throws Exception
+ protected void configure()
{
//Nothing we scan
}
Modified: openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/scanner/EJBMetaDataDiscoveryImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/scanner/EJBMetaDataDiscoveryImpl.java?rev=1079999&r1=1079998&r2=1079999&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/scanner/EJBMetaDataDiscoveryImpl.java (original)
+++ openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/scanner/EJBMetaDataDiscoveryImpl.java Wed Mar 9 21:13:18 2011
@@ -24,10 +24,8 @@ public class EJBMetaDataDiscoveryImpl ex
{
@Override
- protected void configure() throws Exception
+ protected void configure()
{
-
-
}
}
Modified: openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/mock/TCKMetaDataDiscoveryImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/mock/TCKMetaDataDiscoveryImpl.java?rev=1079999&r1=1079998&r2=1079999&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/mock/TCKMetaDataDiscoveryImpl.java (original)
+++ openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/mock/TCKMetaDataDiscoveryImpl.java Wed Mar 9 21:13:18 2011
@@ -35,10 +35,8 @@ public class TCKMetaDataDiscoveryImpl ex
}
@Override
- protected void configure() throws Exception
+ protected void configure()
{
-
-
}
public void addBeanClass(Class<?> clazz)
Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java?rev=1079999&r1=1079998&r2=1079999&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java (original)
+++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java Wed Mar 9 21:13:18 2011
@@ -28,6 +28,7 @@ import org.apache.webbeans.config.OWBLog
import org.apache.webbeans.corespi.scanner.AbstractMetaDataDiscovery;
import org.apache.webbeans.corespi.scanner.AnnotationDB;
import org.apache.webbeans.corespi.se.BeansXmlAnnotationDB;
+import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.logger.WebBeansLogger;
import org.apache.webbeans.util.WebBeansUtil;
import org.scannotation.WarUrlFinder;
@@ -54,7 +55,7 @@ public class WebScannerService extends A
this.servletContext = (ServletContext) context;
}
- protected void configure() throws Exception
+ protected void configure()
{
try
{
@@ -72,8 +73,7 @@ public class WebScannerService extends A
}
catch (Exception e)
{
- logger.error(OWBLogConst.ERROR_0002, e);
- throw e;
+ throw new WebBeansConfigurationException(logger.getTokenString(OWBLogConst.ERROR_0002), e);
}
}