Author: rmannibucau
Date: Sun Jan 6 13:58:07 2013
New Revision: 1429526
URL: http://svn.apache.org/viewvc?rev=1429526&view=rev
Log:
compatibility with old AppComposer API + ignoring jaxrsprovider when deploying
using application
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationFromWebXmlTest.java
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomContextTest.java
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/FeatureTest.java
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSRoutingTest.java
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSWithInterfaceTest.java
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RestDeploymentTest.java
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInjectionTest.java
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInterceptorInjectionTest.java
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsWithInterfaceTest.java
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimplePojoTest.java
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SubResourceTest.java
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/HookedRest.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java?rev=1429526&r1=1429525&r2=1429526&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/testing/ApplicationComposers.java
Sun Jan 6 13:58:07 2013
@@ -71,6 +71,7 @@ import javax.naming.Context;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URL;
import java.util.ArrayList;
@@ -229,12 +230,18 @@ public final class ApplicationComposers
final Properties configuration = new Properties();
configuration.put(DEPLOYMENTS_CLASSPATH_PROPERTY, "false");
- final EnableServices annotation =
testClass.getAnnotation(EnableServices.class);
+ EnableServices annotation =
testClass.getAnnotation(EnableServices.class);
if (annotation != null && annotation.httpDebug()) {
configuration.setProperty("httpejbd.print", "true");
configuration.setProperty("httpejbd.indent.xml", "true");
configuration.setProperty("logging.level.OpenEJB.server.http",
"FINE");
}
+ org.apache.openejb.junit.EnableServices annotationOld =
testClass.getAnnotation(org.apache.openejb.junit.EnableServices.class);
+ if (annotationOld != null && annotationOld.httpDebug()) {
+ configuration.setProperty("httpejbd.print", "true");
+ configuration.setProperty("httpejbd.indent.xml", "true");
+ configuration.setProperty("logging.level.OpenEJB.server.http",
"FINE");
+ }
for (Method method :
testClassFinder.findAnnotatedMethods(Configuration.class)) {
final Object o = method.invoke(testInstance);
@@ -254,9 +261,10 @@ public final class ApplicationComposers
// call the mock injector before module method to be able to use
mocked classes
// it will often use the TestInstance so
- final List<Method> mockInjectors =
testClassFinder.findAnnotatedMethods(MockInjector.class);
- for (Method method : mockInjectors) { // max == 1 so no need to break
- Object o = method.invoke(testInstance);
+ final List<Method> mockInjectors = new
ArrayList<Method>(testClassFinder.findAnnotatedMethods(MockInjector.class));
+
mockInjectors.addAll(testClassFinder.findAnnotatedMethods(org.apache.openejb.junit.MockInjector.class));
+ if (!mockInjectors.isEmpty()) {
+ Object o = mockInjectors.iterator().next().invoke(testInstance);
if (o instanceof Class<?>) {
o = ((Class<?>) o).newInstance();
}
@@ -266,32 +274,35 @@ public final class ApplicationComposers
}
for (Method method :
testClassFinder.findAnnotatedMethods(Component.class)) {
- Object value = method.invoke(testInstance);
- if (value instanceof Class<?>) {
- value = ((Class<?>) value).newInstance();
- }
-
- Class<?> key = method.getReturnType();
-
- if (!key.isInstance(value)) { // we can't do it in validate to
avoid to instantiate the value twice
- throw new OpenEJBRuntimeException(value + " is not an instance
of " + key.getName());
- }
-
- SystemInstance.get().setComponent((Class<Object>) key, value);
+ setComponent(testInstance, method);
+ }
+ for (Method method :
testClassFinder.findAnnotatedMethods(org.apache.openejb.junit.Component.class))
{
+ setComponent(testInstance, method);
}
- final Map<String, URL> additionalDescriptors =
descriptorsToMap(testClass.getAnnotation(Descriptors.class));
+ final Map<String, URL> additionalDescriptors =
descriptorsToMap(testClass.getAnnotation(org.apache.openejb.junit.Descriptors.class));
+ final Map<String, URL> additionalDescriptorsNew =
descriptorsToMap(testClass.getAnnotation(Descriptors.class));
+ additionalDescriptors.putAll(additionalDescriptorsNew);
Application application = null;
int webModulesNb = 0;
// Invoke the @Module producer methods to build out the AppModule
- final List<Method> moduleMethods =
testClassFinder.findAnnotatedMethods(Module.class);
+ final List<Method> moduleMethods = new
ArrayList<Method>(testClassFinder.findAnnotatedMethods(Module.class));
+
moduleMethods.addAll(testClassFinder.findAnnotatedMethods(org.apache.openejb.junit.Module.class));
for (Method method : moduleMethods) {
final Object obj = method.invoke(testInstance);
final Classes classesAnnotation =
method.getAnnotation(Classes.class);
+ final org.apache.openejb.junit.Classes classesAnnotationOld =
method.getAnnotation(org.apache.openejb.junit.Classes.class);
+
+ Class<?>[] classes = null;
+ if (classesAnnotation != null) {
+ classes = classesAnnotation.value();
+ } else if (classesAnnotationOld != null) {
+ classes = classesAnnotationOld.value();
+ }
if (obj instanceof WebApp) { // will add the ejbmodule too
webModulesNb++;
@@ -307,8 +318,8 @@ public final class ApplicationComposers
webModule.getAltDDs().putAll(additionalDescriptors);
webModule.getAltDDs().putAll(descriptorsToMap(method.getAnnotation(Descriptors.class)));
- if (classesAnnotation != null) {
-
webModule.setFinder(finderFromClasses(classesAnnotation.value()));
+ if (classes != null) {
+ webModule.setFinder(finderFromClasses(classes));
}
DeploymentLoader.addWebModule(webModule, appModule);
} else if (obj instanceof WebModule) { // will add the ejbmodule
too
@@ -319,8 +330,8 @@ public final class ApplicationComposers
webModule.getAltDDs().putAll(additionalDescriptors);
webModule.getAltDDs().putAll(descriptorsToMap(method.getAnnotation(Descriptors.class)));
- if (classesAnnotation != null) {
-
webModule.setFinder(finderFromClasses(classesAnnotation.value()));
+ if (classes != null) {
+ webModule.setFinder(finderFromClasses(classes));
}
DeploymentLoader.addWebModule(webModule, appModule);
} else if (obj instanceof EjbModule) {
@@ -329,8 +340,8 @@ public final class ApplicationComposers
ejbModule.getAltDDs().putAll(additionalDescriptors);
ejbModule.getAltDDs().putAll(descriptorsToMap(method.getAnnotation(Descriptors.class)));
- if (classesAnnotation != null) {
-
ejbModule.setFinder(finderFromClasses(classesAnnotation.value()));
+ if (classes != null) {
+ ejbModule.setFinder(finderFromClasses(classes));
}
ejbModule.initAppModule(appModule);
appModule.getEjbModules().add(ejbModule);
@@ -345,8 +356,8 @@ public final class ApplicationComposers
ejbModule.getAltDDs().putAll(descriptorsToMap(method.getAnnotation(Descriptors.class)));
appModule.getEjbModules().add(ejbModule);
- if (classesAnnotation != null) {
-
ejbModule.setFinder(finderFromClasses(classesAnnotation.value()));
+ if (classes != null) {
+ ejbModule.setFinder(finderFromClasses(classes));
}
} else if (obj instanceof EnterpriseBean) {
@@ -384,8 +395,8 @@ public final class ApplicationComposers
final Beans beans = (Beans) obj;
final EjbModule ejbModule = new EjbModule(new
EjbJar(method.getName()));
ejbModule.setBeans(beans);
- if (classesAnnotation != null) {
-
ejbModule.setFinder(finderFromClasses(classesAnnotation.value()));
+ if (classes != null) {
+ ejbModule.setFinder(finderFromClasses(classes));
}
appModule.getEjbModules().add(ejbModule);
@@ -467,10 +478,13 @@ public final class ApplicationComposers
assembler.buildContainerSystem(config.getOpenEjbConfiguration());
if
("true".equals(configuration.getProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE,
"false"))
- || annotation != null) {
+ || (annotation != null || annotationOld != null)) {
try {
if (annotation != null) {
- initFilteredServiceManager(annotation);
+ initFilteredServiceManager(annotation.value());
+ }
+ if (annotationOld != null) {
+ initFilteredServiceManager(annotationOld.value());
}
serviceManager = new ServiceManagerProxy(false);
serviceManager.start();
@@ -516,7 +530,8 @@ public final class ApplicationComposers
System.getProperties().put(OPENEJB_APPLICATION_COMPOSER_CONTEXT,
appContext.getGlobalJndiContext());
// test injections
- final List<Field> fields =
testClassFinder.findAnnotatedFields(AppResource.class);
+ final List<Field> fields = new
ArrayList<Field>(testClassFinder.findAnnotatedFields(AppResource.class));
+
fields.addAll(testClassFinder.findAnnotatedFields(org.apache.openejb.junit.AppResource.class));
for (Field field : fields) {
final Class<?> type = field.getType();
if (AppModule.class.isAssignableFrom(type)) {
@@ -533,6 +548,21 @@ public final class ApplicationComposers
previous = ThreadContext.enter(new ThreadContext(context, null,
Operation.BUSINESS));
}
+ private void setComponent(Object testInstance, Method method) throws
IllegalAccessException, InvocationTargetException, InstantiationException {
+ Object value = method.invoke(testInstance);
+ if (value instanceof Class<?>) {
+ value = ((Class<?>) value).newInstance();
+ }
+
+ Class<?> key = method.getReturnType();
+
+ if (!key.isInstance(value)) { // we can't do it in validate to avoid
to instantiate the value twice
+ throw new OpenEJBRuntimeException(value + " is not an instance of
" + key.getName());
+ }
+
+ SystemInstance.get().setComponent((Class<Object>) key, value);
+ }
+
public void evaluate(final Object testInstance, final Callable<Void> next)
throws Exception {
before(testInstance);
try {
@@ -616,12 +646,20 @@ public final class ApplicationComposers
}
}
- private static Map<String, URL> descriptorsToMap(final Descriptors
descriptors) {
+ private static Map<String, URL> descriptorsToMap(final Object descriptors)
{
if (descriptors != null) {
final Map<String, URL> dds = new HashMap<String, URL>();
final ClassLoader loader =
Thread.currentThread().getContextClassLoader();
- for (Descriptor descriptor : descriptors.value()) {
- dds.put(descriptor.name(),
loader.getResource(descriptor.path()));
+ if (descriptors instanceof Descriptors) {
+ for (Descriptor descriptor : ((Descriptors)
descriptors).value()) {
+ dds.put(descriptor.name(),
loader.getResource(descriptor.path()));
+ }
+ } else {
+ if (descriptors instanceof
org.apache.openejb.junit.Descriptors) {
+ for (org.apache.openejb.junit.Descriptor descriptor :
((org.apache.openejb.junit.Descriptors) descriptors).value()) {
+ dds.put(descriptor.name(),
loader.getResource(descriptor.path()));
+ }
+ }
}
return dds;
}
@@ -632,7 +670,7 @@ public final class ApplicationComposers
return new AnnotationFinder(new ClassesArchive(value)).link();
}
- private void initFilteredServiceManager(EnableServices services) {
+ private void initFilteredServiceManager(String[] services) {
ClassLoader classLoader =
Thread.currentThread().getContextClassLoader();
Class serviceManagerClass;
try {
@@ -646,9 +684,9 @@ public final class ApplicationComposers
Method initServiceManager = null;
try {
initServiceManager =
serviceManagerClass.getMethod("initServiceManager", String[].class);
- initServiceManager.invoke(null, new Object[]{services.value()});
+ initServiceManager.invoke(null, new Object[]{ services });
} catch (Exception e) {
- throw new IllegalStateException("Failed initializing
FilteredServiceManager with services " + services.value(), e);
+ throw new IllegalStateException("Failed initializing
FilteredServiceManager with services " + services, e);
}
}
Modified:
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java?rev=1429526&r1=1429525&r2=1429526&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
(original)
+++
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
Sun Jan 6 13:58:07 2013
@@ -51,7 +51,14 @@ import javax.servlet.http.HttpServletReq
import javax.ws.rs.core.Application;
import javax.xml.bind.Marshaller;
import java.lang.reflect.Field;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
public class CxfRsHttpListener implements RsHttpListener {
private static final Logger LOGGER =
Logger.getInstance(LogCategory.OPENEJB_RS, CxfRsHttpListener.class);
@@ -210,12 +217,16 @@ public class CxfRsHttpListener implement
final List<Class<?>> classes = new ArrayList<Class<?>>();
for (Class<?> clazz : application.getClasses()) {
- classes.add(clazz);
+ if (!additionalProviders.contains(clazz)) {
+ classes.add(clazz);
+ }
}
for (Object o : application.getSingletons()) {
- final Class<?> clazz = o.getClass();
- classes.add(clazz);
+ if (!additionalProviders.contains(o)) {
+ final Class<?> clazz = o.getClass();
+ classes.add(clazz);
+ }
}
for (Class<?> clazz : classes) {
Modified:
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationFromWebXmlTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationFromWebXmlTest.java?rev=1429526&r1=1429525&r2=1429526&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationFromWebXmlTest.java
(original)
+++
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationFromWebXmlTest.java
Sun Jan 6 13:58:07 2013
@@ -19,9 +19,9 @@ package org.apache.openejb.server.cxf.rs
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.openejb.jee.WebApp;
import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.junit.EnableServices;
-import org.apache.openejb.junit.Module;
import org.apache.openejb.server.cxf.rs.beans.MyFirstRestClass;
+import org.apache.openejb.testing.EnableServices;
+import org.apache.openejb.testing.Module;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified:
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomContextTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomContextTest.java?rev=1429526&r1=1429525&r2=1429526&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomContextTest.java
(original)
+++
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomContextTest.java
Sun Jan 6 13:58:07 2013
@@ -26,19 +26,17 @@ import org.apache.openejb.jee.SingletonB
import org.apache.openejb.jee.oejb3.OpenejbJar;
import org.apache.openejb.jee.oejb3.PojoDeployment;
import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.junit.Configuration;
-import org.apache.openejb.junit.Module;
import org.apache.openejb.loader.IO;
+import org.apache.openejb.testing.Configuration;
+import org.apache.openejb.testing.Module;
import org.junit.Test;
import org.junit.runner.RunWith;
import javax.ejb.Singleton;
-import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.core.Context;
import javax.ws.rs.ext.Provider;
-import javax.ws.rs.ext.Providers;
import java.io.IOException;
import java.net.URL;
import java.util.Properties;
Modified:
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java?rev=1429526&r1=1429525&r2=1429526&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java
(original)
+++
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java
Sun Jan 6 13:58:07 2013
@@ -17,11 +17,14 @@
package org.apache.openejb.server.cxf.rs;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.Properties;
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.openejb.OpenEjbContainer;
+import org.apache.openejb.config.DeploymentFilterable;
+import org.apache.openejb.server.rest.RESTService;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
import javax.ejb.Singleton;
import javax.ejb.embeddable.EJBContainer;
import javax.ws.rs.GET;
@@ -31,13 +34,11 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
-import org.apache.cxf.jaxrs.client.WebClient;
-import org.apache.openejb.OpenEjbContainer;
-import org.apache.openejb.config.DeploymentFilterable;
-import org.apache.openejb.server.rest.RESTService;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Properties;
import static junit.framework.Assert.assertEquals;
Modified:
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/FeatureTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/FeatureTest.java?rev=1429526&r1=1429525&r2=1429526&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/FeatureTest.java
(original)
+++
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/FeatureTest.java
Sun Jan 6 13:58:07 2013
@@ -26,14 +26,13 @@ import org.apache.openejb.config.sys.Res
import org.apache.openejb.config.sys.Service;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatelessBean;
-import org.apache.openejb.jee.oejb3.EjbDeployment;
import org.apache.openejb.jee.oejb3.OpenejbJar;
import org.apache.openejb.jee.oejb3.PojoDeployment;
import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.junit.Configuration;
-import org.apache.openejb.junit.Module;
import org.apache.openejb.server.cxf.rs.beans.MySecondRestClass;
import org.apache.openejb.server.cxf.transport.util.CxfUtil;
+import org.apache.openejb.testing.Configuration;
+import org.apache.openejb.testing.Module;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified:
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSRoutingTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSRoutingTest.java?rev=1429526&r1=1429525&r2=1429526&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSRoutingTest.java
(original)
+++
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSRoutingTest.java
Sun Jan 6 13:58:07 2013
@@ -16,25 +16,22 @@
*/
package org.apache.openejb.server.cxf.rs;
-import org.apache.cxf.jaxrs.client.ServerWebApplicationException;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.openejb.jee.WebApp;
import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.junit.Classes;
-import org.apache.openejb.junit.EnableServices;
-import org.apache.openejb.junit.Module;
-import org.apache.openejb.server.cxf.rs.beans.*;
+import org.apache.openejb.server.cxf.rs.beans.MyExpertRestClass;
+import org.apache.openejb.server.cxf.rs.beans.MyFirstRestClass;
+import org.apache.openejb.server.cxf.rs.beans.RestWithInjections;
+import org.apache.openejb.server.cxf.rs.beans.SimpleEJB;
+import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.EnableServices;
+import org.apache.openejb.testing.Module;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.core.Application;
-import javax.ws.rs.core.Response;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
Modified:
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSWithInterfaceTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSWithInterfaceTest.java?rev=1429526&r1=1429525&r2=1429526&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSWithInterfaceTest.java
(original)
+++
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSWithInterfaceTest.java
Sun Jan 6 13:58:07 2013
@@ -19,13 +19,13 @@ package org.apache.openejb.server.cxf.rs
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.openejb.jee.WebApp;
import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.junit.Classes;
-import org.apache.openejb.junit.EnableServices;
-import org.apache.openejb.junit.Module;
import org.apache.openejb.server.cxf.rs.beans.MyExpertRestClass;
import org.apache.openejb.server.cxf.rs.beans.MyFirstRestClass;
import org.apache.openejb.server.cxf.rs.beans.RestWithInjections;
import org.apache.openejb.server.cxf.rs.beans.SimpleEJB;
+import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.EnableServices;
+import org.apache.openejb.testing.Module;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified:
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RestDeploymentTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RestDeploymentTest.java?rev=1429526&r1=1429525&r2=1429526&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RestDeploymentTest.java
(original)
+++
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RestDeploymentTest.java
Sun Jan 6 13:58:07 2013
@@ -20,8 +20,19 @@ import org.apache.cxf.jaxrs.client.Serve
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.openejb.AppContext;
import org.apache.openejb.Injection;
-import org.apache.openejb.assembler.classic.*;
-import org.apache.openejb.config.*;
+import org.apache.openejb.assembler.classic.AppInfo;
+import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.assembler.classic.FacilitiesInfo;
+import org.apache.openejb.assembler.classic.OpenEjbConfiguration;
+import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
+import org.apache.openejb.assembler.classic.SecurityServiceInfo;
+import org.apache.openejb.assembler.classic.ServiceInfo;
+import org.apache.openejb.assembler.classic.TransactionServiceInfo;
+import org.apache.openejb.config.AnnotationDeployer;
+import org.apache.openejb.config.AppModule;
+import org.apache.openejb.config.ConfigurationFactory;
+import org.apache.openejb.config.EjbModule;
+import org.apache.openejb.config.WebModule;
import org.apache.openejb.core.CoreContainerSystem;
import org.apache.openejb.core.WebContext;
import org.apache.openejb.core.ivm.naming.IvmJndiFactory;
@@ -31,7 +42,14 @@ import org.apache.openejb.jee.WebApp;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.server.ServiceDaemon;
import org.apache.openejb.server.ServiceException;
-import org.apache.openejb.server.cxf.rs.beans.*;
+import org.apache.openejb.server.cxf.rs.beans.HookedRest;
+import org.apache.openejb.server.cxf.rs.beans.MyExpertRestClass;
+import org.apache.openejb.server.cxf.rs.beans.MyFirstRestClass;
+import org.apache.openejb.server.cxf.rs.beans.MyNonListedRestClass;
+import org.apache.openejb.server.cxf.rs.beans.MyRESTApplication;
+import org.apache.openejb.server.cxf.rs.beans.MySecondRestClass;
+import org.apache.openejb.server.cxf.rs.beans.RestWithInjections;
+import org.apache.openejb.server.cxf.rs.beans.SimpleEJB;
import org.apache.openejb.server.httpd.HttpServer;
import org.apache.openejb.server.httpd.HttpServerFactory;
import org.apache.openejb.server.httpd.OpenEJBHttpServer;
Modified:
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInjectionTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInjectionTest.java?rev=1429526&r1=1429525&r2=1429526&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInjectionTest.java
(original)
+++
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInjectionTest.java
Sun Jan 6 13:58:07 2013
@@ -20,9 +20,9 @@ import org.apache.openejb.OpenEjbContain
import org.apache.openejb.jee.Empty;
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.junit.Configuration;
-import org.apache.openejb.junit.Module;
import org.apache.openejb.loader.IO;
+import org.apache.openejb.testing.Configuration;
+import org.apache.openejb.testing.Module;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified:
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInterceptorInjectionTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInterceptorInjectionTest.java?rev=1429526&r1=1429525&r2=1429526&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInterceptorInjectionTest.java
(original)
+++
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInterceptorInjectionTest.java
Sun Jan 6 13:58:07 2013
@@ -17,15 +17,12 @@
package org.apache.openejb.server.cxf.rs;
import org.apache.openejb.OpenEjbContainer;
-import org.apache.openejb.core.ivm.naming.MapObjectReference;
-import org.apache.openejb.core.ivm.naming.ObjectReference;
import org.apache.openejb.jee.Empty;
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.junit.Configuration;
-import org.apache.openejb.junit.Module;
import org.apache.openejb.loader.IO;
-import org.apache.openejb.rest.ThreadLocalContextManager;
+import org.apache.openejb.testing.Configuration;
+import org.apache.openejb.testing.Module;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,8 +31,6 @@ import javax.ejb.Singleton;
import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptors;
import javax.interceptor.InvocationContext;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.GET;
Modified:
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsWithInterfaceTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsWithInterfaceTest.java?rev=1429526&r1=1429525&r2=1429526&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsWithInterfaceTest.java
(original)
+++
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsWithInterfaceTest.java
Sun Jan 6 13:58:07 2013
@@ -18,9 +18,9 @@ package org.apache.openejb.server.cxf.rs
import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.junit.Configuration;
-import org.apache.openejb.junit.Module;
import org.apache.openejb.loader.IO;
+import org.apache.openejb.testing.Configuration;
+import org.apache.openejb.testing.Module;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified:
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java?rev=1429526&r1=1429525&r2=1429526&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java
(original)
+++
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java
Sun Jan 6 13:58:07 2013
@@ -20,10 +20,14 @@ import org.apache.cxf.jaxrs.client.Serve
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.openejb.jee.WebApp;
import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.junit.Classes;
-import org.apache.openejb.junit.EnableServices;
-import org.apache.openejb.junit.Module;
-import org.apache.openejb.server.cxf.rs.beans.*;
+import org.apache.openejb.server.cxf.rs.beans.MyExpertRestClass;
+import org.apache.openejb.server.cxf.rs.beans.MyFirstRestClass;
+import org.apache.openejb.server.cxf.rs.beans.MyRESTApplication;
+import org.apache.openejb.server.cxf.rs.beans.RestWithInjections;
+import org.apache.openejb.server.cxf.rs.beans.SimpleEJB;
+import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.EnableServices;
+import org.apache.openejb.testing.Module;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified:
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimplePojoTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimplePojoTest.java?rev=1429526&r1=1429525&r2=1429526&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimplePojoTest.java
(original)
+++
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimplePojoTest.java
Sun Jan 6 13:58:07 2013
@@ -20,16 +20,13 @@ import org.apache.cxf.jaxrs.client.WebCl
import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.assembler.classic.WebAppBuilder;
import org.apache.openejb.config.WebModule;
-import org.apache.openejb.core.WebContext;
import org.apache.openejb.jee.WebApp;
import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.junit.Component;
-import org.apache.openejb.junit.Configuration;
-import org.apache.openejb.junit.Module;
-import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.testing.Component;
import org.apache.openejb.server.cxf.rs.beans.MyFirstRestClass;
+import org.apache.openejb.testing.Configuration;
+import org.apache.openejb.testing.Module;
import org.apache.openejb.web.LightweightWebAppBuilder;
-import org.apache.openejb.spi.ContainerSystem;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified:
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SubResourceTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SubResourceTest.java?rev=1429526&r1=1429525&r2=1429526&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SubResourceTest.java
(original)
+++
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SubResourceTest.java
Sun Jan 6 13:58:07 2013
@@ -19,9 +19,9 @@ package org.apache.openejb.server.cxf.rs
import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.junit.Configuration;
-import org.apache.openejb.junit.Module;
import org.apache.openejb.loader.IO;
+import org.apache.openejb.testing.Configuration;
+import org.apache.openejb.testing.Module;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified:
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/HookedRest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/HookedRest.java?rev=1429526&r1=1429525&r2=1429526&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/HookedRest.java
(original)
+++
openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/HookedRest.java
Sun Jan 6 13:58:07 2013
@@ -17,7 +17,6 @@
package org.apache.openejb.server.cxf.rs.beans;
import javax.annotation.PostConstruct;
-import javax.ejb.EJB;
import javax.inject.Inject;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
