Weld SVN: r6060 - core/trunk/impl/src/main/java/org/jboss/weld/servlet.
by weld-commits＠lists.jboss.org
Author: nickarls
Date: 2010-03-19 05:00:44 -0400 (Fri, 19 Mar 2010)
New Revision: 6060
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/servlet/BeanProvider.java
Log:
cleanup
Modified: core/trunk/impl/src/main/java/org/jboss/weld/servlet/BeanProvider.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/servlet/BeanProvider.java 2010-03-19 08:08:24 UTC (rev 6059)
+++ core/trunk/impl/src/main/java/org/jboss/weld/servlet/BeanProvider.java 2010-03-19 09:00:44 UTC (rev 6060)
@@ -18,55 +18,60 @@
import static org.jboss.weld.servlet.ServletHelper.getModuleBeanManager;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.util.AnnotationLiteral;
import javax.servlet.ServletContext;
import org.jboss.weld.conversation.ConversationIdName;
import org.jboss.weld.conversation.ConversationImpl;
import org.jboss.weld.conversation.ConversationManager2;
-import org.jboss.weld.manager.BeanManagerImpl;
public class BeanProvider
{
private static class ConversationIdNameLiteral extends AnnotationLiteral<ConversationIdName> implements ConversationIdName
{
-
public static final ConversationIdName INSTANCE = new ConversationIdNameLiteral();
-
- private ConversationIdNameLiteral() {}
-
+
+ private ConversationIdNameLiteral()
+ {
+ }
}
-
+
+ @SuppressWarnings("unchecked")
+ private static <T> T getReference(ServletContext servletContext, Type type, Annotation... qualifiers)
+ {
+ BeanManager beanManager = getModuleBeanManager(servletContext);
+ Bean<? extends Object> bean = beanManager.resolve(beanManager.getBeans(type, qualifiers));
+ return (T) beanManager.getReference(bean, type, beanManager.createCreationalContext(bean));
+ }
+
public static ConversationManager2 conversationManager(ServletContext servletContext)
{
- BeanManagerImpl beanManager = getModuleBeanManager(servletContext);
- Bean<?> bean = beanManager.resolve(beanManager.getBeans(ConversationManager2.class));
- return (ConversationManager2) beanManager.getReference(bean, ConversationManager2.class, beanManager.createCreationalContext(bean));
+ return getReference(servletContext, ConversationManager2.class);
}
-
+
public static HttpSessionManager httpSessionManager(ServletContext servletContext)
{
- BeanManagerImpl beanManager = getModuleBeanManager(servletContext);
- Bean<?> bean = beanManager.resolve(beanManager.getBeans(HttpSessionManager.class));
- return (HttpSessionManager) beanManager.getReference(bean, HttpSessionManager.class, beanManager.createCreationalContext(bean));
+ return getReference(servletContext, HttpSessionManager.class);
}
-
+
public static ConversationImpl conversation(ServletContext servletContext)
{
- BeanManagerImpl beanManager = getModuleBeanManager(servletContext);
- Bean<?> bean = beanManager.resolve(beanManager.getBeans(ConversationImpl.class));
- return (ConversationImpl) beanManager.getReference(bean, ConversationImpl.class, beanManager.createCreationalContext(bean));
+ return getReference(servletContext, ConversationImpl.class);
}
-
+
public static String conversationIdName(ServletContext servletContext)
{
- BeanManagerImpl beanManager = getModuleBeanManager(servletContext);
- Bean<?> bean = beanManager.resolve(beanManager.getBeans(String.class, ConversationIdNameLiteral.INSTANCE));
- return (String) beanManager.getReference(bean, String.class, beanManager.createCreationalContext(bean));
+ return getReference(servletContext, String.class, ConversationIdNameLiteral.INSTANCE);
}
-
- private BeanProvider() {}
-
+
+ private BeanProvider()
+ {
+ }
+
}
14 years, 8 months
- 1
- 0
Weld SVN: r6059 - core/trunk/impl/src/main/java/org/jboss/weld/bootstrap.
by weld-commits＠lists.jboss.org
Author: nickarls
Date: 2010-03-19 04:08:24 -0400 (Fri, 19 Mar 2010)
New Revision: 6059
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java
Log:
WELD-397 ignore @New beans.
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java 2010-03-18 23:11:16 UTC (rev 6058)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java 2010-03-19 08:08:24 UTC (rev 6059)
@@ -120,8 +120,8 @@
public class Validator implements Service
{
- private static final LocLogger log = loggerFactory().getLogger(BOOTSTRAP);
-
+ private static final LocLogger log = loggerFactory().getLogger(BOOTSTRAP);
+
private void validateBean(Bean<?> bean, BeanManagerImpl beanManager)
{
for (InjectionPoint ij : bean.getInjectionPoints())
@@ -274,7 +274,11 @@
{
throw new DefinitionException(NON_FIELD_INJECTION_POINT_CANNOT_USE_NAMED, ij);
}
- checkScopeAnnotations(ij, beanManager.getServices().get(MetaAnnotationStore.class));
+ boolean newBean = (ij.getBean() instanceof NewManagedBean<?>) || (ij.getBean() instanceof NewSessionBean<?>);
+ if (!newBean)
+ {
+ checkScopeAnnotations(ij, beanManager.getServices().get(MetaAnnotationStore.class));
+ }
checkFacadeInjectionPoint(ij, Instance.class);
checkFacadeInjectionPoint(ij, Event.class);
Annotation[] bindings = ij.getQualifiers().toArray(new Annotation[0]);
@@ -368,7 +372,7 @@
{
// TODO: confirm that producer methods, fields and disposers can be
// only found on Weld interceptors?
- if (interceptor instanceof InterceptorImpl)
+ if (interceptor instanceof InterceptorImpl<?>)
{
if (!((InterceptorImpl<?>) interceptor).getWeldAnnotated().getWeldMethods(Produces.class).isEmpty())
{
@@ -394,17 +398,17 @@
{
validateRIBean((RIBean<?>) bean, manager, specializedBeans);
- if (bean instanceof WeldDecorator)
+ if (bean instanceof WeldDecorator<?>)
{
- if (!((WeldDecorator) bean).getWeldAnnotated().getWeldMethods(Produces.class).isEmpty())
+ if (!((WeldDecorator<?>) bean).getWeldAnnotated().getWeldMethods(Produces.class).isEmpty())
{
throw new DefinitionException(DECORATORS_CANNOT_HAVE_PRODUCER_METHODS, bean);
}
- if (!((WeldDecorator) bean).getWeldAnnotated().getWeldFields(Produces.class).isEmpty())
+ if (!((WeldDecorator<?>) bean).getWeldAnnotated().getWeldFields(Produces.class).isEmpty())
{
throw new DefinitionException(DECORATORS_CANNOT_HAVE_PRODUCER_FIELDS, bean);
}
- if (!((WeldDecorator) bean).getWeldAnnotated().getDeclaredWeldMethodsWithAnnotatedParameters(Disposes.class).isEmpty())
+ if (!((WeldDecorator<?>) bean).getWeldAnnotated().getDeclaredWeldMethodsWithAnnotatedParameters(Disposes.class).isEmpty())
{
throw new DefinitionException(DECORATORS_CANNOT_HAVE_DISPOSER_METHODS, bean);
}
14 years, 8 months
- 1
- 0
Weld SVN: r6058 - in core/trunk/impl/src/main: java/org/jboss/weld/logging/messages and 1 other directories.
by weld-commits＠lists.jboss.org
Author: nickarls
Date: 2010-03-18 19:11:16 -0400 (Thu, 18 Mar 2010)
New Revision: 6058
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java
core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ValidatorMessage.java
core/trunk/impl/src/main/resources/org/jboss/weld/messages/validator_en.properties
Log:
WELD-397
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java 2010-03-17 20:32:20 UTC (rev 6057)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java 2010-03-18 23:11:16 UTC (rev 6058)
@@ -16,6 +16,9 @@
*/
package org.jboss.weld.bootstrap;
+import static org.jboss.weld.logging.Category.BOOTSTRAP;
+import static org.jboss.weld.logging.LoggerFactory.loggerFactory;
+import static org.jboss.weld.logging.messages.ValidatorMessage.SCOPE_ANNOTATION_ON_INJECTION_POINT;
import static org.jboss.weld.logging.messages.ValidatorMessage.ALTERNATIVE_BEAN_CLASS_NOT_ANNOTATED;
import static org.jboss.weld.logging.messages.ValidatorMessage.ALTERNATIVE_BEAN_CLASS_SPECIFIED_MULTIPLE_TIMES;
import static org.jboss.weld.logging.messages.ValidatorMessage.ALTERNATIVE_STEREOTYPE_NOT_ANNOTATED;
@@ -64,6 +67,7 @@
import java.util.Set;
import javax.enterprise.context.Dependent;
+import javax.enterprise.context.NormalScope;
import javax.enterprise.event.Event;
import javax.enterprise.inject.Alternative;
import javax.enterprise.inject.Disposes;
@@ -76,6 +80,7 @@
import javax.enterprise.inject.spi.InjectionTarget;
import javax.enterprise.inject.spi.Interceptor;
import javax.inject.Named;
+import javax.inject.Scope;
import org.jboss.interceptor.model.InterceptionModel;
import org.jboss.weld.bean.AbstractClassBean;
@@ -100,6 +105,7 @@
import org.jboss.weld.util.Beans;
import org.jboss.weld.util.Proxies;
import org.jboss.weld.util.reflection.Reflections;
+import org.slf4j.cal10n.LocLogger;
import com.google.common.base.Supplier;
import com.google.common.collect.Multimaps;
@@ -114,6 +120,8 @@
public class Validator implements Service
{
+ private static final LocLogger log = loggerFactory().getLogger(BOOTSTRAP);
+
private void validateBean(Bean<?> bean, BeanManagerImpl beanManager)
{
for (InjectionPoint ij : bean.getInjectionPoints())
@@ -206,7 +214,7 @@
{
for (SerializableContextual<Interceptor<?>, ?> serializableContextual : interceptors)
{
- if (!((InterceptorImpl<?>)serializableContextual.get()).isSerializable())
+ if (!((InterceptorImpl<?>) serializableContextual.get()).isSerializable())
{
throw new DeploymentException(PASSIVATING_BEAN_WITH_NONSERIALIZABLE_INTERCEPTOR, classBean, serializableContextual.get());
}
@@ -224,7 +232,7 @@
{
for (Decorator<?> decorator : classBean.getDecorators())
{
- if (!((WeldDecorator<?>)decorator).getWeldAnnotated().isSerializable())
+ if (!((WeldDecorator<?>) decorator).getWeldAnnotated().isSerializable())
{
throw new UnserializableDependencyException(PASSIVATING_BEAN_WITH_NONSERIALIZABLE_DECORATOR, classBean, decorator);
}
@@ -266,6 +274,7 @@
{
throw new DefinitionException(NON_FIELD_INJECTION_POINT_CANNOT_USE_NAMED, ij);
}
+ checkScopeAnnotations(ij, beanManager.getServices().get(MetaAnnotationStore.class));
checkFacadeInjectionPoint(ij, Instance.class);
checkFacadeInjectionPoint(ij, Event.class);
Annotation[] bindings = ij.getQualifiers().toArray(new Annotation[0]);
@@ -297,6 +306,23 @@
}
}
+ private void checkScopeAnnotations(InjectionPoint ij, MetaAnnotationStore metaAnnotationStore)
+ {
+ for (Annotation annotation : ij.getAnnotated().getAnnotations())
+ {
+ if (hasScopeMetaAnnotation(annotation))
+ {
+ log.warn(SCOPE_ANNOTATION_ON_INJECTION_POINT, annotation, ij);
+ }
+ }
+ }
+
+ private boolean hasScopeMetaAnnotation(Annotation annotation)
+ {
+ Class<? extends Annotation> annotationType = annotation.annotationType();
+ return annotationType.isAnnotationPresent(Scope.class) || annotationType.isAnnotationPresent(NormalScope.class);
+ }
+
public void validateInjectionPointPassivationCapable(InjectionPoint ij, Bean<?> resolvedBean, BeanManagerImpl beanManager)
{
if (!ij.isTransient() && !Beans.isPassivationCapableDependency(resolvedBean))
@@ -340,7 +366,8 @@
{
for (Interceptor<?> interceptor : interceptors)
{
- // TODO: confirm that producer methods, fields and disposers can be only found on Weld interceptors?
+ // TODO: confirm that producer methods, fields and disposers can be
+ // only found on Weld interceptors?
if (interceptor instanceof InterceptorImpl)
{
if (!((InterceptorImpl<?>) interceptor).getWeldAnnotated().getWeldMethods(Produces.class).isEmpty())
@@ -532,7 +559,7 @@
}
}
-
+
private static boolean isInjectionPointSatisfied(InjectionPoint ij, Set<?> resolvedBeans, BeanManagerImpl beanManager)
{
if (ij.getBean() instanceof Decorator<?>)
Modified: core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ValidatorMessage.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ValidatorMessage.java 2010-03-17 20:32:20 UTC (rev 6057)
+++ core/trunk/impl/src/main/java/org/jboss/weld/logging/messages/ValidatorMessage.java 2010-03-18 23:11:16 UTC (rev 6058)
@@ -17,10 +17,7 @@
package org.jboss.weld.logging.messages;
-import java.lang.reflect.Modifier;
-
import org.jboss.weld.logging.MessageId;
-import org.jboss.weld.util.reflection.Reflections;
import ch.qos.cal10n.BaseName;
import ch.qos.cal10n.Locale;
@@ -40,7 +37,6 @@
*/
public enum ValidatorMessage
{
-// @MessageId("001400") NOT_PROXYABLE,
@MessageId("001401") BEAN_SPECIALIZED_TOO_MANY_TIMES,
@MessageId("001402") PASSIVATING_BEAN_WITH_NONSERIALIZABLE_INTERCEPTOR,
@MessageId("001403") PASSIVATING_BEAN_WITH_NONSERIALIZABLE_DECORATOR,
@@ -79,5 +75,6 @@
@MessageId("001436") NOT_PROXYABLE_PRIVATE_CONSTRUCTOR,
@MessageId("001437") NOT_PROXYABLE_FINAL_TYPE_OR_METHOD,
@MessageId("001438") NOT_PROXYABLE_PRIMITIVE,
- @MessageId("001439") NOT_PROXYABLE_ARRAY_TYPE;
+ @MessageId("001439") NOT_PROXYABLE_ARRAY_TYPE,
+ @MessageId("001440") SCOPE_ANNOTATION_ON_INJECTION_POINT;
}
Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/validator_en.properties
===================================================================
--- core/trunk/impl/src/main/resources/org/jboss/weld/messages/validator_en.properties 2010-03-17 20:32:20 UTC (rev 6057)
+++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/validator_en.properties 2010-03-18 23:11:16 UTC (rev 6058)
@@ -36,4 +36,5 @@
NOT_PROXYABLE_PRIVATE_CONSTRUCTOR=Normal scoped bean {0} is not proxyable because it has a private no-args constructor {1}.
NOT_PROXYABLE_FINAL_TYPE_OR_METHOD=Normal scoped bean {0} is not proxyable because the type is private or it contains a prive method {1}.
NOT_PROXYABLE_PRIMITIVE=Normal scoped bean {0} is not proxyable because it is a primitive
-NOT_PROXYABLE_ARRAY_TYPE=Normal scoped bean {0} is not proxyable because it is an array type
\ No newline at end of file
+NOT_PROXYABLE_ARRAY_TYPE=Normal scoped bean {0} is not proxyable because it is an array type
+SCOPE_ANNOTATION_ON_INJECTION_POINT=Scope type {0} used on injection point {1}
\ No newline at end of file
14 years, 8 months
- 1
- 0
Weld SVN: r6057 - in extensions/trunk/src/test/java/org/jboss/weld: test/extensions and 1 other directories.
by weld-commits＠lists.jboss.org
Author: swd847
Date: 2010-03-17 16:32:20 -0400 (Wed, 17 Mar 2010)
New Revision: 6057
Added:
extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/
Removed:
extensions/trunk/src/test/java/org/jboss/weld/extensions/genericbeans/test/
Modified:
extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/GenericBeanTest.java
extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/GenericConstructorArgument.java
extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/GenericDep.java
extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/GenericMain.java
extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/GenericProducer.java
extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/InjectedBean.java
extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/NormalBean.java
extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/SomeQualifier.java
extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/TestAnnotation.java
Log:
renamed package to bring it into line with naming conventions
Copied: extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans (from rev 6056, extensions/trunk/src/test/java/org/jboss/weld/extensions/genericbeans/test)
Modified: extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/GenericBeanTest.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/genericbeans/test/GenericBeanTest.java 2010-03-16 17:17:39 UTC (rev 6056)
+++ extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/GenericBeanTest.java 2010-03-17 20:32:20 UTC (rev 6057)
@@ -1,4 +1,4 @@
-package org.jboss.weld.extensions.genericbeans.test;
+package org.jboss.weld.test.extensions.genericbeans;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.weld.test.AbstractWeldTest;
Modified: extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/GenericConstructorArgument.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/genericbeans/test/GenericConstructorArgument.java 2010-03-16 17:17:39 UTC (rev 6056)
+++ extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/GenericConstructorArgument.java 2010-03-17 20:32:20 UTC (rev 6057)
@@ -1,4 +1,4 @@
-package org.jboss.weld.extensions.genericbeans.test;
+package org.jboss.weld.test.extensions.genericbeans;
import javax.inject.Inject;
Modified: extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/GenericDep.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/genericbeans/test/GenericDep.java 2010-03-16 17:17:39 UTC (rev 6056)
+++ extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/GenericDep.java 2010-03-17 20:32:20 UTC (rev 6057)
@@ -1,4 +1,4 @@
-package org.jboss.weld.extensions.genericbeans.test;
+package org.jboss.weld.test.extensions.genericbeans;
import javax.inject.Inject;
Modified: extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/GenericMain.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/genericbeans/test/GenericMain.java 2010-03-16 17:17:39 UTC (rev 6056)
+++ extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/GenericMain.java 2010-03-17 20:32:20 UTC (rev 6057)
@@ -1,4 +1,4 @@
-package org.jboss.weld.extensions.genericbeans.test;
+package org.jboss.weld.test.extensions.genericbeans;
import javax.inject.Inject;
Modified: extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/GenericProducer.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/genericbeans/test/GenericProducer.java 2010-03-16 17:17:39 UTC (rev 6056)
+++ extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/GenericProducer.java 2010-03-17 20:32:20 UTC (rev 6057)
@@ -1,4 +1,4 @@
-package org.jboss.weld.extensions.genericbeans.test;
+package org.jboss.weld.test.extensions.genericbeans;
import javax.enterprise.inject.Produces;
Modified: extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/InjectedBean.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/genericbeans/test/InjectedBean.java 2010-03-16 17:17:39 UTC (rev 6056)
+++ extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/InjectedBean.java 2010-03-17 20:32:20 UTC (rev 6057)
@@ -1,4 +1,4 @@
-package org.jboss.weld.extensions.genericbeans.test;
+package org.jboss.weld.test.extensions.genericbeans;
import javax.inject.Inject;
Modified: extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/NormalBean.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/genericbeans/test/NormalBean.java 2010-03-16 17:17:39 UTC (rev 6056)
+++ extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/NormalBean.java 2010-03-17 20:32:20 UTC (rev 6057)
@@ -1,4 +1,4 @@
-package org.jboss.weld.extensions.genericbeans.test;
+package org.jboss.weld.test.extensions.genericbeans;
public class NormalBean
{
Modified: extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/SomeQualifier.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/genericbeans/test/SomeQualifier.java 2010-03-16 17:17:39 UTC (rev 6056)
+++ extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/SomeQualifier.java 2010-03-17 20:32:20 UTC (rev 6057)
@@ -1,4 +1,4 @@
-package org.jboss.weld.extensions.genericbeans.test;
+package org.jboss.weld.test.extensions.genericbeans;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
Modified: extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/TestAnnotation.java
===================================================================
--- extensions/trunk/src/test/java/org/jboss/weld/extensions/genericbeans/test/TestAnnotation.java 2010-03-16 17:17:39 UTC (rev 6056)
+++ extensions/trunk/src/test/java/org/jboss/weld/test/extensions/genericbeans/TestAnnotation.java 2010-03-17 20:32:20 UTC (rev 6057)
@@ -1,4 +1,4 @@
-package org.jboss.weld.extensions.genericbeans.test;
+package org.jboss.weld.test.extensions.genericbeans;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
14 years, 8 months
- 1
- 0
Weld SVN: r6056 - in core/tags/1.0.1-SP1: bom and 7 other directories.
by weld-commits＠lists.jboss.org
Author: rogerk
Date: 2010-03-16 13:17:39 -0400 (Tue, 16 Mar 2010)
New Revision: 6056
Modified:
core/tags/1.0.1-SP1/bom/pom.xml
core/tags/1.0.1-SP1/impl/pom.xml
core/tags/1.0.1-SP1/inject-tck-runner/pom.xml
core/tags/1.0.1-SP1/jboss-tck-runner/pom.xml
core/tags/1.0.1-SP1/osgi-bundle/pom.xml
core/tags/1.0.1-SP1/parent/pom.xml
core/tags/1.0.1-SP1/pom.xml
core/tags/1.0.1-SP1/porting-package/pom.xml
core/tags/1.0.1-SP1/tests/pom.xml
Log:
branches to tags
Modified: core/tags/1.0.1-SP1/bom/pom.xml
===================================================================
--- core/tags/1.0.1-SP1/bom/pom.xml 2010-03-16 17:02:46 UTC (rev 6055)
+++ core/tags/1.0.1-SP1/bom/pom.xml 2010-03-16 17:17:39 UTC (rev 6056)
@@ -138,7 +138,7 @@
<!-- SCM and distribution management -->
<scm>
<connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/bom</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/bom</developerConnection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/bom</developerConnection>
<url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/bom</url>
</scm>
Modified: core/tags/1.0.1-SP1/impl/pom.xml
===================================================================
--- core/tags/1.0.1-SP1/impl/pom.xml 2010-03-16 17:02:46 UTC (rev 6055)
+++ core/tags/1.0.1-SP1/impl/pom.xml 2010-03-16 17:17:39 UTC (rev 6056)
@@ -179,7 +179,7 @@
<scm>
<connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/impl</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/impl</developerConnection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/impl</developerConnection>
<url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/impl</url>
</scm>
Modified: core/tags/1.0.1-SP1/inject-tck-runner/pom.xml
===================================================================
--- core/tags/1.0.1-SP1/inject-tck-runner/pom.xml 2010-03-16 17:02:46 UTC (rev 6055)
+++ core/tags/1.0.1-SP1/inject-tck-runner/pom.xml 2010-03-16 17:17:39 UTC (rev 6056)
@@ -88,7 +88,7 @@
<scm>
<connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/inject-tck-r...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/inject-t...</developerConnection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/inject-tck-r...</developerConnection>
<url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/inject-tck-runner</url>
</scm>
Modified: core/tags/1.0.1-SP1/jboss-tck-runner/pom.xml
===================================================================
--- core/tags/1.0.1-SP1/jboss-tck-runner/pom.xml 2010-03-16 17:02:46 UTC (rev 6055)
+++ core/tags/1.0.1-SP1/jboss-tck-runner/pom.xml 2010-03-16 17:17:39 UTC (rev 6056)
@@ -315,7 +315,7 @@
<scm>
<connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/jboss-tck-ru...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/jboss-tc...</developerConnection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/jboss-tck-ru...</developerConnection>
<url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/jboss-tck-runner</url>
</scm>
Modified: core/tags/1.0.1-SP1/osgi-bundle/pom.xml
===================================================================
--- core/tags/1.0.1-SP1/osgi-bundle/pom.xml 2010-03-16 17:02:46 UTC (rev 6055)
+++ core/tags/1.0.1-SP1/osgi-bundle/pom.xml 2010-03-16 17:17:39 UTC (rev 6056)
@@ -197,7 +197,7 @@
<scm>
<connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/osgi-bundle</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/osgi-bundle</developerConnection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/osgi-bundle</developerConnection>
<url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/osgi-bundle</url>
</scm>
Modified: core/tags/1.0.1-SP1/parent/pom.xml
===================================================================
--- core/tags/1.0.1-SP1/parent/pom.xml 2010-03-16 17:02:46 UTC (rev 6055)
+++ core/tags/1.0.1-SP1/parent/pom.xml 2010-03-16 17:17:39 UTC (rev 6056)
@@ -172,7 +172,7 @@
<scm>
<connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/parent</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/parent</developerConnection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/parent</developerConnection>
<url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/parent</url>
</scm>
Modified: core/tags/1.0.1-SP1/pom.xml
===================================================================
--- core/tags/1.0.1-SP1/pom.xml 2010-03-16 17:02:46 UTC (rev 6055)
+++ core/tags/1.0.1-SP1/pom.xml 2010-03-16 17:17:39 UTC (rev 6056)
@@ -24,7 +24,7 @@
<!-- SCM and distribution management -->
<scm>
<connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1</developerConnection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1</developerConnection>
<url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1</url>
</scm>
@@ -38,10 +38,12 @@
<module>bom</module>
<module>parent</module>
<module>impl</module>
+<!--
<module>tests</module>
<module>porting-package</module>
<module>inject-tck-runner</module>
<module>jboss-tck-runner</module>
+-->
<module>osgi-bundle</module>
</modules>
</profile>
Modified: core/tags/1.0.1-SP1/porting-package/pom.xml
===================================================================
--- core/tags/1.0.1-SP1/porting-package/pom.xml 2010-03-16 17:02:46 UTC (rev 6055)
+++ core/tags/1.0.1-SP1/porting-package/pom.xml 2010-03-16 17:17:39 UTC (rev 6056)
@@ -56,7 +56,7 @@
<scm>
<connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/porting-package</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/porting-...</developerConnection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/porting-package</developerConnection>
<url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/porting-package</url>
</scm>
Modified: core/tags/1.0.1-SP1/tests/pom.xml
===================================================================
--- core/tags/1.0.1-SP1/tests/pom.xml 2010-03-16 17:02:46 UTC (rev 6055)
+++ core/tags/1.0.1-SP1/tests/pom.xml 2010-03-16 17:17:39 UTC (rev 6056)
@@ -285,7 +285,7 @@
<scm>
<connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/tests</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/tests</developerConnection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/tests</developerConnection>
<url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/tests</url>
</scm>
14 years, 8 months
- 1
- 0
Weld SVN: r6055 - core/tags.
by weld-commits＠lists.jboss.org
Author: rogerk
Date: 2010-03-16 13:02:46 -0400 (Tue, 16 Mar 2010)
New Revision: 6055
Added:
core/tags/1.0.1-SP1/
Log:
tag
Copied: core/tags/1.0.1-SP1 (from rev 6054, core/branches/1.0.1-SP1)
14 years, 8 months
- 1
- 0
Weld SVN: r6054 - core/trunk/osgi-bundle.
by weld-commits＠lists.jboss.org
Author: rogerk
Date: 2010-03-16 11:12:45 -0400 (Tue, 16 Mar 2010)
New Revision: 6054
Modified:
core/trunk/osgi-bundle/pom.xml
Log:
needed to export org.jboss.weld.injection
Modified: core/trunk/osgi-bundle/pom.xml
===================================================================
--- core/trunk/osgi-bundle/pom.xml 2010-03-16 15:06:51 UTC (rev 6053)
+++ core/trunk/osgi-bundle/pom.xml 2010-03-16 15:12:45 UTC (rev 6054)
@@ -83,6 +83,7 @@
org.jboss.weld.conversation;
org.jboss.weld;
org.jboss.weld.bootstrap;
+ org.jboss.weld.injection;
org.jboss.weld.introspector;
org.jboss.weld.manager;
org.jboss.weld.servlet;
14 years, 8 months
- 1
- 0
Weld SVN: r6053 - core/branches/1.0.1-SP1/osgi-bundle.
by weld-commits＠lists.jboss.org
Author: rogerk
Date: 2010-03-16 11:06:51 -0400 (Tue, 16 Mar 2010)
New Revision: 6053
Modified:
core/branches/1.0.1-SP1/osgi-bundle/pom.xml
Log:
add needed exports
Modified: core/branches/1.0.1-SP1/osgi-bundle/pom.xml
===================================================================
--- core/branches/1.0.1-SP1/osgi-bundle/pom.xml 2010-03-15 19:13:29 UTC (rev 6052)
+++ core/branches/1.0.1-SP1/osgi-bundle/pom.xml 2010-03-16 15:06:51 UTC (rev 6053)
@@ -76,12 +76,14 @@
org.jboss.weld.context;
org.jboss.weld.ejb;
org.jboss.weld.bean;
+ org.jboss.weld.bean.builtin;
org.jboss.weld.bean.proxy;
org.jboss.weld.*.api.*;
org.jboss.weld.*.spi.*;
org.jboss.weld.conversation;
org.jboss.weld;
org.jboss.weld.bootstrap;
+ org.jboss.weld.injection;
org.jboss.weld.introspector;
org.jboss.weld.manager;
org.jboss.weld.servlet;
14 years, 8 months
- 1
- 0
Weld SVN: r6052 - in core/tags/1.0.1-Final: bom and 7 other directories.
by weld-commits＠lists.jboss.org
Author: rogerk
Date: 2010-03-15 15:13:29 -0400 (Mon, 15 Mar 2010)
New Revision: 6052
Modified:
core/tags/1.0.1-Final/bom/pom.xml
core/tags/1.0.1-Final/impl/pom.xml
core/tags/1.0.1-Final/inject-tck-runner/pom.xml
core/tags/1.0.1-Final/jboss-tck-runner/pom.xml
core/tags/1.0.1-Final/osgi-bundle/pom.xml
core/tags/1.0.1-Final/parent/pom.xml
core/tags/1.0.1-Final/pom.xml
core/tags/1.0.1-Final/porting-package/pom.xml
core/tags/1.0.1-Final/tests/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.1-SP1
Modified: core/tags/1.0.1-Final/bom/pom.xml
===================================================================
--- core/tags/1.0.1-Final/bom/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
+++ core/tags/1.0.1-Final/bom/pom.xml 2010-03-15 19:13:29 UTC (rev 6052)
@@ -3,7 +3,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-bom</artifactId>
<packaging>pom</packaging>
- <version>1.0.1-SP1</version>
+ <version>1.0.1-Final</version>
<parent>
<groupId>org.jboss.weld</groupId>
@@ -137,9 +137,9 @@
<!-- SCM and distribution management -->
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/bom</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/bom</developerConnection>
- <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/bom</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-Final/bom</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final/bom</developerConnection>
+ <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/bom</url>
</scm>
</project>
Modified: core/tags/1.0.1-Final/impl/pom.xml
===================================================================
--- core/tags/1.0.1-Final/impl/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
+++ core/tags/1.0.1-Final/impl/pom.xml 2010-03-15 19:13:29 UTC (rev 6052)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.1-SP1</version>
+ <version>1.0.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -178,9 +178,9 @@
</profiles>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/impl</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/impl</developerConnection>
- <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/impl</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-Final/impl</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final/impl</developerConnection>
+ <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/impl</url>
</scm>
</project>
Modified: core/tags/1.0.1-Final/inject-tck-runner/pom.xml
===================================================================
--- core/tags/1.0.1-Final/inject-tck-runner/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
+++ core/tags/1.0.1-Final/inject-tck-runner/pom.xml 2010-03-15 19:13:29 UTC (rev 6052)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.1-SP1</version>
+ <version>1.0.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -87,9 +87,9 @@
</build>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/inject-tck-r...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/inject-t...</developerConnection>
- <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/inject-tck-runner</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-Final/inject-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final/inject-tck...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/inject-tck-runner</url>
</scm>
</project>
Modified: core/tags/1.0.1-Final/jboss-tck-runner/pom.xml
===================================================================
--- core/tags/1.0.1-Final/jboss-tck-runner/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
+++ core/tags/1.0.1-Final/jboss-tck-runner/pom.xml 2010-03-15 19:13:29 UTC (rev 6052)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.1-SP1</version>
+ <version>1.0.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -314,9 +314,9 @@
</profiles>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/jboss-tck-ru...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/jboss-tc...</developerConnection>
- <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/jboss-tck-runner</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-Final/jboss-t...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final/jboss-tck-...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/jboss-tck-runner</url>
</scm>
</project>
Modified: core/tags/1.0.1-Final/osgi-bundle/pom.xml
===================================================================
--- core/tags/1.0.1-Final/osgi-bundle/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
+++ core/tags/1.0.1-Final/osgi-bundle/pom.xml 2010-03-15 19:13:29 UTC (rev 6052)
@@ -16,7 +16,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.1-SP1</version>
+ <version>1.0.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -194,9 +194,9 @@
</dependencies>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/osgi-bundle</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/osgi-bundle</developerConnection>
- <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/osgi-bundle</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-Final/osgi-bu...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final/osgi-bundle</developerConnection>
+ <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/osgi-bundle</url>
</scm>
</project>
Modified: core/tags/1.0.1-Final/parent/pom.xml
===================================================================
--- core/tags/1.0.1-Final/parent/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
+++ core/tags/1.0.1-Final/parent/pom.xml 2010-03-15 19:13:29 UTC (rev 6052)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-bom</artifactId>
- <version>1.0.1-SP1</version>
+ <version>1.0.1-Final</version>
<relativePath>../bom</relativePath>
</parent>
@@ -171,9 +171,9 @@
</dependencyManagement>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/parent</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/parent</developerConnection>
- <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/parent</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-Final/parent</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final/parent</developerConnection>
+ <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/parent</url>
</scm>
</project>
Modified: core/tags/1.0.1-Final/pom.xml
===================================================================
--- core/tags/1.0.1-Final/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
+++ core/tags/1.0.1-Final/pom.xml 2010-03-15 19:13:29 UTC (rev 6052)
@@ -3,7 +3,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-build-aggregator</artifactId>
<packaging>pom</packaging>
- <version>1.0.1-SP1</version>
+ <version>1.0.1-Final</version>
<parent>
<groupId>org.jboss.weld</groupId>
@@ -23,9 +23,9 @@
<!-- SCM and distribution management -->
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1</developerConnection>
- <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-Final</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final</developerConnection>
+ <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final</url>
</scm>
<profiles>
Modified: core/tags/1.0.1-Final/porting-package/pom.xml
===================================================================
--- core/tags/1.0.1-Final/porting-package/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
+++ core/tags/1.0.1-Final/porting-package/pom.xml 2010-03-15 19:13:29 UTC (rev 6052)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.1-SP1</version>
+ <version>1.0.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -55,9 +55,9 @@
</dependencies>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/porting-package</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/porting-...</developerConnection>
- <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/porting-package</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-Final/porting...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final/porting-pa...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/porting-package</url>
</scm>
</project>
Modified: core/tags/1.0.1-Final/tests/pom.xml
===================================================================
--- core/tags/1.0.1-Final/tests/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
+++ core/tags/1.0.1-Final/tests/pom.xml 2010-03-15 19:13:29 UTC (rev 6052)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.1-SP1</version>
+ <version>1.0.1-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -284,9 +284,9 @@
</profiles>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/tests</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/tests</developerConnection>
- <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/tests</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-Final/tests</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final/tests</developerConnection>
+ <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/tests</url>
</scm>
</project>
14 years, 8 months
- 1
- 0
Weld SVN: r6051 - in core/branches: 1.0.1-SP1 and 9 other directories.
by weld-commits＠lists.jboss.org
Author: rogerk
Date: 2010-03-15 15:13:11 -0400 (Mon, 15 Mar 2010)
New Revision: 6051
Added:
core/branches/1.0.1-SP1/
core/branches/1.0.1-SP1/bom/pom.xml
core/branches/1.0.1-SP1/impl/pom.xml
core/branches/1.0.1-SP1/impl/src/main/java/org/jboss/weld/util/Proxies.java
core/branches/1.0.1-SP1/inject-tck-runner/pom.xml
core/branches/1.0.1-SP1/jboss-tck-runner/pom.xml
core/branches/1.0.1-SP1/osgi-bundle/pom.xml
core/branches/1.0.1-SP1/parent/pom.xml
core/branches/1.0.1-SP1/pom.xml
core/branches/1.0.1-SP1/porting-package/pom.xml
core/branches/1.0.1-SP1/tests/pom.xml
Removed:
core/branches/1.0.1-SP1/bom/pom.xml
core/branches/1.0.1-SP1/impl/pom.xml
core/branches/1.0.1-SP1/impl/src/main/java/org/jboss/weld/util/Proxies.java
core/branches/1.0.1-SP1/inject-tck-runner/pom.xml
core/branches/1.0.1-SP1/jboss-tck-runner/pom.xml
core/branches/1.0.1-SP1/osgi-bundle/pom.xml
core/branches/1.0.1-SP1/parent/pom.xml
core/branches/1.0.1-SP1/pom.xml
core/branches/1.0.1-SP1/porting-package/pom.xml
core/branches/1.0.1-SP1/tests/pom.xml
Log:
[maven-release-plugin] copy for branch 1.0.1-SP1
Copied: core/branches/1.0.1-SP1 (from rev 5959, core/tags/1.0.1-Final)
Deleted: core/branches/1.0.1-SP1/bom/pom.xml
===================================================================
--- core/tags/1.0.1-Final/bom/pom.xml 2010-02-24 03:53:20 UTC (rev 5959)
+++ core/branches/1.0.1-SP1/bom/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
@@ -1,145 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-bom</artifactId>
- <packaging>pom</packaging>
- <version>1.0.1-Final</version>
-
- <parent>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-parent</artifactId>
- <version>9</version>
- </parent>
-
- <name>Weld Core BOM</name>
-
- <!-- Minimal project metadata, for more see parent/pom.xml -->
- <description>Weld Core "bill of materials" which can be imported by any project using the Weld implementation of CDI. It provides dependency management for the implementation.</description>
-
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <distribution>repo</distribution>
- <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
- </license>
- </licenses>
- <url>http://www.seamframework.org/Weld</url>
-
- <developers>
- <developer>
- <name>Weld committers</name>
- </developer>
- </developers>
-
- <properties>
- <weld.api.version>1.0-SP1</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>
- <cdi.tck.version>1.0.1-Final</cdi.tck.version>
- <atinject.tck.version>1.0.0-PFD-3</atinject.tck.version>
- <jboss.interceptor.version>1.0.0-CR11</jboss.interceptor.version>
- <slf4j.version>1.5.10</slf4j.version>
- <cal10n.version>0.7.2</cal10n.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api-bom</artifactId>
- <version>${weld.api.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${javassist.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-porting-package</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-test</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-api</artifactId>
- <version>${cdi.tck.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-impl</artifactId>
- <version>${cdi.tck.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.atinject</groupId>
- <artifactId>inject-tck</artifactId>
- <version>${atinject.tck.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.interceptor</groupId>
- <artifactId>jboss-interceptor</artifactId>
- <version>${jboss.interceptor.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>${google.collections.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-ext</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>ch.qos</groupId>
- <artifactId>cal10n-api</artifactId>
- <version>${cal10n.version}</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <!-- SCM and distribution management -->
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-Final/bom</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final/bom</developerConnection>
- <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/bom</url>
- </scm>
-
-</project>
Copied: core/branches/1.0.1-SP1/bom/pom.xml (from rev 6050, core/tags/1.0.1-Final/bom/pom.xml)
===================================================================
--- core/branches/1.0.1-SP1/bom/pom.xml (rev 0)
+++ core/branches/1.0.1-SP1/bom/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
@@ -0,0 +1,145 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-bom</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0.1-SP1</version>
+
+ <parent>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-parent</artifactId>
+ <version>9</version>
+ </parent>
+
+ <name>Weld Core BOM</name>
+
+ <!-- Minimal project metadata, for more see parent/pom.xml -->
+ <description>Weld Core "bill of materials" which can be imported by any project using the Weld implementation of CDI. It provides dependency management for the implementation.</description>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <distribution>repo</distribution>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ </license>
+ </licenses>
+ <url>http://www.seamframework.org/Weld</url>
+
+ <developers>
+ <developer>
+ <name>Weld committers</name>
+ </developer>
+ </developers>
+
+ <properties>
+ <weld.api.version>1.0-SP1</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>
+ <cdi.tck.version>1.0.1-Final</cdi.tck.version>
+ <atinject.tck.version>1.0.0-PFD-3</atinject.tck.version>
+ <jboss.interceptor.version>1.0.0-CR11</jboss.interceptor.version>
+ <slf4j.version>1.5.10</slf4j.version>
+ <cal10n.version>0.7.2</cal10n.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api-bom</artifactId>
+ <version>${weld.api.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-porting-package</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-test</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-api</artifactId>
+ <version>${cdi.tck.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-impl</artifactId>
+ <version>${cdi.tck.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.atinject</groupId>
+ <artifactId>inject-tck</artifactId>
+ <version>${atinject.tck.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor</artifactId>
+ <version>${jboss.interceptor.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ <version>${google.collections.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-ext</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos</groupId>
+ <artifactId>cal10n-api</artifactId>
+ <version>${cal10n.version}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- SCM and distribution management -->
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/bom</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/bom</developerConnection>
+ <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/bom</url>
+ </scm>
+
+</project>
Deleted: core/branches/1.0.1-SP1/impl/pom.xml
===================================================================
--- core/tags/1.0.1-Final/impl/pom.xml 2010-02-24 03:53:20 UTC (rev 5959)
+++ core/branches/1.0.1-SP1/impl/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
@@ -1,186 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>weld-core-parent</artifactId>
- <groupId>org.jboss.weld</groupId>
- <version>1.0.1-Final</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- <name>Weld Core Implementation</name>
- <description>Weld's implementation of CDI</description>
-
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <distribution>repo</distribution>
- <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
- </license>
- </licenses>
- <url>http://www.seamframework.org/Weld</url>
-
-
- <dependencies>
-
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-spi</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.interceptor</groupId>
- <artifactId>jboss-interceptor-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.interceptor</groupId>
- <artifactId>jboss-interceptor</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-ext</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>ch.qos.cal10n.plugins</groupId>
- <artifactId>maven-cal10n-plugin</artifactId>
- <executions>
- <execution>
- <id>verify-messages</id>
- <phase>verify</phase>
- <goals>
- <goal>verify</goal>
- </goals>
- <configuration>
- <enumTypes>
- <!-- list every enum type you would like to see checked -->
- <enumType>org.jboss.weld.logging.messages.BeanManagerMessage</enumType>
- <enumType>org.jboss.weld.logging.messages.BeanMessage</enumType>
- <enumType>org.jboss.weld.logging.messages.BootstrapMessage</enumType>
- <enumType>org.jboss.weld.logging.messages.ContextMessage</enumType>
- <enumType>org.jboss.weld.logging.messages.ConversationMessage</enumType>
- <enumType>org.jboss.weld.logging.messages.ElMessage</enumType>
- <enumType>org.jboss.weld.logging.messages.EventMessage</enumType>
- <enumType>org.jboss.weld.logging.messages.JsfMessage</enumType>
- <enumType>org.jboss.weld.logging.messages.MetadataMessage</enumType>
- <enumType>org.jboss.weld.logging.messages.ReflectionMessage</enumType>
- <enumType>org.jboss.weld.logging.messages.ResolutionMessage</enumType>
- <enumType>org.jboss.weld.logging.messages.ServletMessage</enumType>
- <enumType>org.jboss.weld.logging.messages.UtilMessage</enumType>
- <enumType>org.jboss.weld.logging.messages.ValidatorMessage</enumType>
- <enumType>org.jboss.weld.logging.messages.VersionMessage</enumType>
- <enumType>org.jboss.weld.logging.messages.XmlMessage</enumType>
- </enumTypes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>javax.xml.ws</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-Final/impl</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final/impl</developerConnection>
- <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/impl</url>
- </scm>
-
-</project>
Copied: core/branches/1.0.1-SP1/impl/pom.xml (from rev 6050, core/tags/1.0.1-Final/impl/pom.xml)
===================================================================
--- core/branches/1.0.1-SP1/impl/pom.xml (rev 0)
+++ core/branches/1.0.1-SP1/impl/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
@@ -0,0 +1,186 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>weld-core-parent</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <version>1.0.1-SP1</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ <name>Weld Core Implementation</name>
+ <description>Weld's implementation of CDI</description>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <distribution>repo</distribution>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ </license>
+ </licenses>
+ <url>http://www.seamframework.org/Weld</url>
+
+
+ <dependencies>
+
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-spi</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-ext</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>ch.qos.cal10n.plugins</groupId>
+ <artifactId>maven-cal10n-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>verify-messages</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <enumTypes>
+ <!-- list every enum type you would like to see checked -->
+ <enumType>org.jboss.weld.logging.messages.BeanManagerMessage</enumType>
+ <enumType>org.jboss.weld.logging.messages.BeanMessage</enumType>
+ <enumType>org.jboss.weld.logging.messages.BootstrapMessage</enumType>
+ <enumType>org.jboss.weld.logging.messages.ContextMessage</enumType>
+ <enumType>org.jboss.weld.logging.messages.ConversationMessage</enumType>
+ <enumType>org.jboss.weld.logging.messages.ElMessage</enumType>
+ <enumType>org.jboss.weld.logging.messages.EventMessage</enumType>
+ <enumType>org.jboss.weld.logging.messages.JsfMessage</enumType>
+ <enumType>org.jboss.weld.logging.messages.MetadataMessage</enumType>
+ <enumType>org.jboss.weld.logging.messages.ReflectionMessage</enumType>
+ <enumType>org.jboss.weld.logging.messages.ResolutionMessage</enumType>
+ <enumType>org.jboss.weld.logging.messages.ServletMessage</enumType>
+ <enumType>org.jboss.weld.logging.messages.UtilMessage</enumType>
+ <enumType>org.jboss.weld.logging.messages.ValidatorMessage</enumType>
+ <enumType>org.jboss.weld.logging.messages.VersionMessage</enumType>
+ <enumType>org.jboss.weld.logging.messages.XmlMessage</enumType>
+ </enumTypes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>javax.xml.ws</id>
+ <activation>
+ <jdk>1.5</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/impl</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/impl</developerConnection>
+ <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/impl</url>
+ </scm>
+
+</project>
Deleted: core/branches/1.0.1-SP1/impl/src/main/java/org/jboss/weld/util/Proxies.java
===================================================================
--- core/tags/1.0.1-Final/impl/src/main/java/org/jboss/weld/util/Proxies.java 2010-02-24 03:53:20 UTC (rev 5959)
+++ core/branches/1.0.1-SP1/impl/src/main/java/org/jboss/weld/util/Proxies.java 2010-03-15 19:13:11 UTC (rev 6051)
@@ -1,308 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, 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.util;
-
-import static org.jboss.weld.logging.messages.UtilMessage.CANNOT_PROXY_NON_CLASS_TYPE;
-import static org.jboss.weld.logging.messages.UtilMessage.INSTANCE_NOT_A_PROXY;
-import static org.jboss.weld.util.reflection.Reflections.EMPTY_CLASSES;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import javassist.util.proxy.MethodHandler;
-import javassist.util.proxy.ProxyFactory;
-import javassist.util.proxy.ProxyObject;
-
-import org.jboss.weld.exceptions.ForbiddenArgumentException;
-import org.jboss.weld.util.reflection.Reflections;
-import org.jboss.weld.util.reflection.SecureReflections;
-
-/**
- * Utilties for working with Javassist proxies
- *
- * @author Nicklas Karlsson
- * @author Pete Muir
- *
- */
-public class Proxies
-{
-
- public static class TypeInfo
- {
-
- private final Set<Class<?>> interfaces;
- private final Set<Class<?>> classes;
-
- private TypeInfo()
- {
- super();
- this.interfaces = new LinkedHashSet<Class<?>>();
- this.classes = new LinkedHashSet<Class<?>>();
- }
-
- public Class<?> getSuperClass()
- {
- if (classes.isEmpty())
- {
- return null;
- }
- Iterator<Class<?>> it = classes.iterator();
- Class<?> superclass = it.next();
- while (it.hasNext())
- {
- Class<?> clazz = it.next();
- if (superclass.isAssignableFrom(clazz))
- {
- superclass = clazz;
- }
- }
- return superclass;
- }
-
- private Class<?>[] getInterfaces()
- {
- return interfaces.toArray(EMPTY_CLASSES);
- }
-
- public ProxyFactory createProxyFactory()
- {
- ProxyFactory proxyFactory = new ProxyFactory();
- Class<?> superClass = getSuperClass();
- if(superClass != null && superClass != Object.class)
- {
- proxyFactory.setSuperclass(superClass);
- }
- proxyFactory.setInterfaces(getInterfaces());
- return proxyFactory;
- }
-
- public TypeInfo add(Type type)
- {
- if (type instanceof Class<?>)
- {
- Class<?> clazz = (Class<?>) type;
- if (clazz.isInterface())
- {
- interfaces.add(clazz);
- }
- else
- {
- classes.add(clazz);
- }
- }
- else if (type instanceof ParameterizedType)
- {
- add(((ParameterizedType)type).getRawType());
- }
- else
- {
- throw new ForbiddenArgumentException(CANNOT_PROXY_NON_CLASS_TYPE, type);
- }
- return this;
- }
-
- public static TypeInfo of(Set<? extends Type> types)
- {
- TypeInfo typeInfo = create();
- for (Type type : types)
- {
- typeInfo.add(type);
- }
- return typeInfo;
- }
-
- public static TypeInfo create()
- {
- return new TypeInfo();
- }
-
- }
-
- private static final String DEFAULT_INTERCEPTOR = "default_interceptor";
-
- /**
- * Create a proxy with a handler, registering the proxy for cleanup
- *
- * @param <T>
- * @param methodHandler
- * @param typeInfo
- * @return
- * @throws IllegalAccessException
- * @throws InstantiationException
- */
- public static <T> T createProxy(MethodHandler methodHandler, TypeInfo typeInfo) throws IllegalAccessException, InstantiationException
- {
- return SecureReflections.newInstance(Proxies.<T>createProxyClass(methodHandler, typeInfo));
- }
-
- /**
- * Create a proxy class
- *
- * You will need to manually register the proxy instances for cleanup
- *
- * @param <T>
- * @param typeInfo
- * @return
- */
- public static <T> Class<T> createProxyClass(TypeInfo typeInfo)
- {
- return createProxyClass(null, typeInfo);
- }
-
- /**
- * Create a proxy class
- *
- * You will need to manually register the proxy instances for cleanup
- *
- * @param <T>
- * @param methodHandler
- * @param typeInfo
- * @return
- */
- public static <T> Class<T> createProxyClass(MethodHandler methodHandler, TypeInfo typeInfo)
- {
- ProxyFactory proxyFactory = typeInfo.createProxyFactory();
- attachMethodHandler(proxyFactory, methodHandler);
-
- @SuppressWarnings("unchecked")
- Class<T> clazz = proxyFactory.createClass();
- return clazz;
- }
-
- /**
- * Indicates if a class is proxyable
- *
- * @param type The class to test
- * @return True if proxyable, false otherwise
- */
- public static boolean isTypeProxyable(Type type)
- {
- if (type instanceof Class<?>)
- {
- return isClassProxyable((Class<?>) type);
- }
- else if (type instanceof ParameterizedType)
- {
- Type rawType = ((ParameterizedType) type).getRawType();
- if (rawType instanceof Class<?>)
- {
- return isClassProxyable((Class<?>) rawType);
- }
- }
- return false;
- }
-
-
- /**
- * Indicates if a set of types are all proxyable
- *
- * @param types The types to test
- * @return True if proxyable, false otherwise
- */
- public static boolean isTypesProxyable(Iterable<? extends Type> types)
- {
- for (Type apiType : types)
- {
- if (Object.class.equals(apiType))
- {
- continue;
- }
- if (!isTypeProxyable(apiType))
- {
- return false;
- }
- }
- return true;
- }
-
- private static boolean isClassProxyable(Class<?> clazz)
- {
- if (clazz.isInterface())
- {
- return true;
- }
- else
- {
- Constructor<?> constructor = null;
- try
- {
- constructor = SecureReflections.getDeclaredConstructor(clazz);
- }
- catch (NoSuchMethodException e)
- {
- return false;
- }
- if (constructor == null)
- {
- return false;
- }
- else if (Modifier.isPrivate(constructor.getModifiers()))
- {
- return false;
- }
- else if (Reflections.isTypeOrAnyMethodFinal(clazz))
- {
- return false;
- }
- else if (clazz.isPrimitive())
- {
- return false;
- }
- else if (Reflections.isArrayType(clazz))
- {
- return false;
- }
- else
- {
- return true;
- }
- }
- }
-
- public static ProxyFactory attachMethodHandler(ProxyFactory proxyFactory, MethodHandler methodHandler)
- {
- if (methodHandler != null)
- {
- proxyFactory.setHandler(new CleanableMethodHandler(methodHandler));
- }
- return proxyFactory;
- }
-
- public static <T> T attachMethodHandler(T instance, MethodHandler methodHandler)
- {
- if (instance instanceof ProxyObject)
- {
- if (methodHandler != null)
- {
- ((ProxyObject) instance).setHandler(new CleanableMethodHandler(methodHandler));
- }
- return instance;
- }
- else
- {
- throw new ForbiddenArgumentException(INSTANCE_NOT_A_PROXY, instance);
- }
-
- }
-
-
-}
Copied: core/branches/1.0.1-SP1/impl/src/main/java/org/jboss/weld/util/Proxies.java (from rev 6020, core/tags/1.0.1-Final/impl/src/main/java/org/jboss/weld/util/Proxies.java)
===================================================================
--- core/branches/1.0.1-SP1/impl/src/main/java/org/jboss/weld/util/Proxies.java (rev 0)
+++ core/branches/1.0.1-SP1/impl/src/main/java/org/jboss/weld/util/Proxies.java 2010-03-15 19:13:11 UTC (rev 6051)
@@ -0,0 +1,308 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.util;
+
+import static org.jboss.weld.logging.messages.UtilMessage.CANNOT_PROXY_NON_CLASS_TYPE;
+import static org.jboss.weld.logging.messages.UtilMessage.INSTANCE_NOT_A_PROXY;
+import static org.jboss.weld.util.reflection.Reflections.EMPTY_CLASSES;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import javassist.util.proxy.MethodHandler;
+import javassist.util.proxy.ProxyFactory;
+import javassist.util.proxy.ProxyObject;
+
+import org.jboss.weld.exceptions.ForbiddenArgumentException;
+import org.jboss.weld.util.reflection.Reflections;
+import org.jboss.weld.util.reflection.SecureReflections;
+
+/**
+ * Utilties for working with Javassist proxies
+ *
+ * @author Nicklas Karlsson
+ * @author Pete Muir
+ *
+ */
+public class Proxies
+{
+
+ public static class TypeInfo
+ {
+
+ private final Set<Class<?>> interfaces;
+ private final Set<Class<?>> classes;
+
+ private TypeInfo()
+ {
+ super();
+ this.interfaces = new LinkedHashSet<Class<?>>();
+ this.classes = new LinkedHashSet<Class<?>>();
+ }
+
+ public Class<?> getSuperClass()
+ {
+ if (classes.isEmpty())
+ {
+ return null;
+ }
+ Iterator<Class<?>> it = classes.iterator();
+ Class<?> superclass = it.next();
+ while (it.hasNext())
+ {
+ Class<?> clazz = it.next();
+ if (superclass.isAssignableFrom(clazz))
+ {
+ superclass = clazz;
+ }
+ }
+ return superclass;
+ }
+
+ private Class<?>[] getInterfaces()
+ {
+ return interfaces.toArray(EMPTY_CLASSES);
+ }
+
+ public ProxyFactory createProxyFactory()
+ {
+ ProxyFactory proxyFactory = new ProxyFactory();
+ Class<?> superClass = getSuperClass();
+ if(superClass != null && superClass != Object.class)
+ {
+ proxyFactory.setSuperclass(superClass);
+ }
+ proxyFactory.setInterfaces(getInterfaces());
+ return proxyFactory;
+ }
+
+ public TypeInfo add(Type type)
+ {
+ if (type instanceof Class<?>)
+ {
+ Class<?> clazz = (Class<?>) type;
+ if (clazz.isInterface())
+ {
+ interfaces.add(clazz);
+ }
+ else
+ {
+ classes.add(clazz);
+ }
+ }
+ else if (type instanceof ParameterizedType)
+ {
+ add(((ParameterizedType)type).getRawType());
+ }
+ else
+ {
+ throw new ForbiddenArgumentException(CANNOT_PROXY_NON_CLASS_TYPE, type);
+ }
+ return this;
+ }
+
+ public static TypeInfo of(Set<? extends Type> types)
+ {
+ TypeInfo typeInfo = create();
+ for (Type type : types)
+ {
+ typeInfo.add(type);
+ }
+ return typeInfo;
+ }
+
+ public static TypeInfo create()
+ {
+ return new TypeInfo();
+ }
+
+ }
+
+ private static final String DEFAULT_INTERCEPTOR = "default_interceptor";
+
+ /**
+ * Create a proxy with a handler, registering the proxy for cleanup
+ *
+ * @param <T>
+ * @param methodHandler
+ * @param typeInfo
+ * @return
+ * @throws IllegalAccessException
+ * @throws InstantiationException
+ */
+ public static <T> T createProxy(MethodHandler methodHandler, TypeInfo typeInfo) throws IllegalAccessException, InstantiationException
+ {
+ return SecureReflections.newInstance(Proxies.<T>createProxyClass(methodHandler, typeInfo));
+ }
+
+ /**
+ * Create a proxy class
+ *
+ * You will need to manually register the proxy instances for cleanup
+ *
+ * @param <T>
+ * @param typeInfo
+ * @return
+ */
+ public static <T> Class<T> createProxyClass(TypeInfo typeInfo)
+ {
+ return createProxyClass(null, typeInfo);
+ }
+
+ /**
+ * Create a proxy class
+ *
+ * You will need to manually register the proxy instances for cleanup
+ *
+ * @param <T>
+ * @param methodHandler
+ * @param typeInfo
+ * @return
+ */
+ public static <T> Class<T> createProxyClass(MethodHandler methodHandler, TypeInfo typeInfo)
+ {
+ ProxyFactory proxyFactory = typeInfo.createProxyFactory();
+ attachMethodHandler(proxyFactory, methodHandler);
+
+ @SuppressWarnings("unchecked")
+ Class<T> clazz = proxyFactory.createClass();
+ return clazz;
+ }
+
+ /**
+ * Indicates if a class is proxyable
+ *
+ * @param type The class to test
+ * @return True if proxyable, false otherwise
+ */
+ public static boolean isTypeProxyable(Type type)
+ {
+ if (type instanceof Class<?>)
+ {
+ return isClassProxyable((Class<?>) type);
+ }
+ else if (type instanceof ParameterizedType)
+ {
+ Type rawType = ((ParameterizedType) type).getRawType();
+ if (rawType instanceof Class<?>)
+ {
+ return isClassProxyable((Class<?>) rawType);
+ }
+ }
+ return false;
+ }
+
+
+ /**
+ * Indicates if a set of types are all proxyable
+ *
+ * @param types The types to test
+ * @return True if proxyable, false otherwise
+ */
+ public static boolean isTypesProxyable(Iterable<? extends Type> types)
+ {
+ for (Type apiType : types)
+ {
+ if (Object.class.equals(apiType))
+ {
+ continue;
+ }
+ if (!isTypeProxyable(apiType))
+ {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private static boolean isClassProxyable(Class<?> clazz)
+ {
+ if (clazz.isInterface())
+ {
+ return true;
+ }
+ else
+ {
+ Constructor<?> constructor = null;
+ try
+ {
+ constructor = SecureReflections.getDeclaredConstructor(clazz);
+ }
+ catch (NoSuchMethodException e)
+ {
+ return false;
+ }
+ if (constructor == null)
+ {
+ return false;
+ }
+ else if (Modifier.isPrivate(constructor.getModifiers()))
+ {
+ return false;
+ }
+ else if (Reflections.isTypeOrAnyMethodFinal(clazz))
+ {
+ return false;
+ }
+ else if (clazz.isPrimitive())
+ {
+ return false;
+ }
+ else if (Reflections.isArrayType(clazz))
+ {
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+ }
+ }
+
+ public static ProxyFactory attachMethodHandler(ProxyFactory proxyFactory, MethodHandler methodHandler)
+ {
+ if (methodHandler != null)
+ {
+ proxyFactory.setHandler(new CleanableMethodHandler(methodHandler));
+ }
+ return proxyFactory;
+ }
+
+ public static <T> T attachMethodHandler(T instance, MethodHandler methodHandler)
+ {
+ if (instance instanceof ProxyObject)
+ {
+ if (methodHandler != null)
+ {
+ ((ProxyObject) instance).setHandler(new CleanableMethodHandler(methodHandler));
+ }
+ return instance;
+ }
+ else
+ {
+ throw new ForbiddenArgumentException(INSTANCE_NOT_A_PROXY, instance);
+ }
+
+ }
+
+
+}
Deleted: core/branches/1.0.1-SP1/inject-tck-runner/pom.xml
===================================================================
--- core/tags/1.0.1-Final/inject-tck-runner/pom.xml 2010-02-24 03:53:20 UTC (rev 5959)
+++ core/branches/1.0.1-SP1/inject-tck-runner/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
@@ -1,95 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>weld-core-parent</artifactId>
- <groupId>org.jboss.weld</groupId>
- <version>1.0.1-Final</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-inject-tck-runner</artifactId>
- <name>AtInject TCK runner for Weld</name>
- <description>Aggregates dependencies and run's the AtInject TCK for Weld</description>
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <distribution>repo</distribution>
- <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
- </license>
- </licenses>
- <url>http://www.seamframework.org/Weld</url>
-
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-test</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.atinject</groupId>
- <artifactId>inject-tck</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/AtInjectTCK.java</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-Final/inject-...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final/inject-tck...</developerConnection>
- <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/inject-tck-runner</url>
- </scm>
-
-</project>
Copied: core/branches/1.0.1-SP1/inject-tck-runner/pom.xml (from rev 6050, core/tags/1.0.1-Final/inject-tck-runner/pom.xml)
===================================================================
--- core/branches/1.0.1-SP1/inject-tck-runner/pom.xml (rev 0)
+++ core/branches/1.0.1-SP1/inject-tck-runner/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
@@ -0,0 +1,95 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>weld-core-parent</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <version>1.0.1-SP1</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-inject-tck-runner</artifactId>
+ <name>AtInject TCK runner for Weld</name>
+ <description>Aggregates dependencies and run's the AtInject TCK for Weld</description>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <distribution>repo</distribution>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ </license>
+ </licenses>
+ <url>http://www.seamframework.org/Weld</url>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.atinject</groupId>
+ <artifactId>inject-tck</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/AtInjectTCK.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/inject-tck-r...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/inject-t...</developerConnection>
+ <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/inject-tck-runner</url>
+ </scm>
+
+</project>
Deleted: core/branches/1.0.1-SP1/jboss-tck-runner/pom.xml
===================================================================
--- core/tags/1.0.1-Final/jboss-tck-runner/pom.xml 2010-02-24 03:53:20 UTC (rev 5959)
+++ core/branches/1.0.1-SP1/jboss-tck-runner/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
@@ -1,322 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>weld-core-parent</artifactId>
- <groupId>org.jboss.weld</groupId>
- <version>1.0.1-Final</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-jboss-tck-runner</artifactId>
- <name>CDI TCK runner for Weld</name>
- <description>Aggregates dependencies and runs the CDI TCK (both standalone and on JBoss AS)</description>
-
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <distribution>repo</distribution>
- <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
- </license>
- </licenses>
- <url>http://www.seamframework.org/Weld</url>
-
-
- <dependencies>
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-porting-package</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-jboss-as-60</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.slf4j</groupId>
- <artifactId>slf4j-jboss-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <stripVersion>true</stripVersion>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-impl</artifactId>
- <type>xml</type>
- <classifier>suite</classifier>
- <overWrite>true</overWrite>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-porting-package</artifactId>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-test</artifactId>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile>
- </suiteXmlFiles>
- <argLine>-Xmx256m</argLine>
- <forkMode>once</forkMode>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-test-report</id>
- <phase>test</phase>
- <goals>
- <goal>report-only</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
- <outputName>test-report</outputName>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>run</id>
- <activation>
- <property>
- <name>!osgi.bundles.defaultStartLevel</name>
- </property>
- </activation>
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-impl</artifactId>
- </dependency>
-
- </dependencies>
- </profile>
- <profile>
- <id>incontainer-debug</id>
- <activation>
- <property>
- <name>incontainer-debug</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile>
- </suiteXmlFiles>
- <systemProperties>
- <property>
- <name>org.jboss.testharness.standalone</name>
- <value>false</value>
- </property>
- <property>
- <name>org.jboss.testharness.container.extraConfigurationDir</name>
- <value>../jboss-as</value>
- </property>
- <property>
- <name>org.jboss.testharness.container.forceRestart</name>
- <value>false</value>
- </property>
- <property>
- <name>org.jboss.testharness.libraryDirectory</name>
- <value>target/dependency/lib</value>
- </property>
- <property>
- <name>org.jboss.testharness.runIntegrationTests</name>
- <value>true</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>incontainer</id>
- <activation>
- <property>
- <name>incontainer</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile>
- </suiteXmlFiles>
- <systemProperties>
- <property>
- <name>java.io.tmpdir</name>
- <value>${project.build.outputDirectory}</value>
- </property>
- <property>
- <name>org.jboss.testharness.standalone</name>
- <value>false</value>
- </property>
- <property>
- <name>org.jboss.testharness.container.extraConfigurationDir</name>
- <value>../jboss-as</value>
- </property>
- <property>
- <name>org.jboss.testharness.container.forceRestart</name>
- <value>true</value>
- </property>
- <property>
- <name>org.jboss.testharness.runIntegrationTests</name>
- <value>true</value>
- </property>
- <property>
- <name>org.jboss.testharness.libraryDirectory</name>
- <value>target/dependency/lib</value>
- </property>
- <property>
- <name>org.jboss.testharness.outputDirectory</name>
- <value>target</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>write-artifacts-to-disk</id>
- <activation>
- <property>
- <name>dumpArtifacts</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-jsr-299-artifacts</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <mainClass>org.jboss.testharness.api.TCK</mainClass>
- <systemProperties>
- <systemProperty>
- <key>dumpArtifacts</key>
- <value>true</value>
- </systemProperty>
- <systemProperty>
- <key>org.jboss.testharness.outputDirectory</key>
- <value>target/jsr299-artifacts</value>
- </systemProperty>
- <systemProperty>
- <key>org.jboss.testharness.libraryDirectory</key>
- <value>target/dependency/lib</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-Final/jboss-t...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final/jboss-tck-...</developerConnection>
- <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/jboss-tck-runner</url>
- </scm>
-
-</project>
Copied: core/branches/1.0.1-SP1/jboss-tck-runner/pom.xml (from rev 6050, core/tags/1.0.1-Final/jboss-tck-runner/pom.xml)
===================================================================
--- core/branches/1.0.1-SP1/jboss-tck-runner/pom.xml (rev 0)
+++ core/branches/1.0.1-SP1/jboss-tck-runner/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
@@ -0,0 +1,322 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>weld-core-parent</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <version>1.0.1-SP1</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-jboss-tck-runner</artifactId>
+ <name>CDI TCK runner for Weld</name>
+ <description>Aggregates dependencies and runs the CDI TCK (both standalone and on JBoss AS)</description>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <distribution>repo</distribution>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ </license>
+ </licenses>
+ <url>http://www.seamframework.org/Weld</url>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-porting-package</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness-jboss-as-60</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.slf4j</groupId>
+ <artifactId>slf4j-jboss-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <stripVersion>true</stripVersion>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-impl</artifactId>
+ <type>xml</type>
+ <classifier>suite</classifier>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-porting-package</artifactId>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-test</artifactId>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ <argLine>-Xmx256m</argLine>
+ <forkMode>once</forkMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-test-report</id>
+ <phase>test</phase>
+ <goals>
+ <goal>report-only</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
+ <outputName>test-report</outputName>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>run</id>
+ <activation>
+ <property>
+ <name>!osgi.bundles.defaultStartLevel</name>
+ </property>
+ </activation>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-impl</artifactId>
+ </dependency>
+
+ </dependencies>
+ </profile>
+ <profile>
+ <id>incontainer-debug</id>
+ <activation>
+ <property>
+ <name>incontainer-debug</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ <systemProperties>
+ <property>
+ <name>org.jboss.testharness.standalone</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.container.extraConfigurationDir</name>
+ <value>../jboss-as</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.container.forceRestart</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.libraryDirectory</name>
+ <value>target/dependency/lib</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.runIntegrationTests</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>incontainer</id>
+ <activation>
+ <property>
+ <name>incontainer</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ <systemProperties>
+ <property>
+ <name>java.io.tmpdir</name>
+ <value>${project.build.outputDirectory}</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.standalone</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.container.extraConfigurationDir</name>
+ <value>../jboss-as</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.container.forceRestart</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.runIntegrationTests</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.libraryDirectory</name>
+ <value>target/dependency/lib</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.outputDirectory</name>
+ <value>target</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>write-artifacts-to-disk</id>
+ <activation>
+ <property>
+ <name>dumpArtifacts</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-jsr-299-artifacts</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <mainClass>org.jboss.testharness.api.TCK</mainClass>
+ <systemProperties>
+ <systemProperty>
+ <key>dumpArtifacts</key>
+ <value>true</value>
+ </systemProperty>
+ <systemProperty>
+ <key>org.jboss.testharness.outputDirectory</key>
+ <value>target/jsr299-artifacts</value>
+ </systemProperty>
+ <systemProperty>
+ <key>org.jboss.testharness.libraryDirectory</key>
+ <value>target/dependency/lib</value>
+ </systemProperty>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/jboss-tck-ru...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/jboss-tc...</developerConnection>
+ <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/jboss-tck-runner</url>
+ </scm>
+
+</project>
Deleted: core/branches/1.0.1-SP1/osgi-bundle/pom.xml
===================================================================
--- core/tags/1.0.1-Final/osgi-bundle/pom.xml 2010-02-24 03:53:20 UTC (rev 5959)
+++ core/branches/1.0.1-SP1/osgi-bundle/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
@@ -1,202 +0,0 @@
-
- <!--
- /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * *
- Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. *
- * Use is subject to license terms. * * 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. */
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>weld-core-parent</artifactId>
- <groupId>org.jboss.weld</groupId>
- <version>1.0.1-Final</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-osgi-bundle</artifactId>
- <name>Weld OSGi Bundle</name>
- <description>Weld runtime packaged as an OSGi bundle</description>
-
- <developers>
- <developer>
- <id>ss141213</id>
- <name>Sanjeeb Sahoo</name>
- <url>http://weblogs.dev.java.net/ss141213</url>
- <organization>Sun Microsystems, Inc.</organization>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- <developer>
- <name>Roger Kitain</name>
- <id>rogerk</id>
- <organization>Sun Microsystems, Inc.</organization>
- </developer>
- </developers>
-
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <distribution>repo</distribution>
- <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
- </license>
- </licenses>
- <url>http://www.seamframework.org/Weld</url>
-
-
- <properties>
- <osgi.version>1.0</osgi.version>
- </properties>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <_include>-osgi.bundle</_include>
-
- <Embed-Dependency>*; scope=compile; inline=true, slf4j-jdk14; inline=true</Embed-Dependency>
-
- <_exportcontents>
- javax.inject;
- javax.decorator;
- javax.enterprise.*;
- version=${osgi.version},
- org.jboss.weld.context;
- org.jboss.weld.ejb;
- org.jboss.weld.bean;
- org.jboss.weld.bean.proxy;
- org.jboss.weld.*.api.*;
- org.jboss.weld.*.spi.*;
- org.jboss.weld.conversation;
- org.jboss.weld;
- org.jboss.weld.bootstrap;
- org.jboss.weld.introspector;
- org.jboss.weld.manager;
- org.jboss.weld.servlet;
- org.jboss.interceptor.*;
- version=${osgi.version},
- org.jboss.weld.el;
- version=${osgi.version},
- org.jboss.weld.jsf;
- version=${osgi.version},
- javassist.util.proxy;version=${javassist.version}
- </_exportcontents>
-
- <!-- A note about how slf4j is handled:
- We optionally import slf4j APIs (i.e. packages that are part of slf4j-api.jar).
- We also bundle them privately along with the jdk14-logging binding.
- This allows us to function even when there is no separate slf4j bundle.
- When there is a separate slf4j bundle, because of our optional Import-Package header,
- we will get wired to that bundle. Please also note that we don't import impl package,
- as it is sufficient to import just the api. In some other environment, user can
- deploy slf4j-api bundle and their desired binding bundle. The binding bundle is
- a fragement which attaches itself to the api bundle. We will get wired to the
- api bundle and everything will work.
- We also bundle all the slf4j extension and cal10n stuff to avoid having dependency
- on foreign bundles.
- -->
- <Import-Package>
- org.slf4j; org.slf4j.spi; org.slf4j.helpers; version=${slf4j.version}; resolution:=optional,
- ch.qos.cal10n; version=${cal10n.version}; resolution:=optional,
- javax.interceptor.*, *;
- resolution:=optional
- </Import-Package>
-
- <Private-Package>
- !javax.interceptor.*, org.slf4j.*; -split-package:=merge-first, ch.qos.cal10n.*
- </Private-Package>
-
- </instructions>
-
- <!--
- Maven uses the output directory (target/classes)
- rather than the final bundle, when compiling against
- projects in the same reactor (ie. the same build).
- Since this jar comprises of classes that come from
- some other jar and other modules may depend on this
- artifact, we need to unpack.
- -->
- <unpackBundle>true</unpackBundle>
- </configuration>
- <executions>
- <execution>
- <id>osgi-bundle</id>
- <goals>
- <goal>bundle</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-spi</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.interceptor</groupId>
- <artifactId>jboss-interceptor</artifactId>
- </dependency>
-
- <!-- We bundle jdk binding inside this OSGi bundle -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-Final/osgi-bu...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final/osgi-bundle</developerConnection>
- <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/osgi-bundle</url>
- </scm>
-
-</project>
Copied: core/branches/1.0.1-SP1/osgi-bundle/pom.xml (from rev 6050, core/tags/1.0.1-Final/osgi-bundle/pom.xml)
===================================================================
--- core/branches/1.0.1-SP1/osgi-bundle/pom.xml (rev 0)
+++ core/branches/1.0.1-SP1/osgi-bundle/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
@@ -0,0 +1,202 @@
+
+ <!--
+ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * *
+ Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. *
+ * Use is subject to license terms. * * 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. */
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>weld-core-parent</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <version>1.0.1-SP1</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-osgi-bundle</artifactId>
+ <name>Weld OSGi Bundle</name>
+ <description>Weld runtime packaged as an OSGi bundle</description>
+
+ <developers>
+ <developer>
+ <id>ss141213</id>
+ <name>Sanjeeb Sahoo</name>
+ <url>http://weblogs.dev.java.net/ss141213</url>
+ <organization>Sun Microsystems, Inc.</organization>
+ <roles>
+ <role>developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Roger Kitain</name>
+ <id>rogerk</id>
+ <organization>Sun Microsystems, Inc.</organization>
+ </developer>
+ </developers>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <distribution>repo</distribution>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ </license>
+ </licenses>
+ <url>http://www.seamframework.org/Weld</url>
+
+
+ <properties>
+ <osgi.version>1.0</osgi.version>
+ </properties>
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <_include>-osgi.bundle</_include>
+
+ <Embed-Dependency>*; scope=compile; inline=true, slf4j-jdk14; inline=true</Embed-Dependency>
+
+ <_exportcontents>
+ javax.inject;
+ javax.decorator;
+ javax.enterprise.*;
+ version=${osgi.version},
+ org.jboss.weld.context;
+ org.jboss.weld.ejb;
+ org.jboss.weld.bean;
+ org.jboss.weld.bean.proxy;
+ org.jboss.weld.*.api.*;
+ org.jboss.weld.*.spi.*;
+ org.jboss.weld.conversation;
+ org.jboss.weld;
+ org.jboss.weld.bootstrap;
+ org.jboss.weld.introspector;
+ org.jboss.weld.manager;
+ org.jboss.weld.servlet;
+ org.jboss.interceptor.*;
+ version=${osgi.version},
+ org.jboss.weld.el;
+ version=${osgi.version},
+ org.jboss.weld.jsf;
+ version=${osgi.version},
+ javassist.util.proxy;version=${javassist.version}
+ </_exportcontents>
+
+ <!-- A note about how slf4j is handled:
+ We optionally import slf4j APIs (i.e. packages that are part of slf4j-api.jar).
+ We also bundle them privately along with the jdk14-logging binding.
+ This allows us to function even when there is no separate slf4j bundle.
+ When there is a separate slf4j bundle, because of our optional Import-Package header,
+ we will get wired to that bundle. Please also note that we don't import impl package,
+ as it is sufficient to import just the api. In some other environment, user can
+ deploy slf4j-api bundle and their desired binding bundle. The binding bundle is
+ a fragement which attaches itself to the api bundle. We will get wired to the
+ api bundle and everything will work.
+ We also bundle all the slf4j extension and cal10n stuff to avoid having dependency
+ on foreign bundles.
+ -->
+ <Import-Package>
+ org.slf4j; org.slf4j.spi; org.slf4j.helpers; version=${slf4j.version}; resolution:=optional,
+ ch.qos.cal10n; version=${cal10n.version}; resolution:=optional,
+ javax.interceptor.*, *;
+ resolution:=optional
+ </Import-Package>
+
+ <Private-Package>
+ !javax.interceptor.*, org.slf4j.*; -split-package:=merge-first, ch.qos.cal10n.*
+ </Private-Package>
+
+ </instructions>
+
+ <!--
+ Maven uses the output directory (target/classes)
+ rather than the final bundle, when compiling against
+ projects in the same reactor (ie. the same build).
+ Since this jar comprises of classes that come from
+ some other jar and other modules may depend on this
+ artifact, we need to unpack.
+ -->
+ <unpackBundle>true</unpackBundle>
+ </configuration>
+ <executions>
+ <execution>
+ <id>osgi-bundle</id>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-spi</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor</artifactId>
+ </dependency>
+
+ <!-- We bundle jdk binding inside this OSGi bundle -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/osgi-bundle</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/osgi-bundle</developerConnection>
+ <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/osgi-bundle</url>
+ </scm>
+
+</project>
Deleted: core/branches/1.0.1-SP1/parent/pom.xml
===================================================================
--- core/tags/1.0.1-Final/parent/pom.xml 2010-02-24 03:53:20 UTC (rev 5959)
+++ core/branches/1.0.1-SP1/parent/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
@@ -1,180 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-parent</artifactId>
- <packaging>pom</packaging>
-
- <parent>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-bom</artifactId>
- <version>1.0.1-Final</version>
- <relativePath>../bom</relativePath>
- </parent>
-
- <name>Weld Core Parent</name>
-
- <!-- Full metadata -->
-
- <url>http://www.seamframework.org/Weld</url>
-
- <description>
- Parent for Weld, the reference implementation of JSR 299: Contexts and Dependency Injection for Java EE
- </description>
-
- <ciManagement>
- <system>Hudson</system>
- <url>http://hudson.jboss.org</url>
- </ciManagement>
-
- <issueManagement>
- <system>JIRA</system>
- <url>http://jira.jboss.org/browse/WELD</url>
- </issueManagement>
-
- <organization>
- <name>Seam Framework</name>
- <url>http://seamframework.org</url>
- </organization>
-
- <inceptionYear>2008</inceptionYear>
-
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
-
- <developers>
- <developer>
- <name>Pete Muir</name>
- <roles>
- <role>Project Lead</role>
- </roles>
- <email>pete.muir(a)jboss.org</email>
- <organization>JBoss, a division of Red Hat</organization>
- <url>http://in.relation.to/Bloggers/Pete</url>
- </developer>
-
- <developer>
- <name>Shane Bryzak</name>
- <organization>JBoss, a division of Red Hat</organization>
- </developer>
-
- <developer>
- <name>David Allen</name>
- </developer>
-
- <developer>
- <name>Nicklas Karlsson</name>
- </developer>
- </developers>
-
-
- <properties>
- <glassfish.el.version>2.1.2-b04</glassfish.el.version>
- <log4j.version>1.2.14</log4j.version>
- <!-- Testing deps -->
- <testng.version>5.10</testng.version>
- <jboss.test.harness.version>1.1.0-CR5</jboss.test.harness.version>
- <apache.httpclient.version>3.1</apache.httpclient.version>
- <junit.version>4.7</junit.version>
- <htmlunit.version>2.4</htmlunit.version>
- </properties>
-
-
- <!-- Specify Weld non-runtime dependencies (e.g. testing) -->
-
- <dependencyManagement>
- <dependencies>
-
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testng.version}</version>
- <classifier>jdk15</classifier>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness</artifactId>
- <version>${jboss.test.harness.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-jboss-as-50</artifactId>
- <version>${jboss.test.harness.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-jboss-as-60</artifactId>
- <version>${jboss.test.harness.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-jboss-embedded</artifactId>
- <version>${jboss.test.harness.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-tomcat</artifactId>
- <version>${jboss.test.harness.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>${apache.httpclient.version}</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>${htmlunit.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <version>${glassfish.el.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-Final/parent</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final/parent</developerConnection>
- <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/parent</url>
- </scm>
-
-</project>
-
Copied: core/branches/1.0.1-SP1/parent/pom.xml (from rev 6050, core/tags/1.0.1-Final/parent/pom.xml)
===================================================================
--- core/branches/1.0.1-SP1/parent/pom.xml (rev 0)
+++ core/branches/1.0.1-SP1/parent/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
@@ -0,0 +1,180 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-bom</artifactId>
+ <version>1.0.1-SP1</version>
+ <relativePath>../bom</relativePath>
+ </parent>
+
+ <name>Weld Core Parent</name>
+
+ <!-- Full metadata -->
+
+ <url>http://www.seamframework.org/Weld</url>
+
+ <description>
+ Parent for Weld, the reference implementation of JSR 299: Contexts and Dependency Injection for Java EE
+ </description>
+
+ <ciManagement>
+ <system>Hudson</system>
+ <url>http://hudson.jboss.org</url>
+ </ciManagement>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://jira.jboss.org/browse/WELD</url>
+ </issueManagement>
+
+ <organization>
+ <name>Seam Framework</name>
+ <url>http://seamframework.org</url>
+ </organization>
+
+ <inceptionYear>2008</inceptionYear>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ </license>
+ </licenses>
+
+ <developers>
+ <developer>
+ <name>Pete Muir</name>
+ <roles>
+ <role>Project Lead</role>
+ </roles>
+ <email>pete.muir(a)jboss.org</email>
+ <organization>JBoss, a division of Red Hat</organization>
+ <url>http://in.relation.to/Bloggers/Pete</url>
+ </developer>
+
+ <developer>
+ <name>Shane Bryzak</name>
+ <organization>JBoss, a division of Red Hat</organization>
+ </developer>
+
+ <developer>
+ <name>David Allen</name>
+ </developer>
+
+ <developer>
+ <name>Nicklas Karlsson</name>
+ </developer>
+ </developers>
+
+
+ <properties>
+ <glassfish.el.version>2.1.2-b04</glassfish.el.version>
+ <log4j.version>1.2.14</log4j.version>
+ <!-- Testing deps -->
+ <testng.version>5.10</testng.version>
+ <jboss.test.harness.version>1.1.0-CR5</jboss.test.harness.version>
+ <apache.httpclient.version>3.1</apache.httpclient.version>
+ <junit.version>4.7</junit.version>
+ <htmlunit.version>2.4</htmlunit.version>
+ </properties>
+
+
+ <!-- Specify Weld non-runtime dependencies (e.g. testing) -->
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>${testng.version}</version>
+ <classifier>jdk15</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness</artifactId>
+ <version>${jboss.test.harness.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness-jboss-as-50</artifactId>
+ <version>${jboss.test.harness.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness-jboss-as-60</artifactId>
+ <version>${jboss.test.harness.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness-jboss-embedded</artifactId>
+ <version>${jboss.test.harness.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness-tomcat</artifactId>
+ <version>${jboss.test.harness.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${apache.httpclient.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>${htmlunit.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>${glassfish.el.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/parent</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/parent</developerConnection>
+ <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/parent</url>
+ </scm>
+
+</project>
+
Deleted: core/branches/1.0.1-SP1/pom.xml
===================================================================
--- core/tags/1.0.1-Final/pom.xml 2010-02-24 03:53:20 UTC (rev 5959)
+++ core/branches/1.0.1-SP1/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
@@ -1,95 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-build-aggregator</artifactId>
- <packaging>pom</packaging>
- <version>1.0.1-Final</version>
-
- <parent>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-parent</artifactId>
- <version>9</version>
- </parent>
-
- <name>Weld Build Aggregator</name>
-
- <prerequisites>
- <maven>2.0.10</maven>
- </prerequisites>
-
-
- <!-- Minimal metadata -->
- <description>The build aggregator for Weld, which takes care of calling the modules which make up Weld</description>
-
- <!-- SCM and distribution management -->
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-Final</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final</developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final</url>
- </scm>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>bom</module>
- <module>parent</module>
- <module>impl</module>
- <module>tests</module>
- <module>porting-package</module>
- <module>inject-tck-runner</module>
- <module>jboss-tck-runner</module>
- <module>osgi-bundle</module>
- </modules>
- </profile>
- <profile>
- <id>update-jboss-as</id>
- <modules>
- <module>bom</module>
- <module>parent</module>
- <module>impl</module>
- <module>tests</module>
- <module>porting-package</module>
- <module>inject-tck-runner</module>
- <module>jboss-tck-runner</module>
- <module>osgi-bundle</module>
- <module>jboss-as</module>
- </modules>
- </profile>
- <profile>
- <id>skip-tests</id>
- <modules>
- <module>bom</module>
- <module>parent</module>
- <module>impl</module>
- <module>osgi-bundle</module>
- </modules>
- </profile>
- </profiles>
-
- <!-- Minimal build configuration -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/weld/core/tags</tagBase>
- <!-- As we need access to our own artifacts -->
- <preparationGoals>install</preparationGoals>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
Copied: core/branches/1.0.1-SP1/pom.xml (from rev 6050, core/tags/1.0.1-Final/pom.xml)
===================================================================
--- core/branches/1.0.1-SP1/pom.xml (rev 0)
+++ core/branches/1.0.1-SP1/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
@@ -0,0 +1,95 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-build-aggregator</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0.1-SP1</version>
+
+ <parent>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-parent</artifactId>
+ <version>9</version>
+ </parent>
+
+ <name>Weld Build Aggregator</name>
+
+ <prerequisites>
+ <maven>2.0.10</maven>
+ </prerequisites>
+
+
+ <!-- Minimal metadata -->
+ <description>The build aggregator for Weld, which takes care of calling the modules which make up Weld</description>
+
+ <!-- SCM and distribution management -->
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1</developerConnection>
+ <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1</url>
+ </scm>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>bom</module>
+ <module>parent</module>
+ <module>impl</module>
+ <module>tests</module>
+ <module>porting-package</module>
+ <module>inject-tck-runner</module>
+ <module>jboss-tck-runner</module>
+ <module>osgi-bundle</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>update-jboss-as</id>
+ <modules>
+ <module>bom</module>
+ <module>parent</module>
+ <module>impl</module>
+ <module>tests</module>
+ <module>porting-package</module>
+ <module>inject-tck-runner</module>
+ <module>jboss-tck-runner</module>
+ <module>osgi-bundle</module>
+ <module>jboss-as</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>skip-tests</id>
+ <modules>
+ <module>bom</module>
+ <module>parent</module>
+ <module>impl</module>
+ <module>osgi-bundle</module>
+ </modules>
+ </profile>
+ </profiles>
+
+ <!-- Minimal build configuration -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.jboss.org/repos/weld/core/tags</tagBase>
+ <!-- As we need access to our own artifacts -->
+ <preparationGoals>install</preparationGoals>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Deleted: core/branches/1.0.1-SP1/porting-package/pom.xml
===================================================================
--- core/tags/1.0.1-Final/porting-package/pom.xml 2010-02-24 03:53:20 UTC (rev 5959)
+++ core/branches/1.0.1-SP1/porting-package/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
@@ -1,63 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>weld-core-parent</artifactId>
- <groupId>org.jboss.weld</groupId>
- <version>1.0.1-Final</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-porting-package</artifactId>
- <name>Weld Porting Package for the CDI TCK</name>
-
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <distribution>repo</distribution>
- <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
- </license>
- </licenses>
- <url>http://www.seamframework.org/Weld</url>
-
-
- <dependencies>
-
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-test</artifactId>
- </dependency>
-
- </dependencies>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-Final/porting...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final/porting-pa...</developerConnection>
- <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/porting-package</url>
- </scm>
-
-</project>
Copied: core/branches/1.0.1-SP1/porting-package/pom.xml (from rev 6050, core/tags/1.0.1-Final/porting-package/pom.xml)
===================================================================
--- core/branches/1.0.1-SP1/porting-package/pom.xml (rev 0)
+++ core/branches/1.0.1-SP1/porting-package/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
@@ -0,0 +1,63 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>weld-core-parent</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <version>1.0.1-SP1</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-porting-package</artifactId>
+ <name>Weld Porting Package for the CDI TCK</name>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <distribution>repo</distribution>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ </license>
+ </licenses>
+ <url>http://www.seamframework.org/Weld</url>
+
+
+ <dependencies>
+
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-test</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/porting-package</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/porting-...</developerConnection>
+ <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/porting-package</url>
+ </scm>
+
+</project>
Deleted: core/branches/1.0.1-SP1/tests/pom.xml
===================================================================
--- core/tags/1.0.1-Final/tests/pom.xml 2010-02-24 03:53:20 UTC (rev 5959)
+++ core/branches/1.0.1-SP1/tests/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
@@ -1,292 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>weld-core-parent</artifactId>
- <groupId>org.jboss.weld</groupId>
- <version>1.0.1-Final</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-test</artifactId>
- <name>Weld Core Tests</name>
- <description>Tests for Weld, not including the CDI and AtInject TCKs</description>
-
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <distribution>repo</distribution>
- <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
- </license>
- </licenses>
- <url>http://www.seamframework.org/Weld</url>
-
-
- <dependencies>
-
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <exclusions>
- <exclusion>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-jboss-as-60</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.slf4j</groupId>
- <artifactId>slf4j-jboss-logging</artifactId>
- </exclusion>
- </exclusions>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-spi</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.interceptor</groupId>
- <artifactId>jboss-interceptor-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.interceptor</groupId>
- <artifactId>jboss-interceptor</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <!-- override for testing compatibility w/ JSF 2.0 -->
- <version>2.0.2-FCS</version>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- </dependency>
-
- </dependencies>
-
- <build>
- <defaultGoal>test</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>unit-tests.xml</suiteXmlFile>
- </suiteXmlFiles>
- <argLine>-Xmx128m</argLine>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-test-report</id>
- <phase>test</phase>
- <goals>
- <goal>report-only</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
- <outputName>test-report</outputName>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <stripVersion>true</stripVersion>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness</artifactId>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/classes/lib</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>incontainer</id>
- <activation>
- <property>
- <name>incontainer</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>unit-tests.xml</suiteXmlFile>
- </suiteXmlFiles>
- <systemProperties>
- <property>
- <name>org.jboss.testharness.standalone</name>
- <value>false</value>
- </property>
- <property>
- <name>org.jboss.testharness.container.extraConfigurationDir</name>
- <value>../jboss-as</value>
- </property>
- <property>
- <name>org.jboss.testharness.container.forceRestart</name>
- <value>true</value>
- </property>
- <property>
- <name>org.jboss.testharness.runIntegrationTests</name>
- <value>true</value>
- </property>
- <property>
- <name>org.jboss.testharness.libraryDirectory</name>
- <value>target/dependency/lib</value>
- </property>
- <property>
- <name>org.jboss.testharness.outputDirectory</name>
- <value>target</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>write-artifacts-to-disk</id>
- <activation>
- <property>
- <name>dumpArtifacts</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-test-artifacts</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <mainClass>org.jboss.testharness.api.TCK</mainClass>
- <classpathScope>test</classpathScope>
- <systemProperties>
- <systemProperty>
- <key>dumpArtifacts</key>
- <value>true</value>
- </systemProperty>
- <systemProperty>
- <key>org.jboss.testharness.outputDirectory</key>
- <value>target/test-artifacts</value>
- </systemProperty>
- <systemProperty>
- <key>org.jboss.testharness.libraryDirectory</key>
- <value>target/dependency/lib</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.1-Final/tests</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-Final/tests</developerConnection>
- <url>http://fisheye.jboss.org/browse/weld/core/tags/1.0.1-Final/tests</url>
- </scm>
-
-</project>
Copied: core/branches/1.0.1-SP1/tests/pom.xml (from rev 6050, core/tags/1.0.1-Final/tests/pom.xml)
===================================================================
--- core/branches/1.0.1-SP1/tests/pom.xml (rev 0)
+++ core/branches/1.0.1-SP1/tests/pom.xml 2010-03-15 19:13:11 UTC (rev 6051)
@@ -0,0 +1,292 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>weld-core-parent</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <version>1.0.1-SP1</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-test</artifactId>
+ <name>Weld Core Tests</name>
+ <description>Tests for Weld, not including the CDI and AtInject TCKs</description>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <distribution>repo</distribution>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ </license>
+ </licenses>
+ <url>http://www.seamframework.org/Weld</url>
+
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <exclusions>
+ <exclusion>
+ <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness-jboss-as-60</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.slf4j</groupId>
+ <artifactId>slf4j-jboss-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-spi</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <!-- override for testing compatibility w/ JSF 2.0 -->
+ <version>2.0.2-FCS</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <defaultGoal>test</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>unit-tests.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ <argLine>-Xmx128m</argLine>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-test-report</id>
+ <phase>test</phase>
+ <goals>
+ <goal>report-only</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
+ <outputName>test-report</outputName>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <stripVersion>true</stripVersion>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness</artifactId>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/classes/lib</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>incontainer</id>
+ <activation>
+ <property>
+ <name>incontainer</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>unit-tests.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ <systemProperties>
+ <property>
+ <name>org.jboss.testharness.standalone</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.container.extraConfigurationDir</name>
+ <value>../jboss-as</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.container.forceRestart</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.runIntegrationTests</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.libraryDirectory</name>
+ <value>target/dependency/lib</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.outputDirectory</name>
+ <value>target</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>write-artifacts-to-disk</id>
+ <activation>
+ <property>
+ <name>dumpArtifacts</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-test-artifacts</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <mainClass>org.jboss.testharness.api.TCK</mainClass>
+ <classpathScope>test</classpathScope>
+ <systemProperties>
+ <systemProperty>
+ <key>dumpArtifacts</key>
+ <value>true</value>
+ </systemProperty>
+ <systemProperty>
+ <key>org.jboss.testharness.outputDirectory</key>
+ <value>target/test-artifacts</value>
+ </systemProperty>
+ <systemProperty>
+ <key>org.jboss.testharness.libraryDirectory</key>
+ <value>target/dependency/lib</value>
+ </systemProperty>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/tests</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP1/tests</developerConnection>
+ <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP1/tests</url>
+ </scm>
+
+</project>
14 years, 8 months
- 1
- 0