[webbeans-commits] Webbeans SVN: r525 - in ri/trunk/webbeans-ri/src: main/java/org/jboss/webbeans/bean and 8 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Sun Dec 14 17:24:21 EST 2008
Author: pete.muir at jboss.org
Date: 2008-12-14 17:24:20 -0500 (Sun, 14 Dec 2008)
New Revision: 525
Removed:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ManagerBean.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Baboon.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Orangutan.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TameOrangutan.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Chimpanzee.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Gibbon.java
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/transaction/AbstractUserTransaction.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/transaction/UserTransaction.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NewEventTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java
Log:
Better way to register Manager, fix broken build and tests
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-12-14 21:52:56 UTC (rev 524)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-12-14 22:24:20 UTC (rev 525)
@@ -46,6 +46,7 @@
import javax.webbeans.manager.Interceptor;
import javax.webbeans.manager.Manager;
+import org.jboss.webbeans.bean.AbstractBean;
import org.jboss.webbeans.bean.proxy.ProxyPool;
import org.jboss.webbeans.contexts.ContextMap;
import org.jboss.webbeans.contexts.DependentContext;
@@ -65,6 +66,7 @@
* @author Pete Muir
*
*/
+ at Standard
public class ManagerImpl implements Manager
{
// The JNDI key to place the manager under
@@ -97,12 +99,12 @@
public ManagerImpl()
{
this.beans = new CopyOnWriteArrayList<Bean<?>>();
- this.eventManager = new EventManager(this);
this.resolver = new Resolver(this);
this.proxyPool = new ProxyPool();
this.decorators = new HashSet<Decorator>();
this.interceptors = new HashSet<Interceptor>();
this.contextMap = new ContextMap();
+ this.eventManager = new EventManager(this);
List<Class<? extends Annotation>> defaultEnabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>();
defaultEnabledDeploymentTypes.add(0, Standard.class);
@@ -264,7 +266,7 @@
* @param beans The set of beans to add
* @return A reference to the manager
*/
- public void setBeans(Set<Bean<?>> beans)
+ public void setBeans(Set<AbstractBean<?, ?>> beans)
{
synchronized (beans)
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2008-12-14 21:52:56 UTC (rev 524)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2008-12-14 22:24:20 UTC (rev 525)
@@ -62,7 +62,7 @@
{
@SuppressWarnings("unchecked")
- private static Set<Class<?>> STANDARD_WEB_BEAN_CLASSES = new HashSet<Class<?>>(Arrays.asList(DefaultEnterpriseBeanLookup.class, Event.class));
+ private static Set<Class<?>> STANDARD_WEB_BEAN_CLASSES = new HashSet<Class<?>>(Arrays.asList(DefaultEnterpriseBeanLookup.class, Event.class, ManagerImpl.class));
/**
* Helper class for getting deployment type
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ManagerBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ManagerBean.java 2008-12-14 21:52:56 UTC (rev 524)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ManagerBean.java 2008-12-14 22:24:20 UTC (rev 525)
@@ -1,153 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed 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.jboss.webbeans.bean;
-
-import java.lang.annotation.Annotation;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.webbeans.Dependent;
-import javax.webbeans.Standard;
-import javax.webbeans.manager.Bean;
-import javax.webbeans.manager.Manager;
-
-import org.jboss.webbeans.bindings.CurrentBinding;
-import org.jboss.webbeans.util.Reflections;
-
-/**
- * Helper bean for accessing the Manager
- *
- * @author Pete Muir
- *
- */
-public class ManagerBean extends Bean<Manager>
-{
- // The API types of the manager
- private static Set<Class<?>> types = Reflections.getTypeHierachy(Manager.class);
- // The binding types of the manager
- private static final Set<Annotation> BINDING = new HashSet<Annotation>(Arrays.asList(new CurrentBinding()));
-
- /**
- * Constructor
- *
- * @param manager The Web Beans manager
- */
- public ManagerBean(Manager manager)
- {
- super(manager);
- }
-
- /**
- * Creates an instance of the manager
- *
- * @return An instance
- */
- @Override
- public Manager create()
- {
- return getManager();
- }
-
- /**
- * Destroys the manager (not)
- */
- @Override
- public void destroy(Manager instance)
- {
- // No -op
- }
-
- /**
- * Gets the binding types
- *
- * @return A set containing Current
- */
- @Override
- public Set<Annotation> getBindingTypes()
- {
- return BINDING;
- }
-
- /**
- * Gets the deployment types
- *
- * @return Standard
- */
- @Override
- public Class<? extends Annotation> getDeploymentType()
- {
- return Standard.class;
- }
-
- /**
- * Gets the name
- *
- * @return null
- */
- @Override
- public String getName()
- {
- return null;
- }
-
- /**
- * Gets the scope type
- *
- * @return Dependent
- */
- @Override
- public Class<? extends Annotation> getScopeType()
- {
- return Dependent.class;
- }
-
- /**
- * Gets the API types
- *
- * @return The API types
- */
- @Override
- public Set<Class<?>> getTypes()
- {
- return types;
- }
-
- /**
- * Indicates if the bean is nullable
- *
- * @return true
- */
- @Override
- public boolean isNullable()
- {
- return true;
- }
-
- /**
- * Indicates if the bean is serializable
- *
- * @return false
- */
- @Override
- public boolean isSerializable()
- {
- return false;
- }
-
-}
\ No newline at end of file
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2008-12-14 21:52:56 UTC (rev 524)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2008-12-14 22:24:20 UTC (rev 525)
@@ -43,7 +43,6 @@
import javax.webbeans.Observer;
import javax.webbeans.Observes;
import javax.webbeans.Obtainable;
-import javax.webbeans.manager.Bean;
import org.jboss.webbeans.CurrentManager;
import org.jboss.webbeans.ManagerImpl;
@@ -52,7 +51,6 @@
import org.jboss.webbeans.bean.AbstractClassBean;
import org.jboss.webbeans.bean.EventBean;
import org.jboss.webbeans.bean.InstanceBean;
-import org.jboss.webbeans.bean.ManagerBean;
import org.jboss.webbeans.bean.ProducerFieldBean;
import org.jboss.webbeans.bean.ProducerMethodBean;
import org.jboss.webbeans.bindings.InitializedBinding;
@@ -120,8 +118,7 @@
*/
public void registerBeans(Iterable<Class<?>> classes)
{
- Set<Bean<?>> beans = (Set) createBeans(classes);
- beans.add(new ManagerBean(manager));
+ Set<AbstractBean<?, ?>> beans = createBeans(classes);
manager.setBeans(beans);
}
@@ -151,6 +148,7 @@
}
}
createBean(BeanFactory.createSimpleBean(Transaction.class, manager), beans);
+ createBean(BeanFactory.createSimpleBean(ManagerImpl.class, manager), beans);
createBean(BeanFactory.createSimpleBean(DefaultEnterpriseBeanLookup.class, manager), beans);
return beans;
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java 2008-12-14 21:52:56 UTC (rev 524)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java 2008-12-14 22:24:20 UTC (rev 525)
@@ -135,9 +135,8 @@
// The map of registered observers for a give
private final RegisteredObserversMap registeredObservers;
- // The current UserTransaction
- private UserTransaction userTransaction;
+
/**
* Initializes a new instance of the EventManager.
*
@@ -147,7 +146,6 @@
{
this.manager = manager;
registeredObservers = new RegisteredObserversMap();
- userTransaction = manager.getInstanceByType(UserTransaction.class);
}
/**
@@ -196,6 +194,7 @@
*/
private boolean isTransactionActive()
{
+ UserTransaction userTransaction = manager.getInstanceByType(UserTransaction.class);
try
{
return userTransaction!=null && userTransaction.getStatus() == Status.STATUS_ACTIVE;
@@ -240,6 +239,7 @@
*/
private <T> void deferEvent(T event, Observer<T> observer)
{
+ UserTransaction userTransaction = manager.getInstanceByType(UserTransaction.class);
DeferredEventNotification<T> deferredEvent = new DeferredEventNotification<T>(event, observer);
userTransaction.registerSynchronization(deferredEvent);
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2008-12-14 21:52:56 UTC (rev 524)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2008-12-14 22:24:20 UTC (rev 525)
@@ -205,24 +205,23 @@
{
try
{
- // TODO: more details in the exceptions
return getDelegate().newInstance(getParameterValues(parameters, manager));
}
catch (IllegalArgumentException e)
{
- throw new ExecutionException(e);
+ throw new ExecutionException("Error instantiating " + toString, e);
}
catch (InstantiationException e)
{
- throw new ExecutionException(e);
+ throw new ExecutionException("Error instantiating " + toString, e);
}
catch (IllegalAccessException e)
{
- throw new ExecutionException(e);
+ throw new ExecutionException("Error instantiating " + toString, e);
}
catch (InvocationTargetException e)
{
- throw new ExecutionException(e);
+ throw new ExecutionException("Error instantiating " + toString, e);
}
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/transaction/AbstractUserTransaction.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/transaction/AbstractUserTransaction.java 2008-12-14 21:52:56 UTC (rev 524)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/transaction/AbstractUserTransaction.java 2008-12-14 22:24:20 UTC (rev 525)
@@ -6,7 +6,6 @@
import static javax.transaction.Status.STATUS_NO_TRANSACTION;
import static javax.transaction.Status.STATUS_ROLLEDBACK;
-import javax.persistence.EntityManager;
import javax.transaction.Synchronization;
import javax.transaction.SystemException;
@@ -63,12 +62,12 @@
public abstract void registerSynchronization(Synchronization sync);
- public void enlist(EntityManager entityManager) throws SystemException
+ /*public void enlist(EntityManager entityManager) throws SystemException
{
if ( isActiveOrMarkedRollback() )
{
entityManager.joinTransaction();
}
- }
+ }*/
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/transaction/UserTransaction.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/transaction/UserTransaction.java 2008-12-14 21:52:56 UTC (rev 524)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/transaction/UserTransaction.java 2008-12-14 22:24:20 UTC (rev 525)
@@ -1,6 +1,5 @@
package org.jboss.webbeans.transaction;
-import javax.persistence.EntityManager;
import javax.transaction.Synchronization;
import javax.transaction.SystemException;
@@ -25,5 +24,5 @@
public boolean isConversationContextRequired();
public abstract void registerSynchronization(Synchronization sync);
- public void enlist(EntityManager entityManager) throws SystemException;
+ // public void enlist(EntityManager entityManager) throws SystemException;
}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java 2008-12-14 21:52:56 UTC (rev 524)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BoostrapTest.java 2008-12-14 22:24:20 UTC (rev 525)
@@ -37,23 +37,33 @@
public void testSingleSimpleBean()
{
Set<AbstractBean<?, ?>> beans = webBeansBootstrap.createBeans(Tuna.class);
- assert beans.size() == 1;
- assert beans.iterator().next().getType().equals(Tuna.class);
+ assert beans.size() == 1 + MockManagerImpl.BUILT_IN_BEANS;
+ Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
+ for (AbstractBean<?, ?> bean : beans)
+ {
+ classes.put(bean.getType(), bean);
+ }
+ assert classes.containsKey(Tuna.class);
}
@Test(groups="bootstrap")
public void testSingleEnterpriseBean()
{
Set<AbstractBean<?, ?>> beans = webBeansBootstrap.createBeans(Hound.class);
- assert beans.size() == 1;
- assert beans.iterator().next().getType().equals(Hound.class);
+ assert beans.size() == 1 + MockManagerImpl.BUILT_IN_BEANS;
+ Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
+ for (AbstractBean<?, ?> bean : beans)
+ {
+ classes.put(bean.getType(), bean);
+ }
+ assert classes.containsKey(Hound.class);
}
@Test(groups="bootstrap")
public void testMultipleSimpleBean()
{
Set<AbstractBean<?, ?>> beans = webBeansBootstrap.createBeans(Tuna.class, Salmon.class, SeaBass.class, Sole.class);
- assert beans.size() == 4;
+ assert beans.size() == 4 + MockManagerImpl.BUILT_IN_BEANS;
Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
for (AbstractBean<?, ?> bean : beans)
{
@@ -74,7 +84,7 @@
public void testProducerMethodBean()
{
Set<AbstractBean<?, ?>> beans = webBeansBootstrap.createBeans(TarantulaProducer.class);
- assert beans.size() == 2;
+ assert beans.size() == 2 + MockManagerImpl.BUILT_IN_BEANS;
Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
for (AbstractBean<?, ?> bean : beans)
{
@@ -91,7 +101,7 @@
public void testMultipleEnterpriseBean()
{
Set<AbstractBean<?, ?>> beans = webBeansBootstrap.createBeans(Hound.class, Elephant.class, Panther.class, Tiger.class);
- assert beans.size() == 4;
+ assert beans.size() == 4 + MockManagerImpl.BUILT_IN_BEANS;
Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
for (AbstractBean<?, ?> bean : beans)
{
@@ -112,7 +122,7 @@
public void testMultipleEnterpriseAndSimpleBean()
{
Set<AbstractBean<?, ?>> beans = webBeansBootstrap.createBeans(Hound.class, Elephant.class, Panther.class, Tiger.class, Tuna.class, Salmon.class, SeaBass.class, Sole.class);
- assert beans.size() == 8;
+ assert beans.size() == 8 + MockManagerImpl.BUILT_IN_BEANS;
Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
for (AbstractBean<?, ?> bean : beans)
{
@@ -141,7 +151,7 @@
public void testRegisterProducerMethodBean()
{
webBeansBootstrap.registerBeans(TarantulaProducer.class);
- assert manager.getBeans().size() == 4;
+ assert manager.getBeans().size() == 2 + MockManagerImpl.BUILT_IN_BEANS;
Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
for (Bean<?> bean : manager.getBeans())
{
@@ -202,7 +212,7 @@
{
webBeansBootstrap.boot(new MockWebBeanDiscovery(new HashSet<Class<?>>(Arrays.asList(Hound.class, Elephant.class, Panther.class, Tiger.class, Tuna.class, Salmon.class, SeaBass.class, Sole.class)), null, null));
- assert manager.getBeans().size() == 10;
+ assert manager.getBeans().size() == 8 + MockManagerImpl.BUILT_IN_BEANS;
Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>();
for (Bean<?> bean : manager.getBeans())
{
@@ -211,7 +221,6 @@
classes.put(((AbstractBean<?, ?>) bean).getType(), bean);
}
}
- assert classes.containsKey(DefaultEnterpriseBeanLookup.class);
assert classes.containsKey(Hound.class);
assert classes.containsKey(Elephant.class);
assert classes.containsKey(Panther.class);
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NewEventTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NewEventTest.java 2008-12-14 21:52:56 UTC (rev 524)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NewEventTest.java 2008-12-14 22:24:20 UTC (rev 525)
@@ -336,7 +336,7 @@
public void testObserverMethodOnEnterpriseBeanIsBusinessMethodOrStatic()
{
Set<AbstractBean<?, ?>> beans = webBeansBootstrap.createBeans(Pomeranian.class);
- assert beans.size() == 1;
+ assert beans.size() == 1 + MockManagerImpl.BUILT_IN_BEANS;
Set<Observer<MockManagerImpl>> observers = manager.resolveObservers(manager, new InitializedBinding());
assert observers.size() == 2;
}
@@ -346,7 +346,7 @@
public void testObserverMethodOnEnterpriseBeanNotBusinessMethodOrStaticFails()
{
Set<AbstractBean<?, ?>> beans = webBeansBootstrap.createBeans(TibetanTerrier.class);
- assert beans.size() == 1;
+ assert beans.size() == 1 + MockManagerImpl.BUILT_IN_BEANS;
Set<Observer<MockManagerImpl>> observers = manager.resolveObservers(manager, new InitializedBinding());
assert observers.size() == 1;
}
@@ -383,7 +383,7 @@
{
// This observer has no binding types specified
Set<AbstractBean<?, ?>> beans = webBeansBootstrap.createBeans(Pomeranian.class);
- assert beans.size() == 1;
+ assert beans.size() == 1 + MockManagerImpl.BUILT_IN_BEANS;
// Resolve registered observers with an event containing no binding types
Set<Observer<String>> resolvedObservers = manager.resolveObservers("A new event");
@@ -555,7 +555,7 @@
public void testNonTransactionalObserverThrownNonCheckedExceptionIsRethrown()
{
Set<AbstractBean<?, ?>> beans = webBeansBootstrap.createBeans(TeaCupPomeranian.class);
- assert beans.size() == 1;
+ assert beans.size() == 1 + MockManagerImpl.BUILT_IN_BEANS;
manager.fireEvent("Another event");
}
@@ -564,7 +564,7 @@
public void testNonTransactionalObserverThrownCheckedExceptionIsWrappedAndRethrown()
{
Set<AbstractBean<?, ?>> beans = webBeansBootstrap.createBeans(TeaCupPomeranian.class);
- assert beans.size() == 1;
+ assert beans.size() == 1 + MockManagerImpl.BUILT_IN_BEANS;
manager.fireEvent(new Integer(1));
}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Baboon.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Baboon.java 2008-12-14 21:52:56 UTC (rev 524)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Baboon.java 2008-12-14 22:24:20 UTC (rev 525)
@@ -1,12 +0,0 @@
-package org.jboss.webbeans.test.beans;
-
-import javax.ejb.Remote;
-import javax.webbeans.Production;
-
- at Remote
- at Production
-// TODO @BoundTo("/beans/baboon")
-public interface Baboon extends Animal
-{
-
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Orangutan.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Orangutan.java 2008-12-14 21:52:56 UTC (rev 524)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/Orangutan.java 2008-12-14 22:24:20 UTC (rev 525)
@@ -1,18 +0,0 @@
-package org.jboss.webbeans.test.beans;
-
-import javax.ejb.Remote;
-import javax.webbeans.Destructor;
-import javax.webbeans.Named;
-import javax.webbeans.Production;
-
- at Remote
- at Production
-//TODO @BoundTo("/beans/orangutan")
- at Named
-public interface Orangutan extends Animal
-{
-
- @Destructor
- public void removeOrangutan();
-
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TameOrangutan.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TameOrangutan.java 2008-12-14 21:52:56 UTC (rev 524)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TameOrangutan.java 2008-12-14 22:24:20 UTC (rev 525)
@@ -1,17 +0,0 @@
-package org.jboss.webbeans.test.beans;
-
-import javax.ejb.Remote;
-import javax.webbeans.Named;
-import javax.webbeans.Production;
-
-import org.jboss.webbeans.test.annotations.Tame;
-
- at Remote
- at Production
-// TODO @BoundTo("/beans/tame/orangutan")
- at Tame
- at Named
-public interface TameOrangutan extends Orangutan
-{
-
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Chimpanzee.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Chimpanzee.java 2008-12-14 21:52:56 UTC (rev 524)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Chimpanzee.java 2008-12-14 22:24:20 UTC (rev 525)
@@ -1,16 +0,0 @@
-package org.jboss.webbeans.test.beans.broken;
-
-import javax.ejb.Remote;
-import javax.webbeans.Destructor;
-import javax.webbeans.Production;
-
- at Remote
-// TODO @BoundTo("/beans/Chimpanzee")
- at Production
-public interface Chimpanzee
-{
-
- @Destructor
- public void remove(String foo);
-
-}
Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Gibbon.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Gibbon.java 2008-12-14 21:52:56 UTC (rev 524)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/Gibbon.java 2008-12-14 22:24:20 UTC (rev 525)
@@ -1,19 +0,0 @@
-package org.jboss.webbeans.test.beans.broken;
-
-import javax.ejb.Remote;
-import javax.webbeans.Destructor;
-import javax.webbeans.Production;
-
- at Remote
-// TODO @BoundTo("/beans/Chimpanzee")
- at Production
-public interface Gibbon
-{
-
- @Destructor
- public void remove();
-
- @Destructor
- public void removeAgain();
-
-}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java 2008-12-14 21:52:56 UTC (rev 524)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java 2008-12-14 22:24:20 UTC (rev 525)
@@ -13,7 +13,7 @@
public class MockManagerImpl extends ManagerImpl
{
- public static int BUILT_IN_BEANS = 2;
+ public static int BUILT_IN_BEANS = 4;
private Object event = null;
private Annotation[] eventBindings = null;
More information about the weld-commits
mailing list