[webbeans-commits] Webbeans SVN: r1162 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-01-22 07:04:20 -0500 (Thu, 22 Jan 2009)
New Revision: 1162
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java
Log:
oops
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-01-22 12:03:29 UTC (rev 1161)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-01-22 12:04:20 UTC (rev 1162)
@@ -60,7 +60,8 @@
Fox fox1 = configuration().getContainers().evaluateValueExpression("fox", Fox.class);
Fox fox2 = configuration().getContainers().evaluateValueExpression("fox", Fox.class);
- assert !fox1.equals(fox2);
+ assert !fox1.equals(fox2);
+ }
}.run();
}
16 years, 8 months
[webbeans-commits] Webbeans SVN: r1161 - ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-01-22 07:03:29 -0500 (Thu, 22 Jan 2009)
New Revision: 1161
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java
Log:
stubs for new tck spi methods
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java 2009-01-22 12:01:33 UTC (rev 1160)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/tck/ContainersImpl.java 2009-01-22 12:03:29 UTC (rev 1161)
@@ -10,6 +10,8 @@
import org.jboss.webbeans.test.mock.MockBootstrap;
import org.jboss.webbeans.test.mock.MockWebBeanDiscovery;
+import sun.reflect.generics.reflectiveObjects.NotImplementedException;
+
public class ContainersImpl implements Containers
{
@@ -30,4 +32,16 @@
{
return deploy(null, classes);
}
+
+ public <T> T evaluateValueExpression(String expression, Class<T> expectedType)
+ {
+ // TODO implement
+ throw new NotImplementedException();
+ }
+
+ public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes)
+ {
+ // TODO implement
+ throw new NotImplementedException();
+ }
}
16 years, 8 months
[webbeans-commits] Webbeans SVN: r1160 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context: dependent and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-01-22 07:01:33 -0500 (Thu, 22 Jan 2009)
New Revision: 1160
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java
Log:
fixed test, added SPI methods for EL eval
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java 2009-01-22 09:42:17 UTC (rev 1159)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java 2009-01-22 12:01:33 UTC (rev 1160)
@@ -41,14 +41,14 @@
}
- @Test(expectedExceptions={ContextNotActiveException.class}, groups={"manager"}) @SpecAssertion(section="8.6")
+ @Test(expectedExceptions={ContextNotActiveException.class}, groups={"manager"}) @SpecAssertion(section="9.6")
public void testGetContextWithNoActiveContextsFails()
{
configuration().getContexts().setInactive(configuration().getContexts().getRequestContext());
manager.getContext(RequestScoped.class);
}
- @Test(expectedExceptions={IllegalArgumentException.class}, groups={"manager"}) @SpecAssertion(section="8.6")
+ @Test(expectedExceptions={IllegalArgumentException.class}, groups={"manager"}) @SpecAssertion(section="9.6")
public void testGetContextWithTooManyActiveContextsFails()
{
Context firstContext = new DummyContext() {};
@@ -58,14 +58,14 @@
manager.getContext(Dummy.class);
}
- @Test(expectedExceptions={ContextNotActiveException.class}, groups={"stub", "manager"}) @SpecAssertion(section="8.6")
+ @Test(expectedExceptions={ContextNotActiveException.class}, groups={"stub", "manager"}) @SpecAssertion(section="9.6")
public void testGetContextWithNoRegisteredContextsFails()
{
manager.getContext(RequestScoped.class);
assert false;
}
- @Test(groups={"manager"}) @SpecAssertion(section="8.6")
+ @Test(groups={"manager"}) @SpecAssertion(section="9.6")
public void testGetContextReturnsActiveContext()
{
manager.getContext(RequestScoped.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-01-22 09:42:17 UTC (rev 1159)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-01-22 12:01:33 UTC (rev 1160)
@@ -1,5 +1,7 @@
package org.jboss.webbeans.tck.unit.context.dependent;
+import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
+
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Set;
@@ -14,7 +16,7 @@
import org.jboss.webbeans.tck.impl.SpecVersion;
import org.testng.annotations.Test;
-@SpecVersion("20081206")
+@SpecVersion("20090116")
public class DependentContextTest extends AbstractTest
{
/**
@@ -56,8 +58,9 @@
Bean<Fox> foxBean = foxBeans.iterator().next();
manager.addBean(foxBean);
- assert !manager.getInstanceByName("fox").equals(manager.getInstanceByName("fox")); }
-
+ Fox fox1 = configuration().getContainers().evaluateValueExpression("fox", Fox.class);
+ Fox fox2 = configuration().getContainers().evaluateValueExpression("fox", Fox.class);
+ assert !fox1.equals(fox2);
}.run();
}
16 years, 8 months
[webbeans-commits] Webbeans SVN: r1159 - in ri/trunk: webbeans-ri/src/main/java/org/jboss/webbeans/bean and 5 other directories.
by webbeans-commits＠lists.jboss.org
Author: nickarls
Date: 2009-01-22 04:42:17 -0500 (Thu, 22 Jan 2009)
New Revision: 1159
Added:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/ContextualInstance.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentInstancesStore.java
Removed:
ri/trunk/webbeans-api/src/main/java/javax/webbeans/Destructor.java
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/el/WebBeansELResolver.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/InjectionPointProvider.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Elephant.java
Log:
Remove @Destructor and checks
Proto for depedent objects destruction infrastructure
Deleted: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Destructor.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Destructor.java 2009-01-22 09:25:46 UTC (rev 1158)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Destructor.java 2009-01-22 09:42:17 UTC (rev 1159)
@@ -1,37 +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 javax.webbeans;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Specifies that a method of a Web Bean implementation class is a Web Beans
- * remove method.
- *
- * @author Gavin King
- *
- */
-@Retention(RUNTIME)
-@Target(METHOD)
-public @interface Destructor
-{
-}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-01-22 09:25:46 UTC (rev 1158)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-01-22 09:42:17 UTC (rev 1159)
@@ -25,7 +25,6 @@
import javax.webbeans.DefinitionException;
import javax.webbeans.Dependent;
import javax.webbeans.DeploymentType;
-import javax.webbeans.Destructor;
import javax.webbeans.Disposes;
import javax.webbeans.Initializer;
import javax.webbeans.Observes;
@@ -34,6 +33,7 @@
import javax.webbeans.ScopeType;
import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.context.DependentInstancesStore;
import org.jboss.webbeans.injection.InjectionPointProvider;
import org.jboss.webbeans.introspector.AnnotatedClass;
import org.jboss.webbeans.introspector.AnnotatedField;
@@ -61,6 +61,7 @@
private Set<AnnotatedField<?>> injectableFields;
// The initializer methods
private Set<AnnotatedMethod<?>> initializerMethods;
+ protected DependentInstancesStore dependentInstancesStore;
/**
* Constructor
@@ -72,6 +73,7 @@
{
super(manager);
this.annotatedItem = type;
+ dependentInstancesStore = new DependentInstancesStore();
}
/**
@@ -86,7 +88,7 @@
// TODO Interceptors
initInitializerMethods();
}
-
+
/**
* Injects bound fields
*
@@ -158,10 +160,6 @@
{
throw new DefinitionException("Initializer method " + annotatedMethod.toString() + " cannot be annotated @Produces");
}
- else if (annotatedMethod.getAnnotation(Destructor.class) != null)
- {
- throw new DefinitionException("Initializer method " + annotatedMethod.toString() + " cannot be annotated @Destructor");
- }
else if (annotatedMethod.getAnnotatedParameters(Disposes.class).size() > 0)
{
throw new DefinitionException("Initializer method " + annotatedMethod.toString() + " cannot have parameters annotated @Disposes");
@@ -176,7 +174,7 @@
}
}
}
-
+
@Override
protected void initScopeType()
{
@@ -198,19 +196,19 @@
throw new DefinitionException("At most one scope may be specified");
}
}
-
+
if (this.scopeType == null)
{
initScopeTypeFromStereotype();
}
-
+
if (this.scopeType == null)
{
this.scopeType = Dependent.class;
log.trace("Using default @Dependent scope");
}
}
-
+
@Override
protected void initDeploymentType()
{
@@ -338,4 +336,9 @@
return Production.class;
}
+ public DependentInstancesStore getDependentInstancesStore()
+ {
+ return dependentInstancesStore;
+ }
+
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-22 09:25:46 UTC (rev 1158)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-22 09:42:17 UTC (rev 1159)
@@ -17,10 +17,8 @@
package org.jboss.webbeans.bean;
-import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.util.HashSet;
-import java.util.Set;
import javassist.util.proxy.ProxyFactory;
import javassist.util.proxy.ProxyObject;
@@ -30,12 +28,7 @@
import javax.webbeans.Decorator;
import javax.webbeans.DefinitionException;
import javax.webbeans.Dependent;
-import javax.webbeans.Destructor;
-import javax.webbeans.Disposes;
-import javax.webbeans.Initializer;
import javax.webbeans.Interceptor;
-import javax.webbeans.Observes;
-import javax.webbeans.Produces;
import javax.webbeans.Specializes;
import org.jboss.webbeans.ManagerImpl;
@@ -45,7 +38,6 @@
import org.jboss.webbeans.ejb.spi.BusinessInterfaceDescriptor;
import org.jboss.webbeans.introspector.AnnotatedClass;
import org.jboss.webbeans.introspector.AnnotatedMethod;
-import org.jboss.webbeans.introspector.AnnotatedParameter;
import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-01-22 09:25:46 UTC (rev 1158)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2009-01-22 09:42:17 UTC (rev 1159)
@@ -22,7 +22,6 @@
import java.util.Set;
import javax.webbeans.DefinitionException;
-import javax.webbeans.Destructor;
import javax.webbeans.Disposes;
import javax.webbeans.Observes;
@@ -119,12 +118,8 @@
*/
protected void checkProducerMethod()
{
- if (getAnnotatedItem().isAnnotationPresent(Destructor.class))
+ if (getAnnotatedItem().getAnnotatedParameters(Observes.class).size() > 0)
{
- throw new DefinitionException("Producer method cannot be annotated @Destructor");
- }
- else if (getAnnotatedItem().getAnnotatedParameters(Observes.class).size() > 0)
- {
throw new DefinitionException("Producer method cannot have parameter annotated @Observes");
}
else if (getAnnotatedItem().getAnnotatedParameters(Disposes.class).size() > 0)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-01-22 09:25:46 UTC (rev 1158)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-01-22 09:42:17 UTC (rev 1159)
@@ -122,6 +122,7 @@
try
{
instance = constructor.newInstance(manager);
+ injectionPointProvider.setCurrentInjectionInstance(instance);
bindDecorators();
bindInterceptors();
injectEjbAndCommonFields(instance);
@@ -131,6 +132,7 @@
}
finally
{
+ injectionPointProvider.clearCurrentInjectionInstance(instance);
injectionPointProvider.popBean();
}
return instance;
@@ -153,6 +155,7 @@
{
DependentContext.INSTANCE.setActive(true);
callPreDestroy(instance);
+ dependentInstancesStore.destroyDependentInstances(instance);
}
catch (Exception e)
{
Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/ContextualInstance.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/ContextualInstance.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/ContextualInstance.java 2009-01-22 09:42:17 UTC (rev 1159)
@@ -0,0 +1,37 @@
+package org.jboss.webbeans.context;
+
+import javax.webbeans.Dependent;
+import javax.webbeans.manager.Bean;
+import javax.webbeans.manager.Contextual;
+
+public class ContextualInstance<T>
+{
+ private Contextual<T> contextual;
+ private T instance;
+
+ protected ContextualInstance(Contextual<T> contextual, T instance)
+ {
+ this.contextual = contextual;
+ this.instance = instance;
+ }
+
+ public static <T> ContextualInstance<T> of(Contextual<T> contextual, T instance)
+ {
+ return new ContextualInstance<T>(contextual, instance);
+ }
+
+ public void destroy()
+ {
+ contextual.destroy(instance);
+ }
+
+ public boolean isDependent()
+ {
+ return contextual instanceof Bean && Dependent.class.equals(((Bean<T>)contextual).getScopeType());
+ }
+
+ public Object getInstance()
+ {
+ return instance;
+ }
+}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-01-22 09:25:46 UTC (rev 1158)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-01-22 09:42:17 UTC (rev 1159)
@@ -23,6 +23,10 @@
import javax.webbeans.Dependent;
import javax.webbeans.manager.Contextual;
+import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.bean.AbstractClassBean;
+import org.jboss.webbeans.injection.InjectionPointProvider;
+
/**
* The dependent context
*
@@ -32,9 +36,9 @@
{
public static DependentContext INSTANCE = new DependentContext();
-
+
private ThreadLocal<AtomicInteger> reentrantActiveCount;
-
+
/**
* Constructor
*/
@@ -55,8 +59,8 @@
/**
* Overridden method always creating a new instance
*
- * @param bean The bean to create
- * @param create Should a new one be created
+ * @param bean The bean to create
+ * @param create Should a new one be created
*/
public <T> T get(Contextual<T> bean, boolean create)
{
@@ -64,7 +68,14 @@
{
throw new ContextNotActiveException();
}
- return create == false ? null : bean.create();
+ T instance = create == false ? null : bean.create();
+ InjectionPointProvider injectionPointProvider = CurrentManager.rootManager().getInjectionPointProvider();
+ if (bean instanceof AbstractClassBean && injectionPointProvider.isInjecting())
+ {
+ DependentInstancesStore dependentInstancesStore = ((AbstractClassBean<?>) bean).getDependentInstancesStore();
+ dependentInstancesStore.addDependentInstance(injectionPointProvider.getCurrentInjectionInstance(), ContextualInstance.of(bean, instance));
+ }
+ return instance;
}
@Override
@@ -73,7 +84,7 @@
String active = isActive() ? "Active " : "Inactive ";
return active + "dependent context";
}
-
+
@Override
public void setActive(boolean active)
{
@@ -92,5 +103,5 @@
}
}
}
-
+
}
Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentInstancesStore.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentInstancesStore.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/DependentInstancesStore.java 2009-01-22 09:42:17 UTC (rev 1159)
@@ -0,0 +1,40 @@
+package org.jboss.webbeans.context;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+public class DependentInstancesStore
+{
+ private Map<Object, List<ContextualInstance<?>>> dependentInstances;
+
+ public DependentInstancesStore()
+ {
+ dependentInstances = new ConcurrentHashMap<Object, List<ContextualInstance<?>>>();
+ }
+
+ public <T> void addDependentInstance(Object parent, ContextualInstance<T> contextualInstance)
+ {
+ List<ContextualInstance<?>> instances = dependentInstances.get(parent);
+ if (instances == null)
+ {
+ instances = new CopyOnWriteArrayList<ContextualInstance<?>>();
+ dependentInstances.put(parent, instances);
+ }
+ instances.add(contextualInstance);
+ }
+
+ public void destroyDependentInstances(Object parent)
+ {
+ if (!dependentInstances.containsKey(parent))
+ {
+ return;
+ }
+ for (ContextualInstance<?> injectedInstance : dependentInstances.get(parent))
+ {
+ injectedInstance.destroy();
+ }
+ dependentInstances.remove(parent);
+ }
+}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/el/WebBeansELResolver.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/el/WebBeansELResolver.java 2009-01-22 09:25:46 UTC (rev 1158)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/el/WebBeansELResolver.java 2009-01-22 09:42:17 UTC (rev 1159)
@@ -25,6 +25,7 @@
import org.jboss.webbeans.CurrentManager;
import org.jboss.webbeans.context.DependentContext;
+import org.jboss.webbeans.injection.InjectionPointProvider;
public class WebBeansELResolver extends ELResolver
{
@@ -64,9 +65,13 @@
{
if (base == null && property != null)
{
+ // TODO Any other way than creating a dummy parent to collect the created dependent objects under?
+ Object dependentsCollector = new Object();
+ InjectionPointProvider injectionPointProvider = CurrentManager.rootManager().getInjectionPointProvider();
try
{
DependentContext.INSTANCE.setActive(true);
+ injectionPointProvider.setCurrentInjectionInstance(dependentsCollector);
Object value = CurrentManager.rootManager().getInstanceByName(property.toString());
if (value != null)
{
@@ -76,6 +81,7 @@
}
finally
{
+ injectionPointProvider.clearCurrentInjectionInstance(dependentsCollector);
DependentContext.INSTANCE.setActive(false);
}
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-01-22 09:25:46 UTC (rev 1158)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-01-22 09:42:17 UTC (rev 1159)
@@ -29,7 +29,6 @@
import javax.webbeans.AfterTransactionSuccess;
import javax.webbeans.BeforeTransactionCompletion;
import javax.webbeans.DefinitionException;
-import javax.webbeans.Destructor;
import javax.webbeans.Disposes;
import javax.webbeans.ExecutionException;
import javax.webbeans.IfExists;
@@ -184,10 +183,6 @@
{
throw new DefinitionException(this + " cannot be annotated with @Initializer");
}
- if ( this.observerMethod.isAnnotationPresent(Destructor.class) )
- {
- throw new DefinitionException(this + " cannot be annotated with @Destructor");
- }
}
public void notify(final T event)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/InjectionPointProvider.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/InjectionPointProvider.java 2009-01-22 09:25:46 UTC (rev 1158)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/InjectionPointProvider.java 2009-01-22 09:42:17 UTC (rev 1159)
@@ -36,7 +36,29 @@
private final Stack<Bean<?>> beans = new Stack<Bean<?>>();
// The stack of injection points
private final Stack<InjectionPoint> injectionPoints = new Stack<InjectionPoint>();
+ private Object currentInjectionInstance;
+ public void setCurrentInjectionInstance(Object currentInjectionInstance)
+ {
+ if (this.currentInjectionInstance == null)
+ {
+ this.currentInjectionInstance = currentInjectionInstance;
+ }
+ }
+
+ public void clearCurrentInjectionInstance(Object instance)
+ {
+ if (this.currentInjectionInstance == instance)
+ {
+ this.currentInjectionInstance = null;
+ }
+ }
+
+ public Object getCurrentInjectionInstance()
+ {
+ return currentInjectionInstance;
+ }
+
/**
* Pushes a bean to the stack
*
@@ -131,4 +153,9 @@
return "InjectionPointProvider: Bean stack = " + beans.toString() + " InjectionPoint stack = " + injectionPoints.toString();
}
+ public boolean isInjecting()
+ {
+ return currentInjectionInstance != null;
+ }
+
}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Elephant.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Elephant.java 2009-01-22 09:25:46 UTC (rev 1158)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/Elephant.java 2009-01-22 09:42:17 UTC (rev 1159)
@@ -2,7 +2,6 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
-import javax.webbeans.Destructor;
import javax.webbeans.Production;
@Production
@@ -16,7 +15,7 @@
}
- @Remove @Destructor
+ @Remove
public void remove2()
{
16 years, 8 months
[webbeans-commits] Webbeans SVN: r1158 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit: implementation/initializer and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: nickarls
Date: 2009-01-22 04:25:46 -0500 (Thu, 22 Jan 2009)
New Revision: 1158
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java
Log:
Remove references to the now-obsolete @Destroy
(I'll nuke them from RI/API next)
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java 2009-01-22 06:45:49 UTC (rev 1157)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java 2009-01-22 09:25:46 UTC (rev 1158)
@@ -358,15 +358,6 @@
@Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
@SpecAssertion(section = "8.5.2")
- public void testObserverMethodAnnotatedDestructorFails()
- {
- deployBeans(CairnsTerrier.class);
- Set<Bean<Object>> beans = manager.resolveByType(Object.class);
- assert beans != null;
- }
-
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertion(section = "8.5.2")
public void testObserverMethodWithDisposesParamFails()
{
deployBeans(FoxTerrier.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-01-22 06:45:49 UTC (rev 1157)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-01-22 09:25:46 UTC (rev 1158)
@@ -74,12 +74,6 @@
}
@Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.8.1")
- public void testInitializerMethodAnnotatedDestructor()
- {
- createSimpleBean(Shrike.class);
- }
-
- @Test(groups="initializerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.8.1")
public void testInitializerMethodHasParameterAnnotatedDisposes()
{
createSimpleBean(Capercaillie.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-01-22 06:45:49 UTC (rev 1157)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-01-22 09:25:46 UTC (rev 1158)
@@ -186,15 +186,6 @@
}
@Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
- public void testProducerMethodAnnotatedDestructor() throws Exception
- {
- Bean<SpiderProducer_Broken> bean = createSimpleBean(SpiderProducer_Broken.class);
- manager.addBean(bean);
- Method method = SpiderProducer_Broken.class.getMethod("destroy");
- createProducerMethodBean(method, bean);
- }
-
- @Test(groups="producerMethod", expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4")
public void testProducerMethodWithParameterAnnotatedDisposes() throws Exception
{
Bean<SpiderProducer_Broken> bean = createSimpleBean(SpiderProducer_Broken.class);
16 years, 8 months
[webbeans-commits] Webbeans SVN: r1157 - doc/trunk/reference/ko-KR.
by webbeans-commits＠lists.jboss.org
Author: eukim
Date: 2009-01-22 01:45:49 -0500 (Thu, 22 Jan 2009)
New Revision: 1157
Modified:
doc/trunk/reference/ko-KR/injection.po
Log:
updated
Modified: doc/trunk/reference/ko-KR/injection.po
===================================================================
--- doc/trunk/reference/ko-KR/injection.po 2009-01-22 03:19:52 UTC (rev 1156)
+++ doc/trunk/reference/ko-KR/injection.po 2009-01-22 06:45:49 UTC (rev 1157)
@@ -8,7 +8,7 @@
"Project-Id-Version: injection\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-01-06 11:30+0000\n"
-"PO-Revision-Date: 2009-01-22 13:18+1000\n"
+"PO-Revision-Date: 2009-01-22 16:41+1000\n"
"Last-Translator: Eunju Kim <eukim(a)redhat.com>\n"
"Language-Team: Korean <ko(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -651,11 +651,10 @@
#. Tag: para
#: injection.xml:207
#, no-c-format
-#, fuzzy
msgid ""
"For integration or unit testing, the external system is slow or unavailable. "
"So we would create a mock object:"
-msgstr "통합 또는 단위 테스트를 위해 "
+msgstr "통합 또는 단위 테스트를 위해 외부적 시스템은 속도가 느리거나 또는 사용 불가능합니다. 따라서 모의 객체를 생성할 수 있습니다: "
#. Tag: programlisting
#: injection.xml:210
@@ -687,7 +686,7 @@
msgid ""
"But how does the Web Bean manager determine which implementation to use in a "
"particular deployment?"
-msgstr ""
+msgstr "하지만 Web Bean 관리자가 특정 배치에 어떤 구현을 사용할 지를 어떻게 결정할까요? "
#. Tag: title
#: injection.xml:216
@@ -705,6 +704,8 @@
"can identify additional deployment types to be enabled in a particular "
"deployment by listing them in <literal>web-beans.xml</literal>."
msgstr ""
+"Web Beans는 두 개의 내장된 배치 유형을 정의합니다: <literal>@Production</"
+"literal> 및 <literal>@Standard</literal>. 시스템이 배치되면 기본값으로 내장된 배치 유형과 함께 Web Beans 만이 활성화됩니다. <literal>web-beans.xml</literal>에서 몰록을 나열하여 특정 배치에서 활성화될 추가 배치 유형을 인식할 수 있습니다. "
#. Tag: para
#: injection.xml:224
@@ -712,7 +713,7 @@
msgid ""
"Going back to our example, when we deploy our integration tests, we want all "
"our <literal>@Mock</literal> objects to be installed:"
-msgstr ""
+msgstr "예제로 다시 돌아가서, 통합적 테스트를 배치할 때, 모든 <literal>@Mock</literal> 객체가 설치되기를 원합니다: "
#. Tag: programlisting
#: injection.xml:227
@@ -741,7 +742,7 @@
"Now the Web Bean manager will identify and install all Web Beans annotated "
"<literal>@Production</literal>, <literal>@Standard</literal> or "
"<literal>@Mock</literal> at deployment time."
-msgstr ""
+msgstr "이제 Web Bean 관리자는 배치시 <literal>@Production</literal>, <literal>@Standard</literal>, <literal>@Mock</literal> 어노테이션된 모든 Web Beans를 인식 및 설치하게 됩니다. "
#. Tag: para
#: injection.xml:233
@@ -750,7 +751,7 @@
"The deployment type <literal>@Standard</literal> is used only for certain "
"special Web Beans defined by the Web Beans specification. We can't use it "
"for our own Web Beans, and we can't disable it."
-msgstr ""
+msgstr "<literal>@Standard</literal> 배치 유형은 Web Beans 사양에 의해 정의된 특정 Web Beans에서만 사용됩니다. 자체적 Web Beans에는 이를 사용할 수 없으며 이를 비활성화할 수 없습니다. "
#. Tag: para
#: injection.xml:237
@@ -759,13 +760,13 @@
"The deployment type <literal>@Production</literal> is the default deployment "
"type for Web Beans which don't explicitly declare a deployment type, and may "
"be disabled."
-msgstr ""
+msgstr "<literal>@Production</literal> 배치 유형은 배치 유형을 명시하지 않은 Web Beans에 대한 기본값 배치 유형으로 비활성화될 수 있습니다. "
#. Tag: title
#: injection.xml:244
#, no-c-format
msgid "Deployment type precedence"
-msgstr ""
+msgstr "배치 유형 우선 순위 "
#. Tag: para
#: injection.xml:246
@@ -838,13 +839,13 @@
#: injection.xml:284
#, no-c-format
msgid "Example deployment types"
-msgstr ""
+msgstr "배치 유형 예시 "
#. Tag: para
#: injection.xml:286
#, no-c-format
msgid "Deployment types are useful for all kinds of things, here's some examples:"
-msgstr ""
+msgstr "배치 유형은 모든 종류가 유용합니다, 다음에는 일부 예시가 있습니다: "
#. Tag: para
#: injection.xml:290
@@ -858,7 +859,7 @@
#: injection.xml:294
#, no-c-format
msgid "<literal>@AustralianTaxLaw</literal> for site-specific Web Beans"
-msgstr ""
+msgstr "특정 사이트 Web Beans 용 <literal>@AustralianTaxLaw</literal> "
#. Tag: para
#: injection.xml:297
@@ -866,7 +867,7 @@
msgid ""
"<literal>@SeamFramework</literal>, <literal>@Guice</literal> for third-party "
"frameworks which build on Web Beans"
-msgstr ""
+msgstr "Web Beans에서 작성되는 제삼자 프레임워크 용 <literal>@SeamFramework</literal>, <literal>@Guice</literal> "
#. Tag: para
#: injection.xml:301
@@ -874,19 +875,19 @@
msgid ""
"<literal>@Standard</literal> for standard Web Beans defined by the Web Beans "
"specification"
-msgstr ""
+msgstr "Web Beans 사양에 의해 정의된 표준 Web Beans 용 <literal>@Standard</literal> "
#. Tag: para
#: injection.xml:306
#, no-c-format
msgid "I'm sure you can think of more applications..."
-msgstr ""
+msgstr "더 많은 애플리케이션을 생각하실 수 있을 것입니다..."
#. Tag: title
#: injection.xml:313
#, no-c-format
msgid "Fixing unsatisfied dependencies"
-msgstr ""
+msgstr "불만족스러운 의존성 수정 "
#. Tag: para
#: injection.xml:315
@@ -904,7 +905,7 @@
msgid ""
"It's usually easy to fix an <literal>UnsatisfiedDependencyException</"
"literal> or <literal>AmbiguousDependencyException</literal>."
-msgstr ""
+msgstr "<literal>UnsatisfiedDependencyException</literal> 또는 <literal>AmbiguousDependencyException</literal>을 수정하기가 쉽습니다. "
#. Tag: para
#: injection.xml:323
@@ -914,7 +915,7 @@
"a Web Bean which implements the API type and has the binding types of the "
"injection point — or enable the deployment type of a Web Bean that "
"already implements the API type and has the binding types."
-msgstr ""
+msgstr "<literal>UnsatisfiedDependencyException</literal>을 수정하려면, API 유형을 구현하는 Web Bean을 제공하고 삽입 지점의 바인딩 유형을 갖거나 — 또는 API 유형을 이미 구현하고 있는 Web Bean의 배치 유형을 활성화하고 바인딩 유형을 갖습니다. "
#. Tag: para
#: injection.xml:328
@@ -927,6 +928,8 @@
"<literal>AmbiguousDependencyException</literal> can only occur if two Web "
"Beans share a binding type and have exactly the same deployment type."
msgstr ""
+"<literal>AmbiguousDependencyException</literal>을 수정하려면, 두 개의 API 유형 구현 사이에서 구별하기 위해 바인딩 유형을 소개하거나 구현 중 하나의 배치 유형을 변경하여 Web Bean 관리자가 이들 사이에서 선택하기 위해 배치 유형 우선 순위를 사용할 수 있습니다. <literal>AmbiguousDependencyException</literal>은 두 개의 Web "
+"Beans가 바인딩 유형을 공유하여 동일한 배치 유형을 갖고 있을 때에만 발생할 수 있습니다. "
#. Tag: para
#: injection.xml:335
@@ -934,13 +937,13 @@
msgid ""
"There's one more issue you need to be aware of when using dependency "
"injection in Web Beans."
-msgstr ""
+msgstr "Web Beans에서 의존성 삽입을 사용할 때 유의하셔야 할 사항이 한 가지 더 있습니다. "
#. Tag: title
#: injection.xml:341
#, no-c-format
msgid "Client proxies"
-msgstr ""
+msgstr "클라이언트 프록시 "
#. Tag: para
#: injection.xml:343
@@ -948,7 +951,7 @@
msgid ""
"Clients of an injected Web Bean do not usually hold a direct reference to a "
"Web Bean instance."
-msgstr ""
+msgstr "삽입된 Web Bean 클라이언트는 Web Bean 인스턴스에 직접적인 참조를 유지하지 않습니다. "
#. Tag: para
#: injection.xml:346
@@ -999,7 +1002,7 @@
#: injection.xml:370
#, no-c-format
msgid "The following Java types cannot be proxied by the Web Bean manager:"
-msgstr ""
+msgstr "다음과 같은 Java 유형은 Web Bean 관리자에 의해 프록시될 수 없습니다: "
#. Tag: para
#: injection.xml:374
@@ -1007,13 +1010,13 @@
msgid ""
"classes which are declared <literal>final</literal> or have a "
"<literal>final</literal> method,"
-msgstr ""
+msgstr "<literal>final</literal>이라고 명시되어 있거나 또는 <literal>final</literal> 방식을 갖는 클래스, "
#. Tag: para
#: injection.xml:378
#, no-c-format
msgid "classes which have no non-private constructor with no parameters, and"
-msgstr ""
+msgstr "매개 변수 없는 비전용 생성자를 갖지 않는 클래스, "
#. Tag: para
#: injection.xml:381
16 years, 8 months
[webbeans-commits] Webbeans SVN: r1156 - doc/trunk/reference/ko-KR.
by webbeans-commits＠lists.jboss.org
Author: eukim
Date: 2009-01-21 22:19:52 -0500 (Wed, 21 Jan 2009)
New Revision: 1156
Modified:
doc/trunk/reference/ko-KR/injection.po
Log:
updated
Modified: doc/trunk/reference/ko-KR/injection.po
===================================================================
--- doc/trunk/reference/ko-KR/injection.po 2009-01-22 02:19:00 UTC (rev 1155)
+++ doc/trunk/reference/ko-KR/injection.po 2009-01-22 03:19:52 UTC (rev 1156)
@@ -8,7 +8,7 @@
"Project-Id-Version: injection\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-01-06 11:30+0000\n"
-"PO-Revision-Date: 2009-01-22 02:45+1000\n"
+"PO-Revision-Date: 2009-01-22 13:18+1000\n"
"Last-Translator: Eunju Kim <eukim(a)redhat.com>\n"
"Language-Team: Korean <ko(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -24,6 +24,8 @@
"\n"
"\n"
"\n"
+"\n"
+"\n"
#. Tag: title
#: injection.xml:4
@@ -220,6 +222,8 @@
"<literal>UnsatisfiedDependencyException</literal> or "
"<literal>AmbiguousDependencyException</literal>."
msgstr ""
+"Web Beans 사양은 <emphasis>타입 안정적 해상도 알고리즘</emphasis>이라는 절차를 정의하여, Web Bean 관리자가 삽입 지점에 삽입하기 위해 Web Bean을 인식할 때 이를 따르게 됩니다. 이러한 알고르짐은 처음에는 복잡하게 보이지만, 일단 이를 이해하면, 이는 다소 직관적입니다. 타입 안정적 해상도는 시스템 초기화시에 실행되어, 관리자는 사용자에 과한 정보를 즉각적으로 알게되며 Web Bean의 의존성에 만족하지 않을 경우, <literal>UnsatisfiedDependencyException</literal> 또는 "
+"<literal>AmbiguousDependencyException</literal>을 넘기게 됩니다. "
#. Tag: para
#: injection.xml:67
@@ -244,7 +248,7 @@
"allow the application deployer to select which implementation is appropriate "
"for a particular deployment, without changes to the client, by enabling or "
"disabling <emphasis>deployment types</emphasis>, or"
-msgstr ""
+msgstr "애플리케이션 개발자가 클라이언트로 변경하지 않고 <emphasis>배치 유형</emphasis>을 활성화 또는 비활성화하여 특정 시스템에 어떤 구헌이 적합할 지를 선택하게 합니다. "
#. Tag: para
#: injection.xml:82
@@ -253,7 +257,7 @@
"allow one implementation of an API to override another implementation of the "
"same API at deployment time, without changes to the client, using "
"<emphasis>deployment type precedence</emphasis>."
-msgstr ""
+msgstr "하나의 API 구현이 클라이언트에 변경하지 않고 <emphasis>배치 유형 우선 순위</emphasis>를 사용하여 배치시 다른 동일한 API 구현을 덮어쓰기하게 합니다. "
#. Tag: para
#: injection.xml:88
@@ -544,7 +548,7 @@
"Web Beans defines a binding type <literal>@Current</literal> that is the "
"default binding type for any injection point or Web Bean that does not "
"explicitly specify a binding type."
-msgstr ""
+msgstr "Web Beans는 명확하게 바인딩 유형을 지정하지 않은 Web Bean이나 또는 삽입 지점에 대한 기본값 바인딩 유형인 <literal>@Current</literal> 바인딩 유형을 정의합니다. "
#. Tag: para
#: injection.xml:168
@@ -552,7 +556,7 @@
msgid ""
"There are two common circumstances in which it is necessary to explicitly "
"specify <literal>@Current</literal>:"
-msgstr ""
+msgstr "<literal>@Current</literal>를 지정하기 위해 필요한 일반적인 환경이 두 가지 있습니다: "
#. Tag: para
#: injection.xml:173
@@ -560,7 +564,7 @@
msgid ""
"on a field, in order to declare it as an injected field with the default "
"binding type, and"
-msgstr ""
+msgstr "기본값 바인딩 유형과 함께 삽입 영역으로 이를 명시하기 위한 영역에서 "
#. Tag: para
#: injection.xml:177
@@ -568,7 +572,7 @@
msgid ""
"on a Web Bean which has another binding type in addition to the default "
"binding type."
-msgstr ""
+msgstr "기본값 바인딩 유형에 더하여 다른 바인딩 유형을 갖는 Web Bean에서 "
#. Tag: title
#: injection.xml:187
@@ -583,7 +587,7 @@
"All Web Beans have a <emphasis>deployment type</emphasis>. Each deployment "
"type identifies a set of Web Beans that should be conditionally installed in "
"some deployments of the system."
-msgstr ""
+msgstr "모든 Web Beans는 <emphasis>배치 유형</emphasis>을 갖습니다. 각각의 배치 유형은 시스템의 일부 배치에 조건부로 설치되어야 하는 Web Beans 모음을 인식합니다. "
#. Tag: para
#: injection.xml:193
@@ -592,7 +596,7 @@
"For example, we could define a deployment type named <literal>@Mock</"
"literal>, which would identify Web Beans that should only be installed when "
"the system executes inside an integration testing environment:"
-msgstr ""
+msgstr "예를 들어, <literal>@Mock</literal>라는 배치 유형을 정의할 수 있으며, 이는 시스템이 통합적인 테스트 환경 내에서 실행될 때 설치되어야 하는 Web Beans를 인식합니다: "
#. Tag: programlisting
#: injection.xml:197
@@ -614,7 +618,7 @@
msgid ""
"Suppose we had some Web Bean that interacted with an external system to "
"process payments:"
-msgstr ""
+msgstr "지불 절차를 처리하기 위한 외부적 시스템과 상호 작용하는 일부 Web Bean이 있다고 가정합시다: "
#. Tag: programlisting
#: injection.xml:202
@@ -642,15 +646,16 @@
msgid ""
"Since this Web Bean does not explicitly specify a deployment type, it has "
"the default deployment type <literal>@Production</literal>."
-msgstr ""
+msgstr "이러한 Web Bean이 배치 유형을 명시적을 지정하지 않고 있으므로, 이는 기본값 배치 유형 <literal>@Production</literal>을 갖게 됩니다. "
#. Tag: para
#: injection.xml:207
#, no-c-format
+#, fuzzy
msgid ""
"For integration or unit testing, the external system is slow or unavailable. "
"So we would create a mock object:"
-msgstr ""
+msgstr "통합 또는 단위 테스트를 위해 "
#. Tag: programlisting
#: injection.xml:210
16 years, 8 months
[webbeans-commits] Webbeans SVN: r1155 - doc/trunk/reference/ko-KR.
by webbeans-commits＠lists.jboss.org
Author: eukim
Date: 2009-01-21 21:19:00 -0500 (Wed, 21 Jan 2009)
New Revision: 1155
Modified:
doc/trunk/reference/ko-KR/scopescontexts.po
Log:
updated
Modified: doc/trunk/reference/ko-KR/scopescontexts.po
===================================================================
--- doc/trunk/reference/ko-KR/scopescontexts.po 2009-01-22 00:59:13 UTC (rev 1154)
+++ doc/trunk/reference/ko-KR/scopescontexts.po 2009-01-22 02:19:00 UTC (rev 1155)
@@ -8,7 +8,7 @@
"Project-Id-Version: scopescontexts\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-01-06 11:30+0000\n"
-"PO-Revision-Date: 2009-01-22 01:12+1000\n"
+"PO-Revision-Date: 2009-01-22 12:18+1000\n"
"Last-Translator: Eunju Kim <eukim(a)redhat.com>\n"
"Language-Team: Korean <ko(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -18,6 +18,7 @@
"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
"\n"
"\n"
+"\n"
#. Tag: title
#: scopescontexts.xml:4
@@ -270,7 +271,7 @@
"the user. The conversation context holds state associated with what the user "
"is currently working on. If the user is doing multiple things at the same "
"time, there are multiple conversations."
-msgstr ""
+msgstr "컨버세이션은 사용자 관점에서의 작업 단위, 작업 내용을 나타냅니다. 컨버세이션 컨텍스트는 현재 사용자가 작업하고 있는 것과 관련된 상태를 유지합니다. 사용자가 동시에 여러가지 작업을 실행하고 있을 경우, 여러 개의 컨버세이션이 있게 됩니다. "
#. Tag: para
#: scopescontexts.xml:143
@@ -443,14 +444,13 @@
#. Tag: para
#: scopescontexts.xml:190
#, no-c-format
-#, fuzzy
msgid ""
"The Web Bean manager is also required to propagate conversations across any "
"redirect, even if the conversation is not marked long-running. This makes it "
"very easy to implement the common POST-then-redirect pattern, without resort "
"to fragile constructs such as a \"flash\" object. In this case, the Web Bean "
"manager automatically adds a request parameter to the redirect URL."
-msgstr "Web Bean 관리자는 컨버세이션이 장기 실행으로 표시되어 있지 않아도, 리다이렉트를 통해 컨버세이션을 보급해야 합니다. 이는 일반적인 "
+msgstr "Web Bean 관리자는 컨버세이션이 장기 실행으로 표시되어 있지 않아도, 리다이렉트를 통해 컨버세이션을 보급해야 합니다. 이는 \"플래시\" 객체와 같은 깨지기 쉬운 구조에 의지하지 않고 일반적인 POST-then-redirect 패턴 쉽게 구현하게 합니다. 이러한 경우 Web Bean 관리자는 리다이렉트 URL에 요청 매개 변수를 자동으로 추가합니다. "
#. Tag: title
#: scopescontexts.xml:200
@@ -467,7 +467,7 @@
"manager implementation will normally do this on the basis of some kind of "
"timeout — though this is not required by the Web Beans specification. The "
"timeout is the period of inactivity before the conversation is destroyed."
-msgstr ""
+msgstr "Web Bean 관리자에게는 리소스를 보관하기 위해 컨텍스트에 있는 모든 상태 및 컨버세이션을 삭제할 수 있는 권한이 있습니다. Web Bean 관리자 구현은 주로 시간 초과에 기반하여 이를 실행합니다 — 이는 Web Beans 사양에 의해 요청되지 않습니다. 시간 초과는 컨버세이션이 삭제된 후 비활성화 기간을 말합니다. "
#. Tag: para
#: scopescontexts.xml:208
@@ -514,14 +514,13 @@
#. Tag: para
#: scopescontexts.xml:229
#, no-c-format
-#, fuzzy
msgid ""
"When an injection point of a Web Bean resolves to a dependent Web Bean, a "
"new instance of the dependent Web Bean is created every time the first Web "
"Bean is instantiated. Instances of dependent Web Beans are never shared "
"between different Web Beans or different injection points. They are "
"<emphasis>dependent objects</emphasis> of some other Web Bean instance."
-msgstr "Web Bean의 삽입 지점이 "
+msgstr "Web Bean의 삽입 지점이 의존적 Web Bean을 해결할 때, 의존적 Web Bean의 새로운 인스턴스는 처음으로 Web Bean이 초기화될 때 마다 생성됩니다. 의존적 Web Beans의 인스턴스는 다른 Web Bean 사이에서나 또는 다른 삽입 지점 간에 공유되지 않습니다. 이는 일부 다른 Web Bean 인스턴스에 대해 <emphasis>의존적 객체</emphasis>입니다. "
#. Tag: para
#: scopescontexts.xml:235
16 years, 8 months
[webbeans-commits] Webbeans SVN: r1154 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-01-21 19:59:13 -0500 (Wed, 21 Jan 2009)
New Revision: 1154
Added:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/OtherSpiderProducer.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/Fox.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/Spider.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/SpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/Tarantula.java
Log:
dependent context tests
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-01-22 00:26:48 UTC (rev 1153)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-01-22 00:59:13 UTC (rev 1154)
@@ -1,5 +1,6 @@
package org.jboss.webbeans.tck.unit.context.dependent;
+import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Set;
@@ -16,13 +17,12 @@
@SpecVersion("20081206")
public class DependentContextTest extends AbstractTest
{
-
/**
- * No injected instance of the Web Bean is ever shared between multiple
+ * No injected instance of the (@Dependent-scoped) Web Bean is ever shared between multiple
* injection points.
*/
@Test(groups = { "contexts", "injection" })
- @SpecAssertion(section = "9.4")
+ @SpecAssertion(section = "9.3")
public void testInstanceNotSharedBetweenInjectionPoints()
{
deployBeans(Fox.class, FoxRun.class);
@@ -38,23 +38,36 @@
}
/**
- * Any instance of the Web Bean that is used to evaluate a Unified EL
+ * Any instance of the (@Dependent-scoped) Web Bean that is used to evaluate a Unified EL
* expression exists to service that evaluation only.
*/
- @Test(groups = { "stub", "contexts", "el" })
- @SpecAssertion(section = "9.4")
- public void testInstanceUsedForElEvalutionNotShared()
- {
- assert false;
+ @Test(groups = { "contexts", "el" })
+ @SpecAssertion(section = "9.3")
+ public void testInstanceUsedForElEvaluationNotShared() throws Exception
+ {
+ deployBeans(Fox.class);
+ new RunInDependentContext()
+ {
+ @Override
+ protected void execute() throws Exception
+ {
+ Set<Bean<Fox>> foxBeans = manager.resolveByType(Fox.class);
+ assert foxBeans.size() == 1;
+ Bean<Fox> foxBean = foxBeans.iterator().next();
+ manager.addBean(foxBean);
+
+ assert !manager.getInstanceByName("fox").equals(manager.getInstanceByName("fox")); }
+
+ }.run();
}
/**
- * Any instance of the Web Bean that receives a producer method, producer
+ * Any instance of the (@Dependent-scoped) Web Bean that receives a producer method, producer
* field, disposal method or observer method invocation exists to service
* that invocation only
*/
@Test(groups = { "contexts", "producerMethod" })
- @SpecAssertion(section = "9.4")
+ @SpecAssertion(section = "9.3")
public void testInstanceUsedForProducerMethodNotShared() throws Exception
{
Bean<SpiderProducer> spiderProducer = createSimpleBean(SpiderProducer.class);
@@ -69,36 +82,44 @@
}
/**
- * Any instance of the Web Bean that receives a producer method, producer
+ * Any instance of the (@Dependent-scoped) Web Bean that receives a producer method, producer
* field, disposal method or observer method invocation exists to service
* that invocation only
*/
- @Test(groups = { "contexts", "producerMethod", "stub" })
- @SpecAssertion(section = "9.4")
+ @Test(groups = { "contexts", "producerMethod" })
+ @SpecAssertion(section = "9.3")
public void testInstanceUsedForProducerFieldNotShared() throws Exception
{
- assert false;
+ Bean<OtherSpiderProducer> spiderProducer = createSimpleBean(OtherSpiderProducer.class);
+ manager.addBean(spiderProducer);
+ Field field = OtherSpiderProducer.class.getField("produceTarantula");
+ Bean<Tarantula> tarantulaBean = createProducerFieldBean(field, spiderProducer);
+ Tarantula tarantula = tarantulaBean.create();
+ Tarantula tarantula2 = tarantulaBean.create();
+ assert tarantula != null;
+ assert tarantula2 != null;
+ assert tarantula != tarantula2;
}
/**
- * Any instance of the Web Bean that receives a producer method, producer
+ * Any instance of the (@Dependent-scoped) Web Bean that receives a producer method, producer
* field, disposal method or observer method invocation exists to service
* that invocation only
*/
@Test(groups = { "stub", "contexts", "disposalMethod" })
- @SpecAssertion(section = "9.4")
+ @SpecAssertion(section = "9.3")
public void testInstanceUsedForDisposalMethodNotShared()
{
assert false;
}
/**
- * Any instance of the Web Bean that receives a producer method, producer
+ * Any instance of the (@Dependent-scoped) Web Bean that receives a producer method, producer
* field, disposal method or observer method invocation exists to service
* that invocation only
*/
@Test(groups = { "stub", "contexts", "observerMethod" })
- @SpecAssertion(section = "9.4")
+ @SpecAssertion(section = "9.3")
public void testInstanceUsedForObserverMethodNotShared()
{
assert false;
@@ -110,7 +131,7 @@
* of the given Web Bean
*/
@Test(groups = "contexts")
- @SpecAssertion(section = "9.4")
+ @SpecAssertion(section = "9.3")
public void testContextGetWithCreateTrueReturnsNewInstance() throws Exception
{
deployBeans(Fox.class);
@@ -129,7 +150,6 @@
}
}.run();
-
}
/**
@@ -137,7 +157,7 @@
* scope with the value false for the create parameter returns a null value
*/
@Test(groups = "contexts")
- @SpecAssertion(section = "9.4")
+ @SpecAssertion(section = "9.3")
public void testContextGetWithCreateFalseReturnsNull() throws Exception
{
deployBeans(Fox.class);
@@ -155,18 +175,16 @@
}
}.run();
-
-
}
/**
* The @Dependent scope is inactive except:
*/
@Test(groups = {"contexts"}, expectedExceptions = ContextNotActiveException.class)
- @SpecAssertion(section = "9.4")
+ @SpecAssertion(section = "9.3")
public void testContextIsInactive()
{
- manager.getContext(Dependent.class).isActive();
+ assert !manager.getContext(Dependent.class).isActive();
}
/**
@@ -175,7 +193,7 @@
* or observer method invocation, or
*/
@Test(groups = { "stub", "contexts", "producerMethod" })
- @SpecAssertion(section = "9.4")
+ @SpecAssertion(section = "9.3")
public void testContextIsActiveWhenInvokingProducerMethod()
{
assert false;
@@ -187,10 +205,11 @@
* or observer method invocation, or
*/
@Test(groups = { "stub", "contexts", "producerField" })
- @SpecAssertion(section = "9.4")
+ @SpecAssertion(section = "9.3")
public void testContextIsActiveWhenInvokingProducerField()
{
assert false;
+ //assert manager.getContext(Dependent.class).isActive();
}
/**
@@ -199,7 +218,7 @@
* or observer method invocation, or
*/
@Test(groups = { "stub", "contexts", "disposalMethod" })
- @SpecAssertion(section = "9.4")
+ @SpecAssertion(section = "9.3")
public void testContextIsActiveWhenInvokingDisposalMethod()
{
assert false;
@@ -211,7 +230,7 @@
* or observer method invocation, or
*/
@Test(groups = { "stub", "contexts", "observerMethod" })
- @SpecAssertion(section = "9.4")
+ @SpecAssertion(section = "9.3")
public void testContextIsActiveWhenInvokingObserverMethod()
{
assert false;
@@ -221,7 +240,7 @@
* while a Unified EL expression is evaluated, or
*/
@Test(groups = { "stub", "contexts", "el" })
- @SpecAssertion(section = "9.4")
+ @SpecAssertion(section = "9.3")
public void testContextIsActiveWhenEvaluatingElExpression()
{
assert false;
@@ -232,7 +251,7 @@
* injecting its dependencies, or
*/
@Test(groups = { "contexts", "beanLifecycle" })
- @SpecAssertion(section = "9.4")
+ @SpecAssertion(section = "9.3")
public void testContextIsActiveDuringBeanCreation()
{
// Slightly roundabout, but I can't see a better way to test atm
@@ -248,7 +267,7 @@
* injecting its dependencies, or
*/
@Test(groups = { "stub", "contexts", "beanDestruction" })
- @SpecAssertion(section = "9.4")
+ @SpecAssertion(section = "9.3")
public void testContextIsActiveDuringBeanDestruction()
{
assert false;
@@ -275,7 +294,7 @@
* invoked by the EJB container
*/
@Test(groups = { "contexts", "injection", "stub", "ejb3" })
- @SpecAssertion(section = "9.4")
+ @SpecAssertion(section = "9.3")
public void testContextIsActiveDuringEJBDependencyInjection()
{
assert false;
@@ -287,7 +306,7 @@
* invoked by the EJB container
*/
@Test(groups = { "contexts", "injection", "stub", "servlet" })
- @SpecAssertion(section = "9.4")
+ @SpecAssertion(section = "9.3")
public void testContextIsActiveDuringServletDependencyInjection()
{
assert false;
@@ -299,7 +318,7 @@
* invoked by the EJB container
*/
@Test(groups = { "contexts", "postconstruct", "stub", "ejb3" })
- @SpecAssertion(section = "9.4")
+ @SpecAssertion(section = "9.3")
public void testContextIsActiveDuringEJBPostConstruct()
{
assert false;
@@ -311,7 +330,7 @@
* invoked by the EJB container
*/
@Test(groups = { "contexts", "predestroy", "stub", "ejb3" })
- @SpecAssertion(section = "9.4")
+ @SpecAssertion(section = "9.3")
public void testContextIsActiveDuringEJBPreDestroy()
{
assert false;
@@ -325,7 +344,7 @@
* from Web Beans interceptors or decorators for any of these methods
*/
@Test(groups = { "stub", "contexts", "constructor" })
- @SpecAssertion(section = "9.4.1")
+ @SpecAssertion(section = "9.3.1")
public void testWebBeanMayCreateInstanceFromConstructor()
{
assert false;
@@ -339,7 +358,7 @@
* from Web Beans interceptors or decorators for any of these methods
*/
@Test(groups = { "stub", "contexts", "removeMethod" })
- @SpecAssertion(section = "9.4.1")
+ @SpecAssertion(section = "9.3.1")
public void testWebBeanMayCreateInstanceFromRemoveMethod()
{
assert false;
@@ -353,7 +372,7 @@
* from Web Beans interceptors or decorators for any of these methods
*/
@Test(groups = { "stub", "contexts", "initalizerMethod" })
- @SpecAssertion(section = "9.4.1")
+ @SpecAssertion(section = "9.3.1")
public void testWebBeanMayCreateInstanceFromInitializerMethod()
{
assert false;
@@ -367,7 +386,7 @@
* from Web Beans interceptors or decorators for any of these methods
*/
@Test(groups = { "stub", "contexts", "producerMethod" })
- @SpecAssertion(section = "9.4.1")
+ @SpecAssertion(section = "9.3.1")
public void testWebBeanMayCreateInstanceFromProducerMethod()
{
assert false;
@@ -381,7 +400,7 @@
* from Web Beans interceptors or decorators for any of these methods
*/
@Test(groups = { "stub", "contexts", "disposalMethod" })
- @SpecAssertion(section = "9.4.1")
+ @SpecAssertion(section = "9.3.1")
public void testWebBeanMayCreateInstanceFromDisposalMethod()
{
assert false;
@@ -395,7 +414,7 @@
* from Web Beans interceptors or decorators for any of these methods
*/
@Test(groups = { "stub", "contexts", "preDestroy" })
- @SpecAssertion(section = "9.4.1")
+ @SpecAssertion(section = "9.3.1")
public void testWebBeanMayCreateInstanceFromPreDestroy()
{
assert false;
@@ -409,7 +428,7 @@
* from Web Beans interceptors or decorators for any of these methods
*/
@Test(groups = { "stub", "contexts", "postConstruct" })
- @SpecAssertion(section = "9.4.1")
+ @SpecAssertion(section = "9.3.1")
public void testWebBeanMayCreateInstanceFromPostConstruct()
{
assert false;
@@ -423,7 +442,7 @@
* from Web Beans interceptors or decorators for any of these methods
*/
@Test(groups = { "stub", "contexts", "interceptor" })
- @SpecAssertion(section = "9.4.1")
+ @SpecAssertion(section = "9.3.1")
public void testWebBeanMayCreateInstanceFromInterceptorOfActiveMethod()
{
assert false;
@@ -437,7 +456,7 @@
* from Web Beans interceptors or decorators for any of these methods
*/
@Test(groups = { "stub", "contexts", "decorator" })
- @SpecAssertion(section = "9.4.1")
+ @SpecAssertion(section = "9.3.1")
public void testWebBeanMayCreateInstanceFromDecoratorOfActiveMethod()
{
assert false;
@@ -450,7 +469,7 @@
* methods.
*/
@Test(groups = { "stub", "contexts", "ejb3", "initializerMethod" })
- @SpecAssertion(section = "9.4.1")
+ @SpecAssertion(section = "9.3.1")
public void testEjbBeanMayCreateInstanceFromInitializer()
{
assert false;
@@ -463,7 +482,7 @@
* methods.
*/
@Test(groups = { "stub", "contexts", "ejb3", "postConstruct" })
- @SpecAssertion(section = "9.4.1")
+ @SpecAssertion(section = "9.3.1")
public void testEjbBeanMayCreateInstanceFromPostConstruct()
{
assert false;
@@ -476,7 +495,7 @@
* methods.
*/
@Test(groups = { "stub", "contexts", "ejb3", "preDestroy" })
- @SpecAssertion(section = "9.4.1")
+ @SpecAssertion(section = "9.3.1")
public void testEjbBeanMayCreateInstanceFromPreDestroy()
{
assert false;
@@ -489,7 +508,7 @@
* methods.
*/
@Test(groups = { "stub", "contexts", "ejb3", "interceptor" })
- @SpecAssertion(section = "9.4.1")
+ @SpecAssertion(section = "9.3.1")
public void testEjbBeanMayCreateInstanceFromInterceptorOfActiveMethod()
{
assert false;
@@ -500,7 +519,7 @@
* by calling Manager.getInstance() from initializer methods
*/
@Test(groups = { "stub", "contexts", "servlet", "initializerMethod" })
- @SpecAssertion(section = "9.4.1")
+ @SpecAssertion(section = "9.3.1")
public void testServletBeanMayCreateInstanceFromInitializer()
{
assert false;
@@ -511,7 +530,7 @@
* destroyed,
*/
@Test(groups = { "stub", "contexts", "beanDestruction" })
- @SpecAssertion(section = "9.4.2")
+ @SpecAssertion(section = "9.3.2")
public void testDestroyingParentDestroysDependents()
{
assert false;
@@ -522,7 +541,7 @@
* or Servlet is destroyed,
*/
@Test(groups = { "stub", "contexts", "ejb3" })
- @SpecAssertion(section = "9.4.2")
+ @SpecAssertion(section = "9.3.2")
public void testDestroyingEjbDestroysDependents()
{
assert false;
@@ -533,7 +552,7 @@
* or Servlet is destroyed,
*/
@Test(groups = { "stub", "contexts", "servlet" })
- @SpecAssertion(section = "9.4.2")
+ @SpecAssertion(section = "9.3.2")
public void testDestroyingServletDestroysDependents()
{
assert false;
@@ -544,7 +563,7 @@
* expression evaluation when the evaluation completes, and
*/
@Test(groups = { "stub", "contexts", "el" })
- @SpecAssertion(section = "9.4.2")
+ @SpecAssertion(section = "9.3.2")
public void testDependentsDestroyedWhenElEvaluationCompletes()
{
assert false;
@@ -556,7 +575,7 @@
* invocation when the invocation completes
*/
@Test(groups = { "stub", "contexts", "producerMethod" })
- @SpecAssertion(section = "9.4.2")
+ @SpecAssertion(section = "9.3.2")
public void testDependentsDestroyedWhenProducerMethodCompletes()
{
assert false;
@@ -568,7 +587,7 @@
* invocation when the invocation completes
*/
@Test(groups = { "stub", "contexts", "producerField" })
- @SpecAssertion(section = "9.4.2")
+ @SpecAssertion(section = "9.3.2")
public void testDependentsDestroyedWhenProducerFieldCompletes()
{
assert false;
@@ -580,7 +599,7 @@
* invocation when the invocation completes
*/
@Test(groups = { "stub", "contexts", "disposalMethod" })
- @SpecAssertion(section = "9.4.2")
+ @SpecAssertion(section = "9.3.2")
public void testDependentsDestroyedWhenDisposalMethodCompletes()
{
assert false;
@@ -592,7 +611,7 @@
* invocation when the invocation completes
*/
@Test(groups = { "stub", "contexts", "observerMethod" })
- @SpecAssertion(section = "9.4")
+ @SpecAssertion(section = "9.3")
public void testDependentsDestroyedWhenObserverMethodEvaluationCompletes()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/Fox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/Fox.java 2009-01-22 00:26:48 UTC (rev 1153)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/Fox.java 2009-01-22 00:59:13 UTC (rev 1154)
@@ -1,8 +1,9 @@
package org.jboss.webbeans.tck.unit.context.dependent;
import javax.webbeans.Dependent;
+import javax.webbeans.Named;
-@Dependent
+@Dependent @Named
class Fox
{
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/OtherSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/OtherSpiderProducer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/OtherSpiderProducer.java 2009-01-22 00:59:13 UTC (rev 1154)
@@ -0,0 +1,9 @@
+package org.jboss.webbeans.tck.unit.context.dependent;
+
+import javax.webbeans.Produces;
+
+@AnotherDeploymentType
+public class OtherSpiderProducer
+{
+ @Produces public Tarantula produceTarantula = new Tarantula();
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/Spider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/Spider.java 2009-01-22 00:26:48 UTC (rev 1153)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/Spider.java 2009-01-22 00:59:13 UTC (rev 1154)
@@ -1,13 +1,9 @@
package org.jboss.webbeans.tck.unit.context.dependent;
-
-
class Spider implements Animal
{
-
public final void layEggs()
{
- }
-
+ }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/SpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/SpiderProducer.java 2009-01-22 00:26:48 UTC (rev 1153)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/SpiderProducer.java 2009-01-22 00:59:13 UTC (rev 1154)
@@ -1,15 +1,18 @@
package org.jboss.webbeans.tck.unit.context.dependent;
+import javax.webbeans.Disposes;
import javax.webbeans.Produces;
-
@AnotherDeploymentType
class SpiderProducer
{
-
@Produces public Tarantula produceTarantula()
{
return new Tarantula();
}
-
+
+ public void disposeTarantula(@Disposes Tarantula tarantula)
+ {
+
+ }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/Tarantula.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/Tarantula.java 2009-01-22 00:26:48 UTC (rev 1153)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/Tarantula.java 2009-01-22 00:59:13 UTC (rev 1154)
@@ -1,6 +1,5 @@
package org.jboss.webbeans.tck.unit.context.dependent;
-
class Tarantula extends Spider implements DeadlySpider
{
16 years, 8 months
[webbeans-commits] Webbeans SVN: r1153 - tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-01-21 19:26:48 -0500 (Wed, 21 Jan 2009)
New Revision: 1153
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java
Log:
fix import
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java 2009-01-21 21:44:44 UTC (rev 1152)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/bean/BeanDefinitionTest.java 2009-01-22 00:26:48 UTC (rev 1153)
@@ -6,8 +6,8 @@
import javax.webbeans.RequestScoped;
import javax.webbeans.manager.Bean;
-import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.webbeans.tck.AbstractTest;
+import org.jboss.webbeans.tck.impl.SpecAssertion;
import org.jboss.webbeans.tck.impl.SpecVersion;
import org.testng.annotations.Test;
16 years, 8 months