package org.jboss.webbeans.test.tck;

import java.lang.annotation.Annotation;
import java.util.List;

import javax.webbeans.manager.Manager;

import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.tck.api.Containers;
import org.jboss.webbeans.test.mock.MockBootstrap;
import org.jboss.webbeans.test.mock.MockWebBeanDiscovery;

import sun.reflect.generics.reflectiveObjects.NotImplementedException;

public class ContainersImpl implements Containers
{
   
   public Manager deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, Class<?>... classes)
   {
      MockBootstrap bootstrap = new MockBootstrap();
      bootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(classes));
      bootstrap.boot();
      ManagerImpl manager = bootstrap.getManager();
      if (enabledDeploymentTypes != null)
      {
         manager.setEnabledDeploymentTypes(enabledDeploymentTypes);
      }
      return manager;
   }
   
   public Manager deploy(java.lang.Class<?>... classes) 
   {
      return deploy(null, classes);
   }
   
   public <T> T evaluateValueExpression(String expression, Class<T> expectedType)
   {
      // TODO implement
      throw new NotImplementedException();
   }
 
   public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes)
   {
      // TODO implement
      throw new NotImplementedException();
   }
}

@@ -334,80 +334,8 @@
 y;%0A%0A
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;%0A%0A
 publ
@@ -1083,38 +1083,44 @@
   throw new 
-NotImplemented
+UnsupportedOperation
 Exception();
@@ -1290,22 +1290,28 @@
 new 
-NotImplemented
+UnsupportedOperation
 Exce

fix exception