openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r937503 - in /openwebbeans/trunk: webbeans-impl/src/it/properties/src/test/java/org/apache/webbeans/test/spi/configuration/ webbeans-impl/src/it/properties/src/test/resources/META-INF/openwebbeans/ webbeans-impl/src/main/java/org/apache/web...
Date Fri, 23 Apr 2010 20:20:31 GMT
Author: gerdogdu
Date: Fri Apr 23 20:20:30 2010
New Revision: 937503

URL: http://svn.apache.org/viewvc?rev=937503&view=rev
Log: (empty)

Added:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/ServiceLoader.java
      - copied, changed from r937478, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/ServiceLoader.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/
      - copied from r937478, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/scanner/
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/
      - copied from r937478, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/se/
    openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/DefaultConversationService.java
      - copied, changed from r937478, openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/spi/conversation/jsf/DefaultConversationService.java
    openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java
      - copied, changed from r937478, openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/util/JSFUtil.java
Removed:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/
    openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/spi/
    openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/util/
Modified:
    openwebbeans/trunk/webbeans-impl/src/it/properties/src/test/java/org/apache/webbeans/test/spi/configuration/ConfigurationTest.java
    openwebbeans/trunk/webbeans-impl/src/it/properties/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultJndiService.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultScannerService.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/LifecycleFactory.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/JNDIUtil.java
    openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties
    openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
    openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java
    openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java
    openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java
    openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/scopes/ViewScopedContext.java
    openwebbeans/trunk/webbeans-jsf/src/main/resources/META-INF/openwebbeans/openwebbeans-jsf.properties
    openwebbeans/trunk/webbeans-jsf/src/test/java/org/apache/webbeans/jsf/test/JSFUtilTest.java
    openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
    openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/mock/TCKMetaDataDiscoveryImpl.java
    openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
    openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/EnterpriseTestLifeCycle.java
    openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
    openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans-ee-web.properties

Modified: openwebbeans/trunk/webbeans-impl/src/it/properties/src/test/java/org/apache/webbeans/test/spi/configuration/ConfigurationTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/it/properties/src/test/java/org/apache/webbeans/test/spi/configuration/ConfigurationTest.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/it/properties/src/test/java/org/apache/webbeans/test/spi/configuration/ConfigurationTest.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/it/properties/src/test/java/org/apache/webbeans/test/spi/configuration/ConfigurationTest.java
Fri Apr 23 20:20:30 2010
@@ -28,12 +28,12 @@ public class ConfigurationTest
         // not overloaded
         String ts = cfg.getProperty("org.apache.webbeans.spi.TransactionService");
         Assert.assertNotNull(ts);
-        Assert.assertEquals("org.apache.webbeans.spi.ee.TransactionServiceJndiImpl", ts);
+        Assert.assertEquals("org.apache.webbeans.corespi.ee.TransactionServiceJndiImpl",
ts);
         
         // overloaded version 1
         String wbf = cfg.getProperty("org.apache.webbeans.spi.JNDIService");
         Assert.assertNotNull(wbf);
-        Assert.assertEquals("org.apache.webbeans.spi.ee.JNDIServiceEnterpriseImpl", wbf);
+        Assert.assertEquals("org.apache.webbeans.corespi.ee.JNDIServiceEnterpriseImpl", wbf);
         
         // property which is only in the specialised openwebbeans.properties
         String testProperty = cfg.getProperty("test.property");

Modified: openwebbeans/trunk/webbeans-impl/src/it/properties/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/it/properties/src/test/resources/META-INF/openwebbeans/openwebbeans.properties?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/it/properties/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
(original)
+++ openwebbeans/trunk/webbeans-impl/src/it/properties/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
Fri Apr 23 20:20:30 2010
@@ -29,6 +29,7 @@ test.property=true
 
 # TODO these are currently only preliminary values for testing the mechanism!
 # use the real EE server JNDI implementation for storing objects in JNDI  
-org.apache.webbeans.spi.JNDIService=org.apache.webbeans.spi.ee.JNDIServiceEnterpriseImpl
-org.apache.webbeans.spi.JPAService=org.apache.webbeans.spi.ee.geronimo.JPAServiceOpenEjb
+org.apache.webbeans.spi.JNDIService=org.apache.webbeans.corespi.ee.JNDIServiceEnterpriseImpl
+org.apache.webbeans.spi.JPAService=org.apache.webbeans.corespi.ee.geronimo.JPAServiceOpenEjb
+org.apache.webbeans.spi.TransactionService=org.apache.webbeans.corespi.ee.TransactionServiceJndiImpl
 

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
Fri Apr 23 20:20:30 2010
@@ -33,6 +33,7 @@ import org.apache.webbeans.annotation.De
 import org.apache.webbeans.config.OWBLogConst;
 import org.apache.webbeans.config.inheritance.BeanInheritedMetaData;
 import org.apache.webbeans.config.inheritance.IBeanInheritedMetaData;
+import org.apache.webbeans.corespi.ServiceLoader;
 import org.apache.webbeans.decorator.WebBeansDecorator;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.exception.WebBeansException;
@@ -47,7 +48,6 @@ import org.apache.webbeans.intercept.web
 import org.apache.webbeans.logger.WebBeansLogger;
 import org.apache.webbeans.proxy.JavassistProxyFactory;
 import org.apache.webbeans.spi.ResourceInjectionService;
-import org.apache.webbeans.spi.ServiceLoader;
 import org.apache.webbeans.util.ClassUtil;
 import org.apache.webbeans.util.WebBeansUtil;
 

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java
Fri Apr 23 20:20:30 2010
@@ -18,8 +18,8 @@ import javax.enterprise.context.spi.Crea
 
 import org.apache.webbeans.conversation.ConversationImpl;
 import org.apache.webbeans.conversation.ConversationManager;
+import org.apache.webbeans.corespi.ServiceLoader;
 import org.apache.webbeans.spi.ConversationService;
-import org.apache.webbeans.spi.ServiceLoader;
 
 /**
  * Conversation bean implementation.

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
Fri Apr 23 20:20:30 2010
@@ -25,11 +25,11 @@ import javassist.util.proxy.ProxyFactory
 import javax.enterprise.context.spi.CreationalContext;
 
 import org.apache.webbeans.api.ResourceReference;
+import org.apache.webbeans.corespi.ServiceLoader;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.proxy.JavassistProxyFactory;
 import org.apache.webbeans.proxy.ResourceProxyHandler;
 import org.apache.webbeans.spi.ResourceInjectionService;
-import org.apache.webbeans.spi.ServiceLoader;
 
 public class ResourceBean<X, T extends Annotation> extends ProducerFieldBean<X>
 {

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
Fri Apr 23 20:20:30 2010
@@ -48,6 +48,7 @@ import org.apache.webbeans.component.cre
 import org.apache.webbeans.config.OWBLogConst;
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.container.InjectionResolver;
+import org.apache.webbeans.corespi.ServiceLoader;
 import org.apache.webbeans.decorator.DecoratorsManager;
 import org.apache.webbeans.decorator.WebBeansDecorator;
 import org.apache.webbeans.deployment.StereoTypeManager;
@@ -69,7 +70,6 @@ import org.apache.webbeans.portable.even
 import org.apache.webbeans.portable.events.discovery.BeforeBeanDiscoveryImpl;
 import org.apache.webbeans.spi.JNDIService;
 import org.apache.webbeans.spi.ScannerService;
-import org.apache.webbeans.spi.ServiceLoader;
 import org.apache.webbeans.util.AnnotationUtil;
 import org.apache.webbeans.util.ClassUtil;
 import org.apache.webbeans.util.WebBeansAnnotatedTypeUtil;
@@ -113,7 +113,7 @@ public class BeansDeployer
      * Deploys all the defined web beans components in the container startup.
      * <p>
      * It deploys from the web-beans.xml files and from the class files. It uses
-     * the {@link org.apache.webbeans.spi.ScannerService} to get classes.
+     * the {@link org.apache.webbeans.corespi.ScannerService} to get classes.
      * </p>
      * 
      * @throws WebBeansDeploymentException if any deployment exception occurs

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java
Fri Apr 23 20:20:30 2010
@@ -21,9 +21,9 @@ import javax.inject.Singleton;
 
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.context.type.ContextTypes;
+import org.apache.webbeans.corespi.ServiceLoader;
 import org.apache.webbeans.logger.WebBeansLogger;
 import org.apache.webbeans.spi.ContextsService;
-import org.apache.webbeans.spi.ServiceLoader;
 
 /**
  * JSR-299 based standard context

Copied: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/ServiceLoader.java
(from r937478, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/ServiceLoader.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/ServiceLoader.java?p2=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/ServiceLoader.java&p1=openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/ServiceLoader.java&r1=937478&r2=937503&rev=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/spi/ServiceLoader.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/ServiceLoader.java
Fri Apr 23 20:20:30 2010
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.apache.webbeans.spi;
+package org.apache.webbeans.corespi;
 
 import java.util.List;
 
@@ -27,7 +27,7 @@ import org.apache.webbeans.plugins.Plugi
  * 
  * The Configuration for Services looks like
  * <pre>
- * org.apache.webbeans.spi.MyServiceInterface=my.package.webbeans.spi.MyServiceImplementation
+ * org.apache.webbeans.corespi.MyServiceInterface=my.package.webbeans.spi.MyServiceImplementation
  * </pre>
  * 
  * 

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java?rev=937503&r1=937478&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
Fri Apr 23 20:20:30 2010
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.webbeans.spi.scanner;
+package org.apache.webbeans.corespi.scanner;
 
 
 import java.net.URL;
@@ -104,7 +104,7 @@ public abstract class AbstractMetaDataDi
     }
 
     /* (non-Javadoc)
-     * @see org.apache.webbeans.spi.ScannerService#getBeanClasses()
+     * @see org.apache.webbeans.corespi.ScannerService#getBeanClasses()
      */
     @Override
     public Set<Class<?>> getBeanClasses()
@@ -128,7 +128,7 @@ public abstract class AbstractMetaDataDi
     }
 
     /* (non-Javadoc)
-     * @see org.apache.webbeans.spi.ScannerService#getBeanXmls()
+     * @see org.apache.webbeans.corespi.ScannerService#getBeanXmls()
      */
     @Override
     public Set<URL> getBeanXmls()

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java?rev=937503&r1=937478&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java
Fri Apr 23 20:20:30 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.webbeans.spi.se;
+package org.apache.webbeans.corespi.se;
 
 import java.lang.annotation.Annotation;
 

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultJndiService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultJndiService.java?rev=937503&r1=937478&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultJndiService.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultJndiService.java
Fri Apr 23 20:20:30 2010
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.apache.webbeans.spi.se;
+package org.apache.webbeans.corespi.se;
 
 import java.util.HashMap;
 
@@ -27,7 +27,7 @@ import org.apache.webbeans.spi.JNDIServi
  * because they are only readonly (tomcat, resin, jetty, ...) or
  * don't exist at all (JDK standalone applications)
  *
- * @see org.apache.webbeans.spi.ee.JNDIServiceEnterpriseImpl
+ * @see org.apache.webbeans.corespi.ee.JNDIServiceEnterpriseImpl
  */
 public class DefaultJndiService implements JNDIService
 {

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultScannerService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultScannerService.java?rev=937503&r1=937478&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultScannerService.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultScannerService.java
Fri Apr 23 20:20:30 2010
@@ -11,13 +11,13 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.apache.webbeans.spi.se;
+package org.apache.webbeans.corespi.se;
 
 import java.io.IOException;
 import java.net.URL;
 import java.util.Enumeration;
 
-import org.apache.webbeans.spi.scanner.AbstractMetaDataDiscovery;
+import org.apache.webbeans.corespi.scanner.AbstractMetaDataDiscovery;
 import org.apache.webbeans.util.WebBeansUtil;
 import org.scannotation.ClasspathUrlFinder;
 

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
Fri Apr 23 20:20:30 2010
@@ -43,11 +43,11 @@ import org.apache.webbeans.annotation.An
 import org.apache.webbeans.component.InjectionTargetBean;
 import org.apache.webbeans.config.OWBLogConst;
 import org.apache.webbeans.container.BeanManagerImpl;
+import org.apache.webbeans.corespi.ServiceLoader;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.logger.WebBeansLogger;
 import org.apache.webbeans.portable.events.generics.GenericBeanEvent;
 import org.apache.webbeans.portable.events.generics.GenericProducerObserverEvent;
-import org.apache.webbeans.spi.ServiceLoader;
 import org.apache.webbeans.spi.TransactionService;
 import org.apache.webbeans.util.AnnotationUtil;
 import org.apache.webbeans.util.ArrayUtil;

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
Fri Apr 23 20:20:30 2010
@@ -29,6 +29,7 @@ import org.apache.webbeans.config.OWBLog
 import org.apache.webbeans.config.WebBeansFinder;
 import org.apache.webbeans.container.BeanManagerImpl;
 import org.apache.webbeans.container.InjectionResolver;
+import org.apache.webbeans.corespi.ServiceLoader;
 import org.apache.webbeans.logger.WebBeansLogger;
 import org.apache.webbeans.plugins.PluginLoader;
 import org.apache.webbeans.portable.events.ExtensionLoader;
@@ -38,7 +39,6 @@ import org.apache.webbeans.spi.Container
 import org.apache.webbeans.spi.ContextsService;
 import org.apache.webbeans.spi.JNDIService;
 import org.apache.webbeans.spi.ScannerService;
-import org.apache.webbeans.spi.ServiceLoader;
 import org.apache.webbeans.xml.WebBeansXMLConfigurator;
 
 public abstract class AbstractLifeCycle implements ContainerLifecycle

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/LifecycleFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/LifecycleFactory.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/LifecycleFactory.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/LifecycleFactory.java
Fri Apr 23 20:20:30 2010
@@ -14,8 +14,8 @@
 package org.apache.webbeans.lifecycle;
 
 import org.apache.webbeans.config.WebBeansFinder;
+import org.apache.webbeans.corespi.ServiceLoader;
 import org.apache.webbeans.spi.ContainerLifecycle;
-import org.apache.webbeans.spi.ServiceLoader;
 
 public final class LifecycleFactory
 {

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java
Fri Apr 23 20:20:30 2010
@@ -19,7 +19,7 @@ import java.util.Collection;
 
 import javassist.ClassPool;
 
-import org.apache.webbeans.spi.scanner.AbstractMetaDataDiscovery;
+import org.apache.webbeans.corespi.scanner.AbstractMetaDataDiscovery;
 import org.apache.webbeans.util.Asserts;
 
 /**

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/JNDIUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/JNDIUtil.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/JNDIUtil.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/JNDIUtil.java
Fri Apr 23 20:20:30 2010
@@ -24,7 +24,7 @@ import org.apache.webbeans.logger.WebBea
 
 /**
  * This is the internal helper class for low level access to JNDI
- * @see org.apache.webbeans.spi.JNDIService for transparent access over SPI 
+ * @see org.apache.webbeans.corespi.JNDIService for transparent access over SPI 
  */
 public final class JNDIUtil
 {

Modified: openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans-default.properties
Fri Apr 23 20:20:30 2010
@@ -27,23 +27,23 @@
 ################################################################################################

 
 ################################### Default Container Lifecycle ################################
-#Default implementation of org.apache.webbeans.spi.ContainerLifecycle.
+#Default implementation of org.apache.webbeans.corespi.ContainerLifecycle.
 org.apache.webbeans.spi.ContainerLifecycle=org.apache.webbeans.lifecycle.StandaloneLifeCycle
 ################################################################################################
 
 ################################### Default JNDI Service #######################################
-#Default implementation of org.apache.webbeans.spi.JNDIService.
-org.apache.webbeans.spi.JNDIService=org.apache.webbeans.spi.se.DefaultJndiService
+#Default implementation of org.apache.webbeans.corespi.JNDIService.
+org.apache.webbeans.spi.JNDIService=org.apache.webbeans.corespi.se.DefaultJndiService
 ################################################################################################
 
 ################################### Default Scanner Service ####################################
-#Default implementation of org.apache.webbeans.spi.ScannerService.
-org.apache.webbeans.spi.ScannerService=org.apache.webbeans.spi.se.DefaultScannerService
+#Default implementation of org.apache.webbeans.corespi.ScannerService.
+org.apache.webbeans.spi.ScannerService=org.apache.webbeans.corespi.se.DefaultScannerService
 ################################################################################################
 
 ################################### Default Contexts Service ####################################
-#Default implementation of org.apache.webbeans.spi.ContextsService.
-org.apache.webbeans.spi.ContextsService=org.apache.webbeans.spi.se.DefaultContextsService
+#Default implementation of org.apache.webbeans.corespi.ContextsService.
+org.apache.webbeans.spi.ContextsService=org.apache.webbeans.corespi.se.DefaultContextsService
 ################################################################################################
 
 ################################################################################################


Modified: openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
(original)
+++ openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
Fri Apr 23 20:20:30 2010
@@ -39,13 +39,13 @@ import javax.jms.TopicSession;
 import javax.jms.TopicSubscriber;
 
 import org.apache.webbeans.config.OpenWebBeansConfiguration;
+import org.apache.webbeans.corespi.ServiceLoader;
 import org.apache.webbeans.exception.WebBeansCreationException;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.jms.JMSModel;
 import org.apache.webbeans.jms.component.JmsBean;
 import org.apache.webbeans.proxy.JavassistProxyFactory;
 import org.apache.webbeans.spi.JNDIService;
-import org.apache.webbeans.spi.ServiceLoader;
 import org.apache.webbeans.util.Asserts;
 
 public final class JmsUtil

Modified: openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java
(original)
+++ openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/ConversationAwareViewHandler.java
Fri Apr 23 20:20:30 2010
@@ -22,7 +22,6 @@ import javax.faces.application.ViewHandl
 import javax.faces.context.FacesContext;
 
 import org.apache.webbeans.conversation.ConversationManager;
-import org.apache.webbeans.util.JSFUtil;
 
 public class ConversationAwareViewHandler extends ViewHandlerWrapper
 {

Copied: openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/DefaultConversationService.java
(from r937478, openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/spi/conversation/jsf/DefaultConversationService.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/DefaultConversationService.java?p2=openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/DefaultConversationService.java&p1=openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/spi/conversation/jsf/DefaultConversationService.java&r1=937478&r2=937503&rev=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/spi/conversation/jsf/DefaultConversationService.java
(original)
+++ openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/DefaultConversationService.java
Fri Apr 23 20:20:30 2010
@@ -14,12 +14,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.webbeans.spi.conversation.jsf;
+package org.apache.webbeans.jsf;
 
 import javax.servlet.http.HttpSession;
 
 import org.apache.webbeans.spi.ConversationService;
-import org.apache.webbeans.util.JSFUtil;
 
 public class DefaultConversationService implements ConversationService
 {

Copied: openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java
(from r937478, openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/util/JSFUtil.java)
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java?p2=openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java&p1=openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/util/JSFUtil.java&r1=937478&r2=937503&rev=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/util/JSFUtil.java (original)
+++ openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/JSFUtil.java Fri
Apr 23 20:20:30 2010
@@ -11,7 +11,7 @@
  * KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.apache.webbeans.util;
+package org.apache.webbeans.jsf;
 
 import javax.faces.application.Application;
 import javax.faces.application.FacesMessage;
@@ -21,6 +21,8 @@ import javax.faces.context.ExternalConte
 import javax.faces.context.FacesContext;
 import javax.servlet.http.HttpSession;
 
+import org.apache.webbeans.util.Asserts;
+
 
 public final class JSFUtil
 {

Modified: openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java
(original)
+++ openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java
Fri Apr 23 20:20:30 2010
@@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletRes
 
 import org.apache.webbeans.annotation.DefaultLiteral;
 import org.apache.webbeans.container.BeanManagerImpl;
-import org.apache.webbeans.util.JSFUtil;
 
 public class WebBeansJSFFilter implements Filter
 {

Modified: openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java
(original)
+++ openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java
Fri Apr 23 20:20:30 2010
@@ -26,7 +26,6 @@ import org.apache.webbeans.context.Conve
 import org.apache.webbeans.conversation.ConversationImpl;
 import org.apache.webbeans.conversation.ConversationManager;
 import org.apache.webbeans.logger.WebBeansLogger;
-import org.apache.webbeans.util.JSFUtil;
 
 /**
  * Conversation related phase listener.

Modified: openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/scopes/ViewScopedContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/scopes/ViewScopedContext.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/scopes/ViewScopedContext.java
(original)
+++ openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/jsf/scopes/ViewScopedContext.java
Fri Apr 23 20:20:30 2010
@@ -35,7 +35,7 @@ import javax.faces.event.PreDestroyViewM
 import javax.faces.event.SystemEvent;
 import javax.faces.event.SystemEventListener;
 
-import org.apache.webbeans.util.JSFUtil;
+import org.apache.webbeans.jsf.JSFUtil;
 
 /**
  * This class provides the contexts lifecycle for the 

Modified: openwebbeans/trunk/webbeans-jsf/src/main/resources/META-INF/openwebbeans/openwebbeans-jsf.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/main/resources/META-INF/openwebbeans/openwebbeans-jsf.properties?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/src/main/resources/META-INF/openwebbeans/openwebbeans-jsf.properties
(original)
+++ openwebbeans/trunk/webbeans-jsf/src/main/resources/META-INF/openwebbeans/openwebbeans-jsf.properties
Fri Apr 23 20:20:30 2010
@@ -28,6 +28,6 @@ org.apache.webbeans.conversation.Convers
 ################################################################################################
 
 ################################### Default Conversation Service ###############################

-#Default implementation of org.apache.webbeans.spi.ConversationService.
-org.apache.webbeans.spi.ConversationService=org.apache.webbeans.spi.conversation.jsf.DefaultConversationService
+#Default implementation of org.apache.webbeans.corespi.ConversationService.
+org.apache.webbeans.spi.ConversationService=org.apache.webbeans.jsf.DefaultConversationService
 ################################################################################################
\ No newline at end of file

Modified: openwebbeans/trunk/webbeans-jsf/src/test/java/org/apache/webbeans/jsf/test/JSFUtilTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jsf/src/test/java/org/apache/webbeans/jsf/test/JSFUtilTest.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jsf/src/test/java/org/apache/webbeans/jsf/test/JSFUtilTest.java
(original)
+++ openwebbeans/trunk/webbeans-jsf/src/test/java/org/apache/webbeans/jsf/test/JSFUtilTest.java
Fri Apr 23 20:20:30 2010
@@ -13,7 +13,7 @@
  */
 package org.apache.webbeans.jsf.test;
 
-import org.apache.webbeans.util.JSFUtil;
+import org.apache.webbeans.jsf.JSFUtil;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;

Modified: openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
(original)
+++ openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
Fri Apr 23 20:20:30 2010
@@ -41,9 +41,9 @@ import org.apache.openejb.jee.SingletonB
 import org.apache.openejb.jee.StatefulBean;
 import org.apache.openejb.jee.StatelessBean;
 import org.apache.webbeans.container.BeanManagerImpl;
+import org.apache.webbeans.corespi.ServiceLoader;
 import org.apache.webbeans.lifecycle.StandaloneLifeCycle;
 import org.apache.webbeans.spi.ScannerService;
-import org.apache.webbeans.spi.ServiceLoader;
 import org.apache.webbeans.test.tck.mock.TCKMetaDataDiscoveryImpl;
 import org.jboss.testharness.api.DeploymentException;
 import org.jboss.testharness.spi.StandaloneContainers;

Modified: openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/mock/TCKMetaDataDiscoveryImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/mock/TCKMetaDataDiscoveryImpl.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/mock/TCKMetaDataDiscoveryImpl.java
(original)
+++ openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/mock/TCKMetaDataDiscoveryImpl.java
Fri Apr 23 20:20:30 2010
@@ -21,7 +21,7 @@ import java.net.URL;
 
 import javassist.ClassPool;
 
-import org.apache.webbeans.spi.scanner.AbstractMetaDataDiscovery;
+import org.apache.webbeans.corespi.scanner.AbstractMetaDataDiscovery;
 import org.apache.webbeans.util.Asserts;
 
 public class TCKMetaDataDiscoveryImpl extends AbstractMetaDataDiscovery

Modified: openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
(original)
+++ openwebbeans/trunk/webbeans-tck/src/test/resources/META-INF/openwebbeans/openwebbeans.properties
Fri Apr 23 20:20:30 2010
@@ -30,7 +30,7 @@
 # The key is the Interface, the value the implementation of the service
 
 # use the static HashMap instead of storing objects in JNDI as default  
-org.apache.webbeans.spi.JNDIService=org.apache.webbeans.spi.se.DefaultJndiService
+org.apache.webbeans.spi.JNDIService=org.apache.webbeans.corespi.se.DefaultJndiService
 
 #use the web metadata as default
 org.apache.webbeans.spi.ScannerService=org.apache.webbeans.test.tck.mock.TCKMetaDataDiscoveryImpl

Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/EnterpriseTestLifeCycle.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/EnterpriseTestLifeCycle.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/EnterpriseTestLifeCycle.java
(original)
+++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/test/EnterpriseTestLifeCycle.java
Fri Apr 23 20:20:30 2010
@@ -22,8 +22,8 @@ package org.apache.webbeans.web.lifecycl
 import java.util.Properties;
 
 import org.apache.webbeans.context.ContextFactory;
+import org.apache.webbeans.corespi.se.DefaultScannerService;
 import org.apache.webbeans.lifecycle.StandaloneLifeCycle;
-import org.apache.webbeans.spi.se.DefaultScannerService;
 
 /**
  * Ease the writing of the tests. Simulates container

Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
(original)
+++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
Fri Apr 23 20:20:30 2010
@@ -20,8 +20,8 @@ import java.util.Set;
 import javax.servlet.ServletContext;
 
 import org.apache.webbeans.config.OWBLogConst;
+import org.apache.webbeans.corespi.scanner.AbstractMetaDataDiscovery;
 import org.apache.webbeans.logger.WebBeansLogger;
-import org.apache.webbeans.spi.scanner.AbstractMetaDataDiscovery;
 import org.apache.webbeans.util.WebBeansUtil;
 import org.scannotation.ClasspathUrlFinder;
 import org.scannotation.WarUrlFinder;

Modified: openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans-ee-web.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans-ee-web.properties?rev=937503&r1=937502&r2=937503&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans-ee-web.properties
(original)
+++ openwebbeans/trunk/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans-ee-web.properties
Fri Apr 23 20:20:30 2010
@@ -27,22 +27,22 @@
 ################################################################################################

 
 ################################### WEB Container Lifecycle ################################
-#Default implementation of org.apache.webbeans.spi.ContainerLifecycle.
+#Default implementation of org.apache.webbeans.corespi.ContainerLifecycle.
 org.apache.webbeans.spi.ContainerLifecycle=org.apache.webbeans.web.lifecycle.WebContainerLifecycle
 ################################################################################################
 
 ################################### WEB Scanner Service ####################################
-#Default implementation of org.apache.webbeans.spi.ScannerService.
+#Default implementation of org.apache.webbeans.corespi.ScannerService.
 org.apache.webbeans.spi.ScannerService=org.apache.webbeans.web.scanner.WebScannerService
 ################################################################################################
 
 ################################### WEB Contexts Service ####################################
-#Default implementation of org.apache.webbeans.spi.ContextsService.
+#Default implementation of org.apache.webbeans.corespi.ContextsService.
 org.apache.webbeans.spi.ContextsService=org.apache.webbeans.web.context.WebContextsService
 ################################################################################################
 
 ################################### Default Resource Injection Service #########################
-#Default implementation of org.apache.webbeans.spi.ResourceInjectionService
+#Default implementation of org.apache.webbeans.corespi.ResourceInjectionService
 org.apache.webbeans.spi.ResourceInjectionService=org.apache.webbeans.resource.spi.se.StandaloneResourceInjectionService
 ################################################################################################
 



Mime
View raw message