[webbeans-commits] Webbeans SVN: r3593 - in ri/trunk: spi/src/main/java/org/jboss/webbeans and 7 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Tue Aug 25 12:17:50 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-08-25 12:17:45 -0400 (Tue, 25 Aug 2009)
New Revision: 3593
Added:
ri/trunk/spi/src/main/java/org/jboss/webbeans/jsf/
ri/trunk/spi/src/main/java/org/jboss/webbeans/jsf/spi/
ri/trunk/spi/src/main/java/org/jboss/webbeans/jsf/spi/JSFServices.java
Removed:
ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/helpers/JSFServices.java
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JsfHelper.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansApplication.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Environments.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/servlet/api/ServletServices.java
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJSFServices.java
ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEELifecycle.java
ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJSFServices.java
Log:
javadoc + proper package
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JsfHelper.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JsfHelper.java 2009-08-25 15:14:38 UTC (rev 3592)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JsfHelper.java 2009-08-25 16:17:45 UTC (rev 3593)
@@ -25,9 +25,9 @@
import org.jboss.webbeans.CurrentManager;
import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
import org.jboss.webbeans.conversation.ConversationIdName;
+import org.jboss.webbeans.jsf.spi.JSFServices;
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
-import org.jboss.webbeans.persistence.spi.helpers.JSFServices;
import org.jboss.webbeans.util.Reflections;
/**
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansApplication.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansApplication.java 2009-08-25 15:14:38 UTC (rev 3592)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansApplication.java 2009-08-25 16:17:45 UTC (rev 3593)
@@ -28,7 +28,7 @@
import org.jboss.webbeans.el.WebBeansELContextListener;
import org.jboss.webbeans.el.WebBeansELResolverImpl;
import org.jboss.webbeans.el.WebBeansExpressionFactory;
-import org.jboss.webbeans.persistence.spi.helpers.JSFServices;
+import org.jboss.webbeans.jsf.spi.JSFServices;
/**
* @author pmuir
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Environments.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Environments.java 2009-08-25 15:14:38 UTC (rev 3592)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Environments.java 2009-08-25 16:17:45 UTC (rev 3593)
@@ -22,8 +22,8 @@
import org.jboss.webbeans.bootstrap.spi.Deployment;
import org.jboss.webbeans.ejb.spi.EjbServices;
+import org.jboss.webbeans.jsf.spi.JSFServices;
import org.jboss.webbeans.persistence.spi.JpaServices;
-import org.jboss.webbeans.persistence.spi.helpers.JSFServices;
import org.jboss.webbeans.resources.spi.ResourceLoader;
import org.jboss.webbeans.resources.spi.ResourceServices;
import org.jboss.webbeans.security.spi.SecurityServices;
Copied: ri/trunk/spi/src/main/java/org/jboss/webbeans/jsf/spi/JSFServices.java (from rev 3580, ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/helpers/JSFServices.java)
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/jsf/spi/JSFServices.java (rev 0)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/jsf/spi/JSFServices.java 2009-08-25 16:17:45 UTC (rev 3593)
@@ -0,0 +1,43 @@
+/*
+ * 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.jsf.spi;
+
+import javax.faces.application.Application;
+
+import org.jboss.webbeans.bootstrap.api.Service;
+import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
+
+/**
+ * Allows the container to identify BDA in use for a JSF request. This method will
+ * be called, in the same thread as the request, every time Web Beans needs to
+ * identify a JSF request.
+ *
+ * @author pmuir
+ *
+ */
+public interface JSFServices extends Service
+{
+
+ /**
+ * Get the BDA for the current JSF request. The Application is provided for
+ * context.
+ *
+ * @return
+ */
+ public BeanDeploymentArchive getBeanDeploymentArchive(Application application);
+
+}
Property changes on: ri/trunk/spi/src/main/java/org/jboss/webbeans/jsf/spi/JSFServices.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/helpers/JSFServices.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/helpers/JSFServices.java 2009-08-25 15:14:38 UTC (rev 3592)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/persistence/spi/helpers/JSFServices.java 2009-08-25 16:17:45 UTC (rev 3593)
@@ -1,33 +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.persistence.spi.helpers;
-
-import javax.faces.application.Application;
-
-import org.jboss.webbeans.bootstrap.api.Service;
-import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
-
-/**
- * @author pmuir
- *
- */
-public interface JSFServices extends Service
-{
-
- public BeanDeploymentArchive getBeanDeploymentArchive(Application application);
-
-}
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/servlet/api/ServletServices.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/servlet/api/ServletServices.java 2009-08-25 15:14:38 UTC (rev 3592)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/servlet/api/ServletServices.java 2009-08-25 16:17:45 UTC (rev 3593)
@@ -22,12 +22,23 @@
import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
/**
+ * Allows the container to identify BDA in use for a request. This method will
+ * be called, in the same thread as the request, every time Web Beans needs to
+ * identify a request.
+ *
* @author pmuir
*
*/
public interface ServletServices extends Service
{
+ /**
+ * Get the BDA for the current request. The ServletContext is provided for
+ * context.
+ *
+ * @param ctx
+ * @return
+ */
public BeanDeploymentArchive getBeanDeploymentArchive(ServletContext ctx);
}
Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java 2009-08-25 15:14:38 UTC (rev 3592)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java 2009-08-25 16:17:45 UTC (rev 3593)
@@ -5,8 +5,8 @@
import org.jboss.webbeans.bootstrap.spi.Deployment;
import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore;
import org.jboss.webbeans.ejb.spi.EjbServices;
+import org.jboss.webbeans.jsf.spi.JSFServices;
import org.jboss.webbeans.persistence.spi.JpaServices;
-import org.jboss.webbeans.persistence.spi.helpers.JSFServices;
import org.jboss.webbeans.resources.spi.ResourceLoader;
import org.jboss.webbeans.resources.spi.ResourceServices;
import org.jboss.webbeans.security.spi.SecurityServices;
Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJSFServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJSFServices.java 2009-08-25 15:14:38 UTC (rev 3592)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJSFServices.java 2009-08-25 16:17:45 UTC (rev 3593)
@@ -19,7 +19,7 @@
import javax.faces.application.Application;
import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.webbeans.persistence.spi.helpers.JSFServices;
+import org.jboss.webbeans.jsf.spi.JSFServices;
/**
* @author pmuir
Modified: ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEELifecycle.java
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEELifecycle.java 2009-08-25 15:14:38 UTC (rev 3592)
+++ ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEELifecycle.java 2009-08-25 16:17:45 UTC (rev 3593)
@@ -18,8 +18,8 @@
import org.jboss.webbeans.bootstrap.api.Environments;
import org.jboss.webbeans.ejb.spi.EjbServices;
+import org.jboss.webbeans.jsf.spi.JSFServices;
import org.jboss.webbeans.persistence.spi.JpaServices;
-import org.jboss.webbeans.persistence.spi.helpers.JSFServices;
import org.jboss.webbeans.resources.spi.ResourceServices;
import org.jboss.webbeans.security.spi.SecurityServices;
import org.jboss.webbeans.transaction.spi.TransactionServices;
Modified: ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJSFServices.java
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJSFServices.java 2009-08-25 15:14:38 UTC (rev 3592)
+++ ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJSFServices.java 2009-08-25 16:17:45 UTC (rev 3593)
@@ -19,7 +19,7 @@
import javax.faces.application.Application;
import org.jboss.webbeans.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.webbeans.persistence.spi.helpers.JSFServices;
+import org.jboss.webbeans.jsf.spi.JSFServices;
/**
* @author pmuir
More information about the weld-commits
mailing list