Merge branch 'release/3.1.0.Beta2' into develop

seam · Aug 24, 2011 · c082b27 · c082b27
2 parents 6fc3acf + 6ae02e7
commit c082b27
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 29 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -28,11 +28,6 @@
     <artifactId>seam-catch-api</artifactId>
     <packaging>jar</packaging>
 
-    <properties>
-        <junit.version>4.8.2</junit.version>
-        <hamcrest.version>1.3.RC2</hamcrest.version>
-    </properties>
-
     <name>Seam Catch API</name>
     <!-- url required for JAR Manifest -->
     <url>${project.parent.url}</url>
@@ -41,14 +36,10 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
-            <version>${hamcrest.version}</version>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 

diff --git a/dist/src/main/assembly/assembly.xml b/dist/src/main/assembly/assembly.xml
@@ -19,6 +19,8 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
 
+    <id>distribution</id>
+
    <formats>
       <format>zip</format>
    </formats>
@@ -53,7 +55,7 @@
          </excludes>
          <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
       </dependencySet>
-      
+
       <!-- Add necessary dependencies -->
       <dependencySet>
          <outputDirectory>lib</outputDirectory>
@@ -65,7 +67,7 @@
          </excludes>
          <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
       </dependencySet>
-      
+
       <!-- Pull in the example projects -->
       <dependencySet>
          <outputDirectory>examples</outputDirectory>
@@ -75,7 +77,7 @@
             <include>org.jboss.seam.catch:seam-catch-example-basic-servlet</include>
          </includes>
       </dependencySet>
-      
+
       <!-- Pull in JavaDoc -->
       <dependencySet>
          <outputDirectory>doc/api</outputDirectory>
@@ -104,7 +106,7 @@
             </excludes>
          </unpackOptions>
       </dependencySet>
-      
+
       <!-- Add the source -->
       <dependencySet>
          <outputDirectory>source</outputDirectory>
@@ -119,6 +121,6 @@
                <exclude>META-INF/</exclude>
             </excludes>
          </unpackOptions>
-      </dependencySet>       
+      </dependencySet>
    </dependencySets>
 </assembly>
diff --git a/impl/pom.xml b/impl/pom.xml
@@ -63,6 +63,10 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+        </dependency>
     </dependencies>
 
     <profiles>

diff --git a/impl/src/test/java/org/jboss/seam/exception/filter/test/StackFilteringTest.java b/impl/src/test/java/org/jboss/seam/exception/filter/test/StackFilteringTest.java
@@ -101,16 +101,15 @@ public void dropTest() throws IOException {
         final StackFrameFilter<NoClassDefFoundError> filter = new StackFrameFilter<NoClassDefFoundError>() {
             @Override
             public StackFrameFilterResult process(StackFrame frame) {
+                // We want to drop calls referring to reflection
                 if (frame.isMarkSet("reflections.invoke")) {
-                    if (frame.getStackTraceElement().getClassName().contains("java.lang.reflect")) {
+                    if (!frame.getStackTraceElement().toString().contains("reflect")) {
                         frame.clearMark("reflections.invoke");
                         return StackFrameFilterResult.INCLUDE;
-                    } else if (frame.getStackTraceElement().getMethodName().startsWith("invoke")) {
-                        return StackFrameFilterResult.DROP;
                     }
                 }
 
-                if (frame.getStackTraceElement().getMethodName().startsWith("invoke")) {
+                if (frame.getStackTraceElement().toString().contains("reflect")) {
                     frame.mark("reflections.invoke");
                     return StackFrameFilterResult.DROP;
                 }
@@ -127,18 +126,19 @@ public StackFrameFilterResult process(StackFrame frame) {
         final ExceptionStackOutput<NoClassDefFoundError> exceptionStackOutput = new ExceptionStackOutput<NoClassDefFoundError>(noClassDefFoundError, filter);
         final String result = exceptionStackOutput.printTrace();
         final LineNumberReader lineNumberReader = new LineNumberReader(new StringReader(result));
-        int invokeLines = 0;
+        int reflectLines = 0;
         String line;
 
         while ((line = lineNumberReader.readLine()) != null) {
             if (line.contains("reflect")) {
-                invokeLines++;
+                reflectLines++;
             }
-        } // just get the line numbers
+            System.out.println(line);
+        }
 
 
         assertThat("Actual: " + result, lineNumberReader.getLineNumber() < 22, is(true));
-        assertThat(invokeLines, is(1));
+        assertThat(reflectLines, is(0));
     }
 
     @Test

diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>seam-parent</artifactId>
         <groupId>org.jboss.seam</groupId>
-        <version>12</version>
+        <version>14</version>
     </parent>
 
     <groupId>org.jboss.seam.catch</groupId>
@@ -32,8 +32,8 @@
     <url>http://www.seamframework.org/Seam3/CatchModuleHome</url>
 
     <properties>
-        <seam.version>3.1.0-SNAPSHOT</seam.version>
-        <seam.solder.version>3.1.0-SNAPSHOT</seam.solder.version>
+        <seam.version>3.1.0.Beta2</seam.version>
+        <seam.solder.version>3.1.0.Beta2</seam.solder.version>
         <jboss.spec.version>2.0.0.Final</jboss.spec.version>
     </properties>
 
@@ -80,6 +80,12 @@
                 <version>${seam.solder.version}</version>
                 <scope>compile</scope>
             </dependency>
+            <dependency>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest-library</artifactId>
+                <version>${hamcrest.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/testsuite/common/src/main/java/org/jboss/seam/exception/control/test/BaseWebArchive.java b/testsuite/common/src/main/java/org/jboss/seam/exception/control/test/BaseWebArchive.java
@@ -61,15 +61,15 @@ public final class BaseWebArchive {
     private static volatile JavaArchive solderLoggingJar = null;
     private static volatile JavaArchive solderApiJar = null;
 
-    private static final String SOLDER_VERSION = "3.1.0.Beta1";
+    private static final String SOLDER_VERSION = "3.1.0.Beta2";
 
     private static final String SOLDER_NAME = "seam-solder-" + SOLDER_VERSION + ".jar";
     private static final String SOLDER_LOGGING_NAME = "seam-solder-logging-" + SOLDER_VERSION + ".jar";
     private static final String SOLDER_API_NAME = "seam-solder-api-" + SOLDER_VERSION + ".jar";
 
-    private static final String SOLDER_JBOSS_REPO = "https://repository.jboss.org/nexus/content/groups/staging/org/jboss/seam/solder/seam-solder/";
-    private static final String SOLDER_LOGGING_JBOSS_REPO = "https://repository.jboss.org/nexus/content/groups/staging/org/jboss/seam/solder/seam-solder-logging/";
-    private static final String SOLDER_API_JBOSS_REPO = "https://repository.jboss.org/nexus/content/groups/staging/org/jboss/seam/solder/seam-solder-api/";
+    private static final String SOLDER_JBOSS_REPO = "https://repository.jboss.org/nexus/content/groups/public/org/jboss/seam/solder/seam-solder/";
+    private static final String SOLDER_LOGGING_JBOSS_REPO = "https://repository.jboss.org/nexus/content/groups/public/org/jboss/seam/solder/seam-solder-logging/";
+    private static final String SOLDER_API_JBOSS_REPO = "https://repository.jboss.org/nexus/content/groups/public/org/jboss/seam/solder/seam-solder-api/";
 
     private static final String SOLDER_URL_STRING = SOLDER_JBOSS_REPO + SOLDER_VERSION + "/" + SOLDER_NAME;
     private static final String SOLDER_LOGGING_URL_STRING = SOLDER_LOGGING_JBOSS_REPO + SOLDER_VERSION + "/" + SOLDER_LOGGING_NAME;

diff --git a/testsuite/container-boms/weld-ee-embedded-1.1/pom.xml b/testsuite/container-boms/weld-ee-embedded-1.1/pom.xml
@@ -39,6 +39,12 @@
             <groupId>org.jboss.weld</groupId>
             <artifactId>weld-core</artifactId>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

diff --git a/testsuite/internals/pom.xml b/testsuite/internals/pom.xml
@@ -30,6 +30,10 @@
     <name>Seam Catch Test Suite: Internals Integration Tests</name>
     <packaging>pom</packaging>
 
+    <properties>
+        <seam.solder.version>3.1.0.Beta2</seam.solder.version>
+    </properties>
+
     <modules>
         <module>base</module>
         <module>weld-ee-embedded</module>

diff --git a/testsuite/internals/weld-ee-embedded/pom.xml b/testsuite/internals/weld-ee-embedded/pom.xml
@@ -63,6 +63,23 @@
             <groupId>org.jboss.weld</groupId>
             <artifactId>weld-core</artifactId>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${version.slf4j}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.seam.solder</groupId>
+            <artifactId>seam-solder-logging</artifactId>
+            <version>${seam.solder.version}</version>
         </dependency>
     </dependencies>