Weld SVN: r4677 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-04 14:40:43 -0500 (Wed, 04 Nov 2009)
New Revision: 4677
Modified:
doc/trunk/reference/en-US/gettingstarted.xml
Log:
initalises -> initializes
Modified: doc/trunk/reference/en-US/gettingstarted.xml
===================================================================
--- doc/trunk/reference/en-US/gettingstarted.xml 2009-11-04 19:24:32 UTC (rev 4676)
+++ doc/trunk/reference/en-US/gettingstarted.xml 2009-11-04 19:40:43 UTC (rev 4677)
@@ -1618,7 +1618,7 @@
</callout>
<callout arearefs="init">
<para>
- This method initialises all of the Swing components. Note
+ This method initializes all of the Swing components. Note
the use of the <literal>msgGenerator</literal> here.
</para>
</callout>
16 years, 5 months
Weld SVN: r4676 - in examples/trunk/jsf: permalink and 1 other directory.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-04 14:24:32 -0500 (Wed, 04 Nov 2009)
New Revision: 4676
Modified:
examples/trunk/jsf/numberguess/readme.txt
examples/trunk/jsf/permalink/readme.txt
Log:
grammar
Modified: examples/trunk/jsf/numberguess/readme.txt
===================================================================
--- examples/trunk/jsf/numberguess/readme.txt 2009-11-04 19:24:07 UTC (rev 4675)
+++ examples/trunk/jsf/numberguess/readme.txt 2009-11-04 19:24:32 UTC (rev 4676)
@@ -1,27 +1,43 @@
Weld Numberguess Example
========================
-This example demonstrates the use of Weld in a Servlet container
-(Tomcat 6 / Jetty 6) and in as a non-EJB application JBoss AS. No alterations
-are expected to be made to the container. All services are
-self-contained within the deployment.
+This example demonstrates the use of Weld in a Servlet container (Tomcat 6 or
+Jetty 6) or as a non-EJB application in JBoss AS. No alterations are expected
+to be made to the container. All services are self-contained within the
+deployment.
-This example uses a Maven 2 build, and an ant script to deploy to JBoss AS.
-Execute the following command to build the WAR. The WAR will will be located
-in the target directory after completion of the build.
+You'll execute the Ant build script in this directory using the Ant command
+(ant) to compile, assemble and deploy the example to JBoss AS. The Ant build is
+using Maven under the covers, but you're not required to have Maven installed
+on your path. If you do have Maven installed, you can use the Maven command
+(mvn) to compile and assemble a standalone artifact (WAR) and run the example
+in an embedded Servlet container.
+Execute the following command to build a WAR for a Java EE 6 container. The
+WAR will be located in the target directory after completion of the build.
+
mvn
-Now you're ready to deploy.
+Now you're ready to deploy to JBoss AS.
== Deploying to JBoss AS
-Make sure you have set the path to JBoss AS in ../../local.build.properties, using
-jboss.home as the key.
+Make sure you have assigned the path of your JBoss AS installation to the
+jboss.home property key in the following file, relative to this directory:
-Now, type ant restart to deploy the application to JBoss AS. You can access it
-at http://localhost:8080/weld-numberguess
+../../local.build.properties
+(This file is located in the examples directory of the Weld distribution).
+
+If you haven't already, start JBoss AS. Then, deploy the application to JBoss AS
+using this command:
+
+ ant restart
+
+Open this local URL to access the running application:
+
+ http://localhost:8080/weld-numberguess
+
== Deploying with an embedded servlet container
Run this command to execute the application in an embedded Jetty 6 container:
@@ -32,9 +48,11 @@
mvn war:inplace tomcat:run -Ptomcat
-You'll can access the app at http://localhost:9090/weld-numberguess
+In both cases, you can access the application at the following local URL
-In both cases, any changes to assets in src/main/webapp take affect immediately. If
+ http://localhost:9090/weld-numberguess
+
+In both cases, any changes to assets in src/main/webapp take effect immediately. If
a change to a webapp configuration file is made, the application may
automatically redeploy. The redeploy behavior can be fined tuned in the plugin
configuration (at least for Jetty). If you make a change to a classpath
@@ -42,11 +60,11 @@
mvn compile war:inplace {-Ptomcat,-Pjetty}
-Note that war:inplace copies the compiled classes and JARs inside WebContent,
-under WEB-INF/classes and WEB-INF/lib, respectively, mixing source and compiled
-files. However, the build does work around these temporary files by excluding
-them from the packaged WAR and cleaning them during the Maven clean phase.
-These folders are also ignored by SVN.
+Note that war:inplace copies the compiled classes and JARs inside
+src/main/webapp, under WEB-INF/classes and WEB-INF/lib, respectively, mixing
+source and compiled files. However, the build does work around these temporary
+files by excluding them from the packaged WAR and cleaning them during the
+Maven clean phase. These folders are also ignored by SVN.
== Deploying to standalone Tomcat
@@ -63,12 +81,12 @@
appropriate values and uncomment the <server> element inside the
tomcat-maven-plugin configuration in the pom.xml.
-You can deploy it as an exploded archive
-immediately after the war goal is finished assembling the exploded structure:
+You can deploy it as an exploded archive immediately after the war goal is
+finished assembling the exploded structure:
mvn compile war:exploded tomcat:exploded -Ptomcat
-Once the application is deployed, you can redeploy it using the following command:
+Once the application is deployed, you can redeploy it using this command:
mvn tomcat:redeploy -Ptomcat
@@ -78,11 +96,13 @@
mvn war:exploded tomcat:redeploy -Ptomcat
mvn compile war:exploded tomcat:redeploy -Ptomcat
-The application is available at http://localhost:8080/weld-numberguess
+The application is available at the following local URL:
+ http://localhost:8080/weld-numberguess
+
== Launching Jetty embedded from Eclipse
-First, set up the eclipse environment:
+First, set up the Eclipse environment:
mvn clean eclipse:clean eclipse:eclipse -Pjetty-ide
@@ -90,14 +110,15 @@
mvn war:inplace -Pjetty-ide
-Now, you are ready to run the server in Eclipse; find the Start class in src/jetty/java, and run it's
-main method as a Java Application. The server will launch. You'll find the application at
-http://localhost:8080
+Now, you are ready to run the server in Eclipse; find the Start class in
+src/jetty/java, and run its main method as a Java Application. The server
+will launch. You can view the application at the following local URL:
+ http://localhost:8080
== Using Google App Engine
-First, set up the eclipse environment:
+First, set up the Eclipse environment:
mvn clean eclipse:clean eclipse:eclipse -Pgae
@@ -107,4 +128,5 @@
mvn war:inplace -Pgae
-Now, in Eclipse, you can either run the app locally, or deploy it to Google App Engine
+Now, in Eclipse, you can either run the app locally, or deploy it to Google App Engine.
+
Modified: examples/trunk/jsf/permalink/readme.txt
===================================================================
--- examples/trunk/jsf/permalink/readme.txt 2009-11-04 19:24:07 UTC (rev 4675)
+++ examples/trunk/jsf/permalink/readme.txt 2009-11-04 19:24:32 UTC (rev 4676)
@@ -25,7 +25,7 @@
mvn war:inplace tomcat:run
-In both cases, any changes to assets in src/main/webapp take affect
+In both cases, any changes to assets in src/main/webapp take effect
immediately. If a change to a webapp configuration file is made, the
application may automatically redeploy. The redeploy behavior can be fined
tuned in the plugin configuration (at least for Jetty). If you make a change
16 years, 5 months
Weld SVN: r4675 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-04 14:24:07 -0500 (Wed, 04 Nov 2009)
New Revision: 4675
Modified:
doc/trunk/reference/en-US/gettingstarted.xml
Log:
grammar
Modified: doc/trunk/reference/en-US/gettingstarted.xml
===================================================================
--- doc/trunk/reference/en-US/gettingstarted.xml 2009-11-04 19:20:45 UTC (rev 4674)
+++ doc/trunk/reference/en-US/gettingstarted.xml 2009-11-04 19:24:07 UTC (rev 4675)
@@ -445,7 +445,7 @@
<programlisting><![CDATA[$> mvn war:inplace tomcat:run -Ptomcat]]></programlisting>
<para>
- The advantage of using the embedded server is that changes to assets in src/main/webapp take affect
+ The advantage of using the embedded server is that changes to assets in src/main/webapp take effect
immediately. If a change to a webapp configuration file is made, the application may automatically redeploy
(depending on the plugin configuration). If you make a change to a classpath resource, you need to execute a
build:
@@ -504,7 +504,7 @@
</para>
<para>
- Any changes to assets in src/main/webapp take affect immediately. If a change to a webapp configuration file is
+ Any changes to assets in src/main/webapp take effect immediately. If a change to a webapp configuration file is
made, the application may automatically redeploy. The redeploy behavior can be fined tuned in the plugin
configuration. If you make a change to a classpath resource, you need to execute a build and the inplace goal
of the Maven WAR plugin, again with the jetty profile enabled.
16 years, 5 months
Weld SVN: r4674 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-04 14:20:45 -0500 (Wed, 04 Nov 2009)
New Revision: 4674
Modified:
doc/trunk/reference/en-US/injection.xml
Log:
fix lead-in to reference
Modified: doc/trunk/reference/en-US/injection.xml
===================================================================
--- doc/trunk/reference/en-US/injection.xml 2009-11-04 19:19:59 UTC (rev 4673)
+++ doc/trunk/reference/en-US/injection.xml 2009-11-04 19:20:45 UTC (rev 4674)
@@ -390,7 +390,7 @@
implementations of the bean type, or disable one of two <literal>@Alternative</literal> beans that are trying
to occupy the same space. An <literal>AmbiguousDependencyException</literal> can only occur if two enabled
beans share the same qualifier types (and one bean does not specialize the other, which we'll get into
- specialization in <xref linkend="specialization"/>).
+ in <xref linkend="specialization"/>).
</para>
<tip>
16 years, 5 months
Weld SVN: r4673 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-04 14:19:59 -0500 (Wed, 04 Nov 2009)
New Revision: 4673
Modified:
doc/trunk/reference/en-US/ee.xml
doc/trunk/reference/en-US/environments.xml
doc/trunk/reference/en-US/events.xml
doc/trunk/reference/en-US/injection.xml
doc/trunk/reference/en-US/interceptors.xml
doc/trunk/reference/en-US/part3.xml
doc/trunk/reference/en-US/scopescontexts.xml
Log:
fix mdashes
note about dashes in readme
Modified: doc/trunk/reference/en-US/ee.xml
===================================================================
--- doc/trunk/reference/en-US/ee.xml 2009-11-04 19:12:45 UTC (rev 4672)
+++ doc/trunk/reference/en-US/ee.xml 2009-11-04 19:19:59 UTC (rev 4673)
@@ -206,7 +206,7 @@
<title>Packaging and deployment</title>
<para>
- CDI doesn't define any special deployment archive. You can package beans in JARs, EJB-JARs or WARs — any
+ CDI doesn't define any special deployment archive. You can package beans in JARs, EJB-JARs or WARs — any
deployment location in the application classpath. However, the archive must be a "bean archive". That means
each archive that contains beans <emphasis>must</emphasis> include a file named <literal>beans.xml</literal> in
the <literal>META-INF</literal> directory of the classpath or <literal>WEB-INF</literal> directory of the web
Modified: doc/trunk/reference/en-US/environments.xml
===================================================================
--- doc/trunk/reference/en-US/environments.xml 2009-11-04 19:12:45 UTC (rev 4672)
+++ doc/trunk/reference/en-US/environments.xml 2009-11-04 19:19:59 UTC (rev 4673)
@@ -79,6 +79,7 @@
jars:
</para>
+ <!-- TODO check for accuracy in 1.0 release -->
<itemizedlist>
<listitem>
<para>
Modified: doc/trunk/reference/en-US/events.xml
===================================================================
--- doc/trunk/reference/en-US/events.xml 2009-11-04 19:12:45 UTC (rev 4672)
+++ doc/trunk/reference/en-US/events.xml 2009-11-04 19:19:59 UTC (rev 4673)
@@ -105,7 +105,7 @@
<programlisting role="JAVA"><![CDATA[public void afterDocumentUpdate(@Observes @Updated Document document) { ... }]]></programlisting>
<para>
- An observer method need not specify any event qualifiers — in this case it is interested in
+ An observer method need not specify any event qualifiers — in this case it is interested in
<emphasis>all</emphasis> events of a particular type. If it does specify event bindings, it's only interested
in events which also have those qualifiers.
</para>
Modified: doc/trunk/reference/en-US/injection.xml
===================================================================
--- doc/trunk/reference/en-US/injection.xml 2009-11-04 19:12:45 UTC (rev 4672)
+++ doc/trunk/reference/en-US/injection.xml 2009-11-04 19:19:59 UTC (rev 4673)
@@ -381,7 +381,7 @@
<para>
To fix an <literal>UnsatisfiedDependencyException</literal>, simply provide a bean which implements the bean
- type and has all the qualifier types of the injection point — or explicitly enable an
+ type and has all the qualifier types of the injection point — or explicitly enable an
<literal>@Alternative</literal> bean that implements the bean type and has the appropriate qualifier types.
</para>
Modified: doc/trunk/reference/en-US/interceptors.xml
===================================================================
--- doc/trunk/reference/en-US/interceptors.xml 2009-11-04 19:12:45 UTC (rev 4672)
+++ doc/trunk/reference/en-US/interceptors.xml 2009-11-04 19:19:59 UTC (rev 4673)
@@ -278,7 +278,7 @@
<para>
Well, fortunately, CDI works around this missing feature of Java. We may annotate one interceptor binding type
with other interceptor binding types (termed a <emphasis>meta-annotation</emphasis>). The interceptor bindings
- are transitive — any bean with the first interceptor binding inherits the interceptor bindings declared as
+ are transitive — any bean with the first interceptor binding inherits the interceptor bindings declared as
meta-annotations.
</para>
@@ -322,7 +322,7 @@
</listitem>
<listitem>
<para>
- the interceptor ordering is non-global — it is determined by the order in which interceptors are
+ the interceptor ordering is non-global — it is determined by the order in which interceptors are
listed at the class level.
</para>
</listitem>
Modified: doc/trunk/reference/en-US/part3.xml
===================================================================
--- doc/trunk/reference/en-US/part3.xml 2009-11-04 19:12:45 UTC (rev 4672)
+++ doc/trunk/reference/en-US/part3.xml 2009-11-04 19:19:59 UTC (rev 4673)
@@ -10,7 +10,7 @@
<para>
You don't see string-based identifiers in CDI code, not because the framework is hiding them from you using clever
- defaulting rules — so-called "configuration by convention" — but because there are simply no strings
+ defaulting rules — so-called "configuration by convention" — but because there are simply no strings
there to begin with!
</para>
Modified: doc/trunk/reference/en-US/scopescontexts.xml
===================================================================
--- doc/trunk/reference/en-US/scopescontexts.xml 2009-11-04 19:12:45 UTC (rev 4672)
+++ doc/trunk/reference/en-US/scopescontexts.xml 2009-11-04 19:19:59 UTC (rev 4673)
@@ -267,7 +267,7 @@
<para>
The container is permitted to destroy a conversation and all state held in its context at any time in order
to preserve resources. A CDI implementation will normally do this on the basis of some kind of timeout
- — though this is not required by the CDI specification. The timeout is the period of inactivity before
+ — though this is not required by the CDI specification. The timeout is the period of inactivity before
the conversation is destroyed (as opposed to the amount of time the conversation is active).
</para>
16 years, 5 months
Weld SVN: r4672 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-04 14:12:45 -0500 (Wed, 04 Nov 2009)
New Revision: 4672
Modified:
doc/trunk/reference/en-US/intro.xml
Log:
remove note to self
Modified: doc/trunk/reference/en-US/intro.xml
===================================================================
--- doc/trunk/reference/en-US/intro.xml 2009-11-04 19:10:59 UTC (rev 4671)
+++ doc/trunk/reference/en-US/intro.xml 2009-11-04 19:12:45 UTC (rev 4672)
@@ -445,7 +445,7 @@
<para>
CDI defines a simple <emphasis>resolution rule</emphasis> that helps the container decide what to do if there
is more than one bean that satisfies a particular contract. We'll get into the details in
- <xref linkend="alternatives"/>. TBD: write a section about "fixing ambiguous dependencies"!
+ <xref linkend="alternatives"/>.
</para>
</section>
16 years, 5 months
Weld SVN: r4671 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-04 14:10:59 -0500 (Wed, 04 Nov 2009)
New Revision: 4671
Modified:
doc/trunk/reference/en-US/injection.xml
Log:
document workarounds for non-proxyable beans
Modified: doc/trunk/reference/en-US/injection.xml
===================================================================
--- doc/trunk/reference/en-US/injection.xml 2009-11-04 19:08:13 UTC (rev 4670)
+++ doc/trunk/reference/en-US/injection.xml 2009-11-04 19:10:59 UTC (rev 4671)
@@ -464,10 +464,22 @@
</itemizedlist>
<para>
- It's usually very easy to fix an <literal>UnproxyableDependencyException</literal>. Simply add a constructor
+ It's usually very easy to fix an <literal>UnproxyableDependencyException</literal>. Simply add a constructor
with no parameters to the injected class, introduce an interface, or, if all else fails, change the scope of
- the injected bean to <literal>@Dependent</literal>.
+ the injected bean to <literal>@Dependent</literal>. Weld will probably support non-standard ways of getting
+ around this depending on what is available on the classpath:
</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>
+ Sun, IcedTea, Mac: <literal>Unsafe.allocateInstance()</literal> (The most efficient)
+ </para>
+ <para>
+ Above + IBM, JRockit: <literal>ReflectionFactory.newConstructorForSerialization()</literal>
+ </para>
+ </listitem>
+ </itemizedlist>
</section>
16 years, 5 months
Weld SVN: r4670 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-04 14:08:13 -0500 (Wed, 04 Nov 2009)
New Revision: 4670
Modified:
doc/trunk/reference/en-US/gettingstarted.xml
Log:
properly describe how game is initialized
Modified: doc/trunk/reference/en-US/gettingstarted.xml
===================================================================
--- doc/trunk/reference/en-US/gettingstarted.xml 2009-11-04 19:06:22 UTC (rev 4669)
+++ doc/trunk/reference/en-US/gettingstarted.xml 2009-11-04 19:08:13 UTC (rev 4670)
@@ -818,8 +818,9 @@
<para>
The final bean in the application is the session-scoped <literal>Game</literal> class. This is the primary
entry point of the application. It's responsible for setting up or resetting the game, capturing and validating
- the user's guess and providing feedback to the user with a <literal>FacesMessage</literal>. We've used
- constructor injection to initialize the game with a random number.
+ the user's guess and providing feedback to the user with a <literal>FacesMessage</literal>. We've used the
+ post-construct lifecycle method to initialize the game by retrieving a random number from the <literal>@Random
+ Instance<Integer></literal> bean.
</para>
<para>
16 years, 5 months
Weld SVN: r4669 - core/tags/glassfish-integration.
by weld-commits＠lists.jboss.org
Author: rogerk
Date: 2009-11-04 14:06:22 -0500 (Wed, 04 Nov 2009)
New Revision: 4669
Added:
core/tags/glassfish-integration/1.0.0-build2/
Log:
build2 tag
Copied: core/tags/glassfish-integration/1.0.0-build2 (from rev 4668, core/trunk)
16 years, 5 months
Weld SVN: r4668 - in core/trunk/tests: src/test/java/org/jboss/weld/test and 16 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-04 13:29:45 -0500 (Wed, 04 Nov 2009)
New Revision: 4668
Added:
core/trunk/tests/src/test/java/org/jboss/weld/test/managed/
core/trunk/tests/src/test/java/org/jboss/weld/test/managed/newBean/
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named/
core/trunk/tests/src/test/resources/org/jboss/weld/test/decorators/
core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/
core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/ejb/
core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/
core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/beans.xml
core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/broken/
core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/
core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/broken/nonSerializableInterceptor/
core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/simple/
Removed:
core/trunk/tests/src/test/java/org/jboss/weld/test/named/
core/trunk/tests/src/test/java/org/jboss/weld/test/newsimple/
core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/decorator/simple/
core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/ejb/
core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/passivation/beans.xml
core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/passivation/broken/interceptorWithNonSerializableField/
core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/passivation/broken/nonSerializableInterceptor/
core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/simple/
Modified:
core/trunk/tests/src/test/java/org/jboss/weld/test/managed/newBean/NewSimpleBeanTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/managed/newBean/WrappedSimpleBean.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named/Important.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named/NamedBeanWithBinding.java
core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named/NamedBeanWithBindingTest.java
core/trunk/tests/src/test/resources/org/jboss/weld/test/decorators/beans.xml
core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/ejb/beans.xml
core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/beans.xml
core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/simple/beans.xml
core/trunk/tests/unit-tests.xml
Log:
finish tidy up
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/managed/newBean (from rev 4663, core/trunk/tests/src/test/java/org/jboss/weld/test/newsimple)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/managed/newBean/NewSimpleBeanTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/newsimple/NewSimpleBeanTest.java 2009-11-04 18:04:46 UTC (rev 4663)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/managed/newBean/NewSimpleBeanTest.java 2009-11-04 18:29:45 UTC (rev 4668)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.newsimple;
+package org.jboss.weld.test.managed.newBean;
import java.util.Set;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/managed/newBean/WrappedSimpleBean.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/newsimple/WrappedSimpleBean.java 2009-11-04 18:04:46 UTC (rev 4663)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/managed/newBean/WrappedSimpleBean.java 2009-11-04 18:29:45 UTC (rev 4668)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.newsimple;
+package org.jboss.weld.test.managed.newBean;
import java.io.Serializable;
Copied: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named (from rev 4663, core/trunk/tests/src/test/java/org/jboss/weld/test/named)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named/Important.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/named/Important.java 2009-11-04 18:04:46 UTC (rev 4663)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named/Important.java 2009-11-04 18:29:45 UTC (rev 4668)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.named;
+package org.jboss.weld.test.resolution.named;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named/NamedBeanWithBinding.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/named/NamedBeanWithBinding.java 2009-11-04 18:04:46 UTC (rev 4663)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named/NamedBeanWithBinding.java 2009-11-04 18:29:45 UTC (rev 4668)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.named;
+package org.jboss.weld.test.resolution.named;
import javax.enterprise.context.RequestScoped;
import javax.inject.Named;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named/NamedBeanWithBindingTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/named/NamedBeanWithBindingTest.java 2009-11-04 18:04:46 UTC (rev 4663)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/resolution/named/NamedBeanWithBindingTest.java 2009-11-04 18:29:45 UTC (rev 4668)
@@ -1,4 +1,4 @@
-package org.jboss.weld.test.named;
+package org.jboss.weld.test.resolution.named;
import javax.enterprise.inject.spi.Bean;
Copied: core/trunk/tests/src/test/resources/org/jboss/weld/test/decorators (from rev 4663, core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/decorator/simple)
Modified: core/trunk/tests/src/test/resources/org/jboss/weld/test/decorators/beans.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/decorator/simple/beans.xml 2009-11-04 18:04:46 UTC (rev 4663)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/test/decorators/beans.xml 2009-11-04 18:29:45 UTC (rev 4668)
@@ -1,6 +1,6 @@
<beans>
<decorators>
- <class>org.jboss.weld.test.unit.decorator.simple.SimpleDecorator1</class>
- <class>org.jboss.weld.test.unit.decorator.simple.SimpleDecorator2</class>
+ <class>org.jboss.weld.test.decorators.SimpleDecorator1</class>
+ <class>org.jboss.weld.test.decorators.SimpleDecorator2</class>
</decorators>
</beans>
Copied: core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/ejb (from rev 4663, core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/ejb)
Modified: core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/ejb/beans.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/ejb/beans.xml 2009-11-04 18:04:46 UTC (rev 4663)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/ejb/beans.xml 2009-11-04 18:29:45 UTC (rev 4668)
@@ -1,7 +1,7 @@
<beans>
<interceptors>
- <class>org.jboss.weld.test.unit.interceptor.ejb.Goalkeeper</class>
- <class>org.jboss.weld.test.unit.interceptor.ejb.Defender</class>
- <class>org.jboss.weld.test.unit.interceptor.ejb.Referee</class>
+ <class>org.jboss.weld.test.interceptors.ejb.Goalkeeper</class>
+ <class>org.jboss.weld.test.interceptors.ejb.Defender</class>
+ <class>org.jboss.weld.test.interceptors.ejb.Referee</class>
</interceptors>
</beans>
Copied: core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/beans.xml (from rev 4663, core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/passivation/beans.xml)
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/beans.xml (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/beans.xml 2009-11-04 18:29:45 UTC (rev 4668)
@@ -0,0 +1,7 @@
+<beans>
+ <interceptors>
+ <class>org.jboss.weld.test.interceptors.passivation.Goalkeeper</class>
+ <class>org.jboss.weld.test.interceptors.passivation.Defender</class>
+ <class>org.jboss.weld.test.interceptors.passivation.PassivationActivationInterceptor</class>
+ </interceptors>
+</beans>
Copied: core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField (from rev 4663, core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/passivation/broken/interceptorWithNonSerializableField)
Modified: core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/beans.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/passivation/broken/interceptorWithNonSerializableField/beans.xml 2009-11-04 18:04:46 UTC (rev 4663)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/broken/interceptorWithNonSerializableField/beans.xml 2009-11-04 18:29:45 UTC (rev 4668)
@@ -1,5 +1,5 @@
<beans>
<interceptors>
- <class>org.jboss.weld.test.unit.interceptor.passivation.broken.interceptorWithNonSerializableField.Defender</class>
+ <class>org.jboss.weld.test.interceptors.passivation.broken.interceptorWithNonSerializableField.Defender</class>
</interceptors>
</beans>
\ No newline at end of file
Copied: core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/passivation/broken/nonSerializableInterceptor (from rev 4663, core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/passivation/broken/nonSerializableInterceptor)
Copied: core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/simple (from rev 4663, core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/simple)
Modified: core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/simple/beans.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/simple/beans.xml 2009-11-04 18:04:46 UTC (rev 4663)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/test/interceptors/simple/beans.xml 2009-11-04 18:29:45 UTC (rev 4668)
@@ -1,9 +1,9 @@
<beans>
<interceptors>
- <class>org.jboss.weld.test.unit.interceptor.simple.SimpleInterceptor</class>
- <class>org.jboss.weld.test.unit.interceptor.simple.TwoBindingsInterceptor</class>
+ <class>org.jboss.weld.test.interceptors.simple.SimpleInterceptor</class>
+ <class>org.jboss.weld.test.interceptors.simple.TwoBindingsInterceptor</class>
</interceptors>
<decorators>
- <class>org.jboss.weld.test.unit.interceptor.simple.SimpleDecorator</class>
+ <class>org.jboss.weld.test.interceptors.simple.SimpleDecorator</class>
</decorators>
</beans>
Deleted: core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/passivation/beans.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/passivation/beans.xml 2009-11-04 18:20:14 UTC (rev 4667)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/test/unit/interceptor/passivation/beans.xml 2009-11-04 18:29:45 UTC (rev 4668)
@@ -1,7 +0,0 @@
-<beans>
- <interceptors>
- <class>org.jboss.weld.test.unit.interceptor.passivation.Goalkeeper</class>
- <class>org.jboss.weld.test.unit.interceptor.passivation.Defender</class>
- <class>org.jboss.weld.test.unit.interceptor.passivation.PassivationActivationInterceptor</class>
- </interceptors>
-</beans>
Modified: core/trunk/tests/unit-tests.xml
===================================================================
--- core/trunk/tests/unit-tests.xml 2009-11-04 18:20:14 UTC (rev 4667)
+++ core/trunk/tests/unit-tests.xml 2009-11-04 18:29:45 UTC (rev 4668)
@@ -18,56 +18,53 @@
</run>
</groups>
<packages>
+ <package name="org.jboss.weld.test.activities" />
+ <package name="org.jboss.weld.test.activities.current" />
+ <package name="org.jboss.weld.test.activities.child" />
+ <package name="org.jboss.weld.test.annotatedType" />
+ <package name="org.jboss.weld.test.annotatedType.decoration" />
+ <package name="org.jboss.weld.test.beanDeployment.managed.multiple" />
+ <package name="org.jboss.weld.test.beanDeployment.managed.single" />
+ <package name="org.jboss.weld.test.beanDeployment.mixed" />
+ <package name="org.jboss.weld.test.beanDeployment.producers.singleProducerMethod" />
+ <package name="org.jboss.weld.test.beanDeployment.session.multiple" />
+ <package name="org.jboss.weld.test.beanDeployment.session.single" />
+ <package name="org.jboss.weld.test.beanManager.serializability" />
+ <package name="org.jboss.weld.test.contexts" />
+ <package name="org.jboss.weld.test.decorators" />
+ <package name="org.jboss.weld.test.el.resolver" />
+ <package name="org.jboss.weld.test.enterprise" />
+ <package name="org.jboss.weld.test.enterprise.lifecycle" />
+ <package name="org.jboss.weld.test.event" />
+ <package name="org.jboss.weld.test.event.tx" />
<package name="org.jboss.weld.test.examples" />
- <package name="org.jboss.weld.test.unit.activities" />
- <package name="org.jboss.weld.test.unit.activities.current" />
- <package name="org.jboss.weld.test.unit.activities.child" />
- <package name="org.jboss.weld.test.unit.annotated" />
- <package name="org.jboss.weld.test.unit.annotated.decoration" />
+ <package name="org.jboss.weld.test.extensions" />
+ <package name="org.jboss.weld.test.interceptors.ejb" />
+ <package name="org.jboss.weld.test.interceptors.ejb3model" />
+ <package name="org.jboss.weld.test.interceptors.passivation" />
+ <package name="org.jboss.weld.test.interceptors.simple" />
+ <package name="org.jboss.weld.test.managed.newBean" />
+ <package name="org.jboss.weld.test.nonContextual" />
+ <package name="org.jboss.weld.test.producer.field" />
+ <package name="org.jboss.weld.test.producer.method" />
+ <package name="org.jboss.weld.test.proxy" />
+ <package name="org.jboss.weld.test.proxy.enterprise" />
+ <package name="org.jboss.weld.test.resolution" />
+ <package name="org.jboss.weld.test.resolution.circular" />
+ <package name="org.jboss.weld.test.resolution.named" />
+ <package name="org.jboss.weld.test.resolution.wbri279" />
+ <package name="org.jboss.weld.test.resolution.wbri293" />
+ <package name="org.jboss.weld.test.session.newBean" />
+ <package name="org.jboss.weld.test.stereotypes" />
<package name="org.jboss.weld.test.unit.bootstrap" />
- <package name="org.jboss.weld.test.unit.bootstrap.environments" />
- <package name="org.jboss.weld.test.unit.bootstrap.multipleEnterprise" />
- <package name="org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple" />
- <package name="org.jboss.weld.test.unit.bootstrap.multipleSimple" />
- <package name="org.jboss.weld.test.unit.bootstrap.singleEnterprise" />
- <package name="org.jboss.weld.test.unit.bootstrap.singleProducerMethod" />
- <package name="org.jboss.weld.test.unit.bootstrap.singleSimple" />
<package name="org.jboss.weld.test.unit.cluster" />
- <package name="org.jboss.weld.test.unit.context" />
- <package name="org.jboss.weld.test.unit.decorator.simple" />
- <package name="org.jboss.weld.test.unit.definition" />
<package name="org.jboss.weld.test.unit.deployment.structure.extensions" />
- <package name="org.jboss.weld.test.unit.deployment.structure.resolution" />
<package name="org.jboss.weld.test.unit.deployment.structure.nonTransitiveResolution" />
+ <package name="org.jboss.weld.test.unit.deployment.structure.resolution" />
<package name="org.jboss.weld.test.unit.environments.servlet" />
- <package name="org.jboss.weld.test.unit.extensions" />
- <package name="org.jboss.weld.test.unit.implementation" />
- <package name="org.jboss.weld.test.unit.implementation.enterpise" />
- <package name="org.jboss.weld.test.unit.implementation.enterpise.lifecycle" />
- <package name="org.jboss.weld.test.unit.implementation.enterprise.sbi" />
- <package name="org.jboss.weld.test.unit.implementation.event" />
- <package name="org.jboss.weld.test.unit.implementation.event.tx" />
- <package name="org.jboss.weld.test.unit.implementation.exceptions" />
- <package name="org.jboss.weld.test.unit.implementation.named" />
- <package name="org.jboss.weld.test.unit.implementation.newsimple" />
- <package name="org.jboss.weld.test.unit.implementation.producer.field" />
- <package name="org.jboss.weld.test.unit.implementation.producer.method" />
- <package name="org.jboss.weld.test.unit.implementation.proxy" />
- <package name="org.jboss.weld.test.unit.implementation.proxy.enterprise" />
- <package name="org.jboss.weld.test.unit.interceptor.ejb" />
- <package name="org.jboss.weld.test.unit.interceptor.ejb3model" />
- <package name="org.jboss.weld.test.unit.interceptor.passivation" />
- <package name="org.jboss.weld.test.unit.interceptor.simple" />
- <package name="org.jboss.weld.test.unit.lookup" />
- <package name="org.jboss.weld.test.unit.lookup.circular" />
- <package name="org.jboss.weld.test.unit.lookup.wbri279" />
- <package name="org.jboss.weld.test.unit.lookup.wbri293" />
- <package name="org.jboss.weld.test.unit.manager" />
- <package name="org.jboss.weld.test.unit.noncontextual" />
- <package name="org.jboss.weld.test.unit.preinstantiatebeanmanager" />
- <package name="org.jboss.weld.test.unit.security" />
<package name="org.jboss.weld.test.unit.reflection.clazz" />
<package name="org.jboss.weld.test.unit.reflection.method" />
+ <package name="org.jboss.weld.test.unit.security" />
</packages>
</test>
16 years, 5 months