Weld SVN: r6992 - archetypes/javaee6-webapp/trunk.
by weld-commits@lists.jboss.org
Author: dan.j.allen
Date: 2010-08-19 22:37:00 -0400 (Thu, 19 Aug 2010)
New Revision: 6992
Modified:
archetypes/javaee6-webapp/trunk/pom.xml
Log:
grammar
Modified: archetypes/javaee6-webapp/trunk/pom.xml
===================================================================
--- archetypes/javaee6-webapp/trunk/pom.xml 2010-08-20 02:36:46 UTC (rev 6991)
+++ archetypes/javaee6-webapp/trunk/pom.xml 2010-08-20 02:37:00 UTC (rev 6992)
@@ -86,7 +86,7 @@
</dependency>
<!-- Need to use the injectable logger in Weld Extensions -->
- <!-- Switch scope to provided if server provides slf4j; JBoss AS provides it; GlassFish provides it if you have the Hibernate JPA provider installed -->
+ <!-- Switch scope to provided if server provides slf4j; JBoss AS provides it; GlassFish provides it if the Hibernate JPA provider is installed -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -94,7 +94,7 @@
<scope>compile</scope>
</dependency>
- <!-- Remove if server provides slf4j; JBoss AS provides it; GlassFish provides it if you have the Hibernate JPA provider installed -->
+ <!-- Remove if server provides slf4j; JBoss AS provides it; GlassFish provides it if the Hibernate JPA provider is installed -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
13 years, 8 months
Weld SVN: r6991 - archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany.
by weld-commits@lists.jboss.org
Author: dan.j.allen
Date: 2010-08-19 22:36:46 -0400 (Thu, 19 Aug 2010)
New Revision: 6991
Modified:
archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/JaxRsActivator.java
Log:
document modifications required to get JAX-RS working on JBoss AS 6.0.0.M4
Modified: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/JaxRsActivator.java
===================================================================
--- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/JaxRsActivator.java 2010-08-20 02:36:19 UTC (rev 6990)
+++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/JaxRsActivator.java 2010-08-20 02:36:46 UTC (rev 6991)
@@ -4,13 +4,35 @@
import javax.ws.rs.core.Application;
/**
- * This empty, annotated {@link Application} class is the Java EE 6 "no XML"
- * approach to activate JAX-RS. Resources are served from the servlet path
- * specified in the @ApplicationPath annotation.
- *
- * NOTE As of JBoss AS 6.0.0.M3, JAX-RS does not activate properly.
+ * A class extending {@link Application} and annotated with @ApplicationPath
+ * is the Java EE 6 "no XML" approach to activating JAX-RS.
+ *
+ * <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, prefixed
+ * with a forward slash (/).</p></li>
+ * </ol>
*/
-@ApplicationPath("/rest")
+@ApplicationPath("rest")
public class JaxRsActivator extends Application
{
/* class body intentionally left blank */
13 years, 8 months
Weld SVN: r6990 - archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany.
by weld-commits@lists.jboss.org
Author: dan.j.allen
Date: 2010-08-19 22:36:19 -0400 (Thu, 19 Aug 2010)
New Revision: 6990
Modified:
archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberResourceRESTService.java
Log:
whitespace
Modified: archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberResourceRESTService.java
===================================================================
--- archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberResourceRESTService.java 2010-08-19 21:40:04 UTC (rev 6989)
+++ archetypes/javaee6-webapp/trunk/src/main/java/com/mycompany/MemberResourceRESTService.java 2010-08-20 02:36:19 UTC (rev 6990)
@@ -7,6 +7,7 @@
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
+
/**
* JAX-RS Example
*
13 years, 8 months
Weld SVN: r6989 - archetypes/javaee6-webapp/trunk.
by weld-commits@lists.jboss.org
Author: dan.j.allen
Date: 2010-08-19 17:40:04 -0400 (Thu, 19 Aug 2010)
New Revision: 6989
Modified:
archetypes/javaee6-webapp/trunk/build.sh
Log:
create transient readme.html
Modified: archetypes/javaee6-webapp/trunk/build.sh
===================================================================
--- archetypes/javaee6-webapp/trunk/build.sh 2010-08-19 21:39:35 UTC (rev 6988)
+++ archetypes/javaee6-webapp/trunk/build.sh 2010-08-19 21:40:04 UTC (rev 6989)
@@ -13,6 +13,7 @@
ARCHETYPE_RESOURCES_DIR=$ARCHETYPE_DIR/src/main/resources/archetype-resources
echo Generating archetype from project into $ARCHETYPE_BUILD_DIR...
+txt2html -pb 1 -p 2 -mh readme.txt > readme.html
mvn clean archetype:create-from-project -Darchetype.properties=archetype.properties
echo Relocating generated archetype project to $ARCHETYPE_DIR...
rsync -az --exclude `basename $0` --exclude archetype-pom.xml --exclude eclipse-dot-files $ARCHETYPE_BUILD_DIR/src $ARCHETYPE_DIR/
@@ -29,6 +30,7 @@
sed -i 's;eclipse-dot-files/\?;;' $ARCHETYPE_DIR/src/main/resources/META-INF/maven/archetype-metadata.xml
# remove local file that NetBeans add to source project
rm -f $ARCHETYPE_RESOURCES_DIR/src/main/webapp/WEB-INF/sun-web.xml
+rm -f readme.html
# could set the release version at this point, if specified
if [ ! -z $1 ] && [ "$1" = "install" ]; then
echo Installing archetype...
13 years, 8 months
Weld SVN: r6988 - archetypes/javaee6-webapp/trunk.
by weld-commits@lists.jboss.org
Author: dan.j.allen
Date: 2010-08-19 17:39:35 -0400 (Thu, 19 Aug 2010)
New Revision: 6988
Modified:
archetypes/javaee6-webapp/trunk/archetype.properties
Log:
filter html
Modified: archetypes/javaee6-webapp/trunk/archetype.properties
===================================================================
--- archetypes/javaee6-webapp/trunk/archetype.properties 2010-08-18 12:28:27 UTC (rev 6987)
+++ archetypes/javaee6-webapp/trunk/archetype.properties 2010-08-19 21:39:35 UTC (rev 6988)
@@ -5,5 +5,5 @@
archetype.package=com.mycompany
archetype.languages=java
# value of <artifactId> is converted to ${artifactId} expression in filtered files
-archetype.filteredExtensions=java,txt
+archetype.filteredExtensions=java,txt,html
name=Java EE 6 project
13 years, 8 months
[weld/core] 359216: WELD-466
by noreply@github.com
Branch: refs/heads/master
Home: http://github.com/weld/core
Commit: 3592160a5c7a20a4f6757550426b7ed257b33260
http://github.com/weld/core/commit/3592160a5c7a20a4f6757550426b7ed257b33260
Author: Pete Muir <pmuir(a)bleepbleep.org.uk>
Date: 2010-08-19 (Thu, 19 Aug 2010)
Changed paths:
M impl/src/main/java/org/jboss/weld/bean/builtin/AbstractFacade.java
M impl/src/main/java/org/jboss/weld/bean/builtin/AbstractFacadeBean.java
M impl/src/main/java/org/jboss/weld/bean/builtin/EventBean.java
M impl/src/main/java/org/jboss/weld/bean/builtin/InstanceBean.java
M impl/src/main/java/org/jboss/weld/bean/builtin/InstanceImpl.java
M impl/src/main/java/org/jboss/weld/event/EventImpl.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/producer/method/Cafe.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/producer/method/Compostable.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/producer/method/Food.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/producer/method/InstanceCleanupTest.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/producer/method/Kitchen.java
Log Message:
-----------
WELD-466
13 years, 8 months
[weld/core] 52cb45: Prevent NPEs
by noreply@github.com
Branch: refs/heads/master
Home: http://github.com/weld/core
Commit: 52cb45128030e1784fb1d2b36029011fac156d55
http://github.com/weld/core/commit/52cb45128030e1784fb1d2b36029011fac156d55
Author: Pete Muir <pmuir(a)bleepbleep.org.uk>
Date: 2010-08-19 (Thu, 19 Aug 2010)
Changed paths:
M impl/src/main/java/org/jboss/weld/bean/DecoratorImpl.java
Log Message:
-----------
Prevent NPEs
Commit: 91764036754c98662b94b3f2cf31e71ec3d57628
http://github.com/weld/core/commit/91764036754c98662b94b3f2cf31e71ec3d57628
Author: Pete Muir <pmuir(a)bleepbleep.org.uk>
Date: 2010-08-19 (Thu, 19 Aug 2010)
Changed paths:
A tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/AlarmedChickenHutch.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/ChickenHutch.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/ChickenHutchFactory.java
M tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/MassProduced.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/enterprise/lifecycle/StandardChickenHutch.java
Log Message:
-----------
WELD-556
13 years, 8 months