[webbeans-commits] Webbeans SVN: r2038 - in ri/trunk: core-api and 13 other directories.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Mon Mar 16 09:14:48 EDT 2009


Author: pete.muir at jboss.org
Date: 2009-03-16 09:14:48 -0400 (Mon, 16 Mar 2009)
New Revision: 2038

Added:
   ri/trunk/core-api/
   ri/trunk/core-api/pom.xml
   ri/trunk/core-api/src/
   ri/trunk/core-api/src/main/
   ri/trunk/core-api/src/main/java/
   ri/trunk/core-api/src/main/java/org/
   ri/trunk/core-api/src/main/java/org/jboss/
   ri/trunk/core-api/src/main/java/org/jboss/webbeans/
   ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/
   ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationConcurrentAccessTimeout.java
   ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationIdGenerator.java
   ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationIdName.java
   ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationInactivityTimeout.java
   ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationManager.java
   ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationTerminator.java
   ri/trunk/core-api/src/main/resources/
   ri/trunk/core-api/src/test/
   ri/trunk/core-api/src/test/java/
   ri/trunk/core-api/src/test/resources/
Removed:
   ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationIdGenerator.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationManager.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationTerminator.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/bindings/
Modified:
   ri/trunk/impl/pom.xml
   ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ConversationPropagationFilter.java
   ri/trunk/pom.xml
   ri/trunk/version-matrix/pom.xml
Log:
split out core-api

Added: ri/trunk/core-api/pom.xml
===================================================================
--- ri/trunk/core-api/pom.xml	                        (rev 0)
+++ ri/trunk/core-api/pom.xml	2009-03-16 13:14:48 UTC (rev 2038)
@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <parent>
+      <artifactId>webbeans-parent</artifactId>
+      <groupId>org.jboss.webbeans</groupId>
+      <version>1.0.0-SNAPSHOT</version>
+   </parent>
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>org.jboss.webbeans</groupId>
+   <artifactId>webbeans-api</artifactId>
+   <version>1.0.0-SNAPSHOT</version>
+   <name>Web Beans Core API</name>
+   <dependencies>
+
+      <dependency>
+         <groupId>org.jboss.webbeans</groupId>
+         <artifactId>jsr299-api</artifactId>
+      </dependency>
+      
+   </dependencies>
+
+   <build>
+   	<defaultGoal>install</defaultGoal>
+   </build>
+   
+</project>

Added: ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationConcurrentAccessTimeout.java
===================================================================
--- ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationConcurrentAccessTimeout.java	                        (rev 0)
+++ ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationConcurrentAccessTimeout.java	2009-03-16 13:14:48 UTC (rev 2038)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed 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.jboss.webbeans.conversation;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.BindingType;
+
+/**
+ * The conversation context concurrent access wait timeout on a lock
+ *  
+ * @author Nicklas Karlsson
+ */
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at BindingType
+public @interface ConversationConcurrentAccessTimeout
+{
+}

Added: ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationIdGenerator.java
===================================================================
--- ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationIdGenerator.java	                        (rev 0)
+++ ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationIdGenerator.java	2009-03-16 13:14:48 UTC (rev 2038)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed 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.jboss.webbeans.conversation;
+
+/**
+ * Generates conversation ID:s for the conversation manager
+ * 
+ * @author Nicklas Karlsson
+ * @see org.jboss.webbeans.conversation.ConversationManager#beginOrRestoreConversation(String)
+ */
+public interface ConversationIdGenerator
+{
+   /**
+    * Gets the next ID for a new conversation
+    * @return The ID
+    */
+   public abstract String nextId();
+}

Added: ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationIdName.java
===================================================================
--- ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationIdName.java	                        (rev 0)
+++ ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationIdName.java	2009-03-16 13:14:48 UTC (rev 2038)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed 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.jboss.webbeans.conversation;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.BindingType;
+
+/**
+ * The conversation id request parameter name
+ *  
+ * @author Nicklas Karlsson
+ */
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at BindingType
+public @interface ConversationIdName
+{
+}

Added: ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationInactivityTimeout.java
===================================================================
--- ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationInactivityTimeout.java	                        (rev 0)
+++ ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationInactivityTimeout.java	2009-03-16 13:14:48 UTC (rev 2038)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed 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.jboss.webbeans.conversation;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.BindingType;
+
+/**
+ * The conversation context inactivity timeout
+ *  
+ * @author Nicklas Karlsson
+ */
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at BindingType
+public @interface ConversationInactivityTimeout
+{
+}

Added: ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationManager.java
===================================================================
--- ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationManager.java	                        (rev 0)
+++ ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationManager.java	2009-03-16 13:14:48 UTC (rev 2038)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed 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.jboss.webbeans.conversation;
+
+import java.util.Set;
+
+import javax.context.Conversation;
+
+/**
+ * A conversation manager responsible for starting, resuming and ending conversations
+ * 
+ * @author Nicklas Karlsson
+ * @see org.jboss.webbeans.conversation.ConversationManager
+ */
+public interface ConversationManager
+{
+   /**
+    * Begins or restores a conversation
+    * 
+    * @param cid The incoming conversation ID. Can be null in cases of transient conversations
+    */
+   public abstract void beginOrRestoreConversation(String cid);
+   
+   /**
+    * Cleans up the current conversation, destroying transient conversation and handling 
+    * long-running conversations
+    */
+   public abstract void cleanupConversation();
+   
+   /**
+    * Destroys all long-running conversations
+    */
+   public abstract void destroyAllConversations();
+   
+   /**
+    * Gets the currently managed long-running conversations
+    * 
+    * @return the conversations
+    */
+   public abstract Set<Conversation> getLongRunningConversations();
+   
+}

Added: ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationTerminator.java
===================================================================
--- ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationTerminator.java	                        (rev 0)
+++ ri/trunk/core-api/src/main/java/org/jboss/webbeans/conversation/ConversationTerminator.java	2009-03-16 13:14:48 UTC (rev 2038)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed 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.jboss.webbeans.conversation;
+
+import java.util.concurrent.Future;
+
+/**
+ * A conversation terminator for scheduling inactivity timeout destructions
+ * 
+ * @author Nicklas Karlsson
+ *
+ */
+public interface ConversationTerminator
+{
+   /**
+    * Schedules a termination
+    * 
+    * @param terminationTask The termination task to run
+    * @param timeoutInMilliseconds The timeout in milliseconds
+    * 
+    * @return A handle for manipulating the task later on
+    */
+   public abstract Future<?> scheduleForTermination(Runnable terminationTask, long timeoutInMilliseconds);
+}

Modified: ri/trunk/impl/pom.xml
===================================================================
--- ri/trunk/impl/pom.xml	2009-03-16 12:24:23 UTC (rev 2037)
+++ ri/trunk/impl/pom.xml	2009-03-16 13:14:48 UTC (rev 2038)
@@ -18,6 +18,11 @@
       
       <dependency>
          <groupId>org.jboss.webbeans</groupId>
+         <artifactId>webbeans-api</artifactId>
+      </dependency>
+      
+      <dependency>
+         <groupId>org.jboss.webbeans</groupId>
          <artifactId>webbeans-spi</artifactId>
       </dependency>
 

Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationIdGenerator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationIdGenerator.java	2009-03-16 12:24:23 UTC (rev 2037)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationIdGenerator.java	2009-03-16 13:14:48 UTC (rev 2038)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed 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.jboss.webbeans.conversation;
-
-/**
- * Generates conversation ID:s for the conversation manager
- * 
- * @author Nicklas Karlsson
- * @see org.jboss.webbeans.conversation.ConversationManager#beginOrRestoreConversation(String)
- */
-public interface ConversationIdGenerator
-{
-   /**
-    * Gets the next ID for a new conversation
-    * @return The ID
-    */
-   public abstract String nextId();
-}

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java	2009-03-16 12:24:23 UTC (rev 2037)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java	2009-03-16 13:14:48 UTC (rev 2038)
@@ -23,7 +23,6 @@
 import javax.inject.Initializer;
 import javax.inject.Standard;
 
-import org.jboss.webbeans.conversation.bindings.ConversationInactivityTimeout;
 import org.jboss.webbeans.log.LogProvider;
 import org.jboss.webbeans.log.Logging;
 

Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationManager.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationManager.java	2009-03-16 12:24:23 UTC (rev 2037)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationManager.java	2009-03-16 13:14:48 UTC (rev 2038)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed 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.jboss.webbeans.conversation;
-
-import java.util.Set;
-
-import javax.context.Conversation;
-
-/**
- * A conversation manager responsible for starting, resuming and ending conversations
- * 
- * @author Nicklas Karlsson
- * @see org.jboss.webbeans.conversation.ConversationManager
- */
-public interface ConversationManager
-{
-   /**
-    * Begins or restores a conversation
-    * 
-    * @param cid The incoming conversation ID. Can be null in cases of transient conversations
-    */
-   public abstract void beginOrRestoreConversation(String cid);
-   
-   /**
-    * Cleans up the current conversation, destroying transient conversation and handling 
-    * long-running conversations
-    */
-   public abstract void cleanupConversation();
-   
-   /**
-    * Destroys all long-running conversations
-    */
-   public abstract void destroyAllConversations();
-   
-   /**
-    * Gets the currently managed long-running conversations
-    * 
-    * @return the conversations
-    */
-   public abstract Set<Conversation> getLongRunningConversations();
-   
-}

Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationTerminator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationTerminator.java	2009-03-16 12:24:23 UTC (rev 2037)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationTerminator.java	2009-03-16 13:14:48 UTC (rev 2038)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed 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.jboss.webbeans.conversation;
-
-import java.util.concurrent.Future;
-
-/**
- * A conversation terminator for scheduling inactivity timeout destructions
- * 
- * @author Nicklas Karlsson
- *
- */
-public interface ConversationTerminator
-{
-   /**
-    * Schedules a termination
-    * 
-    * @param terminationTask The termination task to run
-    * @param timeoutInMilliseconds The timeout in milliseconds
-    * 
-    * @return A handle for manipulating the task later on
-    */
-   public abstract Future<?> scheduleForTermination(Runnable terminationTask, long timeoutInMilliseconds);
-}

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java	2009-03-16 12:24:23 UTC (rev 2037)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java	2009-03-16 13:14:48 UTC (rev 2038)
@@ -33,9 +33,6 @@
 import org.jboss.webbeans.CurrentManager;
 import org.jboss.webbeans.WebBean;
 import org.jboss.webbeans.context.ConversationContext;
-import org.jboss.webbeans.conversation.bindings.ConversationConcurrentAccessTimeout;
-import org.jboss.webbeans.conversation.bindings.ConversationIdName;
-import org.jboss.webbeans.conversation.bindings.ConversationInactivityTimeout;
 import org.jboss.webbeans.log.LogProvider;
 import org.jboss.webbeans.log.Logging;
 import org.jboss.webbeans.servlet.HttpSessionManager;

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java	2009-03-16 12:24:23 UTC (rev 2037)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java	2009-03-16 13:14:48 UTC (rev 2038)
@@ -21,7 +21,7 @@
 import javax.servlet.http.HttpSession;
 
 import org.jboss.webbeans.CurrentManager;
-import org.jboss.webbeans.conversation.bindings.ConversationIdName;
+import org.jboss.webbeans.conversation.ConversationIdName;
 import org.jboss.webbeans.log.LogProvider;
 import org.jboss.webbeans.log.Logging;
 

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ConversationPropagationFilter.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ConversationPropagationFilter.java	2009-03-16 12:24:23 UTC (rev 2037)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ConversationPropagationFilter.java	2009-03-16 13:14:48 UTC (rev 2038)
@@ -31,7 +31,7 @@
 import javax.servlet.http.HttpServletResponseWrapper;
 
 import org.jboss.webbeans.CurrentManager;
-import org.jboss.webbeans.conversation.bindings.ConversationIdName;
+import org.jboss.webbeans.conversation.ConversationIdName;
 
 /**
  * Filter for handling conversation propagation over redirects

Modified: ri/trunk/pom.xml
===================================================================
--- ri/trunk/pom.xml	2009-03-16 12:24:23 UTC (rev 2037)
+++ ri/trunk/pom.xml	2009-03-16 13:14:48 UTC (rev 2038)
@@ -54,6 +54,7 @@
             <module>parent</module>
             <module>api</module>
             <module>spi</module>
+            <module>core-api</module>
          </modules>
       </profile>
       <profile>
@@ -66,6 +67,7 @@
             <module>parent</module>
             <module>api</module>
             <module>spi</module>
+            <module>core-api</module>
             <module>impl</module>
             <module>porting-package</module>
             <module>jboss-tck-runner</module>

Modified: ri/trunk/version-matrix/pom.xml
===================================================================
--- ri/trunk/version-matrix/pom.xml	2009-03-16 12:24:23 UTC (rev 2037)
+++ ri/trunk/version-matrix/pom.xml	2009-03-16 13:14:48 UTC (rev 2038)
@@ -209,6 +209,12 @@
          
          <dependency>
             <groupId>org.jboss.webbeans</groupId>
+            <artifactId>webbeans-api</artifactId>
+            <version>${webbeans.version}</version>
+         </dependency>
+         
+         <dependency>
+            <groupId>org.jboss.webbeans</groupId>
             <artifactId>webbeans-core</artifactId>
             <version>${webbeans.version}</version>
          </dependency>




More information about the weld-commits mailing list