[weld-commits] Weld SVN: r7099 - in archetypes/javaee6-webapp/trunk: src/main/java/com/mycompany/rest and 1 other directories.

[weld-commits at 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>
- * &lt;context-param&gt;
- *    &lt;param-name&gt;resteasy.scan&lt;/param-name&gt;
- *    &lt;param-value&gt;true&lt;/param-value&gt;
- * &lt;/context-param&gt;
- *
- * &lt;context-param&gt;
- *    &lt;param-name&gt;resteasy.servlet.mapping.prefix&lt;/param-name&gt;
- *    &lt;param-value&gt;/rest&lt;/param-value&gt;
- * &lt;/context-param&gt;
- * </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>