You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2010/03/07 01:08:00 UTC
svn commit: r919885 [2/2] - in /openwebbeans/trunk/webbeans-impl: ./
src/main/java/org/apache/webbeans/boot/
src/main/java/org/apache/webbeans/component/javaee/
src/main/java/org/apache/webbeans/config/
src/main/java/org/apache/webbeans/context/ src/ma...
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLogger.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLogger.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLogger.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLogger.java Sun Mar 7 00:07:58 2010
@@ -13,8 +13,12 @@
*/
package org.apache.webbeans.logger;
-import org.apache.log4j.Logger;
-
+/*
+ * These are for use of JDK util logging.
+ */
+import java.util.logging.Logger;
+import java.util.logging.Level;
+
import java.text.MessageFormat;
import java.util.Locale;
import java.util.MissingResourceException;
@@ -31,10 +35,23 @@
*/
public final class WebBeansLogger
{
+ /** Log level mappings from OWB DEBUG, TRACE, INFO, WARN, ERROR, FATAL to whatever log
+ * levels the currently loaded logger supports (i.e. JUL provides FINEST, FINER, FINE,
+ * CONFIG, INFO, WARNING, SEVERE).
+ */
+ /* JDK util logger mappings */
+ public final static Level WBL_DEBUG = Level.FINER;
+ public final static Level WBL_TRACE = Level.FINE;
+ public final static Level WBL_INFO = Level.INFO;
+ public final static Level WBL_WARN = Level.WARNING;
+ public final static Level WBL_ERROR = Level.SEVERE;
+ public final static Level WBL_FATAL = Level.SEVERE;
+
/** Inner logger object to log actual log messages */
private Logger logger = null;
private ResourceBundle wbBundle = null;
-
+ private Class<?> caller = null;
+
/** Private constructor */
private WebBeansLogger()
{
@@ -50,161 +67,135 @@
public static WebBeansLogger getLogger(Class<?> clazz)
{
WebBeansLogger wbLogger = new WebBeansLogger();
- Logger inLogger = Logger.getLogger(clazz);
-
+ wbLogger.caller = clazz;
+ Logger inLogger = Logger.getLogger(clazz.getName(),"openwebbeans/Messages");
wbLogger.setLogger(inLogger);
return wbLogger;
}
- public void fatal(String messageKey)
+ private void wblLog(Level log_level, String messageKey)
{
checkNullLogger();
- logger.fatal(getTokenString(messageKey));
+ logger.logp(log_level, this.caller.getName(), Thread.currentThread().getStackTrace()[4].getMethodName(), messageKey);
}
- public void fatal(String messageKey, Object args[])
+ private void wblLog(Level log_level, String messageKey, Object args[])
{
checkNullLogger();
- logger.fatal(constructMessage(messageKey, args));
+ logger.logp(log_level, this.caller.getName(), Thread.currentThread().getStackTrace()[4].getMethodName(), messageKey, args);
}
- public void fatal(String messageKey, Throwable e)
+ private void wblLog(Level log_level, String messageKey, Throwable e)
{
checkNullLogger();
- logger.fatal(getTokenString(messageKey), e);
+ logger.logp(log_level, this.caller.getName(), Thread.currentThread().getStackTrace()[4].getMethodName(), messageKey, e);
+ }
+
+ private void wblLog(Level log_level, String messageKey, Object args[], Throwable e)
+ {
+ checkNullLogger();
+ logger.logp(log_level, this.caller.getName(), Thread.currentThread().getStackTrace()[3].getMethodName(), constructMessage(messageKey, args), e);
+ }
+
+ public void fatal(String messageKey)
+ {
+ this.wblLog(WebBeansLogger.WBL_FATAL, messageKey);
+ }
+
+ public void fatal(String messageKey, Object args[])
+ {
+ this.wblLog(WebBeansLogger.WBL_FATAL, messageKey, args);
+ }
+ public void fatal(String messageKey, Throwable e)
+ {
+ this.wblLog(WebBeansLogger.WBL_FATAL, messageKey, e);
}
public void error(Throwable e)
{
- checkNullLogger();
- logger.error(e);
+ this.wblLog(WebBeansLogger.WBL_ERROR, "", e);
}
public void error(String messageKey)
{
- checkNullLogger();
- logger.error(getTokenString(messageKey));
+ this.wblLog(WebBeansLogger.WBL_ERROR, messageKey);
}
public void error(String messageKey, Object args[])
{
- checkNullLogger();
- logger.error(constructMessage(messageKey, args));
+ this.wblLog(WebBeansLogger.WBL_ERROR, messageKey, args);
}
public void error(String messageKey, Throwable e)
{
- checkNullLogger();
- logger.error(getTokenString(messageKey), e);
-
+ this.wblLog(WebBeansLogger.WBL_ERROR, messageKey, e);
}
public void error(String messageKey, Object args[], Throwable e)
{
- checkNullLogger();
- logger.error(constructMessage(messageKey, args), e);
-
+ this.wblLog(WebBeansLogger.WBL_ERROR, messageKey, args, e);
}
public void warn(String messageKey)
{
- checkNullLogger();
- logger.warn(getTokenString(messageKey));
+ this.wblLog(WebBeansLogger.WBL_WARN, messageKey);
}
public void warn(String messageKey, Object args[])
{
- checkNullLogger();
- logger.warn(constructMessage(messageKey, args));
+ this.wblLog(WebBeansLogger.WBL_WARN, messageKey, args);
}
public void warn(String messageKey, Throwable e)
{
- checkNullLogger();
- logger.warn(getTokenString(messageKey), e);
+ this.wblLog(WebBeansLogger.WBL_WARN, messageKey, e);
}
public void info(String messageKey)
{
- checkNullLogger();
- if (logger.isInfoEnabled())
- {
- logger.info(getTokenString(messageKey));
- }
+ this.wblLog(WebBeansLogger.WBL_INFO, messageKey);
}
public void info(String messageKey, Object args[])
{
- checkNullLogger();
- if (logger.isInfoEnabled())
- {
- logger.info(constructMessage(messageKey, args));
- }
+ this.wblLog(WebBeansLogger.WBL_INFO, messageKey, args);
}
public void info(String messageKey, Throwable e)
{
- checkNullLogger();
- if (logger.isInfoEnabled())
- {
- logger.info(getTokenString(messageKey), e);
- }
+ this.wblLog(WebBeansLogger.WBL_INFO, messageKey, e);
}
public void debug(String messageKey)
{
- checkNullLogger();
- if (logger.isDebugEnabled())
- {
- logger.debug(getTokenString(messageKey));
- }
+ this.wblLog(WebBeansLogger.WBL_DEBUG, messageKey);
}
public void debug(String messageKey, Object args[])
{
- checkNullLogger();
- if (logger.isDebugEnabled())
- {
- logger.debug(constructMessage(messageKey, args));
- }
+ this.wblLog(WebBeansLogger.WBL_WARN, messageKey, args);
}
public void debug(String messageKey, Throwable e)
{
- checkNullLogger();
- if (logger.isDebugEnabled())
- {
- logger.debug(getTokenString(messageKey), e);
- }
+ this.wblLog(WebBeansLogger.WBL_DEBUG, messageKey, e);
}
public void trace(String messageKey)
{
- checkNullLogger();
- if (logger.isTraceEnabled())
- {
- logger.trace(getTokenString(messageKey));
- }
+ this.wblLog(WebBeansLogger.WBL_TRACE, messageKey);
}
public void trace(String messageKey, Object args[])
{
- checkNullLogger();
- if (logger.isTraceEnabled())
- {
- logger.trace(constructMessage(messageKey, args));
- }
+ this.wblLog(WebBeansLogger.WBL_TRACE, messageKey, args);
}
public void trace(String messageKey, Throwable e)
{
- checkNullLogger();
- if (logger.isTraceEnabled())
- {
- logger.trace(getTokenString(messageKey), e);
- }
+ this.wblLog(WebBeansLogger.WBL_TRACE, messageKey, e);
}
private String constructMessage(String messageKey, Object args[])
Added: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/AbstractEnterpriseProviderPlugin.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/AbstractEnterpriseProviderPlugin.java?rev=919885&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/AbstractEnterpriseProviderPlugin.java (added)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/AbstractEnterpriseProviderPlugin.java Sun Mar 7 00:07:58 2010
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.webbeans.plugins;
+
+import javax.enterprise.inject.spi.Bean;
+
+import org.apache.webbeans.spi.SecurityService;
+import org.apache.webbeans.spi.TransactionService;
+import org.apache.webbeans.spi.ValidatorService;
+
+public abstract class AbstractEnterpriseProviderPlugin extends AbstractOwbPlugin implements OpenWebBeansJavaEEPlugin
+{
+
+ @Override
+ public Bean<?> getPrincipalBean()
+ {
+
+ return null;
+ }
+
+ @Override
+ public SecurityService getSecurityService()
+ {
+
+ return null;
+ }
+
+ @Override
+ public TransactionService getTransactionService()
+ {
+
+ return null;
+ }
+
+ @Override
+ public Bean<?> getUserTransactionBean()
+ {
+
+ return null;
+ }
+
+ @Override
+ public Bean<?> getValidatorBean()
+ {
+
+ return null;
+ }
+
+ @Override
+ public Bean<?> getValidatorFactoryBean()
+ {
+
+ return null;
+ }
+
+ @Override
+ public ValidatorService getValidatorService()
+ {
+
+ return null;
+ }
+
+}
Propchange: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/AbstractEnterpriseProviderPlugin.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansJavaEEPlugin.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansJavaEEPlugin.java?rev=919885&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansJavaEEPlugin.java (added)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansJavaEEPlugin.java Sun Mar 7 00:07:58 2010
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.webbeans.plugins;
+
+import javax.enterprise.inject.spi.Bean;
+
+import org.apache.webbeans.spi.TransactionService;
+import org.apache.webbeans.spi.ValidatorService;
+
+/**
+ * In fully Java EE environments, it will be implemented
+ * by the application servers.
+ * <p>
+ * There is no default plugin implementation for any
+ * Java EE application server.
+ * </p>
+ * @version $Rev$ $Date$
+ *
+ */
+public interface OpenWebBeansJavaEEPlugin extends OpenWebBeansWebPlugin
+{
+ /**
+ * Gets application server transaction
+ * service implementation.
+ * @return transaction service
+ */
+ public TransactionService getTransactionService();
+
+ /**
+ * Gets application server validator service
+ * implementation.
+ * @return validator service
+ */
+ public ValidatorService getValidatorService();
+
+ /**
+ * OpenWebBeans provides default implementation
+ * of validator bean that uses valdiator service.
+ * Application servers directly instantiate this bean
+ * instead of implementing custom validator bean.
+ * @return validator bean
+ */
+ public Bean<?> getValidatorBean();
+
+ /**
+ * OpenWebBeans provides default implementation
+ * of validator factory bean that uses valdiator service.
+ * Application servers directly instantiate this bean
+ * instead of implementing custom validator factory bean.
+ * @return validator factory bean
+ */
+ public Bean<?> getValidatorFactoryBean();
+
+ /**
+ * OpenWebBeans provides default implementation
+ * of user transaction bean that uses transaction service.
+ * Application servers directly instantiate this bean
+ * instead of implementing custom user transaction bean.
+ * @return user transaction bean
+ */
+ public Bean<?> getUserTransactionBean();
+}
Propchange: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansJavaEEPlugin.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansWebPlugin.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansWebPlugin.java?rev=919885&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansWebPlugin.java (added)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansWebPlugin.java Sun Mar 7 00:07:58 2010
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.webbeans.plugins;
+
+import javax.enterprise.inject.spi.Bean;
+
+import org.apache.webbeans.spi.SecurityService;
+
+/**
+ * OpenWebBeans plugin point for Web Containers.
+ * Currently there is no default implementation
+ * for this plugin. Each web container that wants
+ * to support OpenWebBeans, implements this plugin
+ * and register it via META-INF/services/org.apache.webbeans.plugins.OpenWebBeansWebPlugin
+ * @version $Rev$ $Date$
+ *
+ */
+public interface OpenWebBeansWebPlugin extends OpenWebBeansPlugin
+{
+ /**
+ * Gets web container security service implementation.
+ * @return security service
+ */
+ public SecurityService getSecurityService();
+
+ /**
+ * Gets web container implemented prinicipal
+ * bean.
+ * <p>
+ * There is an default implementation
+ * of prinicipal bean, in the openwebbeans-ee-common.
+ * Generally, web containers instantiates this bean and returns
+ * it.
+ * </p>
+ * @return prinicipal bean
+ */
+ public Bean<?> getPrincipalBean();
+}
Propchange: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/OpenWebBeansWebPlugin.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java Sun Mar 7 00:07:58 2010
@@ -181,7 +181,33 @@
return null;
}
-
+ public OpenWebBeansJavaEEPlugin getJavaEEPlugin()
+ {
+ for(OpenWebBeansPlugin plugin : this.plugins)
+ {
+ if(plugin instanceof OpenWebBeansJavaEEPlugin)
+ {
+ return (OpenWebBeansJavaEEPlugin)plugin;
+ }
+ }
+
+ return null;
+ }
+
+ public OpenWebBeansWebPlugin getWebPlugin()
+ {
+ for(OpenWebBeansPlugin plugin : this.plugins)
+ {
+ if(plugin instanceof OpenWebBeansWebPlugin)
+ {
+ return (OpenWebBeansWebPlugin)plugin;
+ }
+ }
+
+ return null;
+ }
+
+
public boolean isShowDown()
{
return !this.started.get();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/ServiceLoader.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/ServiceLoader.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/ServiceLoader.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/ServiceLoader.java Sun Mar 7 00:07:58 2010
@@ -15,7 +15,7 @@
import org.apache.webbeans.config.OpenWebBeansConfiguration;
import org.apache.webbeans.config.WebBeansFinder;
-import org.apache.webbeans.exception.WebBeansConfigurationException;
+import org.apache.webbeans.logger.WebBeansLogger;
/**
* Loads any Service Provider Interface implementation declared in the
@@ -30,6 +30,8 @@
*/
public class ServiceLoader
{
+ private static final WebBeansLogger logger = WebBeansLogger.getLogger(ServiceLoader.class);
+
/**
* Get a new service singleton instance for the given interface.
*
@@ -42,9 +44,8 @@
String implName = OpenWebBeansConfiguration.getInstance().getProperty(serviceInterface.getName());
if (implName == null)
{
- throw new WebBeansConfigurationException("Cannot find Service configuration for " +
- serviceInterface.getName() +
- " in the openwebbeans-default.properties file");
+ logger.warn("Unable to find service with class name : " + serviceInterface.getName());
+ return null;
}
return (T) WebBeansFinder.getSingletonInstance(implName);
}
Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/scanner/AbstractMetaDataDiscovery.java (from r919879, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/deployer/AbstractMetaDataDiscovery.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/scanner/AbstractMetaDataDiscovery.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/scanner/AbstractMetaDataDiscovery.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/deployer/AbstractMetaDataDiscovery.java&r1=919879&r2=919885&rev=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/deployer/AbstractMetaDataDiscovery.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/scanner/AbstractMetaDataDiscovery.java Sun Mar 7 00:07:58 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.webbeans.spi.deployer;
+package org.apache.webbeans.spi.scanner;
import java.net.URL;
Added: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/se/DefaultContextsService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/se/DefaultContextsService.java?rev=919885&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/se/DefaultContextsService.java (added)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/se/DefaultContextsService.java Sun Mar 7 00:07:58 2010
@@ -0,0 +1,357 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.webbeans.spi.se;
+
+import java.lang.annotation.Annotation;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.ContextException;
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.context.Dependent;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.context.spi.Context;
+import javax.inject.Singleton;
+
+import org.apache.webbeans.context.AbstractContextsService;
+import org.apache.webbeans.context.ApplicationContext;
+import org.apache.webbeans.context.ConversationContext;
+import org.apache.webbeans.context.DependentContext;
+import org.apache.webbeans.context.RequestContext;
+import org.apache.webbeans.context.SessionContext;
+import org.apache.webbeans.context.SingletonContext;
+
+public class DefaultContextsService extends AbstractContextsService
+{
+ private static ThreadLocal<RequestContext> requestContext = null;
+
+ private static ThreadLocal<SessionContext> sessionContext = null;
+
+ private static ThreadLocal<ApplicationContext> applicationContext = null;
+
+ private static ThreadLocal<ConversationContext> conversationContext = null;
+
+ private static ThreadLocal<SingletonContext> singletonContext = null;
+
+ private static ThreadLocal<DependentContext> dependentContext = null;
+
+
+ static
+ {
+ requestContext = new ThreadLocal<RequestContext>();
+ sessionContext = new ThreadLocal<SessionContext>();
+ applicationContext = new ThreadLocal<ApplicationContext>();
+ conversationContext = new ThreadLocal<ConversationContext>();
+ dependentContext = new ThreadLocal<DependentContext>();
+ singletonContext = new ThreadLocal<SingletonContext>();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void endContext(Class<? extends Annotation> scopeType, Object endParameters)
+ {
+
+ if(supportsContext(scopeType))
+ {
+ if(scopeType.equals(RequestScoped.class))
+ {
+ stopRequestContext(endParameters);
+ }
+ else if(scopeType.equals(SessionScoped.class))
+ {
+ stopSessionContext(endParameters);
+ }
+ else if(scopeType.equals(ApplicationScoped.class))
+ {
+ stopApplicationContext(endParameters);
+ }
+ else if(scopeType.equals(ConversationScoped.class))
+ {
+ stopConversationContext(endParameters);
+ }
+ else if(scopeType.equals(Dependent.class))
+ {
+ //Do nothing
+ }
+ else
+ {
+ stopSingletonContext(endParameters);
+ }
+ }
+
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Context getCurrentContext(Class<? extends Annotation> scopeType)
+ {
+ if(supportsContext(scopeType))
+ {
+ if(scopeType.equals(RequestScoped.class))
+ {
+ return getCurrentRequestContext();
+ }
+ else if(scopeType.equals(SessionScoped.class))
+ {
+ return getCurrentSessionContext();
+ }
+ else if(scopeType.equals(ApplicationScoped.class))
+ {
+ return getCurrentApplicationContext();
+ }
+ else if(scopeType.equals(ConversationScoped.class))
+ {
+ return getCurrentConversationContext();
+ }
+ else if(scopeType.equals(Dependent.class))
+ {
+ return getCurrentDependentContext();
+ }
+ else
+ {
+ return getCurrentSingletonContext();
+ }
+ }
+
+ return null;
+
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void startContext(Class<? extends Annotation> scopeType, Object startParameter) throws ContextException
+ {
+ try
+ {
+ if(supportsContext(scopeType))
+ {
+ if(scopeType.equals(RequestScoped.class))
+ {
+ startRequestContext(startParameter);
+ }
+ else if(scopeType.equals(SessionScoped.class))
+ {
+ startSessionContext(startParameter);
+ }
+ else if(scopeType.equals(ApplicationScoped.class))
+ {
+ startApplicationContext(startParameter);
+ }
+ else if(scopeType.equals(ConversationScoped.class))
+ {
+ startConversationContext((ConversationContext)startParameter);
+ }
+ else if(scopeType.equals(Dependent.class))
+ {
+ //Do nothing
+ }
+ else
+ {
+ startSingletonContext(startParameter);
+ }
+ }
+ }catch(Exception e)
+ {
+ if(e instanceof ContextException)
+ {
+ throw (ContextException)e;
+ }
+
+ throw new ContextException(e);
+ }
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean supportsContext(Class<? extends Annotation> scopeType)
+ {
+
+ if(scopeType.equals(RequestScoped.class) ||
+ scopeType.equals(SessionScoped.class) ||
+ scopeType.equals(ApplicationScoped.class) ||
+ scopeType.equals(Dependent.class) ||
+ scopeType.equals(Singleton.class))
+ {
+ return true;
+ }
+
+ return false;
+
+ }
+
+
+ @Override
+ public void destroy(Object destroyObject)
+ {
+ requestContext.remove();
+ sessionContext.remove();
+ applicationContext.remove();
+ conversationContext.remove();
+ dependentContext.remove();
+ singletonContext.remove();
+ }
+
+
+ private Context getCurrentApplicationContext()
+ {
+ return applicationContext.get();
+ }
+
+
+ private Context getCurrentConversationContext()
+ {
+ return conversationContext.get();
+ }
+
+
+ private Context getCurrentDependentContext()
+ {
+ if(dependentContext.get() == null)
+ {
+ dependentContext.set(new DependentContext());
+ }
+
+ return dependentContext.get();
+ }
+
+
+ private Context getCurrentRequestContext()
+ {
+ return requestContext.get();
+ }
+
+
+ private Context getCurrentSessionContext()
+ {
+ return sessionContext.get();
+ }
+
+
+ private Context getCurrentSingletonContext()
+ {
+ return singletonContext.get();
+ }
+
+
+ private void startApplicationContext(Object instance) throws Exception
+ {
+ ApplicationContext ctx = new ApplicationContext();
+ ctx.setActive(true);
+
+ applicationContext.set(ctx);
+ }
+
+
+ private void startConversationContext(Object object) throws Exception
+ {
+ ConversationContext ctx = new ConversationContext();
+ ctx.setActive(true);
+
+ conversationContext.set(ctx);
+
+ }
+
+
+ private void startRequestContext(Object instance) throws Exception
+ {
+
+ RequestContext ctx = new RequestContext();
+ ctx.setActive(true);
+
+ requestContext.set(ctx);
+ }
+
+
+ private void startSessionContext(Object instance) throws Exception
+ {
+ SessionContext ctx = new SessionContext();
+ ctx.setActive(true);
+
+ sessionContext.set(ctx);
+ }
+
+
+ private void startSingletonContext(Object object) throws Exception
+ {
+
+ SingletonContext ctx = new SingletonContext();
+ ctx.setActive(true);
+
+ singletonContext.set(ctx);
+ }
+
+
+ private void stopApplicationContext(Object object)
+ {
+ if(applicationContext.get() != null)
+ {
+ applicationContext.get().destroy();
+ }
+
+ }
+
+
+ private void stopConversationContext(Object object)
+ {
+ if(conversationContext.get() != null)
+ {
+ conversationContext.get().destroy();
+ }
+ }
+
+
+ private void stopRequestContext(Object instance)
+ {
+ if(requestContext.get() != null)
+ {
+ requestContext.get().destroy();
+ }
+ }
+
+
+ private void stopSessionContext(Object instance)
+ {
+ if(sessionContext.get() != null)
+ {
+ sessionContext.get().destroy();
+ }
+ }
+
+
+ private void stopSingletonContext(Object object)
+ {
+ if(singletonContext.get() != null)
+ {
+ singletonContext.get().destroy();
+ }
+ }
+
+}
Propchange: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/se/DefaultContextsService.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/se/DefaultScannerService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/se/DefaultScannerService.java?rev=919885&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/se/DefaultScannerService.java (added)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/se/DefaultScannerService.java Sun Mar 7 00:07:58 2010
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.apache.webbeans.spi.se;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Enumeration;
+
+import org.apache.webbeans.spi.scanner.AbstractMetaDataDiscovery;
+import org.apache.webbeans.util.WebBeansUtil;
+import org.scannotation.ClasspathUrlFinder;
+
+public class DefaultScannerService extends AbstractMetaDataDiscovery
+{
+ public DefaultScannerService()
+ {
+ super();
+ }
+
+ protected void configure() throws Exception
+ {
+ configureAnnotationDB();
+ }
+
+ private void configureAnnotationDB() throws Exception
+ {
+ ClassLoader loader = WebBeansUtil.getCurrentClassLoader();
+
+ URL[] urls = ClasspathUrlFinder.findResourceBases("META-INF/beans.xml", loader);
+
+ this.getAnnotationDB().scanArchives(urls);
+
+ configureXML();
+
+ }
+
+ private void configureXML() throws Exception
+ {
+ try
+ {
+ Enumeration<URL> resources = getClass().getClassLoader().getResources("META-INF/beans.xml");
+
+ while (resources.hasMoreElements())
+ {
+ URL resource = resources.nextElement();
+ addWebBeansXmlLocation(resource);
+ }
+
+ }
+ catch (IOException e)
+ {
+ throw e;
+ }
+ }
+
+
+}
Propchange: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/se/DefaultScannerService.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties Sun Mar 7 00:07:58 2010
@@ -28,7 +28,7 @@
################################### Default Container Lifecycle ################################
#Default implementation of org.apache.webbeans.spi.ContainerLifecycle.
-org.apache.webbeans.spi.ContainerLifecycle=org.apache.webbeans.lifecycle.DefaultLifecycle
+org.apache.webbeans.spi.ContainerLifecycle=org.apache.webbeans.lifecycle.StandaloneLifeCycle
################################################################################################
################################### Default JNDI Service #######################################
@@ -36,53 +36,28 @@
org.apache.webbeans.spi.JNDIService=org.apache.webbeans.spi.se.DefaultJndiService
################################################################################################
-################################### Default Conversation Service ###############################
-#Default implementation of org.apache.webbeans.spi.ConversationService.
-org.apache.webbeans.spi.ConversationService=org.apache.webbeans.spi.conversation.jsf.DefaultConversationService
-################################################################################################
-
################################### Default Scanner Service ####################################
#Default implementation of org.apache.webbeans.spi.ScannerService.
-org.apache.webbeans.spi.ScannerService=org.apache.webbeans.spi.ee.deployer.DefaultScannerService
-################################################################################################
-
-################################### Default Security Service ###################################
-#Default implementation of org.apache.webbeans.spi.SecurityService.
-org.apache.webbeans.spi.SecurityService=org.apache.webbeans.spi.se.DefaultSecurityService
+org.apache.webbeans.spi.ScannerService=org.apache.webbeans.spi.se.DefaultScannerService
################################################################################################
-################################### Default Validator Service ##################################
-#Default implementation of org.apache.webbeans.spi.ValidatorService.
-org.apache.webbeans.spi.ValidatorService=org.apache.webbeans.spi.se.DefaultValidatorService
-################################################################################################
-
-################################### Default Transaction Service ################################
-#Default implementation of org.apache.webbeans.spi.TransactionService.
-org.apache.webbeans.spi.TransactionService=org.apache.webbeans.spi.se.DefaultTransactionService
+################################### Default Contexts Service ####################################
+#Default implementation of org.apache.webbeans.spi.ContextsService.
+org.apache.webbeans.spi.ContextsService=org.apache.webbeans.spi.se.DefaultContextsService
################################################################################################
################################### Default Resource Injection Service #########################
#Default implementation of org.apache.webbeans.spi.ResourceInjectionService
-org.apache.webbeans.spi.ResourceInjectionService=org.apache.webbeans.se.DefaultResourceInjectionService
+org.apache.webbeans.spi.ResourceInjectionService=org.apache.webbeans.resource.spi.se.StandaloneResourceInjectionService
################################################################################################
################################################################################################
#################################### SEVERAL CONFIGURATION PARAMETERS ##########################
################################################################################################
-#################################### JMS ConnectionFactory JNDI Name ###########################
-# JMS ConnectionFactory instance global jndi name.
-org.apache.webbeans.spi.JNDIService.jmsConnectionFactoryJndi=ConnectionFactory
-################################################################################################
-
-#################################### Conversation Context Removal Thread Delay##################
-#Converation contexts are removed when idle timeout > timeout. Default timeout is 3 mins.
-org.apache.webbeans.conversation.Conversation.periodicDelay=150000
-################################################################################################
-
#################################### Use Embedded OpenEJB Discovery ############################
#If it is true, it checks every bean class whether or not represent EJB Bean
-org.apache.webbeans.spi.deployer.UseEjbMetaDataDiscoveryService=false
+org.apache.webbeans.spi.deployer.useEjbMetaDataDiscoveryService=false
################################################################################################
################################### Use OWB Specific XML Configuration #########################
@@ -105,4 +80,14 @@
################################# Application Development JSF Version is 2.0 ###################
#Add extra extensions for JSF2, for example adding ViewScope
org.apache.webbeans.application.useJSF2Extensions=false
+################################################################################################
+
+#################################### Conversation Context Removal Thread Delay##################
+#Converation contexts are removed when idle timeout > timeout. Default timeout is 3 mins.
+org.apache.webbeans.conversation.Conversation.periodicDelay=150000
+################################################################################################
+
+################################### Default Conversation Service ###############################
+#Default implementation of org.apache.webbeans.spi.ConversationService.
+org.apache.webbeans.spi.ConversationService=org.apache.webbeans.spi.conversation.jsf.DefaultConversationService
################################################################################################
\ No newline at end of file
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/AbstractUnitTest.java Sun Mar 7 00:07:58 2010
@@ -24,6 +24,7 @@
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.Extension;
+import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.lifecycle.test.OpenWebBeansTestLifeCycle;
import org.apache.webbeans.lifecycle.test.OpenWebBeansTestMetaDataDiscoveryService;
import org.apache.webbeans.portable.events.ExtensionLoader;
@@ -51,11 +52,18 @@
}
//Deploy bean classes
- OpenWebBeansTestMetaDataDiscoveryService discoveyService = (OpenWebBeansTestMetaDataDiscoveryService)testLifecycle.getDiscoveryService();
+ OpenWebBeansTestMetaDataDiscoveryService discoveyService = (OpenWebBeansTestMetaDataDiscoveryService)testLifecycle.getScannerService();
discoveyService.deployClasses(beanClasses);
//Start application
- testLifecycle.applicationStarted(null);
+ try
+ {
+ testLifecycle.startApplication(null);
+ }
+ catch (Exception e)
+ {
+ throw new WebBeansConfigurationException(e);
+ }
}
protected void startContainer(Collection<Class<?>> beanClasses, Collection<URL> beanXmls)
@@ -69,12 +77,19 @@
}
//Deploy bean classes
- OpenWebBeansTestMetaDataDiscoveryService discoveyService = (OpenWebBeansTestMetaDataDiscoveryService)testLifecycle.getDiscoveryService();
+ OpenWebBeansTestMetaDataDiscoveryService discoveyService = (OpenWebBeansTestMetaDataDiscoveryService)testLifecycle.getScannerService();
discoveyService.deployClasses(beanClasses);
discoveyService.deployXMLs(beanXmls);
//Start application
- testLifecycle.applicationStarted(null);
+ try
+ {
+ testLifecycle.startApplication(null);
+ }
+ catch (Exception e)
+ {
+ throw new WebBeansConfigurationException(e);
+ }
}
@@ -84,7 +99,7 @@
//Shwtdown application
if(this.testLifecycle != null)
{
- this.testLifecycle.applicationEnded(null);
+ this.testLifecycle.stopApplication(null);
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/ExtensionTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/ExtensionTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/ExtensionTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/ExtensionTest.java Sun Mar 7 00:07:58 2010
@@ -29,7 +29,6 @@
import org.apache.webbeans.annotation.DefaultLiteral;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.exception.inject.DefinitionException;
-import org.apache.webbeans.lifecycle.test.MockServletContext;
import org.apache.webbeans.newtests.AbstractUnitTest;
import org.apache.webbeans.newtests.portable.scopeextension.ExternalTestScopeExtension;
import org.apache.webbeans.newtests.portable.scopeextension.ExternalTestScoped;
@@ -60,8 +59,7 @@
addExtension(new ExternalTestScopeExtension());
startContainer(classes);
- MockServletContext servletContext = new MockServletContext();
- ContextFactory.initApplicationContext(servletContext);
+ ContextFactory.initApplicationContext(null);
@SuppressWarnings("unchecked")
Bean<ExternalTestScopedBean> bean = (Bean<ExternalTestScopedBean>) getBeanManager().getBeans(ExternalTestScopedBean.class,
@@ -77,7 +75,7 @@
//Fire shut down
getBeanManager().fireEvent(new BeforeShutdownImpl(), new Annotation[0]);
- ContextFactory.destroyApplicationContext(servletContext);
+ ContextFactory.destroyApplicationContext(null);
shutDownContainer();
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/promethods/PersonProducerTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/promethods/PersonProducerTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/promethods/PersonProducerTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/promethods/PersonProducerTest.java Sun Mar 7 00:07:58 2010
@@ -66,6 +66,6 @@
Assert.assertTrue(reference instanceof Person);
-
+ shutDownContainer();
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java Sun Mar 7 00:07:58 2010
@@ -28,13 +28,9 @@
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.interceptor.Interceptor;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextListener;
-import javax.servlet.http.HttpSession;
import junit.framework.Assert;
-import org.apache.log4j.Logger;
import org.apache.webbeans.component.AbstractOwbBean;
import org.apache.webbeans.component.AbstractInjectionTargetBean;
import org.apache.webbeans.component.ManagedBean;
@@ -52,7 +48,7 @@
import org.apache.webbeans.intercept.InterceptorUtil;
import org.apache.webbeans.intercept.InterceptorsManager;
import org.apache.webbeans.intercept.WebBeansInterceptorConfig;
-import org.apache.webbeans.lifecycle.test.MockHttpSession;
+import org.apache.webbeans.logger.WebBeansLogger;
import org.apache.webbeans.newtests.AbstractUnitTest;
import org.apache.webbeans.plugins.PluginLoader;
import org.apache.webbeans.portable.AnnotatedElementFactory;
@@ -95,7 +91,7 @@
*/
public abstract class TestContext implements ITestContext
{
- private Logger logger = Logger.getLogger(TestContext.class);
+ private WebBeansLogger logger = WebBeansLogger.getLogger(TestContext.class);
/**
* All unit test classes. It is defined for starting the tests from the
@@ -273,12 +269,12 @@
* @see TestListener
* @see ComponentResolutionByTypeTest
*/
- public static void startAllTests(ServletContext ctx)
+ public static void startAllTests(Object object)
{
Iterator<ITestContext> it = testContexts.iterator();
while (it.hasNext())
{
- it.next().startTests(ctx);
+ it.next().startTests(object);
}
}
@@ -291,12 +287,12 @@
* @see TestListener
* @see ComponentResolutionByTypeTest
*/
- public static void endAllTests(ServletContext ctx)
+ public static void endAllTests(Object object)
{
Iterator<ITestContext> it = testContexts.iterator();
while (it.hasNext())
{
- it.next().endTests(ctx);
+ it.next().endTests(object);
}
}
@@ -524,9 +520,9 @@
*
* @return new mock session
*/
- protected HttpSession getSession()
+ protected Object getSession()
{
- return new MockHttpSession();
+ return new Object();
}
/**
@@ -582,7 +578,7 @@
* @see TestListener
* @see ComponentResolutionByTypeTest
*/
- public void endTests(ServletContext ctx)
+ public void endTests(Object ctx)
{
}
@@ -595,7 +591,7 @@
* @see TestListener
* @see ComponentResolutionByTypeTest
*/
- public void startTests(ServletContext ctx)
+ public void startTests(Object ctx)
{
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent2.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent2.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent2.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent2.java Sun Mar 7 00:07:58 2010
@@ -15,12 +15,12 @@
import javax.enterprise.event.Observes;
-import org.apache.log4j.spi.LoggingEvent;
+import org.apache.webbeans.test.event.LoggedInEvent;
public class BrokenObserverComponent2
{
- public void observer(@Observes LoggingEvent event1, @Observes LoggingEvent event2)
+ public void observer(@Observes LoggedInEvent event1, @Observes LoggedInEvent event2)
{
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent3.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent3.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent3.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent3.java Sun Mar 7 00:07:58 2010
@@ -16,14 +16,14 @@
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Produces;
-import org.apache.log4j.spi.LoggingEvent;
import org.apache.webbeans.test.component.CurrentBindingComponent;
+import org.apache.webbeans.test.event.LoggedInEvent;
public class BrokenObserverComponent3
{
@Produces
- public CurrentBindingComponent observer(@Observes LoggingEvent event1)
+ public CurrentBindingComponent observer(@Observes LoggedInEvent event1)
{
return null;
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent4.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent4.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent4.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent4.java Sun Mar 7 00:07:58 2010
@@ -16,14 +16,14 @@
import javax.enterprise.event.Observes;
import javax.inject.Inject;
-import org.apache.log4j.spi.LoggingEvent;
import org.apache.webbeans.test.component.CurrentBindingComponent;
+import org.apache.webbeans.test.event.LoggedInEvent;
public class BrokenObserverComponent4
{
@Inject
- public CurrentBindingComponent observer(@Observes LoggingEvent event1)
+ public CurrentBindingComponent observer(@Observes LoggedInEvent event1)
{
return null;
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent5.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent5.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent5.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent5.java Sun Mar 7 00:07:58 2010
@@ -16,14 +16,14 @@
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Produces;
-import org.apache.log4j.spi.LoggingEvent;
import org.apache.webbeans.test.component.CurrentBindingComponent;
+import org.apache.webbeans.test.event.LoggedInEvent;
public class BrokenObserverComponent5
{
@Produces
- public CurrentBindingComponent observer(@Observes LoggingEvent event1)
+ public CurrentBindingComponent observer(@Observes LoggedInEvent event1)
{
return null;
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent6.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent6.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent6.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/event/broken/BrokenObserverComponent6.java Sun Mar 7 00:07:58 2010
@@ -16,13 +16,13 @@
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Disposes;
-import org.apache.log4j.spi.LoggingEvent;
import org.apache.webbeans.test.component.CurrentBindingComponent;
+import org.apache.webbeans.test.event.LoggedInEvent;
public class BrokenObserverComponent6
{
- public CurrentBindingComponent observer(@Observes LoggingEvent event1, @Disposes CurrentBindingComponent com)
+ public CurrentBindingComponent observer(@Observes LoggedInEvent event1, @Disposes CurrentBindingComponent com)
{
return null;
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/containertests/ComponentResolutionByTypeTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/containertests/ComponentResolutionByTypeTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/containertests/ComponentResolutionByTypeTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/containertests/ComponentResolutionByTypeTest.java Sun Mar 7 00:07:58 2010
@@ -16,7 +16,6 @@
import java.util.Set;
import javax.enterprise.inject.spi.Bean;
-import javax.servlet.ServletContext;
import junit.framework.Assert;
@@ -57,10 +56,6 @@
cont = BeanManagerImpl.getManager();
}
- public void endTests(ServletContext ctx)
- {
- cont = null;
- }
@Test
public void testBindingTypeOk() throws Throwable
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/ITestContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/ITestContext.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/ITestContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/ITestContext.java Sun Mar 7 00:07:58 2010
@@ -13,8 +13,6 @@
*/
package org.apache.webbeans.test.servlet;
-import javax.servlet.ServletContext;
-
/**
* Simple test interfaces.
*
@@ -31,11 +29,11 @@
/**
* Start all tests in the context
*/
- public void startTests(ServletContext ctx);
+ public void startTests(Object ctx);
/**
* End tests in the context
*/
- public void endTests(ServletContext ctx);
+ public void endTests(Object ctx);
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestListener.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestListener.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestListener.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/servlet/TestListener.java Sun Mar 7 00:07:58 2010
@@ -13,10 +13,7 @@
*/
package org.apache.webbeans.test.servlet;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.apache.log4j.Logger;
+import org.apache.webbeans.logger.WebBeansLogger;
import org.apache.webbeans.test.TestContext;
import org.junit.Test;
@@ -29,9 +26,9 @@
* @author <a href="mailto:gurkanerdogdu@yahoo.com">Gurkan Erdogdu</a>
* @since 1.0
*/
-public class TestListener implements ServletContextListener
+public class TestListener
{
- Logger log = Logger.getLogger(TestListener.class);
+ WebBeansLogger log = WebBeansLogger.getLogger(TestListener.class);
private void init()
{
@@ -42,11 +39,11 @@
/**
* Ending all tests
*/
- public void contextDestroyed(ServletContextEvent arg0)
+ public void contextDestroyed(Object arg0)
{
log.info("Ending all tests");
- TestContext.endAllTests(arg0.getServletContext());
+ TestContext.endAllTests(arg0);
}
@Test
@@ -58,13 +55,13 @@
/**
* Initialize and start all tests from the web application.
*/
- public void contextInitialized(ServletContextEvent arg0)
+ public void contextInitialized(Object arg0)
{
init();
log.info("Starting all tests");
- TestContext.startAllTests(arg0.getServletContext());
+ TestContext.startAllTests(arg0);
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/config/WebBeansScannerTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/config/WebBeansScannerTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/config/WebBeansScannerTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/config/WebBeansScannerTest.java Sun Mar 7 00:07:58 2010
@@ -40,7 +40,7 @@
//Start test container
startContainer(classes);
- ScannerService scanner = getLifecycle().getDiscoveryService();
+ ScannerService scanner = getLifecycle().getScannerService();
Set<Class<?>> classMap = scanner.getBeanClasses();
Assert.assertNotNull(classMap);
Assert.assertFalse(classMap.isEmpty());
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorExceptionTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorExceptionTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorExceptionTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorExceptionTest.java Sun Mar 7 00:07:58 2010
@@ -18,8 +18,6 @@
import java.util.HashSet;
import java.util.Set;
-import javax.servlet.ServletContext;
-
import junit.framework.Assert;
import org.apache.webbeans.annotation.RequestedScopeLiteral;
@@ -47,15 +45,6 @@
super.init();
}
- public void endTests(ServletContext ctx)
- {
-
- }
-
- public void startTests(ServletContext ctx)
- {
-
- }
@Test
public void testDelegateAttributeIsnotInterface()
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorTest1.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorTest1.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorTest1.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorTest1.java Sun Mar 7 00:07:58 2010
@@ -21,7 +21,6 @@
import java.util.Set;
import javax.enterprise.inject.spi.Decorator;
-import javax.servlet.ServletContext;
import junit.framework.Assert;
@@ -48,16 +47,6 @@
super(DecoratorTest1.class.getName());
}
- public void endTests(ServletContext ctx)
- {
-
- }
-
- public void startTests(ServletContext ctx)
- {
-
- }
-
@Before
public void init()
{
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/disposal/DisposalTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/disposal/DisposalTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/disposal/DisposalTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/disposal/DisposalTest.java Sun Mar 7 00:07:58 2010
@@ -16,7 +16,6 @@
import java.util.List;
import org.apache.webbeans.context.ContextFactory;
-import org.apache.webbeans.lifecycle.test.MockHttpSession;
import org.apache.webbeans.test.TestContext;
import org.apache.webbeans.test.component.disposal.Disposal1;
import org.junit.Assert;
@@ -43,7 +42,7 @@
clear();
ContextFactory.initRequestContext(null);
- ContextFactory.initSessionContext(new MockHttpSession());
+ ContextFactory.initSessionContext(null);
defineManagedBean(Disposal1.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/EventTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/EventTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/EventTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/EventTest.java Sun Mar 7 00:07:58 2010
@@ -17,7 +17,6 @@
import javax.enterprise.util.AnnotationLiteral;
import javax.enterprise.util.TypeLiteral;
-import javax.servlet.ServletContext;
import org.apache.webbeans.event.NotificationManager;
import org.apache.webbeans.test.TestContext;
@@ -40,14 +39,6 @@
super(EventTest.class.getName());
}
- public void endTests(ServletContext ctx)
- {
- }
-
- public void startTests(ServletContext ctx)
- {
- }
-
@Test
public void testObserverWithClazz()
{
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/exception/EventExceptionTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/exception/EventExceptionTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/exception/EventExceptionTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/exception/EventExceptionTest.java Sun Mar 7 00:07:58 2010
@@ -17,7 +17,6 @@
import javax.enterprise.context.NormalScope;
import javax.enterprise.util.AnnotationLiteral;
-import javax.servlet.ServletContext;
import org.apache.webbeans.event.NotificationManager;
import org.apache.webbeans.test.TestContext;
@@ -37,14 +36,6 @@
super(EventExceptionTest.class.getName());
}
- public void endTests(ServletContext ctx)
- {
- }
-
- public void startTests(ServletContext ctx)
- {
- }
-
@Test
public void testAddObserverGenericType()
{
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java Sun Mar 7 00:07:58 2010
@@ -14,7 +14,6 @@
package org.apache.webbeans.test.unittests.exception;
import javax.enterprise.inject.spi.Bean;
-import javax.servlet.ServletContext;
import junit.framework.Assert;
@@ -57,11 +56,6 @@
super(ExceptionComponentTest.class.getName());
}
- public void endTests(ServletContext ctx)
- {
-
- }
-
@Before
public void init()
{
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ScopeTypeExceptionComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ScopeTypeExceptionComponentTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ScopeTypeExceptionComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ScopeTypeExceptionComponentTest.java Sun Mar 7 00:07:58 2010
@@ -17,7 +17,6 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.context.SessionScoped;
import javax.enterprise.inject.spi.Bean;
-import javax.servlet.ServletContext;
import junit.framework.Assert;
@@ -42,11 +41,6 @@
super(ScopeTypeExceptionComponentTest.class.getName());
}
- public void endTests(ServletContext ctx)
- {
-
- }
-
@Before
public void init()
{
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/CurrentInjectedComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/CurrentInjectedComponentTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/CurrentInjectedComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/CurrentInjectedComponentTest.java Sun Mar 7 00:07:58 2010
@@ -15,8 +15,6 @@
import java.util.List;
-import javax.servlet.http.HttpSession;
-
import junit.framework.Assert;
import org.apache.webbeans.component.AbstractOwbBean;
@@ -53,7 +51,7 @@
defineManagedBean(ContaintsCurrentComponent.class);
List<AbstractOwbBean<?>> comps = getComponents();
- HttpSession session = getSession();
+ Object session = getSession();
ContextFactory.initRequestContext(null);
ContextFactory.initSessionContext(session);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/InjectedComponentTestWithMember.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/InjectedComponentTestWithMember.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/InjectedComponentTestWithMember.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/InjectedComponentTestWithMember.java Sun Mar 7 00:07:58 2010
@@ -16,7 +16,6 @@
import java.util.List;
import javax.enterprise.inject.spi.BeanManager;
-import javax.servlet.http.HttpSession;
import junit.framework.Assert;
@@ -53,7 +52,7 @@
defineManagedBean(NonBindingComponent.class);
List<AbstractOwbBean<?>> comps = getComponents();
- HttpSession session = getSession();
+ Object session = getSession();
ContextFactory.initSessionContext(session);
Assert.assertEquals(2, comps.size());
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/TypedInjectedComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/TypedInjectedComponentTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/TypedInjectedComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/TypedInjectedComponentTest.java Sun Mar 7 00:07:58 2010
@@ -16,7 +16,6 @@
import java.util.List;
import javax.enterprise.inject.spi.BeanManager;
-import javax.servlet.http.HttpSession;
import junit.framework.Assert;
@@ -56,7 +55,7 @@
defineManagedBean(TypedInjection.class);
List<AbstractOwbBean<?>> comps = getComponents();
- HttpSession session = getSession();
+ Object session = getSession();
ContextFactory.initSessionContext(session);
@@ -91,7 +90,7 @@
defineManagedBean(TypedInjectionWithoutArguments.class);
List<AbstractOwbBean<?>> comps = getComponents();
- HttpSession session = getSession();
+ Object session = getSession();
ContextFactory.initSessionContext(session);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/UserComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/UserComponentTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/UserComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/UserComponentTest.java Sun Mar 7 00:07:58 2010
@@ -16,7 +16,6 @@
import java.util.List;
import javax.enterprise.inject.spi.BeanManager;
-import javax.servlet.http.HttpSession;
import junit.framework.Assert;
@@ -54,7 +53,7 @@
defineManagedBean(ContainUserComponent.class);
List<AbstractOwbBean<?>> comps = getComponents();
- HttpSession session = getSession();
+ Object session = getSession();
ContextFactory.initRequestContext(null);
ContextFactory.initSessionContext(session);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java Sun Mar 7 00:07:58 2010
@@ -15,8 +15,6 @@
import java.util.List;
-import javax.servlet.ServletContext;
-
import junit.framework.Assert;
import org.apache.webbeans.component.AbstractOwbBean;
@@ -38,11 +36,6 @@
super(EJBInterceptComponentTest.class.getName());
}
- public void endTests(ServletContext ctx)
- {
-
- }
-
@Before
public void init()
{
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureAndTransactionalInterceptorTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureAndTransactionalInterceptorTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureAndTransactionalInterceptorTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureAndTransactionalInterceptorTest.java Sun Mar 7 00:07:58 2010
@@ -21,7 +21,6 @@
import junit.framework.Assert;
import org.apache.webbeans.context.ContextFactory;
-import org.apache.webbeans.lifecycle.test.MockHttpSession;
import org.apache.webbeans.test.TestContext;
import org.apache.webbeans.test.component.intercept.webbeans.SecureAndTransactionalComponent;
import org.apache.webbeans.test.component.intercept.webbeans.SecureAndTransactionalInterceptor;
@@ -45,7 +44,7 @@
@Test
public void testSecureAndTransactionalInterceptor()
{
- ContextFactory.initSessionContext(new MockHttpSession());
+ ContextFactory.initSessionContext(null);
defineInterceptor(SecureAndTransactionalInterceptor.class);
Bean<SecureAndTransactionalComponent> bean = defineManagedBean(SecureAndTransactionalComponent.class);
@@ -58,6 +57,6 @@
Assert.assertTrue(SecureAndTransactionalComponent.getCALL());
- ContextFactory.destroySessionContext(new MockHttpSession());
+ ContextFactory.destroySessionContext(null);
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java Sun Mar 7 00:07:58 2010
@@ -22,7 +22,6 @@
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.intercept.InterceptorsManager;
-import org.apache.webbeans.lifecycle.test.MockHttpSession;
import org.apache.webbeans.test.TestContext;
import org.apache.webbeans.test.component.intercept.webbeans.ShoppingCard;
import org.apache.webbeans.test.component.intercept.webbeans.TransactionalInterceptor;
@@ -49,7 +48,7 @@
@Test
public void testTransactionalInterceptor()
{
- ContextFactory.initSessionContext(new MockHttpSession());
+ ContextFactory.initSessionContext(null);
// Interceptors must explicitly get enabled via XML. We fake this:
InterceptorsManager.getInstance().addNewInterceptor(TransactionalInterceptor.class);
@@ -67,6 +66,6 @@
Assert.assertFalse(ShoppingCard.getCALLED());
- ContextFactory.destroySessionContext(new MockHttpSession());
+ ContextFactory.destroySessionContext(null);
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/WebBeansInterceptComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/WebBeansInterceptComponentTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/WebBeansInterceptComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/WebBeansInterceptComponentTest.java Sun Mar 7 00:07:58 2010
@@ -15,8 +15,6 @@
import java.util.List;
-import javax.servlet.ServletContext;
-
import junit.framework.Assert;
import org.apache.webbeans.component.AbstractOwbBean;
@@ -39,11 +37,6 @@
super(WebBeansInterceptComponentTest.class.getName());
}
- public void endTests(ServletContext ctx)
- {
-
- }
-
@Before
public void init()
{
@@ -52,11 +45,6 @@
initializeInterceptorType(WebBeanswithMetaInterceptor.class);
}
- public void startTests(ServletContext ctx)
- {
-
- }
-
@Test
public void testInterceptedComponent()
{
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/events/ExtensionTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/events/ExtensionTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/events/ExtensionTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/portable/events/ExtensionTest.java Sun Mar 7 00:07:58 2010
@@ -28,7 +28,6 @@
import org.apache.webbeans.annotation.DefaultLiteral;
import org.apache.webbeans.context.ContextFactory;
-import org.apache.webbeans.lifecycle.test.MockServletContext;
import org.apache.webbeans.newtests.AbstractUnitTest;
import org.apache.webbeans.portable.events.discovery.BeforeShutdownImpl;
import org.apache.webbeans.test.component.library.BookShop;
@@ -59,9 +58,8 @@
addExtension(new MyExtension());
startContainer(classes);
-
- MockServletContext servletContext = new MockServletContext();
- ContextFactory.initApplicationContext(servletContext);
+
+ ContextFactory.initApplicationContext(null);
Bean<MyExtension> extension = (Bean<MyExtension>) getBeanManager().getBeans(MyExtension.class, new DefaultLiteral()).iterator().next();
@@ -81,7 +79,7 @@
//Fire shut down
getBeanManager().fireEvent(new BeforeShutdownImpl(), new Annotation[0]);
- ContextFactory.destroyApplicationContext(servletContext);
+ ContextFactory.destroyApplicationContext(null);
Assert.assertNotNull(MyExtension.beforeShutdownEvent);
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/ProducerComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/ProducerComponentTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/ProducerComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/ProducerComponentTest.java Sun Mar 7 00:07:58 2010
@@ -17,13 +17,11 @@
import java.util.List;
import javax.enterprise.util.TypeLiteral;
-import javax.servlet.ServletContext;
import junit.framework.Assert;
import org.apache.webbeans.component.AbstractOwbBean;
import org.apache.webbeans.context.ContextFactory;
-import org.apache.webbeans.lifecycle.test.MockHttpSession;
import org.apache.webbeans.test.TestContext;
import org.apache.webbeans.test.component.producer.ParametrizedModel1;
import org.apache.webbeans.test.component.producer.ParametrizedModel2;
@@ -53,7 +51,7 @@
/**
* From the container with servlet context
*/
- public void startTests(ServletContext ctx)
+ public void startTests(Object ctx)
{
testProducerDeployment1();
testProducerDeployment2();
@@ -119,7 +117,7 @@
defineManagedBean(Producer4.class);
AbstractOwbBean<Producer4ConsumerComponent> component = defineManagedBean(Producer4ConsumerComponent.class);
- ContextFactory.initSessionContext(new MockHttpSession());
+ ContextFactory.initSessionContext(new Object());
Producer4ConsumerComponent instance = getManager().getInstance(component);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/scopes/ScopeAdapterTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/scopes/ScopeAdapterTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/scopes/ScopeAdapterTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/scopes/ScopeAdapterTest.java Sun Mar 7 00:07:58 2010
@@ -15,8 +15,6 @@
import java.util.List;
-import javax.servlet.http.HttpSession;
-
import junit.framework.Assert;
import org.apache.webbeans.component.AbstractOwbBean;
@@ -51,7 +49,7 @@
defineManagedBean(ScopeAdaptorComponent.class);
defineManagedBean(ScopeAdaptorInjectorComponent.class);
- HttpSession session = getSession();
+ Object session = getSession();
ContextFactory.initRequestContext(null);
ContextFactory.initSessionContext(session);
ContextFactory.initApplicationContext(null);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/scopes/SingletonComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/scopes/SingletonComponentTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/scopes/SingletonComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/scopes/SingletonComponentTest.java Sun Mar 7 00:07:58 2010
@@ -16,7 +16,6 @@
import java.util.List;
import javax.enterprise.inject.spi.BeanManager;
-import javax.servlet.http.HttpSession;
import junit.framework.Assert;
@@ -56,7 +55,7 @@
defineManagedBean(Singleton.class);
List<AbstractOwbBean<?>> comps = getComponents();
- HttpSession session = getSession();
+ Object session = getSession();
ContextFactory.initSessionContext(session);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLTest.java?rev=919885&r1=919884&r2=919885&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/XMLTest.java Sun Mar 7 00:07:58 2010
@@ -15,14 +15,11 @@
import java.io.InputStream;
-import javax.servlet.ServletContext;
-
import junit.framework.Assert;
import org.apache.webbeans.test.TestContext;
import org.apache.webbeans.xml.XMLUtil;
import org.dom4j.Element;
-import org.junit.Before;
import org.junit.Test;
public class XMLTest extends TestContext
@@ -32,21 +29,6 @@
super(XMLTest.class.getSimpleName());
}
- public void endTests(ServletContext ctx)
- {
-
- }
-
- @Before
- public void init()
- {
- }
-
- public void startTests(ServletContext ctx)
- {
-
- }
-
@Test
public void nameSpacesIsDefined()
{