svn commit: r931247 - in /myfaces/extensions/cdi/branches/sandbox_conversations: core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversatio...

[gp...@apache.org]

Author: gpetracek
Date: Tue Apr  6 18:01:35 2010
New Revision: 931247

URL: http://svn.apache.org/viewvc?rev=931247&view=rev
Log:
moved ConversationManager

Added:
    myfaces/extensions/cdi/branches/sandbox_conversations/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/named/spi/
    myfaces/extensions/cdi/branches/sandbox_conversations/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/named/spi/ConversationManager.java
      - copied, changed from r930073, myfaces/extensions/cdi/branches/sandbox_conversations/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationManager.java
Removed:
    myfaces/extensions/cdi/branches/sandbox_conversations/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationManager.java
Modified:
    myfaces/extensions/cdi/branches/sandbox_conversations/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/named/AbstractNamedConversationContextAdapter.java
    myfaces/extensions/cdi/branches/sandbox_conversations/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversationManager.java
    myfaces/extensions/cdi/branches/sandbox_conversations/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/named/NamedConversationContextAdapter.java

Modified: myfaces/extensions/cdi/branches/sandbox_conversations/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/named/AbstractNamedConversationContextAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/branches/sandbox_conversations/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/named/AbstractNamedConversationContextAdapter.java?rev=931247&r1=931246&r2=931247&view=diff
==============================================================================
--- myfaces/extensions/cdi/branches/sandbox_conversations/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/named/AbstractNamedConversationContextAdapter.java (original)
+++ myfaces/extensions/cdi/branches/sandbox_conversations/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/named/AbstractNamedConversationContextAdapter.java Tue Apr  6 18:01:35 2010
@@ -19,7 +19,7 @@
 package org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.named;
 
 import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.named.ConversationScoped;
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationManager;
+import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.named.spi.ConversationManager;
 
 import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.spi.Bean;

Copied: myfaces/extensions/cdi/branches/sandbox_conversations/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/named/spi/ConversationManager.java (from r930073, myfaces/extensions/cdi/branches/sandbox_conversations/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationManager.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/branches/sandbox_conversations/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/named/spi/ConversationManager.java?p2=myfaces/extensions/cdi/branches/sandbox_conversations/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/named/spi/ConversationManager.java&p1=myfaces/extensions/cdi/branches/sandbox_conversations/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationManager.java&r1=930073&r2=931247&rev=931247&view=diff
==============================================================================
--- myfaces/extensions/cdi/branches/sandbox_conversations/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationManager.java (original)
+++ myfaces/extensions/cdi/branches/sandbox_conversations/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/named/spi/ConversationManager.java Tue Apr  6 18:01:35 2010
@@ -16,7 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.core.api.scope.conversation;
+package org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.named.spi;
+
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationContext;
 
 /**
  * @author Gerhard Petracek
@@ -27,8 +29,6 @@ public interface ConversationManager
 
     ConversationContext getCurrentConversationContext();
 
-    ConversationContext getConversationContext(Long id);
-
     void activateConversationContext(ConversationContext conversationContext);
 
     void resetCurrentConversationContext();

Modified: myfaces/extensions/cdi/branches/sandbox_conversations/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversationManager.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/branches/sandbox_conversations/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversationManager.java?rev=931247&r1=931246&r2=931247&view=diff
==============================================================================
--- myfaces/extensions/cdi/branches/sandbox_conversations/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversationManager.java (original)
+++ myfaces/extensions/cdi/branches/sandbox_conversations/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversationManager.java Tue Apr  6 18:01:35 2010
@@ -18,15 +18,13 @@
  */
 package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation;
 
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationManager;
+import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.named.spi.ConversationManager;
 import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationContext;
-import org.apache.myfaces.extensions.cdi.javaee.jsf.api.qualifier.Jsf;
 
 /**
  * TODO
  * @author Gerhard Petracek
  */
-@Jsf
 public class DefaultConversationManager implements ConversationManager
 {
     public ConversationContext getCurrentConversationContext()

Modified: myfaces/extensions/cdi/branches/sandbox_conversations/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/named/NamedConversationContextAdapter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/branches/sandbox_conversations/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/named/NamedConversationContextAdapter.java?rev=931247&r1=931246&r2=931247&view=diff
==============================================================================
--- myfaces/extensions/cdi/branches/sandbox_conversations/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/named/NamedConversationContextAdapter.java (original)
+++ myfaces/extensions/cdi/branches/sandbox_conversations/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/named/NamedConversationContextAdapter.java Tue Apr  6 18:01:35 2010
@@ -18,7 +18,7 @@
  */
 package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.named;
 
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationManager;
+import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.named.spi.ConversationManager;
 import org.apache.myfaces.extensions.cdi.core.api.tools.annotate.DefaultAnnotation;
 import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.named.AbstractNamedConversationContextAdapter;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.qualifier.Jsf;