svn commit: r1838715 - in /openwebbeans/trunk/webbeans-web/src/it: forward/b/src/main/java/org/apache/openwebbeans/web/it/beans/ forward/b/src/main/java/org/superbiz/ forward/b/src/main/java/org/superbiz/beans/ forward/b/src/main/webapp/ webcdiapp/ web...

[st...@apache.org]

Author: struberg
Date: Thu Aug 23 11:28:36 2018
New Revision: 1838715

URL: http://svn.apache.org/viewvc?rev=1838715&view=rev
Log:
OWB-1252 fix our web ITs

Added:
    openwebbeans/trunk/webbeans-web/src/it/forward/b/src/main/java/org/superbiz/
    openwebbeans/trunk/webbeans-web/src/it/forward/b/src/main/java/org/superbiz/beans/
      - copied from r1838714, openwebbeans/trunk/webbeans-web/src/it/forward/b/src/main/java/org/apache/openwebbeans/web/it/beans/
    openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/
    openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/TestServlet.java
      - copied, changed from r1838714, openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/apache/openwebbeans/web/it/TestServlet.java
    openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/
      - copied from r1838714, openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/apache/openwebbeans/web/it/beans/
    openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/
      - copied from r1838714, openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/apache/openwebbeans/web/it/conversation/
Removed:
    openwebbeans/trunk/webbeans-web/src/it/forward/b/src/main/java/org/apache/openwebbeans/web/it/beans/
    openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/apache/
Modified:
    openwebbeans/trunk/webbeans-web/src/it/forward/b/src/main/java/org/superbiz/beans/RequestScopedBean.java
    openwebbeans/trunk/webbeans-web/src/it/forward/b/src/main/webapp/target.jsp
    openwebbeans/trunk/webbeans-web/src/it/webcdiapp/pom.xml
    openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/ContextEventCounter.java
    openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/NonAnnotatedDependentBean.java
    openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/RequestScopedBean.java
    openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/SessionScopedCounter.java
    openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/ConversationITServlet.java
    openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/ConversationalShoppingCart.java
    openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/SessionUser.java

Modified: openwebbeans/trunk/webbeans-web/src/it/forward/b/src/main/java/org/superbiz/beans/RequestScopedBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/it/forward/b/src/main/java/org/superbiz/beans/RequestScopedBean.java?rev=1838715&r1=1838714&r2=1838715&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/it/forward/b/src/main/java/org/superbiz/beans/RequestScopedBean.java (original)
+++ openwebbeans/trunk/webbeans-web/src/it/forward/b/src/main/java/org/superbiz/beans/RequestScopedBean.java Thu Aug 23 11:28:36 2018
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openwebbeans.web.it.beans;
+package org.superbiz.beans;
 
 import javax.enterprise.context.RequestScoped;
 

Modified: openwebbeans/trunk/webbeans-web/src/it/forward/b/src/main/webapp/target.jsp
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/it/forward/b/src/main/webapp/target.jsp?rev=1838715&r1=1838714&r2=1838715&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/it/forward/b/src/main/webapp/target.jsp (original)
+++ openwebbeans/trunk/webbeans-web/src/it/forward/b/src/main/webapp/target.jsp Thu Aug 23 11:28:36 2018
@@ -18,7 +18,7 @@ under the License.
 -->
 <%@ page import="java.util.Date" %>
 <%@ page import="javax.enterprise.inject.spi.CDI" %>
-<%@ page import="org.apache.openwebbeans.web.it.beans.RequestScopedBean" %>
+<%@ page import="org.superbiz.beans.RequestScopedBean" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%
     System.out.println("entering target.jsp page");

Modified: openwebbeans/trunk/webbeans-web/src/it/webcdiapp/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/it/webcdiapp/pom.xml?rev=1838715&r1=1838714&r2=1838715&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/it/webcdiapp/pom.xml (original)
+++ openwebbeans/trunk/webbeans-web/src/it/webcdiapp/pom.xml Thu Aug 23 11:28:36 2018
@@ -63,6 +63,11 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-interceptor_1.2_spec</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.3_spec</artifactId>
+        </dependency>
+
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Copied: openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/TestServlet.java (from r1838714, openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/apache/openwebbeans/web/it/TestServlet.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/TestServlet.java?p2=openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/TestServlet.java&p1=openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/apache/openwebbeans/web/it/TestServlet.java&r1=1838714&r2=1838715&rev=1838715&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/apache/openwebbeans/web/it/TestServlet.java (original)
+++ openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/TestServlet.java Thu Aug 23 11:28:36 2018
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openwebbeans.web.it;
+package org.superbiz;
 
-import org.apache.openwebbeans.web.it.beans.ContextEventCounter;
-import org.apache.openwebbeans.web.it.beans.RequestScopedBean;
+import org.superbiz.beans.ContextEventCounter;
+import org.superbiz.beans.RequestScopedBean;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;

Modified: openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/ContextEventCounter.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/ContextEventCounter.java?rev=1838715&r1=1838714&r2=1838715&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/ContextEventCounter.java (original)
+++ openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/ContextEventCounter.java Thu Aug 23 11:28:36 2018
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openwebbeans.web.it.beans;
+package org.superbiz.beans;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.context.Destroyed;

Modified: openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/NonAnnotatedDependentBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/NonAnnotatedDependentBean.java?rev=1838715&r1=1838714&r2=1838715&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/NonAnnotatedDependentBean.java (original)
+++ openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/NonAnnotatedDependentBean.java Thu Aug 23 11:28:36 2018
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openwebbeans.web.it.beans;
+package org.superbiz.beans;
 
 /**
  * This bean is _not_ annotated with a bean scope

Modified: openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/RequestScopedBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/RequestScopedBean.java?rev=1838715&r1=1838714&r2=1838715&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/RequestScopedBean.java (original)
+++ openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/RequestScopedBean.java Thu Aug 23 11:28:36 2018
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openwebbeans.web.it.beans;
+package org.superbiz.beans;
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.ContextNotActiveException;
@@ -31,8 +31,8 @@ import javax.inject.Named;
 public class RequestScopedBean
 {
 
-    private static int requestInstanceCounter = 0;
-    private static int requestContextCounter = 0;
+    private static volatile int requestInstanceCounter = 0;
+    private static volatile int requestContextCounter = 0;
 
     private @Inject NonAnnotatedDependentBean nonAnnotatedBean;
     private @Inject SessionScopedCounter sessionScopedCounter;

Modified: openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/SessionScopedCounter.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/SessionScopedCounter.java?rev=1838715&r1=1838714&r2=1838715&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/SessionScopedCounter.java (original)
+++ openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/beans/SessionScopedCounter.java Thu Aug 23 11:28:36 2018
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openwebbeans.web.it.beans;
+package org.superbiz.beans;
 
 import javax.enterprise.context.SessionScoped;
 import javax.inject.Named;

Modified: openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/ConversationITServlet.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/ConversationITServlet.java?rev=1838715&r1=1838714&r2=1838715&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/ConversationITServlet.java (original)
+++ openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/ConversationITServlet.java Thu Aug 23 11:28:36 2018
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openwebbeans.web.it.conversation;
+package org.superbiz.conversation;
 
 import javax.enterprise.inject.spi.CDI;
 import javax.servlet.ServletException;

Modified: openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/ConversationalShoppingCart.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/ConversationalShoppingCart.java?rev=1838715&r1=1838714&r2=1838715&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/ConversationalShoppingCart.java (original)
+++ openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/ConversationalShoppingCart.java Thu Aug 23 11:28:36 2018
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openwebbeans.web.it.conversation;
+package org.superbiz.conversation;
 
 import javax.enterprise.context.Conversation;
 import javax.enterprise.context.ConversationScoped;

Modified: openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/SessionUser.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/SessionUser.java?rev=1838715&r1=1838714&r2=1838715&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/SessionUser.java (original)
+++ openwebbeans/trunk/webbeans-web/src/it/webcdiapp/src/main/java/org/superbiz/conversation/SessionUser.java Thu Aug 23 11:28:36 2018
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openwebbeans.web.it.conversation;
+package org.superbiz.conversation;
 
 import javax.enterprise.context.SessionScoped;
 import java.io.Serializable;