Tjws removal

integration-tests/profiling-tests/pom.xml

@@ -65,12 +65,6 @@
             <groupId>org.jboss.spec.javax.servlet</groupId>
             <artifactId>jboss-servlet-api_3.1_spec</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>tjws</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 

pom.xml

@@ -148,7 +148,6 @@
                 <module>resteasy-test-data</module>
                 <module>resteasy-jaxrs</module>
                 <module>resteasy-client</module>
-                <module>resteasy-jaxrs-testsuite</module>
                 <module>providers</module>
                 <module>resteasy-bom</module>
                 <module>resteasy-cache</module>
@@ -198,7 +197,6 @@
                 <module>resteasy-test-data</module>
                 <module>resteasy-jaxrs</module>
                 <module>resteasy-client</module>
-                <module>resteasy-jaxrs-testsuite</module>
                 <module>providers</module>
                 <module>resteasy-bom</module>
                 <module>resteasy-cache</module>
@@ -227,7 +225,6 @@
                 <module>resteasy-test-data</module>
                 <module>resteasy-jaxrs</module>
                 <module>resteasy-client</module>
-                <module>resteasy-jaxrs-testsuite</module>
                 <module>providers</module>
                 <module>resteasy-bom</module>
                 <module>resteasy-cache</module>

providers/fastinfoset/pom.xml

@@ -13,10 +13,6 @@
     <description/>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
@@ -33,23 +29,6 @@
             <groupId>com.sun.xml.fastinfoset</groupId>
             <artifactId>FastInfoset</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.spec.javax.servlet</groupId>
-            <artifactId>jboss-servlet-api_3.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>tjws</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <!--
-        <dependency>
-           <groupId>tjws</groupId>
-           <artifactId>webserver</artifactId>
-           <scope>test</scope>
-        </dependency>
-        -->
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
@@ -62,17 +41,8 @@
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-processor</artifactId>
         </dependency> 
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-jaxrs-testsuite</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
-
-
     <profiles>
         <profile>
             <id>i18n</id>

providers/jettison/pom.xml

@@ -56,12 +56,6 @@
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-processor</artifactId>
         </dependency> 
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-jaxrs-testsuite</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <profiles>

providers/jettison/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesAbstract.java

@@ -7,7 +7,6 @@
 import org.junit.Assert;
 
 import org.jboss.resteasy.plugins.providers.jaxb.json.i18n.Messages;
-import org.jboss.resteasy.test.resteasy_jaxrs.i18n.TestMessagesParent;
 import org.junit.Test;
 
 /**

resteasy-jaxrs-testsuite/src/main/java/org/jboss/resteasy/test/resteasy_jaxrs/i18n/TestMessagesParent.java → providers/jettison/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesParent.java

@@ -1,4 +1,4 @@
-package org.jboss.resteasy.test.resteasy_jaxrs.i18n;
+package org.jboss.resteasy.test.i18n;
 
 import java.io.InputStream;
 import java.util.Locale;

providers/multipart/pom.xml

@@ -41,18 +41,6 @@
             <artifactId>jboss-servlet-api_3.1_spec</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>tjws</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.weld.se</groupId>
-            <artifactId>weld-se</artifactId>
-            <version>2.1.0.Final</version>
-            <scope>test</scope>
-        </dependency>
-      <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
         </dependency>
@@ -64,12 +52,6 @@
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-processor</artifactId>
         </dependency> 
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-jaxrs-testsuite</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <profiles>

providers/resteasy-atom/pom.xml

@@ -23,31 +23,6 @@
             <artifactId>resteasy-jaxb-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
-      <dependency>
-            <groupId>org.jboss.spec.javax.servlet</groupId>
-            <artifactId>jboss-servlet-api_3.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-jaxrs-testsuite</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>tjws</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.spec.javax.annotation</groupId>
-            <artifactId>jboss-annotations-api_1.2_spec</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-annotations</artifactId>

providers/resteasy-atom/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesAbstract.java

@@ -7,7 +7,6 @@
 import org.junit.Assert;
 
 import org.jboss.resteasy.plugins.providers.resteasy_atom.i18n.Messages;
-import org.jboss.resteasy.test.resteasy_jaxrs.i18n.TestMessagesParent;
 import org.junit.Test;
 
 /**

providers/resteasy-atom/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesParent.java

@@ -0,0 +1,81 @@
+package org.jboss.resteasy.test.i18n;
+
+import java.io.InputStream;
+import java.util.Locale;
+import java.util.Properties;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+
+/**
+ * 
+ * @author <a href="ron.sigal@jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * 
+ * Copyright Oct 8, 2014
+ */
+abstract public class TestMessagesParent
+{
+   static protected Locale savedLocale;
+   protected Properties properties = new Properties();
+
+   @BeforeClass
+   static public void beforeClass()
+   {
+      savedLocale = Locale.getDefault();  
+   }
+
+   @AfterClass
+   static public void afterClass()
+   {
+      Locale.setDefault(savedLocale);
+      System.out.println("Reset default locale to: " + savedLocale);
+   }
+
+   public boolean before(Locale locale, String filename) throws Exception
+   {
+         System.out.println("default locale: " + Locale.getDefault());
+         Locale.setDefault(locale);
+         System.out.println("Set default locale to: " + locale);
+         System.out.println("Messages file: " + filename);
+         InputStream is = getClass().getClassLoader().getResourceAsStream(filename);
+         if (is == null)
+         {
+            return false;
+         }
+         properties.load(is);
+         return getExpectedNumberOfMethods() == properties.size(); 
+   }
+
+   protected String getExpected(String id, String message, Object... args)
+   {
+      String expected = "RESTEASY" + id + ": " + String.format(replacePositionalSpecifiers(String.class.cast(properties.get(message))), args);
+      System.out.println("expected: " + expected);
+      return expected;    
+   }
+
+   protected String replacePositionalSpecifiers(String s)
+   {
+//      System.out.println("before: " + s);
+      int pos0 = s.indexOf("{0}");
+      if (pos0 > -1)
+      {
+         s = s.substring(0, pos0) + "%1$s" + (pos0 + 3 >= s.length() ? "" : s.substring(pos0 + 3));
+      }
+      int pos1 = s.indexOf("{1}");
+      if (pos1 > -1)
+      {
+         s = s.substring(0, pos1) + "%2$s" + (pos1 + 3 >= s.length() ? "" : s.substring(pos1 + 3));
+      }
+      int pos2 = s.indexOf("{2}");
+      if (pos2 > -1)
+      {
+         s = s.substring(0, pos2) + "%3$s" + (pos2 + 3 >= s.length() ? "" : s.substring(pos2 + 3));
+      }
+//      System.out.println("after: " + s);
+      return s;
+   }
+
+   abstract protected int getExpectedNumberOfMethods();
+   abstract protected Locale getLocale();
+}

providers/resteasy-html/pom.xml

@@ -18,18 +18,11 @@
             <artifactId>resteasy-jaxrs</artifactId>
             <version>${project.version}</version>
         </dependency>
-       <dependency>
+        <dependency>
             <groupId>org.jboss.spec.javax.servlet</groupId>
             <artifactId>jboss-servlet-api_3.1_spec</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>tjws</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-      <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
         </dependency>
@@ -41,12 +34,6 @@
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-processor</artifactId>
         </dependency> 
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-jaxrs-testsuite</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <profiles>

providers/resteasy-html/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesAbstract.java

@@ -5,7 +5,6 @@
 import org.junit.Assert;
 
 import org.jboss.resteasy.plugins.providers.html.i18n.Messages;
-import org.jboss.resteasy.test.resteasy_jaxrs.i18n.TestMessagesParent;
 import org.junit.Test;
 
 /**

providers/resteasy-html/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesParent.java

@@ -0,0 +1,81 @@
+package org.jboss.resteasy.test.i18n;
+
+import java.io.InputStream;
+import java.util.Locale;
+import java.util.Properties;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+
+/**
+ * 
+ * @author <a href="ron.sigal@jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * 
+ * Copyright Oct 8, 2014
+ */
+abstract public class TestMessagesParent
+{
+   static protected Locale savedLocale;
+   protected Properties properties = new Properties();
+
+   @BeforeClass
+   static public void beforeClass()
+   {
+      savedLocale = Locale.getDefault();  
+   }
+
+   @AfterClass
+   static public void afterClass()
+   {
+      Locale.setDefault(savedLocale);
+      System.out.println("Reset default locale to: " + savedLocale);
+   }
+
+   public boolean before(Locale locale, String filename) throws Exception
+   {
+         System.out.println("default locale: " + Locale.getDefault());
+         Locale.setDefault(locale);
+         System.out.println("Set default locale to: " + locale);
+         System.out.println("Messages file: " + filename);
+         InputStream is = getClass().getClassLoader().getResourceAsStream(filename);
+         if (is == null)
+         {
+            return false;
+         }
+         properties.load(is);
+         return getExpectedNumberOfMethods() == properties.size(); 
+   }
+
+   protected String getExpected(String id, String message, Object... args)
+   {
+      String expected = "RESTEASY" + id + ": " + String.format(replacePositionalSpecifiers(String.class.cast(properties.get(message))), args);
+      System.out.println("expected: " + expected);
+      return expected;    
+   }
+
+   protected String replacePositionalSpecifiers(String s)
+   {
+//      System.out.println("before: " + s);
+      int pos0 = s.indexOf("{0}");
+      if (pos0 > -1)
+      {
+         s = s.substring(0, pos0) + "%1$s" + (pos0 + 3 >= s.length() ? "" : s.substring(pos0 + 3));
+      }
+      int pos1 = s.indexOf("{1}");
+      if (pos1 > -1)
+      {
+         s = s.substring(0, pos1) + "%2$s" + (pos1 + 3 >= s.length() ? "" : s.substring(pos1 + 3));
+      }
+      int pos2 = s.indexOf("{2}");
+      if (pos2 > -1)
+      {
+         s = s.substring(0, pos2) + "%3$s" + (pos2 + 3 >= s.length() ? "" : s.substring(pos2 + 3));
+      }
+//      System.out.println("after: " + s);
+      return s;
+   }
+
+   abstract protected int getExpectedNumberOfMethods();
+   abstract protected Locale getLocale();
+}