[webbeans-commits] Webbeans SVN: r1478 - in ri/trunk: webbeans-ri/src/main/java/org/jboss/webbeans and 9 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Tue Feb 10 15:30:52 EST 2009
Author: nickarls
Date: 2009-02-10 15:30:51 -0500 (Tue, 10 Feb 2009)
New Revision: 1478
Modified:
ri/trunk/webbeans-api/src/main/java/javax/context/Context.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/ConstructorInjectionPoint.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/Exceptions.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockBootstrap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockEjbDescriptor.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockEjbDiscovery.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockResourceLoader.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockWebBeanDiscovery.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockApplicationContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockDependentContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockRequestContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockSessionContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/el/EL.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ConversationBeanMap.java
Log:
minors
Modified: ri/trunk/webbeans-api/src/main/java/javax/context/Context.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/context/Context.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-api/src/main/java/javax/context/Context.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -44,7 +44,7 @@
* @param <T> the type of contextual type
* @param contextual the contextual type
* @param creationalContext the creational context in which incompletely
- * initialized may be placed
+ * initialized instances may be placed
* @return the contextual instance, or null if no creational context is given
* and an instance does not exist in the context
* @throws ContextNotActiveException if the context is not active
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -108,7 +108,7 @@
if (resolvedBean instanceof AbstractProducerBean)
{
AbstractProducerBean producerBean = (AbstractProducerBean) resolvedBean;
- if (producerBean.getScopeType().equals(Dependent.class) && !Reflections.isSerializable(producerBean.getType()))
+ if (producerBean.isDependent() && !Reflections.isSerializable(producerBean.getType()))
{
throw new IllegalProductException("Cannot inject @Depedent non-serializable type into " + injectionPoint);
}
@@ -123,7 +123,7 @@
{
injectionPoint.getBean();
}
- else if (producerBean.getScopeType().equals(Dependent.class) && !Reflections.isSerializable(producerBean.getType()))
+ else if (producerBean.isDependent() && !Reflections.isSerializable(producerBean.getType()))
{
throw new IllegalProductException("Cannot inject @Depedent non-serializable type into " + injectionPoint);
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -849,6 +849,7 @@
buffer.append("Registered beans: " + getBeans().size() + "\n");
buffer.append("Registered decorators: " + decorators.size() + "\n");
buffer.append("Registered interceptors: " + interceptors.size() + "\n");
+ buffer.append("Specialized beans: " + specializedBeans.size() + "\n");
return buffer.toString();
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -169,11 +169,11 @@
*/
protected void checkEnterpriseScopeAllowed()
{
- if (ejbDescriptor.isStateless() && !getScopeType().equals(Dependent.class))
+ if (ejbDescriptor.isStateless() && !isDependent())
{
throw new DefinitionException("Scope " + getScopeType() + " is not allowed on stateless enterpise beans for " + getType() + ". Only @Dependent is allowed on stateless enterprise beans");
}
- if (ejbDescriptor.isSingleton() && (!(getScopeType().equals(Dependent.class) || getScopeType().equals(ApplicationScoped.class))))
+ if (ejbDescriptor.isSingleton() && (!isDependent() || getScopeType().equals(ApplicationScoped.class)))
{
throw new DefinitionException("Scope " + getScopeType() + " is not allowed on singleton enterpise beans for " + getType() + ". Only @Dependent or @ApplicationScoped is allowed on singleton enterprise beans");
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -339,7 +339,7 @@
protected void checkBeanImplementation()
{
super.checkBeanImplementation();
- if (!scopeType.equals(Dependent.class))
+ if (!isDependent())
{
for (AnnotatedField<?> field : getAnnotatedItem().getFields())
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -1,3 +1,19 @@
+/*
+ * 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.context;
import java.util.HashMap;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -36,11 +36,11 @@
@WebBeans
public class JavaSEConversationTerminator implements ConversationTerminator, Serializable
{
- private ScheduledExecutorService terminator = Executors.newScheduledThreadPool(1);
+ private ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
public Future<?> scheduleForTermination(Runnable terminationTask, long timeoutInMilliseconds)
{
- return terminator.schedule(terminationTask, timeoutInMilliseconds, TimeUnit.MILLISECONDS);
+ return executor.schedule(terminationTask, timeoutInMilliseconds, TimeUnit.MILLISECONDS);
}
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -45,6 +45,9 @@
public class ServletConversationManager implements ConversationManager, Serializable
{
private static LogProvider log = Logging.getLogProvider(WebBeansBootstrap.class);
+
+ private static final long CONVERSATION_TIMEOUT_IN_MS = 10 * 60 * 1000;
+ private static final long CONVERSATION_CONCURRENT_ACCESS_TIMEOUT_IN_MS = 1 * 1000;
// The conversation terminator
@Current
@@ -83,7 +86,7 @@
@WebBeans
public long getConversationTimeoutInMilliseconds()
{
- return 10 * 60 * 1000;
+ return CONVERSATION_TIMEOUT_IN_MS;
}
@Produces
@@ -91,7 +94,7 @@
@WebBeans
public long getConversationConcurrentAccessTimeout()
{
- return 1 * 1000;
+ return CONVERSATION_CONCURRENT_ACCESS_TIMEOUT_IN_MS;
}
public void beginOrRestoreConversation(String cid)
@@ -116,13 +119,13 @@
{
if (!longRunningConversations.get(cid).lock(concurrentAccessTimeout))
{
- log.info("Could not acquire conversation lock in " + concurrentAccessTimeout + "ms, giving up");
+ log.debug("Could not acquire conversation lock in " + concurrentAccessTimeout + "ms, giving up");
return;
}
}
catch (InterruptedException e)
{
- log.info("Interrupted while trying to acquire lock");
+ log.debug("Interrupted while trying to acquire lock");
return;
}
// If we can't cancel the termination, release the lock, return and continue
@@ -130,13 +133,15 @@
if (!longRunningConversations.get(cid).cancelTermination())
{
longRunningConversations.get(cid).unlock();
- log.info("Failed to cancel termination of conversation " + cid);
+ log.debug("Failed to cancel termination of conversation " + cid);
}
else
{
// If all goes well, set the identity of the current conversation to
// match the fetched long-running one
+ String oldConversation = currentConversation.toString();
currentConversation.switchTo(cid, true, inactivityTimeout);
+ log.trace("Conversation switched from " + oldConversation + " to " + currentConversation);
}
}
@@ -218,13 +223,14 @@
*/
public void run()
{
- log.trace("Conversation " + cid + " timed out and was terminated");
+ log.trace("Conversation " + cid + " timed out and was destroyed");
longRunningConversations.remove(cid).destroy(session);
}
}
public void destroyAllConversations()
{
+ log.trace("Destroying " + longRunningConversations.size() + " long-running conversations in session " + session.getId());
for (ConversationEntry conversationEntry : longRunningConversations.values())
{
conversationEntry.destroy(session);
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/ConstructorInjectionPoint.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/ConstructorInjectionPoint.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/ConstructorInjectionPoint.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -1,3 +1,19 @@
+/*
+ * 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.injection;
import static org.jboss.webbeans.injection.Exceptions.rethrowException;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/Exceptions.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/Exceptions.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injection/Exceptions.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -1,3 +1,19 @@
+/*
+ * 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.injection;
import java.lang.reflect.InvocationTargetException;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -25,27 +25,29 @@
import javax.faces.event.PhaseListener;
import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.context.ConversationContext;
import org.jboss.webbeans.conversation.ConversationManager;
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
import org.jboss.webbeans.servlet.ServletLifecycle;
/**
- * A phase listener for propagating conversation id over postbacks through a hidden component
- *
+ * A phase listener for propagating conversation id over postbacks through a
+ * hidden component
+ *
* @author Nicklas Karlsson
- *
+ *
*/
public class WebBeansPhaseListener implements PhaseListener
{
// The ID/name of the conversation-propagating component
- private static final String CONVERSATION_PROPAGATION_COMPONENT = "jboss_org_webbeans_conversation_propagation";
+ private static final String CONVERSATION_PROPAGATION_COMPONENT = "webbeans_conversation_propagation";
private static LogProvider log = Logging.getLogProvider(ServletLifecycle.class);
/**
* Indicates if we are in a JSF postback or not
- *
+ *
* @return True if postback, false otherwise
*/
private boolean isPostback()
@@ -69,6 +71,10 @@
conversationManager.beginOrRestoreConversation(cid);
}
}
+ else if (phaseEvent.getPhaseId().equals(PhaseId.RENDER_RESPONSE))
+ {
+ ConversationContext.INSTANCE.setActive(false);
+ }
}
public void beforePhase(PhaseEvent phaseEvent)
@@ -78,7 +84,8 @@
// If we are rendering the response from a postback
log.trace("Processing after RENDER_RESPONSE phase");
Conversation conversation = CurrentManager.rootManager().getInstanceByType(Conversation.class);
- // If we are in a long-running conversation, create or update the conversation id
+ // If we are in a long-running conversation, create or update the
+ // conversation id
// in the propagation component in the view root
if (conversation.isLongRunning())
{
@@ -92,6 +99,10 @@
removePropagationComponent(phaseEvent.getFacesContext().getViewRoot());
}
}
+ else if (phaseEvent.getPhaseId().equals(PhaseId.APPLY_REQUEST_VALUES))
+ {
+ ConversationContext.INSTANCE.setActive(true);
+ }
}
/**
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockBootstrap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockBootstrap.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockBootstrap.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -1,3 +1,19 @@
+/*
+ * 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.mock;
import java.lang.annotation.Annotation;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockEjbDescriptor.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockEjbDescriptor.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockEjbDescriptor.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -1,3 +1,19 @@
+/*
+ * 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.mock;
import java.lang.reflect.Method;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockEjbDiscovery.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockEjbDiscovery.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockEjbDiscovery.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -1,3 +1,19 @@
+/*
+ * 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.mock;
import java.util.ArrayList;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockResourceLoader.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockResourceLoader.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockResourceLoader.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -1,3 +1,19 @@
+/*
+ * 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.mock;
import java.io.IOException;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockWebBeanDiscovery.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockWebBeanDiscovery.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockWebBeanDiscovery.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -1,3 +1,19 @@
+/*
+ * 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.mock;
import java.net.URL;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockApplicationContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockApplicationContext.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockApplicationContext.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -1,3 +1,19 @@
+/*
+ * 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.mock.context;
import org.jboss.webbeans.context.ApplicationContext;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockDependentContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockDependentContext.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockDependentContext.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -1,3 +1,19 @@
+/*
+ * 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.mock.context;
import org.jboss.webbeans.context.DependentContext;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockRequestContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockRequestContext.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockRequestContext.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -1,3 +1,19 @@
+/*
+ * 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.mock.context;
import org.jboss.webbeans.context.RequestContext;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockSessionContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockSessionContext.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/context/MockSessionContext.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -1,3 +1,19 @@
+/*
+ * 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.mock.context;
import org.jboss.webbeans.context.SessionContext;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/el/EL.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/el/EL.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/el/EL.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -1,3 +1,19 @@
+/*
+ * 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.mock.el;
import javax.el.ArrayELResolver;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ConversationBeanMap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ConversationBeanMap.java 2009-02-10 18:57:59 UTC (rev 1477)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ConversationBeanMap.java 2009-02-10 20:30:51 UTC (rev 1478)
@@ -21,6 +21,11 @@
import org.jboss.webbeans.context.ConversationContext;
+/**
+ * A HTTP session backed bean map for the conversational scope
+ *
+ * @author Nicklas Karlsson
+ */
public class ConversationBeanMap extends HttpSessionBeanMap
{
private String cid;
More information about the weld-commits
mailing list