Weld SVN: r6195 - core/trunk/impl/src/main/java/org/jboss/weld/bootstrap.
by weld-commits＠lists.jboss.org
Author: dallen6
Date: 2010-04-29 15:00:25 -0400 (Thu, 29 Apr 2010)
New Revision: 6195
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
Log:
Another piece for the new ProxyServices...adds a default service if none provided.
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2010-04-29 17:01:41 UTC (rev 6194)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2010-04-29 19:00:25 UTC (rev 6195)
@@ -42,6 +42,7 @@
import org.jboss.weld.ContainerState;
import org.jboss.weld.bean.builtin.BeanManagerBean;
import org.jboss.weld.bean.interceptor.InterceptionMetadataService;
+import org.jboss.weld.bean.proxy.util.SimpleProxyServices;
import org.jboss.weld.bootstrap.api.Bootstrap;
import org.jboss.weld.bootstrap.api.Environment;
import org.jboss.weld.bootstrap.api.Lifecycle;
@@ -87,6 +88,7 @@
import org.jboss.weld.resources.spi.ScheduledExecutorServiceFactory;
import org.jboss.weld.serialization.ContextualStoreImpl;
import org.jboss.weld.serialization.spi.ContextualStore;
+import org.jboss.weld.serialization.spi.ProxyServices;
import org.jboss.weld.servlet.HttpSessionManager;
import org.jboss.weld.servlet.ServletApiAbstraction;
import org.jboss.weld.servlet.api.ServletServices;
@@ -230,7 +232,6 @@
private Map<BeanDeploymentArchive, BeanDeployment> beanDeployments;
private Environment environment;
private Deployment deployment;
- private ExtensionBeanDeployerEnvironment extensionDeployerEnvironment;
private DeploymentVisitor deploymentVisitor;
public Bootstrap startContainer(Environment environment, Deployment deployment, BeanStore applicationBeanStore)
@@ -249,6 +250,10 @@
{
deployment.getServices().add(ScheduledExecutorServiceFactory.class, new SingleThreadScheduledExecutorServiceFactory());
}
+ if (!deployment.getServices().contains(ProxyServices.class))
+ {
+ deployment.getServices().add(ProxyServices.class, new SimpleProxyServices());
+ }
verifyServices(deployment.getServices(), environment.getRequiredDeploymentServices());
@@ -294,7 +299,7 @@
initializeContexts();
// Start the application context
Container.instance().services().get(ContextLifecycle.class).beginApplication(applicationBeanStore);
- this.extensionDeployerEnvironment = new ExtensionBeanDeployerEnvironment(EjbDescriptors.EMPTY, deploymentManager);
+ new ExtensionBeanDeployerEnvironment(EjbDescriptors.EMPTY, deploymentManager);
this.deploymentVisitor = new DeploymentVisitor(deploymentManager, environment, deployment);
// Read the deployment structure, this will be the physical structure as caused by the presence of beans.xml
14 years
Weld SVN: r6194 - in core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy: util and 1 other directory.
by weld-commits＠lists.jboss.org
Author: dallen6
Date: 2010-04-29 13:01:41 -0400 (Thu, 29 Apr 2010)
New Revision: 6194
Added:
core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ProxyFactory.java
Log:
ProxyFactory now uses new ProxyServices to get the classloader and protection domains.
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ProxyFactory.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ProxyFactory.java 2010-04-29 17:00:11 UTC (rev 6193)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ProxyFactory.java 2010-04-29 17:01:41 UTC (rev 6194)
@@ -39,9 +39,11 @@
import org.jboss.interceptor.proxy.LifecycleMixin;
import org.jboss.interceptor.util.proxy.TargetInstanceProxy;
+import org.jboss.weld.Container;
import org.jboss.weld.bean.proxy.util.ClassloaderClassPath;
import org.jboss.weld.exceptions.DefinitionException;
import org.jboss.weld.exceptions.WeldException;
+import org.jboss.weld.serialization.spi.ProxyServices;
import org.slf4j.cal10n.LocLogger;
/**
@@ -84,16 +86,8 @@
public ProxyFactory(Class<?> proxiedBeanType)
{
this.beanType = proxiedBeanType;
- if (beanType.getName().startsWith("java"))
- {
- this.classLoader = this.getClass().getClassLoader();
- this.protectionDomain = this.getClass().getProtectionDomain();
- }
- else
- {
- this.classLoader = beanType.getClassLoader();
- this.protectionDomain = beanType.getProtectionDomain();
- }
+ this.classLoader = Container.instance().services().get(ProxyServices.class).getClassLoader(beanType);
+ this.protectionDomain = Container.instance().services().get(ProxyServices.class).getProtectionDomain(beanType);
this.classPool = new ClassPool();
this.classPool.appendClassPath(new ClassloaderClassPath(classLoader));
addDefaultAdditionalInterfaces();
Added: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java (rev 0)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java 2010-04-29 17:01:41 UTC (rev 6194)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat, Inc. and/or its affiliates, 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.weld.bean.proxy.util;
+
+import java.security.ProtectionDomain;
+
+import org.jboss.weld.serialization.spi.ProxyServices;
+
+/**
+ * A default implementation of the {@link ProxyServices} which simply use the
+ * corresponding information from the proxy type. An exception is made for
+ * {@code java.*} and {@code javax.*} packages which are often associated
+ * with the system classloader and a more privileged ProtectionDomain.
+ *
+ * @author David Allen
+ *
+ */
+public class SimpleProxyServices implements ProxyServices
+{
+
+ /* (non-Javadoc)
+ * @see org.jboss.weld.serialization.spi.ProxyServices#getClassLoader(java.lang.Class)
+ */
+ public ClassLoader getClassLoader(Class<?> type)
+ {
+ if (type.getName().startsWith("java"))
+ {
+ return this.getClass().getClassLoader();
+ }
+ else
+ {
+ return type.getClassLoader();
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.weld.serialization.spi.ProxyServices#getProtectionDomain(java.lang.Class)
+ */
+ public ProtectionDomain getProtectionDomain(Class<?> type)
+ {
+ if (type.getName().startsWith("java"))
+ {
+ return this.getClass().getProtectionDomain();
+ }
+ else
+ {
+ return type.getProtectionDomain();
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.weld.bootstrap.api.Service#cleanup()
+ */
+ public void cleanup()
+ {
+ // This implementation requires no cleanup
+
+ }
+
+}
Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years
Weld SVN: r6193 - core/trunk/bom.
by weld-commits＠lists.jboss.org
Author: dallen6
Date: 2010-04-29 13:00:11 -0400 (Thu, 29 Apr 2010)
New Revision: 6193
Modified:
core/trunk/bom/pom.xml
Log:
Changed version of weld-spi used to snapshot till next release
Modified: core/trunk/bom/pom.xml
===================================================================
--- core/trunk/bom/pom.xml 2010-04-29 16:59:06 UTC (rev 6192)
+++ core/trunk/bom/pom.xml 2010-04-29 17:00:11 UTC (rev 6193)
@@ -32,7 +32,7 @@
</developers>
<properties>
- <weld.api.version>1.0-SP1</weld.api.version>
+ <weld.api.version>1.0-SNAPSHOT</weld.api.version>
<!-- Override the API and compile with more recent EL API -->
<google.collections.version>1.0</google.collections.version>
<javassist.version>3.11.0.GA</javassist.version>
14 years
Weld SVN: r6192 - api/trunk/weld-spi/src/main/java/org/jboss/weld/serialization/spi.
by weld-commits＠lists.jboss.org
Author: dallen6
Date: 2010-04-29 12:59:06 -0400 (Thu, 29 Apr 2010)
New Revision: 6192
Added:
api/trunk/weld-spi/src/main/java/org/jboss/weld/serialization/spi/ProxyServices.java
Log:
Added new ProxyServices to allow container control over proxying behaviors
Added: api/trunk/weld-spi/src/main/java/org/jboss/weld/serialization/spi/ProxyServices.java
===================================================================
--- api/trunk/weld-spi/src/main/java/org/jboss/weld/serialization/spi/ProxyServices.java (rev 0)
+++ api/trunk/weld-spi/src/main/java/org/jboss/weld/serialization/spi/ProxyServices.java 2010-04-29 16:59:06 UTC (rev 6192)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat, Inc. and/or its affiliates, 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.weld.serialization.spi;
+
+import java.security.ProtectionDomain;
+
+import org.jboss.weld.bootstrap.api.Service;
+
+/**
+ * <p>Support services related to proxy generation and serialization which are required
+ * to be implemented by all containers.</p>
+ *
+ * <p>
+ * These services are used by all Weld proxy classes to ensure the correct class loaders
+ * are used and to aid in the serialization and deserialization of these classes across
+ * container instances.
+ * </p>
+ *
+ * <p>
+ * Required in all environments since proxies are always in use. A default
+ * implementation will be used if none are provided by the container which
+ * will use the information directly from the type of proxy.
+ * </p>
+ *
+ * <p> {@link ProxyServices} is a per-deployment service.</p>
+ *
+ * @author David Allen
+ *
+ */
+public interface ProxyServices extends Service
+{
+ /**
+ * Returns the class loader that will load the proxy class which extends or
+ * implements the given type. This class loader may simply be the same
+ * class loader used for the type, or it may be another class loader designed
+ * to hold proxies while still providing access to the given type and any of its
+ * ancestors and used types.
+ *
+ * @param type the super type (class or interface) of the proxy
+ * @return the class loader to use for the proxy class
+ */
+ public ClassLoader getClassLoader(Class<?> type);
+
+ /**
+ * Returns the protection domain to use when a security manager is present
+ * during generation of a proxy class with the given super type. Usually
+ * this protection domain will need to correspond to the one used with
+ * the class loader provided by {@link #getClassLoader(Class)}.
+ *
+ * @param type the super type (class or interface) of the proxy
+ * @return the protection domain to use for the proxy class
+ */
+ public ProtectionDomain getProtectionDomain(Class<?> type);
+}
14 years
Weld SVN: r6191 - in extensions/trunk/src: main/resources/META-INF/services and 1 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-04-28 12:45:31 -0400 (Wed, 28 Apr 2010)
New Revision: 6191
Removed:
extensions/trunk/src/main/java/org/jboss/weld/extensions/ManagedProducer.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/managedproducer/
extensions/trunk/src/test/java/org/jboss/weld/extensions/test/managedproducer/
Modified:
extensions/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
Log:
remove ManagedProducer for now until Stuart can redo it
Deleted: extensions/trunk/src/main/java/org/jboss/weld/extensions/ManagedProducer.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/ManagedProducer.java 2010-04-28 16:39:02 UTC (rev 6190)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/ManagedProducer.java 2010-04-28 16:45:31 UTC (rev 6191)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.weld.extensions;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-(a)Retention(RetentionPolicy.RUNTIME)
-@Target(value = { ElementType.METHOD })
-public @interface ManagedProducer
-{
-
-}
Modified: extensions/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
===================================================================
--- extensions/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2010-04-28 16:39:02 UTC (rev 6190)
+++ extensions/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2010-04-28 16:45:31 UTC (rev 6191)
@@ -2,5 +2,4 @@
org.jboss.weld.extensions.resourceLoader.servlet.ServletResourceExtension
org.jboss.weld.extensions.bean.lookup.IdentifiableBeanExtension
org.jboss.weld.extensions.CoreExtension
-org.jboss.weld.extensions.managedproducer.ManagedProducerExtension
org.jboss.weld.extensions.interceptor.InterceptorExtension
\ No newline at end of file
14 years
Weld SVN: r6190 - in extensions/trunk/src: main/resources/META-INF/services and 1 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-04-28 12:39:02 -0400 (Wed, 28 Apr 2010)
New Revision: 6190
Modified:
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java
extensions/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableBeansTest.java
Log:
WELDX-98
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java 2010-04-28 16:34:22 UTC (rev 6189)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java 2010-04-28 16:39:02 UTC (rev 6190)
@@ -23,11 +23,12 @@
import java.util.Set;
import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.InjectionTarget;
+import org.jboss.weld.extensions.util.reannotated.ReannotatedField;
+import org.jboss.weld.extensions.util.reannotated.ReannotatedType;
+
/**
* injection target wrapper that injects the configuration for generic beans
*
@@ -52,9 +53,9 @@
private final InjectionTarget<T> delegate;
private final Annotation annotation;
- private final AnnotatedType<T> annotatedType;
+ private final ReannotatedType<T> annotatedType;
- public GenericBeanInjectionTargetWrapper(AnnotatedType<T> annotatedType, InjectionTarget<T> delegate, Annotation annotation)
+ public GenericBeanInjectionTargetWrapper(ReannotatedType<T> annotatedType, InjectionTarget<T> delegate, Annotation annotation)
{
this.annotation = annotation;
this.delegate = delegate;
@@ -68,7 +69,7 @@
if (annotation.annotationType().isAssignableFrom(f.getType()))
{
- AnnotatedField<? super T> reannotatedField = annotatedType.getField(f);
+ ReannotatedField<? super T> reannotatedField = annotatedType.getField(f);
if (reannotatedField.isAnnotationPresent(InjectConfiguration.class))
{
try
Modified: extensions/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
===================================================================
--- extensions/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2010-04-28 16:34:22 UTC (rev 6189)
+++ extensions/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2010-04-28 16:39:02 UTC (rev 6190)
@@ -1,6 +1,6 @@
org.jboss.weld.extensions.bean.generic.GenericExtension
org.jboss.weld.extensions.resourceLoader.servlet.ServletResourceExtension
-org.jboss.weld.extensions.beanlookup.IdentifiableBeanExtension
+org.jboss.weld.extensions.bean.lookup.IdentifiableBeanExtension
org.jboss.weld.extensions.CoreExtension
org.jboss.weld.extensions.managedproducer.ManagedProducerExtension
org.jboss.weld.extensions.interceptor.InterceptorExtension
\ No newline at end of file
Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableBeansTest.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableBeansTest.java 2010-04-28 16:34:22 UTC (rev 6189)
+++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableBeansTest.java 2010-04-28 16:39:02 UTC (rev 6190)
@@ -26,7 +26,7 @@
import org.jboss.weld.test.AbstractWeldTest;
import org.testng.annotations.Test;
@Artifact
-@Classes(packages = { "org.jboss.weld.extensions.beanlookup" })
+@Classes(packages = { "org.jboss.weld.extensions.bean.lookup" })
public class IdentifiableBeansTest extends AbstractWeldTest
{
@Test
14 years
Weld SVN: r6189 - in extensions/trunk/src: main/java/org/jboss/weld/extensions/bean and 3 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-04-28 12:34:22 -0400 (Wed, 28 Apr 2010)
New Revision: 6189
Added:
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/
Removed:
extensions/trunk/src/main/java/org/jboss/weld/extensions/beanlookup/
Modified:
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/AnnotatedTypeIdentifier.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/IdentifiableBeanExtension.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/IdentifiableInjectionTarget.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/RequiresIdentification.java
extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableBeansTest.java
extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableInterceptorBinding.java
Log:
WELDX-98
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java 2010-04-28 16:21:33 UTC (rev 6188)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java 2010-04-28 16:34:22 UTC (rev 6189)
@@ -23,12 +23,11 @@
import java.util.Set;
import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.InjectionTarget;
-import org.jboss.weld.extensions.util.reannotated.ReannotatedField;
-import org.jboss.weld.extensions.util.reannotated.ReannotatedType;
-
/**
* injection target wrapper that injects the configuration for generic beans
*
@@ -53,9 +52,9 @@
private final InjectionTarget<T> delegate;
private final Annotation annotation;
- private final ReannotatedType<T> annotatedType;
+ private final AnnotatedType<T> annotatedType;
- public GenericBeanInjectionTargetWrapper(ReannotatedType<T> annotatedType, InjectionTarget<T> delegate, Annotation annotation)
+ public GenericBeanInjectionTargetWrapper(AnnotatedType<T> annotatedType, InjectionTarget<T> delegate, Annotation annotation)
{
this.annotation = annotation;
this.delegate = delegate;
@@ -69,7 +68,7 @@
if (annotation.annotationType().isAssignableFrom(f.getType()))
{
- ReannotatedField<? super T> reannotatedField = annotatedType.getField(f);
+ AnnotatedField<? super T> reannotatedField = annotatedType.getField(f);
if (reannotatedField.isAnnotationPresent(InjectConfiguration.class))
{
try
Copied: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup (from rev 6188, extensions/trunk/src/main/java/org/jboss/weld/extensions/beanlookup)
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/AnnotatedTypeIdentifier.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/beanlookup/AnnotatedTypeIdentifier.java 2010-04-28 16:21:33 UTC (rev 6188)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/AnnotatedTypeIdentifier.java 2010-04-28 16:34:22 UTC (rev 6189)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.beanlookup;
+package org.jboss.weld.extensions.bean.lookup;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.inject.Inject;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/IdentifiableBeanExtension.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/beanlookup/IdentifiableBeanExtension.java 2010-04-28 16:21:33 UTC (rev 6188)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/IdentifiableBeanExtension.java 2010-04-28 16:34:22 UTC (rev 6189)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.beanlookup;
+package org.jboss.weld.extensions.bean.lookup;
import java.lang.annotation.Annotation;
import java.util.Collections;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/IdentifiableInjectionTarget.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/beanlookup/IdentifiableInjectionTarget.java 2010-04-28 16:21:33 UTC (rev 6188)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/IdentifiableInjectionTarget.java 2010-04-28 16:34:22 UTC (rev 6189)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.beanlookup;
+package org.jboss.weld.extensions.bean.lookup;
import java.util.Map;
import java.util.Set;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/RequiresIdentification.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/beanlookup/RequiresIdentification.java 2010-04-28 16:21:33 UTC (rev 6188)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/lookup/RequiresIdentification.java 2010-04-28 16:34:22 UTC (rev 6189)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.beanlookup;
+package org.jboss.weld.extensions.bean.lookup;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableBeansTest.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableBeansTest.java 2010-04-28 16:21:33 UTC (rev 6188)
+++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableBeansTest.java 2010-04-28 16:34:22 UTC (rev 6189)
@@ -22,7 +22,7 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Classes;
-import org.jboss.weld.extensions.beanlookup.AnnotatedTypeIdentifier;
+import org.jboss.weld.extensions.bean.lookup.AnnotatedTypeIdentifier;
import org.jboss.weld.test.AbstractWeldTest;
import org.testng.annotations.Test;
@Artifact
Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableInterceptorBinding.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableInterceptorBinding.java 2010-04-28 16:21:33 UTC (rev 6188)
+++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/beanlookup/IdentifiableInterceptorBinding.java 2010-04-28 16:34:22 UTC (rev 6189)
@@ -23,7 +23,7 @@
import javax.interceptor.InterceptorBinding;
-import org.jboss.weld.extensions.beanlookup.RequiresIdentification;
+import org.jboss.weld.extensions.bean.lookup.RequiresIdentification;
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD,ElementType.TYPE})
14 years
Weld SVN: r6188 - in extensions/trunk/src: main/java/org/jboss/weld/extensions/bean and 5 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-04-28 12:21:33 -0400 (Wed, 28 Apr 2010)
New Revision: 6188
Added:
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/
extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/
extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/
Removed:
extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/
extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean/
Modified:
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/FieldSetter.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/Generic.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericAnnotation.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericExtension.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/InjectConfiguration.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/InjectGeneric.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/InjectLiteral.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/ProducerFieldInjectionTarget.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/SyntheticQualifier.java
extensions/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericBeanTest.java
extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericConstructorArgument.java
extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericDep.java
extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericMain.java
extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericProducer.java
extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/InjectedBean.java
extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/NormalBean.java
extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/SomeQualifier.java
extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/TestAnnotation.java
Log:
WELDX-98
Copied: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic (from rev 6185, extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean)
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/FieldSetter.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/FieldSetter.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/FieldSetter.java 2010-04-28 16:21:33 UTC (rev 6188)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.genericbean;
+package org.jboss.weld.extensions.bean.generic;
import java.lang.reflect.Field;
import java.util.Set;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/Generic.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/Generic.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/Generic.java 2010-04-28 16:21:33 UTC (rev 6188)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.genericbean;
+package org.jboss.weld.extensions.bean.generic;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericAnnotation.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/GenericAnnotation.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericAnnotation.java 2010-04-28 16:21:33 UTC (rev 6188)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.genericbean;
+package org.jboss.weld.extensions.bean.generic;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/GenericBeanInjectionTargetWrapper.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java 2010-04-28 16:21:33 UTC (rev 6188)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.genericbean;
+package org.jboss.weld.extensions.bean.generic;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericExtension.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/GenericExtension.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericExtension.java 2010-04-28 16:21:33 UTC (rev 6188)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.genericbean;
+package org.jboss.weld.extensions.bean.generic;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/InjectConfiguration.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/InjectConfiguration.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/InjectConfiguration.java 2010-04-28 16:21:33 UTC (rev 6188)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.genericbean;
+package org.jboss.weld.extensions.bean.generic;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/InjectGeneric.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/InjectGeneric.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/InjectGeneric.java 2010-04-28 16:21:33 UTC (rev 6188)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.genericbean;
+package org.jboss.weld.extensions.bean.generic;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/InjectLiteral.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/InjectLiteral.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/InjectLiteral.java 2010-04-28 16:21:33 UTC (rev 6188)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.genericbean;
+package org.jboss.weld.extensions.bean.generic;
import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Inject;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/ProducerFieldInjectionTarget.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/ProducerFieldInjectionTarget.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/ProducerFieldInjectionTarget.java 2010-04-28 16:21:33 UTC (rev 6188)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.genericbean;
+package org.jboss.weld.extensions.bean.generic;
import java.util.List;
import java.util.Set;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/SyntheticQualifier.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/SyntheticQualifier.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/SyntheticQualifier.java 2010-04-28 16:21:33 UTC (rev 6188)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.genericbean;
+package org.jboss.weld.extensions.bean.generic;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
Modified: extensions/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
===================================================================
--- extensions/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2010-04-28 16:13:32 UTC (rev 6187)
+++ extensions/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2010-04-28 16:21:33 UTC (rev 6188)
@@ -1,4 +1,4 @@
-org.jboss.weld.extensions.genericbean.GenericExtension
+org.jboss.weld.extensions.bean.generic.GenericExtension
org.jboss.weld.extensions.resourceLoader.servlet.ServletResourceExtension
org.jboss.weld.extensions.beanlookup.IdentifiableBeanExtension
org.jboss.weld.extensions.CoreExtension
Copied: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic (from rev 6185, extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean)
Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericBeanTest.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean/GenericBeanTest.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericBeanTest.java 2010-04-28 16:21:33 UTC (rev 6188)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.test.genericbean;
+package org.jboss.weld.extensions.test.bean.generic;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.weld.test.AbstractWeldTest;
Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericConstructorArgument.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean/GenericConstructorArgument.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericConstructorArgument.java 2010-04-28 16:21:33 UTC (rev 6188)
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.test.genericbean;
+package org.jboss.weld.extensions.test.bean.generic;
import javax.inject.Inject;
-import org.jboss.weld.extensions.genericbean.Generic;
+import org.jboss.weld.extensions.bean.generic.Generic;
@Generic(TestAnnotation.class)
public class GenericConstructorArgument
Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericDep.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean/GenericDep.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericDep.java 2010-04-28 16:21:33 UTC (rev 6188)
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.test.genericbean;
+package org.jboss.weld.extensions.test.bean.generic;
import javax.inject.Inject;
-import org.jboss.weld.extensions.genericbean.Generic;
+import org.jboss.weld.extensions.bean.generic.Generic;
@Generic(TestAnnotation.class)
public class GenericDep
Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericMain.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean/GenericMain.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericMain.java 2010-04-28 16:21:33 UTC (rev 6188)
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.test.genericbean;
+package org.jboss.weld.extensions.test.bean.generic;
import javax.inject.Inject;
-import org.jboss.weld.extensions.genericbean.Generic;
+import org.jboss.weld.extensions.bean.generic.Generic;
@Generic(TestAnnotation.class)
public class GenericMain
Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericProducer.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean/GenericProducer.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericProducer.java 2010-04-28 16:21:33 UTC (rev 6188)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.test.genericbean;
+package org.jboss.weld.extensions.test.bean.generic;
import javax.enterprise.inject.Produces;
Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/InjectedBean.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean/InjectedBean.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/InjectedBean.java 2010-04-28 16:21:33 UTC (rev 6188)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.test.genericbean;
+package org.jboss.weld.extensions.test.bean.generic;
import javax.inject.Inject;
Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/NormalBean.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean/NormalBean.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/NormalBean.java 2010-04-28 16:21:33 UTC (rev 6188)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.test.genericbean;
+package org.jboss.weld.extensions.test.bean.generic;
public class NormalBean
{
Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/SomeQualifier.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean/SomeQualifier.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/SomeQualifier.java 2010-04-28 16:21:33 UTC (rev 6188)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.test.genericbean;
+package org.jboss.weld.extensions.test.bean.generic;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/TestAnnotation.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean/TestAnnotation.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/TestAnnotation.java 2010-04-28 16:21:33 UTC (rev 6188)
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.test.genericbean;
+package org.jboss.weld.extensions.test.bean.generic;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import org.jboss.weld.extensions.genericbean.GenericAnnotation;
+import org.jboss.weld.extensions.bean.generic.GenericAnnotation;
@Retention(RetentionPolicy.RUNTIME)
@GenericAnnotation
14 years
Weld SVN: r6187 - extensions/trunk.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-04-28 12:13:32 -0400 (Wed, 28 Apr 2010)
New Revision: 6187
Modified:
extensions/trunk/pom.xml
Log:
update to TestNG 5.12
Modified: extensions/trunk/pom.xml
===================================================================
--- extensions/trunk/pom.xml 2010-04-28 15:14:25 UTC (rev 6186)
+++ extensions/trunk/pom.xml 2010-04-28 16:13:32 UTC (rev 6187)
@@ -61,7 +61,7 @@
<weld.api.version>1.0-SP1</weld.api.version>
<weld.core.version>1.0.1-Final</weld.core.version>
<slf4j.version>1.5.10</slf4j.version>
- <testng.version>5.10</testng.version>
+ <testng.version>5.12.1</testng.version>
<jboss.test.harness.version>1.1.0-CR3</jboss.test.harness.version>
</properties>
@@ -101,7 +101,6 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
<version>${testng.version}</version>
</dependency>
<dependency>
@@ -146,7 +145,6 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
- <classifier>jdk15</classifier>
<exclusions>
<exclusion>
<artifactId>junit</artifactId>
14 years
Weld SVN: r6186 - core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy.
by weld-commits＠lists.jboss.org
Author: dallen6
Date: 2010-04-28 11:14:25 -0400 (Wed, 28 Apr 2010)
New Revision: 6186
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseProxyFactory.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ProxyFactory.java
Log:
Changed constructor generation to use constructors from base class for all types of proxies.
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseProxyFactory.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseProxyFactory.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseProxyFactory.java 2010-04-28 15:14:25 UTC (rev 6186)
@@ -47,23 +47,6 @@
}
@Override
- protected void addConstructors(CtClass proxyClassType)
- {
- try
- {
- CtClass baseType = classPool.get(beanType.getName());
- for (CtConstructor constructor : baseType.getConstructors())
- {
- proxyClassType.addConstructor(CtNewConstructor.make(constructor.getParameterTypes(), constructor.getExceptionTypes(), proxyClassType));
- }
- }
- catch (Exception e)
- {
- throw new WeldException(e);
- }
- }
-
- @Override
protected String getProxyNameSuffix()
{
return PROXY_SUFFIX;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ProxyFactory.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ProxyFactory.java 2010-04-28 15:10:34 UTC (rev 6185)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ProxyFactory.java 2010-04-28 15:14:25 UTC (rev 6186)
@@ -28,9 +28,9 @@
import java.util.ArrayList;
import java.util.Arrays;
-import javassist.CannotCompileException;
import javassist.ClassPool;
import javassist.CtClass;
+import javassist.CtConstructor;
import javassist.CtField;
import javassist.CtMethod;
import javassist.CtNewConstructor;
@@ -242,8 +242,8 @@
}
/**
- * Adds a public default constructor to the proxy class for ease of
- * instantiating it.
+ * Adds a constructor for the proxy for each constructor declared
+ * by the base bean type.
*
* @param proxyClassType the Javassist class for the proxy
*/
@@ -251,9 +251,20 @@
{
try
{
- proxyClassType.addConstructor(CtNewConstructor.defaultConstructor(proxyClassType));
+ CtClass baseType = classPool.get(beanType.getName());
+ if (baseType.isInterface())
+ {
+ proxyClassType.addConstructor(CtNewConstructor.defaultConstructor(proxyClassType));
+ }
+ else
+ {
+ for (CtConstructor constructor : baseType.getConstructors())
+ {
+ proxyClassType.addConstructor(CtNewConstructor.make(constructor.getParameterTypes(), constructor.getExceptionTypes(), proxyClassType));
+ }
+ }
}
- catch (CannotCompileException e)
+ catch (Exception e)
{
throw new WeldException(e);
}
14 years