switch to Seam Solder

- switch from Weld Extensions to Seam Solder - remove functionality migrated to Solder - relocate HttpMethod to event package - generate ServletMessages and ServletLog concrete classes - accomodate inverted type parameters on ProcessProducerMethod event - tests for @started WebApplication event - update tests to reflect use of Servlet in event bridge
seam · Dec 22, 2010 · eee9dfa · eee9dfa
1 parent c72a4f9
commit eee9dfa
Show file tree

Hide file tree

Showing 25 changed files with 230 additions and 775 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -34,11 +34,11 @@
 
    <build>
       <plugins>
-         <!-- No tests in the api, skip phase -->
+         <!-- Skip test phase in API module -->
          <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-               <skipTests>true</skipTests>
+               <skip>true</skip>
             </configuration>
          </plugin>
       </plugins>

diff --git a/...g/jboss/seam/servlet/http/HttpMethod.java → .../jboss/seam/servlet/event/HttpMethod.java b/...g/jboss/seam/servlet/http/HttpMethod.java → .../jboss/seam/servlet/event/HttpMethod.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.seam.servlet.http;
+package org.jboss.seam.servlet.event;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.PARAMETER;
@@ -27,7 +27,8 @@
 import javax.inject.Qualifier;
 
 /**
- * Qualifies the HTTP method.
+ * Qualifies observer methods to select HTTP lifecycle events for a particular
+ * HTTP method.
  * 
  * @author <a href="http://community.jboss.org/people/dan.j.allen">Dan Allen</a>
  */

diff --git a/api/src/main/java/org/jboss/seam/servlet/event/Path.java b/api/src/main/java/org/jboss/seam/servlet/event/Path.java
@@ -11,9 +11,9 @@
 import javax.inject.Qualifier;
 
 /**
- * Qualifies observer methods to select events for a particular Servlet path. A
- * leading '/' should not be used in the value as base URIs are treated as if
- * they ended in '/'.
+ * Qualifies observer methods to select HTTP lifecycle events for a particular
+ * Servlet path. A leading '/' should not be used in the value as base URIs are
+ * treated as if they ended in '/'.
  * 
  * @author <a href="http://community.jboss.org/people/dan.j.allen">Dan Allen</a>
  */

diff --git a/...rvlet/http/literal/HttpMethodLiteral.java → ...vlet/event/literal/HttpMethodLiteral.java b/...rvlet/http/literal/HttpMethodLiteral.java → ...vlet/event/literal/HttpMethodLiteral.java
@@ -17,11 +17,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.seam.servlet.http.literal;
+package org.jboss.seam.servlet.event.literal;
 
 import javax.enterprise.util.AnnotationLiteral;
 
-import org.jboss.seam.servlet.http.HttpMethod;
+import org.jboss.seam.servlet.event.HttpMethod;
 
 /**
  * @author <a href="http://community.jboss.org/people/dan.j.allen">Dan Allen</a>
@@ -32,7 +32,14 @@ public class HttpMethodLiteral extends AnnotationLiteral<HttpMethod> implements
 
    public HttpMethodLiteral(String value)
    {
-      this.value = value;
+      if (value == null || value.length() == 0)
+      {
+         this.value = "GET";
+      }
+      else
+      {
+         this.value = value;
+      }
    }
 
    public String value()

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -40,44 +40,75 @@
       </dependency>
 
       <dependency>
-         <groupId>org.jboss.weld</groupId>
-         <artifactId>weld-extensions</artifactId>
+         <groupId>org.jboss.seam.solder</groupId>
+         <artifactId>seam-solder-api</artifactId>
          <scope>compile</scope>
       </dependency>
 
       <dependency>
          <groupId>org.jboss.seam.catch</groupId>
          <artifactId>seam-catch-api</artifactId>
-         <version>3.0.0.Alpha2</version>
          <scope>provided</scope>
       </dependency>
 
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>
-         <version>3.0.0.Beta4</version>
-         <scope>provided</scope>
+      </dependency>
+
+      <!-- JBoss Logging annotation processor for generating type-safe loggers -->
+      <dependency>
+         <groupId>org.jboss.logging</groupId>
+         <artifactId>jboss-logging-tools</artifactId>
+         <optional>true</optional>
       </dependency>
 
       <!-- Test Dependencies -->
       <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>
-         <scope>test</scope>
       </dependency>
       <dependency>
          <groupId>org.jboss.arquillian</groupId>
          <artifactId>arquillian-junit</artifactId>
-         <scope>test</scope>
       </dependency>
       <dependency>
          <groupId>org.mockito</groupId>
          <artifactId>mockito-all</artifactId>
-         <version>1.8.4</version>
-         <scope>test</scope>
       </dependency>
    </dependencies>
 
+   <build>
+      <plugins>
+         <!-- Next two plugins configure 1.6 behavior for 1.5 compiler -->
+         <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>generate-sources</id>
+                  <phase>generate-sources</phase>
+                  <configuration>
+                     <tasks>
+                        <mkdir dir="${project.build.directory}/generated-sources/annotations"/>
+                     </tasks>
+                  </configuration>
+                  <goals>
+                     <goal>run</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
+         <plugin>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+               <compilerArguments>
+                  <s>${project.build.directory}/generated-sources/annotations</s>
+               </compilerArguments>
+            </configuration>
+         </plugin>
+      </plugins>
+   </build>
+
    <profiles>
       <profile>
          <id>default</id>
@@ -92,20 +123,17 @@
             <dependency>
                <groupId>org.jboss.arquillian.container</groupId>
                <artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
-               <scope>test</scope>
             </dependency>
             <dependency>
                <groupId>org.jboss.spec</groupId>
                <artifactId>jboss-javaee-6.0</artifactId>
-               <version>${jboss.javaee.version}</version>
                <type>pom</type>
                <scope>provided</scope>
             </dependency>
             <dependency>
                <groupId>org.jboss.weld</groupId>
                <artifactId>weld-core</artifactId>
                <scope>test</scope>
-               <optional>true</optional>
             </dependency>
             <dependency>
                <groupId>org.slf4j</groupId>
@@ -127,28 +155,23 @@
             <dependency>
                <groupId>org.jboss.arquillian.container</groupId>
                <artifactId>arquillian-jbossas-remote-6</artifactId>
-               <version>${arquillian.version}</version>
-               <scope>test</scope>
             </dependency>
             <dependency>
                <groupId>org.jboss.spec</groupId>
                <artifactId>jboss-javaee-6.0</artifactId>
-               <version>${jboss.javaee.version}</version>
                <type>pom</type>
                <scope>provided</scope>
             </dependency>
             <dependency>
                <groupId>org.jboss.jbossas</groupId>
                <artifactId>jboss-as-client</artifactId>
-               <version>6.0.0.20100911-M5</version>
                <type>pom</type>
                <scope>test</scope>
             </dependency>
             <dependency>
                <groupId>org.jboss.weld</groupId>
                <artifactId>weld-core</artifactId>
                <scope>test</scope>
-               <optional>true</optional>
             </dependency>
          </dependencies>
          <build>
@@ -174,7 +197,6 @@
             <dependency>
                <groupId>org.jboss.arquillian.container</groupId>
                <artifactId>arquillian-glassfish-embedded-3</artifactId>
-               <version>${arquillian.version}</version>
                <scope>test</scope>
             </dependency>
          </dependencies>