Weld SVN: r6261 - cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-20 14:27:43 -0400 (Thu, 20 May 2010)
New Revision: 6261
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
Log:
CDITCK-160
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2010-05-20 18:23:31 UTC (rev 6260)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2010-05-20 18:27:43 UTC (rev 6261)
@@ -42,12 +42,9 @@
@SpecAssertion(section = "3.12", id = "l")
public void testNewBeanHasSameConstructor()
{
- ExplicitConstructor bean = getInstanceByType(ExplicitConstructor.class);
- bean.setConstructorCalls(0);
ExplicitConstructor newBean = getInstanceByType(ExplicitConstructor.class, ExplicitConstructorSessionBean.NEW);
- assert bean != newBean;
- assert bean.getConstructorCalls() == 1;
- assert bean.getInjectedSimpleBean() != null;
+ assert newBean.getConstructorCalls() == 1;
+ assert newBean.getInjectedSimpleBean() != null;
}
@Test(groups = { "new" })
13 years, 11 months
Weld SVN: r6260 - cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-20 14:23:31 -0400 (Thu, 20 May 2010)
New Revision: 6260
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/SimpleBean.java
Log:
CDITCK-161
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/SimpleBean.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/SimpleBean.java 2010-05-20 18:21:29 UTC (rev 6259)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/SimpleBean.java 2010-05-20 18:23:31 UTC (rev 6260)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.implementation.enterprise.definition;
-class SimpleBean
+public class SimpleBean
{
}
13 years, 11 months
Weld SVN: r6259 - cdi-tck/branches/1.0/doc/reference/en-US.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-20 14:21:29 -0400 (Thu, 20 May 2010)
New Revision: 6259
Modified:
cdi-tck/branches/1.0/doc/reference/en-US/configuration.xml
cdi-tck/branches/1.0/doc/reference/en-US/eclipse-running.xml
cdi-tck/branches/1.0/doc/reference/en-US/executing.xml
cdi-tck/branches/1.0/doc/reference/en-US/installation.xml
cdi-tck/branches/1.0/doc/reference/en-US/introduction.xml
Log:
CDITCK-119
Modified: cdi-tck/branches/1.0/doc/reference/en-US/configuration.xml
===================================================================
--- cdi-tck/branches/1.0/doc/reference/en-US/configuration.xml 2010-05-20 17:41:32 UTC (rev 6258)
+++ cdi-tck/branches/1.0/doc/reference/en-US/configuration.xml 2010-05-20 18:21:29 UTC (rev 6259)
@@ -104,7 +104,7 @@
To run the full TCK you must additionally implement
<literal>org.jboss.testharness.spi.Containers</literal>,
which handles deploying the test artifact to the container. An
- implementations of this API is already available for JBoss AS 5.2.
+ implementations of this API is already available for JBoss AS 6.0.
Therefore, you only need to implement this part of the porting package
if you wish to use another container.
</para>
Modified: cdi-tck/branches/1.0/doc/reference/en-US/eclipse-running.xml
===================================================================
--- cdi-tck/branches/1.0/doc/reference/en-US/eclipse-running.xml 2010-05-20 17:41:32 UTC (rev 6258)
+++ cdi-tck/branches/1.0/doc/reference/en-US/eclipse-running.xml 2010-05-20 18:21:29 UTC (rev 6259)
@@ -76,7 +76,7 @@
<para>
<emphasis role="bold">Weld JBoss TCK Runner</emphasis> -
Groups the porting package implementation and TCK runner projects
- that are configured to certify Weld deployed on JBoss AS 5.2
+ that are configured to certify Weld deployed on JBoss AS 6.0
</para>
</listitem>
</orderedlist>
@@ -238,7 +238,7 @@
<para>
Let's see what has to be done to execute an integration test. This
will result in the artifact being deployed to the container, which is
- JBoss AS 5.2 if you are using the JBoss TCK runner.
+ JBoss AS 6.0 if you are using the JBoss TCK runner.
</para>
</section>
<section id="eclipse-in-container">
@@ -275,7 +275,7 @@
- the relative path from the jboss-tck-impl project to a
directory that contains a build.properties or
local.build.properties file defining the location of a JBoss AS
- 5.2 installation in the
+ 6.0 installation in the
<literal>jboss.home</literal>
property
</para>
@@ -373,7 +373,7 @@
</orderedlist>
<para>
When you run the test this time, it should pass. If you get a
- failure that the container (e.g., JBoss AS 5.2) must be run with
+ failure that the container (e.g., JBoss AS 6.0) must be run with
assertions enabled, you need to stop the container and start it with
the -ea flag (or just leave it stopped and the test will start it
appropriately).
Modified: cdi-tck/branches/1.0/doc/reference/en-US/executing.xml
===================================================================
--- cdi-tck/branches/1.0/doc/reference/en-US/executing.xml 2010-05-20 17:41:32 UTC (rev 6258)
+++ cdi-tck/branches/1.0/doc/reference/en-US/executing.xml 2010-05-20 18:21:29 UTC (rev 6259)
@@ -17,7 +17,7 @@
phase of the Maven 2 life cycle. The execution happens within a TCK
runner project (as opposed to the TCK project itself). Weld
includes a TCK runner project that executes the CDI TCK on Weld
- running inside JBoss AS 5.2. To execute the CDI TCK on your own CDI
+ running inside JBoss AS 6.0. To execute the CDI TCK on your own CDI
implementation, you could modify the TCK runner project included with
Weld to use your CDI implementation as described in <xref
linkend="configuration" />.
@@ -88,7 +88,7 @@
deploy the test artifact to the container and execute the test in a
true Java EE life cycle. The JBoss TCK runner has a dependency on the
library that provides an implementation of this interface for JBoss AS
- 5.2.
+ 6.0.
</para>
<para>
Since in-container tests are executed in a remote JVM, the results of
Modified: cdi-tck/branches/1.0/doc/reference/en-US/installation.xml
===================================================================
--- cdi-tck/branches/1.0/doc/reference/en-US/installation.xml 2010-05-20 17:41:32 UTC (rev 6258)
+++ cdi-tck/branches/1.0/doc/reference/en-US/installation.xml 2010-05-20 18:21:29 UTC (rev 6259)
@@ -72,7 +72,7 @@
</listitem>
<listitem>
<para>
- Java EE 6 preview or better (e.g., JBoss AS 5.2.x or GlassFish V3)
+ Java EE 6 preview or better (e.g., JBoss AS 6.0.x or GlassFish V3)
</para>
</listitem>
</itemizedlist>
@@ -148,9 +148,9 @@
Create a file called <literal>local.build.properties</literal>
in <literal>weld/jboss-as</literal> and make sure the
<literal>jboss.home</literal>
- property references a JBoss AS 5.2 installation:
+ property references a JBoss AS 6.0 installation:
</para>
- <programlisting>jboss.home=/path/to/jboss-as-5.2</programlisting>
+ <programlisting>jboss.home=/path/to/jboss-as-6.0</programlisting>
</listitem>
</itemizedlist>
Modified: cdi-tck/branches/1.0/doc/reference/en-US/introduction.xml
===================================================================
--- cdi-tck/branches/1.0/doc/reference/en-US/introduction.xml 2010-05-20 17:41:32 UTC (rev 6258)
+++ cdi-tck/branches/1.0/doc/reference/en-US/introduction.xml 2010-05-20 18:21:29 UTC (rev 6259)
@@ -291,7 +291,7 @@
<itemizedlist>
<listitem>
<para>
- JBoss AS 5.2.0.Beta1 using Sun Java SE 6 on Red Hat Enterprise
+ JBoss AS 6.0 using Sun Java SE 6 on Red Hat Enterprise
Linux 5.2
</para>
</listitem>
13 years, 11 months
Weld SVN: r6258 - core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-20 13:41:32 -0400 (Thu, 20 May 2010)
New Revision: 6258
Modified:
core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/SimpleExtension.java
Log:
fix test for new proxies
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java 2010-05-20 17:24:50 UTC (rev 6257)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/ExtensionTest.java 2010-05-20 17:41:32 UTC (rev 6258)
@@ -34,8 +34,7 @@
@Test(description="WELD-234")
public void testExtensionInjectableAsBean()
{
- assert SimpleExtension.getInstance() != null;
- assert getReference(SimpleExtension.class).equals(SimpleExtension.getInstance());
+ assert getReference(SimpleExtension.class).isObservedBeforeBeanDiscovery();
}
@Test(description="WELD-243")
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/SimpleExtension.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/SimpleExtension.java 2010-05-20 17:24:50 UTC (rev 6257)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/extensions/SimpleExtension.java 2010-05-20 17:41:32 UTC (rev 6258)
@@ -24,17 +24,17 @@
public class SimpleExtension implements Extension
{
+
+ private static boolean observedBeforeBeanDiscovery;
- private static SimpleExtension instance;
-
public void observe(@Observes BeforeBeanDiscovery event)
{
- SimpleExtension.instance = this;
+ observedBeforeBeanDiscovery = true;
}
- public static SimpleExtension getInstance()
+ public static boolean isObservedBeforeBeanDiscovery()
{
- return instance;
+ return observedBeforeBeanDiscovery;
}
public void observeBeforeShutdown(@Observes BeforeShutdown beforeShutdown, BeanManager beanManager)
13 years, 11 months
Weld SVN: r6257 - core/trunk/jboss-as.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-20 13:24:50 -0400 (Thu, 20 May 2010)
New Revision: 6257
Modified:
core/trunk/jboss-as/pom.xml
Log:
add spi to what is updated
Modified: core/trunk/jboss-as/pom.xml
===================================================================
--- core/trunk/jboss-as/pom.xml 2010-05-20 12:44:12 UTC (rev 6256)
+++ core/trunk/jboss-as/pom.xml 2010-05-20 17:24:50 UTC (rev 6257)
@@ -62,7 +62,7 @@
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
<overWriteSnapshots>true</overWriteSnapshots>
<stripVersion>true</stripVersion>
- <includeArtifactIds>cdi-api,weld-api,weld-core,weld-jboss-int-deployer-assembly</includeArtifactIds>
+ <includeArtifactIds>cdi-api,weld-api,weld-core,weld-spi,weld-jboss-int-deployer-assembly</includeArtifactIds>
</configuration>
</execution>
</executions>
@@ -102,6 +102,14 @@
</fileset>
</copy>
+ <copy todir="target/weld.deployer/"
+ overwrite="true">
+ <fileset dir="target/dependency/lib">
+ <include name="weld-spi.jar" />
+ </fileset>
+ </copy>
+
+
<copy todir="${jboss.home}/client"
overwrite="true">
<fileset dir="target/dependency/lib">
13 years, 11 months
Weld SVN: r6256 - in core/trunk: impl and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-20 08:44:12 -0400 (Thu, 20 May 2010)
New Revision: 6256
Modified:
core/trunk/impl/pom.xml
core/trunk/pom.xml
Log:
workaround bug in maven
Modified: core/trunk/impl/pom.xml
===================================================================
--- core/trunk/impl/pom.xml 2010-05-20 12:38:45 UTC (rev 6255)
+++ core/trunk/impl/pom.xml 2010-05-20 12:44:12 UTC (rev 6256)
@@ -128,6 +128,7 @@
<plugin>
<groupId>ch.qos.cal10n.plugins</groupId>
<artifactId>maven-cal10n-plugin</artifactId>
+ <version>0.7.2</version>
<executions>
<execution>
<id>verify-messages</id>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2010-05-20 12:38:45 UTC (rev 6255)
+++ core/trunk/pom.xml 2010-05-20 12:44:12 UTC (rev 6256)
@@ -28,6 +28,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-bom</artifactId>
<version>1.0-SNAPSHOT</version>
+ <type>pom</type>
</dependency>
</dependencies>
13 years, 11 months
Weld SVN: r6255 - build/trunk/parent.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-20 08:38:45 -0400 (Thu, 20 May 2010)
New Revision: 6255
Modified:
build/trunk/parent/pom.xml
Log:
small update to cal10n plugin
Modified: build/trunk/parent/pom.xml
===================================================================
--- build/trunk/parent/pom.xml 2010-05-20 12:23:49 UTC (rev 6254)
+++ build/trunk/parent/pom.xml 2010-05-20 12:38:45 UTC (rev 6255)
@@ -123,7 +123,7 @@
<plugin>
<groupId>ch.qos.cal10n.plugins</groupId>
<artifactId>maven-cal10n-plugin</artifactId>
- <version>0.7</version>
+ <version>0.7.2</version>
</plugin>
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
13 years, 11 months
Weld SVN: r6254 - build/trunk/parent.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-20 08:23:49 -0400 (Thu, 20 May 2010)
New Revision: 6254
Modified:
build/trunk/parent/pom.xml
Log:
minor
Modified: build/trunk/parent/pom.xml
===================================================================
--- build/trunk/parent/pom.xml 2010-05-20 12:02:33 UTC (rev 6253)
+++ build/trunk/parent/pom.xml 2010-05-20 12:23:49 UTC (rev 6254)
@@ -291,12 +291,9 @@
<requireMavenVersion>
<version>[${minimum.maven.version},)</version>
</requireMavenVersion>
- <requirePluginVersions>
- <unCheckedPlugins>
- <unCheckedPlugin>org.apache.maven.plugins:maven-eclipse-plugin</unCheckedPlugin>
- </unCheckedPlugins>
- </requirePluginVersions>
+ <requirePluginVersions />
</rules>
+ <unCheckedPluginsList>org.apache.maven.plugins:maven-eclipse-plugin</unCheckedPluginsList>
</configuration>
</execution>
</executions>
13 years, 11 months
Weld SVN: r6253 - in core/trunk: parent and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-20 08:02:33 -0400 (Thu, 20 May 2010)
New Revision: 6253
Modified:
core/trunk/parent/pom.xml
core/trunk/pom.xml
Log:
workaround bug in maven
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2010-05-20 10:22:36 UTC (rev 6252)
+++ core/trunk/parent/pom.xml 2010-05-20 12:02:33 UTC (rev 6253)
@@ -8,7 +8,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-bom</artifactId>
<version>1.0.2-SNAPSHOT</version>
- <relativePath>../bom</relativePath>
+ <relativePath>../bom/pom.xml</relativePath>
</parent>
<name>Weld Core Parent</name>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2010-05-20 10:22:36 UTC (rev 6252)
+++ core/trunk/pom.xml 2010-05-20 12:02:33 UTC (rev 6253)
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -21,6 +22,15 @@
<!-- Minimal metadata -->
<description>The build aggregator for Weld, which takes care of calling the modules which make up Weld</description>
+ <!-- Workaround bug in Maven 2.? where it can't download a unique version snapshot on import scope -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api-bom</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
<!-- SCM and distribution management -->
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk</connection>
13 years, 11 months