Author: struberg
Date: Thu Oct 13 13:41:50 2011
New Revision: 1182852
URL: http://svn.apache.org/viewvc?rev=1182852&view=rev
Log:
OWB-615 remove @Override for interfaces (java5 compat)
Modified:
openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/plugin/OpenWebBeansJmsPlugin.java
openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/scopes/ViewScopedContext.java
openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/resource/OpenEjbResourceInjectionService.java
openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/service/OpenEJBTransactionService.java
openwebbeans/trunk/webbeans-openejb/src/test/java/org/apache/webbeans/ejb/bean/SimpleBean.java
openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/BeansImpl.java
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ELImpl.java
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatAnnotProcessor.java
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityListener.java
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityListener.java
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBagWrapper.java
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/MockServletContext.java
openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/MockServletRequest.java
Modified:
openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/plugin/OpenWebBeansJmsPlugin.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/plugin/OpenWebBeansJmsPlugin.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/plugin/OpenWebBeansJmsPlugin.java
(original)
+++
openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/plugin/OpenWebBeansJmsPlugin.java
Thu Oct 13 13:41:50 2011
@@ -41,7 +41,6 @@ public class OpenWebBeansJmsPlugin exten
super();
}
- @Override
public Bean<?> getJmsBean(JMSModel model)
{
JmsBean<?> bean =
JmsComponentFactory.getJmsComponentFactory().getJmsComponent(model);
@@ -56,7 +55,6 @@ public class OpenWebBeansJmsPlugin exten
JmsProxyHandler.clearConnections();
}
- @Override
public Object getJmsBeanProxy(Bean<?> bean, Class<?> iface)
{
Object proxy = JmsUtil.createNewJmsProxy((JmsBean<?>) bean, iface);
Modified:
openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/scopes/ViewScopedContext.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/scopes/ViewScopedContext.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/scopes/ViewScopedContext.java
(original)
+++
openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/scopes/ViewScopedContext.java
Thu Oct 13 13:41:50 2011
@@ -50,7 +50,6 @@ public class ViewScopedContext implement
private boolean isJsfSubscribed = false;
- @Override
public <T> T get(Contextual<T> component)
{
checkActive();
@@ -78,7 +77,6 @@ public class ViewScopedContext implement
return instance;
}
- @Override
public <T> T get(Contextual<T> component, CreationalContext<T>
creationalContext)
{
checkActive();
@@ -142,7 +140,6 @@ public class ViewScopedContext implement
return instance;
}
- @Override
public Class<? extends Annotation> getScope()
{
return ViewScoped.class;
@@ -151,7 +148,6 @@ public class ViewScopedContext implement
/**
* The view context is active if a valid ViewRoot could be detected.
*/
- @Override
public boolean isActive()
{
return JSFUtil.getViewRoot() != null;
@@ -165,7 +161,6 @@ public class ViewScopedContext implement
}
}
- @Override
public boolean isListenerForSource(Object source)
{
if (source instanceof UIViewRoot)
@@ -183,7 +178,6 @@ public class ViewScopedContext implement
*
* @see
javax.faces.event.SystemEventListener#processEvent(javax.faces.event.SystemEvent)
*/
- @Override
@SuppressWarnings("unchecked")
public void processEvent(SystemEvent event)
{
Modified:
openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/resource/OpenEjbResourceInjectionService.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/resource/OpenEjbResourceInjectionService.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/resource/OpenEjbResourceInjectionService.java
(original)
+++
openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/resource/OpenEjbResourceInjectionService.java
Thu Oct 13 13:41:50 2011
@@ -58,13 +58,11 @@ public class OpenEjbResourceInjectionSer
this.webBeansContext = webBeansContext;
}
- @Override
public void clear()
{
}
- @Override
public <X, T extends Annotation> X
getResourceReference(ResourceReference<X, T> resourceReference)
{
try
@@ -80,7 +78,6 @@ public class OpenEjbResourceInjectionSer
}
}
- @Override
public void injectJavaEEResources(Object managedBeanInstance)
{
Field[] fields =
webBeansContext.getSecurityService().doPrivilegedGetDeclaredFields(managedBeanInstance.getClass());
Modified:
openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/service/OpenEJBTransactionService.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/service/OpenEJBTransactionService.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/service/OpenEJBTransactionService.java
(original)
+++
openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/service/OpenEJBTransactionService.java
Thu Oct 13 13:41:50 2011
@@ -40,7 +40,6 @@ public class OpenEJBTransactionService i
}
- @Override
public Transaction getTransaction()
{
TransactionManager manager = getTransactionManager();
@@ -59,20 +58,17 @@ public class OpenEJBTransactionService i
return null;
}
- @Override
public TransactionManager getTransactionManager()
{
return SystemInstance.get().getComponent(TransactionManager.class);
}
- @Override
public UserTransaction getUserTransaction()
{
CoreUserTransaction ut = new
CoreUserTransaction(getTransactionManager());
return ut;
}
- @Override
public void registerTransactionSynchronization(TransactionPhase phase,
ObserverMethod<? super Object> observer, Object event) throws Exception
{
TransactionalEventNotifier.registerTransactionSynchronization(phase,
observer, event);
Modified:
openwebbeans/trunk/webbeans-openejb/src/test/java/org/apache/webbeans/ejb/bean/SimpleBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-openejb/src/test/java/org/apache/webbeans/ejb/bean/SimpleBean.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-openejb/src/test/java/org/apache/webbeans/ejb/bean/SimpleBean.java
(original)
+++
openwebbeans/trunk/webbeans-openejb/src/test/java/org/apache/webbeans/ejb/bean/SimpleBean.java
Thu Oct 13 13:41:50 2011
@@ -25,7 +25,6 @@ import javax.enterprise.inject.Produces;
public class SimpleBean implements SimpleBeanLocal
{
- @Override
@Produces
public String hello(String hi)
{
Modified:
openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java
(original)
+++
openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java
Thu Oct 13 13:41:50 2011
@@ -71,7 +71,6 @@ public class OsgiMetaDataScannerService
private Set<String> beanArchiveJarNames = new HashSet<String>();
private Map<String, Set<String>> classAnnotations = new HashMap<String,
Set<String>>();
- @Override
public void init(Object object)
{
if (object instanceof ServletContext)
@@ -80,7 +79,6 @@ public class OsgiMetaDataScannerService
}
}
- @Override
public void release()
{
beanClasses = new HashSet<Class<?>>();
@@ -89,7 +87,6 @@ public class OsgiMetaDataScannerService
classAnnotations.clear();
}
- @Override
public void scan() throws WebBeansDeploymentException
{
logger.info("Using OsgiMetaDataScannerService!");
@@ -126,26 +123,22 @@ public class OsgiMetaDataScannerService
new ClassDiscoveryFilter()
{
- @Override
public boolean directoryDiscoveryRequired(String directory)
{
return true;
}
- @Override
public boolean jarFileDiscoveryRequired(String jarUrl)
{
boolean isValidBeanArchive =
beanArchiveJarNames.contains(jarUrl);
return isValidBeanArchive;
}
- @Override
public boolean packageDiscoveryRequired(String packageName)
{
return true;
}
- @Override
public boolean rangeDiscoveryRequired(DiscoveryRange
discoveryRange)
{
return discoveryRange.equals(DiscoveryRange.BUNDLE_CLASSPATH);
@@ -261,31 +254,26 @@ public class OsgiMetaDataScannerService
}
}
- @Override
public Set<URL> getBeanXmls()
{
return beanXMLs;
}
- @Override
public Set<Class<?>> getBeanClasses()
{
return beanClasses;
}
- @Override
public Set<String> getAllAnnotations(String className)
{
return classAnnotations.get(className);
}
- @Override
public BDABeansXmlScanner getBDABeansXmlScanner()
{
return null;
}
- @Override
public boolean isBDABeansXmlScanningEnabled()
{
return false;
Modified:
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/BeansImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/BeansImpl.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/BeansImpl.java
(original)
+++
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/BeansImpl.java
Thu Oct 13 13:41:50 2011
@@ -72,7 +72,6 @@ public class BeansImpl implements Beans
return instance.getClass().getName().contains("$$");
}
- @Override
public byte[] serialize(Object o) throws IOException
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -81,7 +80,6 @@ public class BeansImpl implements Beans
return baos.toByteArray();
}
- @Override
public Object deserialize(byte[] bytes) throws IOException,
ClassNotFoundException
{
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
Modified:
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ELImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ELImpl.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ELImpl.java
(original)
+++
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ELImpl.java
Thu Oct 13 13:41:50 2011
@@ -99,7 +99,6 @@ public class ELImpl implements EL
return (T)object;
}
- @Override
public ELContext createELContext()
{
ELContext context = new ELContextImpl();
Modified:
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
(original)
+++
openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
Thu Oct 13 13:41:50 2011
@@ -196,14 +196,12 @@ public class StandaloneContainersImpl im
return WebBeansContext.getInstance().getBeanManagerImpl();
}
- @Override
public void deploy(Collection<Class<?>> classes) throws DeploymentException
{
setUp(classes);
deployInternal(classes);
}
- @Override
public boolean deploy(Collection<Class<?>> classes, Collection<URL> xmls)
{
if (!setUp(classes))
Modified:
openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java
(original)
+++
openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java
Thu Oct 13 13:41:50 2011
@@ -75,7 +75,6 @@ public class StandaloneResourceInjection
return webBeansContext;
}
- @Override
public <X, T extends Annotation> X
getResourceReference(ResourceReference<X, T> resourceReference)
{
if(resourceReference.supports(Resource.class))
@@ -106,7 +105,6 @@ public class StandaloneResourceInjection
return null;
}
- @Override
public void injectJavaEEResources(Object managedBeanInstance)
{
Class currentClass = managedBeanInstance.getClass();
@@ -165,7 +163,6 @@ public class StandaloneResourceInjection
classContainsEEResources.put(managedBeanInstance.getClass(),
containsEeResource);
}
- @Override
public void clear()
{
processor.clear();
Modified:
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
(original)
+++
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
Thu Oct 13 13:41:50 2011
@@ -113,7 +113,6 @@ public class ContextLifecycleListener im
}
}
- @Override
public void containerEvent(ContainerEvent event)
{
StandardContext context = null;
Modified:
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatAnnotProcessor.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatAnnotProcessor.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatAnnotProcessor.java
(original)
+++
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatAnnotProcessor.java
Thu Oct 13 13:41:50 2011
@@ -43,13 +43,11 @@ public class TomcatAnnotProcessor implem
this.loader = loader;
}
- @Override
public void postConstruct(Object obj) throws IllegalAccessException,
InvocationTargetException
{
processor.postConstruct(obj);
}
- @Override
public void preDestroy(Object obj) throws IllegalAccessException,
InvocationTargetException
{
Object injectorInstance = objects.get(obj);
@@ -67,7 +65,6 @@ public class TomcatAnnotProcessor implem
processor.preDestroy(obj);
}
- @Override
public void processAnnotations(Object obj) throws IllegalAccessException,
InvocationTargetException, NamingException
{
processor.processAnnotations(obj);
Modified:
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityListener.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityListener.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityListener.java
(original)
+++
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityListener.java
Thu Oct 13 13:41:50 2011
@@ -34,7 +34,6 @@ public class TomcatSecurityListener impl
}
- @Override
public void requestDestroyed(ServletRequestEvent event)
{
if(principal.get() != null)
@@ -43,7 +42,6 @@ public class TomcatSecurityListener impl
}
}
- @Override
public void requestInitialized(ServletRequestEvent event)
{
ServletRequest request = event.getServletRequest();
Modified:
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
(original)
+++
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
Thu Oct 13 13:41:50 2011
@@ -113,7 +113,6 @@ public class ContextLifecycleListener im
}
}
- @Override
public void containerEvent(ContainerEvent event)
{
StandardContext context = null;
Modified:
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java
(original)
+++
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java
Thu Oct 13 13:41:50 2011
@@ -44,7 +44,6 @@ public class TomcatInstanceManager imple
this.loader = loader;
}
- @Override
public void destroyInstance(Object instance) throws
IllegalAccessException, InvocationTargetException
{
Object injectorInstance = objects.get(instance);
@@ -66,7 +65,6 @@ public class TomcatInstanceManager imple
this.processor.destroyInstance(instance);
}
- @Override
public Object newInstance(String str) throws IllegalAccessException,
InvocationTargetException, NamingException, InstantiationException,
ClassNotFoundException
{
// Creates a defaut instance
@@ -78,14 +76,12 @@ public class TomcatInstanceManager imple
return object;
}
- @Override
public void newInstance(Object object) throws IllegalAccessException,
InvocationTargetException, NamingException
{
// Inject dependencies
inject(object);
}
- @Override
public Object newInstance(String str, ClassLoader cl) throws
IllegalAccessException, InvocationTargetException, NamingException,
InstantiationException, ClassNotFoundException
{
// Creates a defaut instance
Modified:
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityListener.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityListener.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityListener.java
(original)
+++
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatSecurityListener.java
Thu Oct 13 13:41:50 2011
@@ -34,7 +34,6 @@ public class TomcatSecurityListener impl
}
- @Override
public void requestDestroyed(ServletRequestEvent event)
{
if(principal.get() != null)
@@ -43,7 +42,6 @@ public class TomcatSecurityListener impl
}
}
- @Override
public void requestInitialized(ServletRequestEvent event)
{
ServletRequest request = event.getServletRequest();
Modified:
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java
(original)
+++
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/DefaultOwbFailOverService.java
Thu Oct 13 13:41:50 2011
@@ -152,7 +152,6 @@ public class DefaultOwbFailOverService i
}
}
- @Override
public void sessionWillPassivate(HttpSession session)
{
FailOverBagWrapper bagWrapper = new FailOverBagWrapper(session, this);
@@ -175,25 +174,21 @@ public class DefaultOwbFailOverService i
}
}
- @Override
public boolean isSupportFailOver()
{
return isSupportFailOver;
}
- @Override
public boolean isSupportPassivation()
{
return isSupportPassivation;
}
- @Override
public void enableFailOverSupport(boolean flag)
{
isSupportFailOver = flag;
}
- @Override
public void enablePassivationSupport(boolean flag)
{
isSupportPassivation = flag;
@@ -204,7 +199,6 @@ public class DefaultOwbFailOverService i
*
* @return custom object input stream.
*/
- @Override
public ObjectInputStream getObjectInputStream(InputStream in) throws
IOException
{
return new OwbProxyObjectInputStream(in);
@@ -215,7 +209,6 @@ public class DefaultOwbFailOverService i
*
* @return custom object output stream.
*/
- @Override
public ObjectOutputStream getObjectOutputStream(OutputStream out) throws
IOException
{
return new ProxyObjectOutputStream(out);
@@ -227,7 +220,6 @@ public class DefaultOwbFailOverService i
* SerializationHandler.
*
*/
- @Override
public Object handleResource(
Bean<?> bean,
Object resourceObject,
Modified:
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBagWrapper.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBagWrapper.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBagWrapper.java
(original)
+++
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBagWrapper.java
Thu Oct 13 13:41:50 2011
@@ -99,7 +99,6 @@ public class FailOverBagWrapper implemen
isSessionInUse = true;
}
- @Override
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException
{
@@ -115,7 +114,6 @@ public class FailOverBagWrapper implemen
}
}
- @Override
public synchronized void writeExternal(ObjectOutput out) throws
IOException
{
out.writeBoolean(isSessionInUse);
@@ -146,7 +144,6 @@ public class FailOverBagWrapper implemen
out.writeObject(buf);
}
- @Override
public void sessionWillPassivate(HttpSessionEvent event)
{
if (failoverService != null && failoverService.isSupportPassivation())
@@ -157,7 +154,6 @@ public class FailOverBagWrapper implemen
}
- @Override
public void sessionDidActivate(HttpSessionEvent event)
{
if (failoverService != null && (failoverService.isSupportFailOver() ||
failoverService.isSupportPassivation()))
Modified:
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
(original)
+++
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
Thu Oct 13 13:41:50 2011
@@ -108,7 +108,6 @@ public final class WebContainerLifecycle
service = Executors.newScheduledThreadPool(1, new ThreadFactory()
{
- @Override
public Thread newThread(Runnable runable)
{
Thread t = new Thread(runable, "OwbConversationCleaner-"
Modified:
openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/MockServletContext.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/MockServletContext.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/MockServletContext.java
(original)
+++
openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/MockServletContext.java
Thu Oct 13 13:41:50 2011
@@ -33,146 +33,121 @@ import java.util.Set;
*/
public class MockServletContext implements ServletContext
{
- @Override
public Object getAttribute(String name)
{
return null;
}
- @Override
public ServletContext getContext(String uripath)
{
return null;
}
- @Override
public String getContextPath()
{
return null;
}
- @Override
public int getMajorVersion()
{
return 0;
}
- @Override
public int getMinorVersion()
{
return 0;
}
- @Override
public String getMimeType(String file)
{
return null;
}
- @Override
public Set getResourcePaths(String path)
{
return null;
}
- @Override
public URL getResource(String path) throws MalformedURLException
{
return null;
}
- @Override
public InputStream getResourceAsStream(String path)
{
return null;
}
- @Override
public RequestDispatcher getRequestDispatcher(String path)
{
return null;
}
- @Override
public RequestDispatcher getNamedDispatcher(String name)
{
return null;
}
- @Override
public Servlet getServlet(String name) throws ServletException
{
return null;
}
- @Override
public Enumeration getServlets()
{
return null;
}
- @Override
public Enumeration getServletNames()
{
return null;
}
- @Override
public void log(String msg)
{
}
- @Override
public void log(Exception exception, String msg)
{
}
- @Override
public void log(String message, Throwable throwable)
{
}
- @Override
public String getRealPath(String path)
{
return null;
}
- @Override
public String getServerInfo()
{
return null;
}
- @Override
public String getInitParameter(String name)
{
return null;
}
- @Override
public Enumeration getInitParameterNames()
{
return null;
}
- @Override
public Enumeration getAttributeNames()
{
return null;
}
- @Override
public void setAttribute(String name, Object object)
{
}
- @Override
public void removeAttribute(String name)
{
}
- @Override
public String getServletContextName()
{
return null;
Modified:
openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/MockServletRequest.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/MockServletRequest.java?rev=1182852&r1=1182851&r2=1182852&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/MockServletRequest.java
(original)
+++
openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/MockServletRequest.java
Thu Oct 13 13:41:50 2011
@@ -37,322 +37,268 @@ import java.util.Map;
public class MockServletRequest implements HttpServletRequest
{
- @Override
public Object getAttribute(String name)
{
return null;
}
- @Override
public Enumeration getAttributeNames()
{
return null;
}
- @Override
public String getCharacterEncoding()
{
return null;
}
- @Override
public void setCharacterEncoding(String env) throws
UnsupportedEncodingException
{
}
- @Override
public int getContentLength()
{
return 0;
}
- @Override
public String getContentType()
{
return null;
}
- @Override
public ServletInputStream getInputStream() throws IOException
{
return null;
}
- @Override
public String getParameter(String name)
{
return null;
}
- @Override
public Enumeration getParameterNames()
{
return null;
}
- @Override
public String[] getParameterValues(String name)
{
return new String[0];
}
- @Override
public Map getParameterMap()
{
return null;
}
- @Override
public String getProtocol()
{
return null;
}
- @Override
public String getScheme()
{
return null;
}
- @Override
public String getServerName()
{
return null;
}
- @Override
public int getServerPort()
{
return 0;
}
- @Override
public BufferedReader getReader() throws IOException
{
return null;
}
- @Override
public String getRemoteAddr()
{
return null;
}
- @Override
public String getRemoteHost()
{
return null;
}
- @Override
public void setAttribute(String name, Object o)
{
}
- @Override
public void removeAttribute(String name)
{
}
- @Override
public Locale getLocale()
{
return null;
}
- @Override
public Enumeration getLocales()
{
return null;
}
- @Override
public boolean isSecure()
{
return false;
}
- @Override
public RequestDispatcher getRequestDispatcher(String path)
{
return null;
}
- @Override
public String getRealPath(String path)
{
return null;
}
- @Override
public int getRemotePort()
{
return 0;
}
- @Override
public String getLocalName()
{
return null;
}
- @Override
public String getLocalAddr()
{
return null;
}
- @Override
public int getLocalPort()
{
return 0;
}
- @Override
public String getAuthType()
{
return null;
}
- @Override
public Cookie[] getCookies()
{
return new Cookie[0];
}
- @Override
public long getDateHeader(String name)
{
return 0;
}
- @Override
public String getHeader(String name)
{
return null;
}
- @Override
public Enumeration getHeaders(String name)
{
return null;
}
- @Override
public Enumeration getHeaderNames()
{
return null;
}
- @Override
public int getIntHeader(String name)
{
return 0;
}
- @Override
public String getMethod()
{
return null;
}
- @Override
public String getPathInfo()
{
return null;
}
- @Override
public String getPathTranslated()
{
return null;
}
- @Override
public String getContextPath()
{
return null;
}
- @Override
public String getQueryString()
{
return null;
}
- @Override
public String getRemoteUser()
{
return null;
}
- @Override
public boolean isUserInRole(String role)
{
return false;
}
- @Override
public Principal getUserPrincipal()
{
return null;
}
- @Override
public String getRequestedSessionId()
{
return null;
}
- @Override
public String getRequestURI()
{
return null;
}
- @Override
public StringBuffer getRequestURL()
{
return null;
}
- @Override
public String getServletPath()
{
return null;
}
- @Override
public HttpSession getSession(boolean create)
{
return null;
}
- @Override
public HttpSession getSession()
{
return null;
}
- @Override
public boolean isRequestedSessionIdValid()
{
return false;
}
- @Override
public boolean isRequestedSessionIdFromCookie()
{
return false;
}
- @Override
public boolean isRequestedSessionIdFromURL()
{
return false;
}
- @Override
public boolean isRequestedSessionIdFromUrl()
{
return false;
