svn commit: r1606533 - in /openwebbeans/trunk/webbeans-tck/src: main/java/ main/java/org/ main/java/org/apache/ main/java/org/apache/openwebbeans/ main/java/org/apache/openwebbeans/tck/ main/java/org/apache/openwebbeans/tck/conversation/ main/resources...

[rm...@apache.org]

Author: rmannibucau
Date: Sun Jun 29 16:16:14 2014
New Revision: 1606533

URL: http://svn.apache.org/r1606533
Log:
tck needs a conversation service, using a constant one for now

Added:
    openwebbeans/trunk/webbeans-tck/src/main/java/
    openwebbeans/trunk/webbeans-tck/src/main/java/org/
    openwebbeans/trunk/webbeans-tck/src/main/java/org/apache/
    openwebbeans/trunk/webbeans-tck/src/main/java/org/apache/openwebbeans/
    openwebbeans/trunk/webbeans-tck/src/main/java/org/apache/openwebbeans/tck/
    openwebbeans/trunk/webbeans-tck/src/main/java/org/apache/openwebbeans/tck/conversation/
    openwebbeans/trunk/webbeans-tck/src/main/java/org/apache/openwebbeans/tck/conversation/TckConversationService.java
Removed:
    openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/openwebbeans/
Modified:
    openwebbeans/trunk/webbeans-tck/src/main/resources/META-INF/openwebbeans/openwebbeans.properties

Added: openwebbeans/trunk/webbeans-tck/src/main/java/org/apache/openwebbeans/tck/conversation/TckConversationService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/src/main/java/org/apache/openwebbeans/tck/conversation/TckConversationService.java?rev=1606533&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-tck/src/main/java/org/apache/openwebbeans/tck/conversation/TckConversationService.java (added)
+++ openwebbeans/trunk/webbeans-tck/src/main/java/org/apache/openwebbeans/tck/conversation/TckConversationService.java Sun Jun 29 16:16:14 2014
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openwebbeans.tck.conversation;
+
+import org.apache.webbeans.spi.ConversationService;
+
+import java.util.UUID;
+
+public class TckConversationService implements ConversationService
+{
+    @Override
+    public String getConversationId()
+    {
+        return "tck-conversation";
+    }
+
+    @Override
+    public String getConversationSessionId()
+    {
+        return "tck-session-conversation";
+    }
+}

Modified: openwebbeans/trunk/webbeans-tck/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1606533&r1=1606532&r2=1606533&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/src/main/resources/META-INF/openwebbeans/openwebbeans.properties (original)
+++ openwebbeans/trunk/webbeans-tck/src/main/resources/META-INF/openwebbeans/openwebbeans.properties Sun Jun 29 16:16:14 2014
@@ -27,7 +27,7 @@
 # this is the tck configuration, thus it has a very high ordinal of 150
 configuration.ordinal=150
 
-
+org.apache.webbeans.spi.ConversationService = org.apache.openwebbeans.tck.conversation.TckConversationService
 
 # we have to switch back to the un-cached version of the normal scoping handler 
 org.apache.webbeans.proxy.mapping.javax.enterprise.context.ApplicationScoped=org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandler