[weld/core] d2f00a: whitespace
by noreply＠github.com
Branch: refs/heads/master
Home: https://github.com/weld/core
Commit: d2f00a1d64ab03841175944afa5fc5b7241fe207
https://github.com/weld/core/commit/d2f00a1d64ab03841175944afa5fc5b7241fe207
Author: Pete Muir <pmuir(a)bleepbleep.org.uk>
Date: 2010-11-24 (Wed, 24 Nov 2010)
Changed paths:
M impl/src/main/java/org/jboss/weld/bean/proxy/ContextBeanInstance.java
M impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java
Log Message:
-----------
whitespace
Commit: 53ce930113ea4d9e9d29b2183e616c8270029382
https://github.com/weld/core/commit/53ce930113ea4d9e9d29b2183e616c8270029382
Author: Pete Muir <pmuir(a)bleepbleep.org.uk>
Date: 2010-11-24 (Wed, 24 Nov 2010)
Changed paths:
M impl/src/main/java/org/jboss/weld/context/conversation/ConversationImpl.java
Log Message:
-----------
Remove uneeded check
Commit: 6f08d53047bf7d0c185169bf63ef74b756a43547
https://github.com/weld/core/commit/6f08d53047bf7d0c185169bf63ef74b756a43547
Author: Pete Muir <pmuir(a)bleepbleep.org.uk>
Date: 2010-11-24 (Wed, 24 Nov 2010)
Changed paths:
M impl/src/main/java/org/jboss/weld/context/CreationalContextImpl.java
R impl/src/main/java/org/jboss/weld/context/DependentInstancesStore.java
M impl/src/main/java/org/jboss/weld/context/ForwardingWeldCreationalContext.java
M impl/src/main/java/org/jboss/weld/context/WeldCreationalContext.java
M impl/src/main/java/org/jboss/weld/context/unbound/DependentContextImpl.java
Log Message:
-----------
Merge DependentInstancesStore into CreationalContext
13 years, 5 months
Weld SVN: r7100 - archetypes/javaee6-webapp/trunk.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2010-11-24 14:35:18 -0500 (Wed, 24 Nov 2010)
New Revision: 7100
Modified:
archetypes/javaee6-webapp/trunk/pom.xml
Log:
upgrade to jboss as 6.0.0.CR1
Modified: archetypes/javaee6-webapp/trunk/pom.xml
===================================================================
--- archetypes/javaee6-webapp/trunk/pom.xml 2010-11-24 19:34:45 UTC (rev 7099)
+++ archetypes/javaee6-webapp/trunk/pom.xml 2010-11-24 19:35:18 UTC (rev 7100)
@@ -21,8 +21,8 @@
<!-- By default, we assign it to the value of the JBOSS_HOME envrionment variable -->
<jboss.home>${env.JBOSS_HOME}</jboss.home>
<jboss.domain>default</jboss.domain>
- <arquillian.version>1.0.0.Alpha3</arquillian.version>
- <jboss-javaee6-spec.version>1.0.0.Beta7</jboss-javaee6-spec.version>
+ <arquillian.version>1.0.0.Alpha4</arquillian.version>
+ <jboss-javaee6-spec.version>1.0.0.CR1</jboss-javaee6-spec.version>
</properties>
<repositories>
@@ -294,6 +294,7 @@
</plugins>
</build>
</profile>
+
<profile>
<!-- An optional Arquillian testing profile that executes tests in a remote JBoss AS instance -->
<!-- Run with 'mvn clean test -Parq-jbossas-remote' -->
@@ -318,7 +319,7 @@
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-client</artifactId>
- <version>6.0.0.20100721-M4</version>
+ <version>6.0.0.20101110-CR1</version>
<type>pom</type>
<scope>test</scope>
</dependency>
13 years, 5 months
Weld SVN: r7099 - in archetypes/javaee6-webapp/trunk: src/main/java/com/mycompany/rest and 1 other directories.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2010-11-24 14:34:45 -0500 (Wed, 24 Nov 2010)
New Revision: 7099
Modified:
archetypes/javaee6-webapp/trunk/readme.txt
archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/JaxRsActivator.java
archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/web.xml
Log:
remove special note, jax-rs works correctly on jboss as 6.0.0.CR1
Modified: archetypes/javaee6-webapp/trunk/readme.txt
===================================================================
--- archetypes/javaee6-webapp/trunk/readme.txt 2010-11-24 19:25:39 UTC (rev 7098)
+++ archetypes/javaee6-webapp/trunk/readme.txt 2010-11-24 19:34:45 UTC (rev 7099)
@@ -33,9 +33,9 @@
framework used by the project, Arquillian, is also only available in the JBoss
Community Maven repository.
- TIP:
- As of JBoss AS 6.0.0.CR1, modifications are required to get the sample JAX-RS
- resource working on JBoss AS. See the JaxRsActivator class for instructions.
+ NOTE:
+ Prior to JBoss AS 6.0.0.CR1, modifications were required to get JAX-RS working
+ properly on JBoss AS. We strongly recommend upgrading to 6.0.0.CR1.
With the prerequisites out of the way, you're ready to build and deploy.
Modified: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/JaxRsActivator.java
===================================================================
--- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/JaxRsActivator.java 2010-11-24 19:25:39 UTC (rev 7098)
+++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/rest/JaxRsActivator.java 2010-11-24 19:34:45 UTC (rev 7099)
@@ -9,34 +9,9 @@
*
* <p>Resources are served relative to the servlet path specified in the {@link
* ApplicationPath} annotation.</p>
- *
- * <p><strong>NOTE</strong><br/>The following modifications are required to get
- * JAX-RS working on JBoss AS 6.0.0.M4:</p>
- *
- * <ol>
- * <li>Remove (or comment out) the <code>extends Application</code> clause on this class</li>
- * <li>Remove (or comment out) the <code>@ApplicationPath</code> annotation on this class</li>
- * <li>Open up web.xml and add the following XML snippet:
- * <pre>
- * <context-param>
- * <param-name>resteasy.scan</param-name>
- * <param-value>true</param-value>
- * </context-param>
- *
- * <context-param>
- * <param-name>resteasy.servlet.mapping.prefix</param-name>
- * <param-value>/rest</param-value>
- * </context-param>
- * </pre>
- * <p>The mapping prefix should match the value that was in the
- * <code>@ApplicationPath</code> annotation, prepended with a forward slash (/)
- * if not already present.</p>
- * </li>
- * </ol>
*/
@ApplicationPath("/rest")
public class JaxRsActivator extends Application
{
/* class body intentionally left blank */
}
-//public class JaxRsActivator {}
Modified: archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/web.xml
===================================================================
--- archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/web.xml 2010-11-24 19:25:39 UTC (rev 7098)
+++ archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/web.xml 2010-11-24 19:34:45 UTC (rev 7099)
@@ -6,18 +6,6 @@
http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
- <!-- Extra context parameters required when using RESTEasy as the JAX-RS provider -->
- <!-- You also need to remove JaxRsActivator (or make it an empty class) -->
- <context-param>
- <param-name>resteasy.scan</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <param-name>resteasy.servlet.mapping.prefix</param-name>
- <param-value>/rest</param-value>
- </context-param>
-
<!-- An optional parameter that makes troubleshooting errors much easier -->
<!-- You should remove this context parameter before deploying to production! -->
<context-param>
13 years, 5 months
Weld SVN: r7098 - archetypes/javaee6-webapp/trunk.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2010-11-24 14:25:39 -0500 (Wed, 24 Nov 2010)
New Revision: 7098
Modified:
archetypes/javaee6-webapp/trunk/readme.txt
Log:
update recommended version of JBoss AS
Modified: archetypes/javaee6-webapp/trunk/readme.txt
===================================================================
--- archetypes/javaee6-webapp/trunk/readme.txt 2010-11-24 19:18:05 UTC (rev 7097)
+++ archetypes/javaee6-webapp/trunk/readme.txt 2010-11-24 19:25:39 UTC (rev 7098)
@@ -22,7 +22,7 @@
SDK 1.6) and Maven 3.
The application this project produces is designed to be run on a Java EE 6
- application server. We recommend JBoss AS 6.0.0.M4 or GlassFish 3.0.1, though
+ application server. We recommend JBoss AS 6.0.0.CR1 or GlassFish 3.0.1, though
it should work on any server that is Java EE 6 compliant.
NOTE:
@@ -34,8 +34,8 @@
Community Maven repository.
TIP:
- As of JBoss AS 6.0.0.M4, modifications are required to get the sample JAX-RS
- resource working. See the JaxRsActivator class in this project for instructions.
+ As of JBoss AS 6.0.0.CR1, modifications are required to get the sample JAX-RS
+ resource working on JBoss AS. See the JaxRsActivator class for instructions.
With the prerequisites out of the way, you're ready to build and deploy.
@@ -48,7 +48,7 @@
mvn package
If you want to deploy the application on JBoss AS (standalone), make sure that
- your JBOSS_HOME environment variable points to a JBoss AS 6.0 installation.
+ your JBOSS_HOME environment variable points to a JBoss AS 6 installation.
Alternatively, you can set the location of JBoss AS using the following
profile definition in the .m2/settings.xml file in your home directory:
13 years, 5 months
Weld SVN: r7097 - archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2010-11-24 14:18:05 -0500 (Wed, 24 Nov 2010)
New Revision: 7097
Modified:
archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MemberRegistrationTest.java
Log:
update to latest shrinkwrap api
simplify library imports
Modified: archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MemberRegistrationTest.java
===================================================================
--- archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MemberRegistrationTest.java 2010-11-24 19:17:33 UTC (rev 7096)
+++ archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MemberRegistrationTest.java 2010-11-24 19:18:05 UTC (rev 7097)
@@ -13,7 +13,7 @@
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
@@ -27,12 +27,12 @@
return ShrinkWrap.create(WebArchive.class, "test.war")
.addClasses(Member.class, MemberRegistration.class, MemberRepository.class, MemberRepositoryProducer.class)
// SLF4J libraries required only if not available on the container classpath
-// .addLibraries(
-// MavenArtifactResolver.resolve("org.slf4j:slf4j-api:1.5.10"),
-// MavenArtifactResolver.resolve("org.slf4j:slf4j-jdk14:1.5.10")
-// )
- .addWebResource("test-persistence.xml", "classes/META-INF/persistence.xml")
- .addWebResource(new ByteArrayAsset(new byte[0]), "beans.xml");
+// .addLibraries(MavenArtifactResolver.resolve(
+// "org.slf4j:slf4j-api:1.5.10",
+// "org.slf4j:slf4j-jdk14:1.5.10"
+// ))
+ .addManifestResource("test-persistence.xml", "persistence.xml")
+ .addWebResource(EmptyAsset.INSTANCE, "beans.xml");
}
@Inject MemberRegistration memberRegistration;
13 years, 5 months
Weld SVN: r7096 - archetypes/javaee6-webapp/trunk.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2010-11-24 14:17:33 -0500 (Wed, 24 Nov 2010)
New Revision: 7096
Modified:
archetypes/javaee6-webapp/trunk/pom.xml
Log:
remove include filter causing problems in Eclipse import
Modified: archetypes/javaee6-webapp/trunk/pom.xml
===================================================================
--- archetypes/javaee6-webapp/trunk/pom.xml 2010-11-24 19:17:03 UTC (rev 7095)
+++ archetypes/javaee6-webapp/trunk/pom.xml 2010-11-24 19:17:33 UTC (rev 7096)
@@ -148,9 +148,11 @@
<configuration>
<compilerArgument>-proc:only</compilerArgument>
<!-- If your app has multiple packages, use this include filter to execute the processor only on the package containing your entities -->
+ <!--
<includes>
<include>**/model/*.java</include>
</includes>
+ -->
</configuration>
<goals>
<goal>compile</goal>
13 years, 5 months
Weld SVN: r7095 - archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2010-11-24 14:17:03 -0500 (Wed, 24 Nov 2010)
New Revision: 7095
Modified:
archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MavenArtifactResolver.java
Log:
add simplified methods
Modified: archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MavenArtifactResolver.java
===================================================================
--- archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MavenArtifactResolver.java 2010-11-24 19:16:41 UTC (rev 7094)
+++ archetypes/javaee6-webapp/trunk/src/test/java/com/mycompany/test/MavenArtifactResolver.java 2010-11-24 19:17:03 UTC (rev 7095)
@@ -47,18 +47,45 @@
(System.getProperty("user.home") + File.separatorChar +
".m2" + File.separatorChar + "repository");
- public static File resolve(String groupId, String artifactId, String version)
+ public static File resolve(final String groupId, final String artifactId, final String version)
{
+ return resolve(groupId, artifactId, version, null);
+ }
+
+ public static File resolve(final String groupId, final String artifactId,
+ final String version, final String classifier)
+ {
return new File(LOCAL_MAVEN_REPO + File.separatorChar +
groupId.replace(".", File.separator) + File.separatorChar +
artifactId + File.separatorChar +
version + File.separatorChar +
- artifactId + "-" + version + ".jar");
+ artifactId + "-" + version +
+ (classifier != null ? ("-" + classifier) : "") + ".jar");
}
- public static File resolve(String qualifiedArtifactId)
+ public static File resolve(final String qualifiedArtifactId)
{
String[] segments = qualifiedArtifactId.split(":");
- return resolve(segments[0], segments[1], segments[2]);
+ if (segments.length == 3)
+ {
+ return resolve(segments[0], segments[1], segments[2]);
+ }
+ else if (segments.length == 4)
+ {
+ return resolve(segments[0], segments[1], segments[2], segments[3]);
+ }
+ throw new IllegalArgumentException("Invalid format for qualified artifactId: " + qualifiedArtifactId);
}
+
+ public static File[] resolve(final String... qualifiedArtifactIds)
+ {
+ int n = qualifiedArtifactIds.length;
+ File[] artifacts = new File[n];
+ for (int i = 0; i < n; i++)
+ {
+ artifacts[i] = resolve(qualifiedArtifactIds[i]);
+ }
+
+ return artifacts;
+ }
}
13 years, 5 months
Weld SVN: r7094 - archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2010-11-24 14:16:41 -0500 (Wed, 24 Nov 2010)
New Revision: 7094
Modified:
archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberRepositoryProducer.java
Log:
add example to javadoc
Modified: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberRepositoryProducer.java
===================================================================
--- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberRepositoryProducer.java 2010-11-24 19:16:25 UTC (rev 7093)
+++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/MemberRepositoryProducer.java 2010-11-24 19:16:41 UTC (rev 7094)
@@ -6,8 +6,13 @@
/**
* This class uses CDI to produce EntityManager instances qualified that are
- * qualified as @MemberRepository. Therefore, to inject an instance, @Inject
- * must be followed by @MemberRepository.
+ * qualified as @MemberRepository.
+ *
+ * <p>Example injection on a managed bean field:</p>
+ * <pre>
+ * @Inject @MemberRepository
+ * private EntityManager memberRepository;
+ * </pre>
*/
public class MemberRepositoryProducer
{
13 years, 5 months
Weld SVN: r7093 - archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2010-11-24 14:16:25 -0500 (Wed, 24 Nov 2010)
New Revision: 7093
Modified:
archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/SeedDataImporter.java
Log:
add note about web listener
Modified: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/SeedDataImporter.java
===================================================================
--- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/SeedDataImporter.java 2010-11-24 19:16:00 UTC (rev 7092)
+++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/data/SeedDataImporter.java 2010-11-24 19:16:25 UTC (rev 7093)
@@ -13,6 +13,8 @@
/**
* Import seed data into the database on application startup using
* a startup singleton EJB.
+ *
+ * FIXME Better would be to make this a ServletContextListener (first verify it works on all containers)
*
* @author Dan Allen
*/
13 years, 5 months
Weld SVN: r7092 - archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2010-11-24 14:16:00 -0500 (Wed, 24 Nov 2010)
New Revision: 7092
Modified:
archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/faces-config.xml
archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/web.xml
Log:
FacesServlet activates automatically
add recommended security constraint for protecting .xhtml files
context parameters when using RESTEasy
Modified: archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/faces-config.xml 2010-11-24 19:11:28 UTC (rev 7091)
+++ archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/faces-config.xml 2010-11-24 19:16:00 UTC (rev 7092)
@@ -7,6 +7,8 @@
http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd">
+ <!-- This descriptor activates the JSF 2.0 Servlet -->
+
<!-- Write your navigation rules here. You are encouraged to use CDI for creating @Named managed beans. -->
</faces-config>
Modified: archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/web.xml
===================================================================
--- archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/web.xml 2010-11-24 19:11:28 UTC (rev 7091)
+++ archetypes/javaee6-webapp/trunk/src/main/webapp/WEB-INF/web.xml 2010-11-24 19:16:00 UTC (rev 7092)
@@ -1,32 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app version="3.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
- <!-- This is an optional parameter, but it makes troubleshooting errors much easier -->
- <!-- You should delete it before final deployment! -->
+ <!-- Extra context parameters required when using RESTEasy as the JAX-RS provider -->
+ <!-- You also need to remove JaxRsActivator (or make it an empty class) -->
<context-param>
+ <param-name>resteasy.scan</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>resteasy.servlet.mapping.prefix</param-name>
+ <param-value>/rest</param-value>
+ </context-param>
+
+ <!-- An optional parameter that makes troubleshooting errors much easier -->
+ <!-- You should remove this context parameter before deploying to production! -->
+ <context-param>
<param-name>javax.faces.PROJECT_STAGE</param-name>
<param-value>Development</param-value>
</context-param>
+
+ <!-- JSF 2.0 Servlet activates automatically when the WEB-INF/faces-config.xml descriptor is present -->
- <!-- Activate the JSF 2.0 servlet -->
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <!-- Tell the context which URLs to process with JSF -->
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.jsf</url-pattern>
- </servlet-mapping>
-
<!-- This section is optional. We are allowing index.jsf to handle the root URL (i.e., /). -->
<welcome-file-list>
<!-- Add additional files here, if desired, for example: <welcome-file>index.html</welcome-file> -->
<welcome-file>index.jsf</welcome-file>
</welcome-file-list>
+
+ <!-- Enable this security constraint if you are using *.jsf as your Faces Servlet mapping -->
+ <!--
+ <security-constraint>
+ <display-name>Restrict direct access to Facelets views</display-name>
+ <web-resource-collection>
+ <web-resource-name>Facelets views</web-resource-name>
+ <url-pattern>*.xhtml</url-pattern>
+ </web-resource-collection>
+ <auth-constraint/>
+ </security-constraint>
+ -->
</web-app>
13 years, 5 months