openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1360309 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: config/ conversation/ exception/definition/ exception/inject/ jms/ lifecycle/
Date Wed, 11 Jul 2012 17:22:26 GMT
Author: struberg
Date: Wed Jul 11 17:22:25 2012
New Revision: 1360309

URL: http://svn.apache.org/viewvc?rev=1360309&view=rev
Log:
OWB-678 remove JMSManager and lots of unused Exceptions

Removed:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentConstructorException.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentFieldException.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentMemberException.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentMethodException.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/definition/NonexistentTypeException.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/inject/ExecutionException.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/inject/UnserializableDependencyException.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSManager.java
Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java?rev=1360309&r1=1360308&r2=1360309&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
Wed Jul 11 17:22:25 2012
@@ -41,7 +41,6 @@ import org.apache.webbeans.intercept.Int
 import org.apache.webbeans.intercept.InterceptorsManager;
 import org.apache.webbeans.intercept.WebBeansInterceptorConfig;
 import org.apache.webbeans.intercept.ejb.EJBInterceptorConfig;
-import org.apache.webbeans.jms.JMSManager;
 import org.apache.webbeans.plugins.PluginLoader;
 import org.apache.webbeans.portable.AnnotatedElementFactory;
 import org.apache.webbeans.portable.events.ExtensionLoader;
@@ -77,7 +76,6 @@ public class WebBeansContext
     private final ExtensionLoader extensionLoader = new ExtensionLoader(this);
     private final InterceptorsManager interceptorsManager = new InterceptorsManager(this);
     private final WebBeansInterceptorConfig webBeansInterceptorConfig = new WebBeansInterceptorConfig(this);
-    private final JMSManager jmsManager = new JMSManager();
     private final JavassistProxyFactory javassistProxyFactory = new JavassistProxyFactory();
     private final OpenWebBeansConfiguration openWebBeansConfiguration;
     private final PluginLoader pluginLoader = new PluginLoader();
@@ -150,7 +148,6 @@ public class WebBeansContext
         managerMap.put(DecoratorsManager.class, decoratorsManager);
         managerMap.put(ExtensionLoader.class, extensionLoader);
         managerMap.put(InterceptorsManager.class, interceptorsManager);
-        managerMap.put(JMSManager.class, jmsManager);
         managerMap.put(JavassistProxyFactory.class, javassistProxyFactory);
         managerMap.put(OpenWebBeansConfiguration.class, openWebBeansConfiguration);
         managerMap.put(PluginLoader.class, pluginLoader);
@@ -327,11 +324,6 @@ public class WebBeansContext
         return interceptorsManager;
     }
 
-    public JMSManager getjMSManager()
-    {
-        return jmsManager;
-    }
-
     public PluginLoader getPluginLoader()
     {
         return pluginLoader;

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java?rev=1360309&r1=1360308&r2=1360309&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
Wed Jul 11 17:22:25 2012
@@ -115,7 +115,6 @@ public class ConversationImpl implements
         }
         
         this.sessionId = sessionId;
-        this.webBeansContext = WebBeansContext.getInstance();
     }
     
     /**
@@ -134,7 +133,7 @@ public class ConversationImpl implements
             ConversationManager manager = webBeansContext.getConversationManager();
             try
             {
-                //Gets current converation context instance.
+                //Gets current conversation context instance.
                 //Each conversation has its own conversation context instance.
                 //Sets at the beginning of each JSF request.
                 manager.addConversationContext(this, (ConversationContext) webBeansContext.getBeanManagerImpl().getContext(ConversationScoped.class));

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java?rev=1360309&r1=1360308&r2=1360309&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
Wed Jul 11 17:22:25 2012
@@ -170,9 +170,6 @@ public abstract class AbstractLifeCycle 
             //Delete AnnotateTypeCache
             webBeansContext.getAnnotatedElementFactory().clear();
             
-            //Delete JMS Model Cache
-            webBeansContext.getjMSManager().clear();
-            
             //After Stop
             afterStopApplication(endObject);
 



Mime
View raw message