You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/07/14 18:11:40 UTC
svn commit: r1610454 [3/6] - in /tomee/tomee/trunk/server: ./
openejb-activemq/ openejb-axis/
openejb-axis/src/main/java/org/apache/openejb/server/axis/
openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/
openejb-axis/src/main/java/org...
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java Mon Jul 14 16:11:36 2014
@@ -259,7 +259,7 @@ public class CxfRsHttpListener implement
final Collection<Object> additionalProviders,
final ServiceConfiguration configuration) {
deploy(contextRoot, loadedClazz, fullContext, new OpenEJBPerRequestPojoResourceProvider(loader, loadedClazz, injections, context, owbCtx),
- null, app, null, additionalProviders, configuration);
+ null, app, null, additionalProviders, configuration);
}
@Override
@@ -526,29 +526,29 @@ public class CxfRsHttpListener implement
// Init and register MBeans
final ObjectNameBuilder jmxName = new ObjectNameBuilder("openejb.management")
- .set("j2eeType", "JAX-RS")
- .set("J2EEServer", "openejb")
- .set("J2EEApplication", base)
- .set("EndpointType", resource.type)
- .set("name", resource.classname);
+ .set("j2eeType", "JAX-RS")
+ .set("J2EEServer", "openejb")
+ .set("J2EEApplication", base)
+ .set("EndpointType", resource.type)
+ .set("name", resource.classname);
final ObjectName jmxObjectName = jmxName.build();
LocalMBeanServer.registerDynamicWrapperSilently(
- new RestServiceMBean(resource),
- jmxObjectName);
+ new RestServiceMBean(resource),
+ jmxObjectName);
jmxNames.add(jmxObjectName);
LOGGER.info(" Service URI: "
- + Logs.forceLength(resource.address, addressSize, true) + " -> "
- + Logs.forceLength(resource.type, 4, false) + " "
- + Logs.forceLength(resource.classname, classSize, true));
+ + Logs.forceLength(resource.address, addressSize, true) + " -> "
+ + Logs.forceLength(resource.type, 4, false) + " "
+ + Logs.forceLength(resource.classname, classSize, true));
for (final Logs.LogOperationEndpointInfo log : resource.operations) {
LOGGER.info(" "
- + Logs.forceLength(log.http, resource.methodSize, false) + " "
- + Logs.forceLength(log.address, addressSize, true) + " -> "
- + Logs.forceLength(log.method, resource.methodStrSize, true));
+ + Logs.forceLength(log.http, resource.methodSize, false) + " "
+ + Logs.forceLength(log.address, addressSize, true) + " -> "
+ + Logs.forceLength(log.method, resource.methodStrSize, true));
}
resource.operations.clear();
@@ -581,7 +581,7 @@ public class CxfRsHttpListener implement
ResourceComparator instance = (ResourceComparator) ServiceInfos.resolve(services, resourceComparator);
if (instance == null) {
instance = (ResourceComparator) Thread.currentThread().getContextClassLoader()
- .loadClass(resourceComparator).newInstance();
+ .loadClass(resourceComparator).newInstance();
}
factory.setResourceComparator(instance);
} catch (final Exception e) {
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/Logs.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/Logs.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/Logs.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/Logs.java Mon Jul 14 16:11:36 2014
@@ -52,7 +52,7 @@ public class Logs {
if (typeparms.length > 0) {
boolean first = true;
sb.append("<");
- for(Type typeparm: typeparms) {
+ for (Type typeparm : typeparms) {
if (!first) {
sb.append(",");
}
@@ -91,7 +91,7 @@ public class Logs {
public static String name(final Type type) {
if (type instanceof Class<?>) {
- return ((Class) type).getSimpleName() .replace("java.lang.", "").replace("java.util", "");
+ return ((Class) type).getSimpleName().replace("java.lang.", "").replace("java.util", "");
} else if (type instanceof ParameterizedType) {
final ParameterizedType pt = (ParameterizedType) type;
final StringBuilder builder = new StringBuilder();
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBEJBInvoker.java Mon Jul 14 16:11:36 2014
@@ -41,10 +41,10 @@ public class OpenEJBEJBInvoker extends J
final Collection<Class<?>> classes = new HashSet<Class<?>>();
Contexts.findContextFields(context.getBeanClass(), classes);
for (final Collection<InterceptorData> list :
- Arrays.asList(
- context.getInterceptorData(),
- context.getInstanceScopedInterceptors(),
- context.getCallbackInterceptors())) {
+ Arrays.asList(
+ context.getInterceptorData(),
+ context.getInstanceScopedInterceptors(),
+ context.getCallbackInterceptors())) {
for (final InterceptorData id : list) {
final Class<?> interceptorClass = id.getInterceptorClass();
if (!StatsInterceptor.class.equals(interceptorClass)) {
@@ -64,7 +64,7 @@ public class OpenEJBEJBInvoker extends J
private Collection<Class<?>> getContextTypes(final Object resourceObject) {
if (!ProxyManager.isProxyClass(resourceObject.getClass())
- && !LocalBeanProxyFactory.isProxy(resourceObject.getClass())) {
+ && !LocalBeanProxyFactory.isProxy(resourceObject.getClass())) {
return Collections.emptySet();
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/OpenEJBPerRequestPojoResourceProvider.java Mon Jul 14 16:11:36 2014
@@ -318,12 +318,12 @@ public class OpenEJBPerRequestPojoResour
throw new WebApplicationException(Response.serverError().entity(msg).build());
} catch (final IllegalAccessException ex) {
final String msg = "Resource class " + constructor.getDeclaringClass().getName() + " can not be instantiated"
- + " due to IllegalAccessException";
+ + " due to IllegalAccessException";
throw new WebApplicationException(Response.serverError().entity(msg).build());
} catch (final InvocationTargetException ex) {
final String msg = "Resource class "
- + constructor.getDeclaringClass().getName() + " can not be instantiated"
- + " due to InvocationTargetException";
+ + constructor.getDeclaringClass().getName() + " can not be instantiated"
+ + " due to InvocationTargetException";
throw new WebApplicationException(Response.serverError().entity(msg).build());
} catch (final OpenEJBException e) {
final String msg = "An error occured injecting in class " + constructor.getDeclaringClass().getName();
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/cdi/JAXRSContextExtension.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/cdi/JAXRSContextExtension.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/cdi/JAXRSContextExtension.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/cdi/JAXRSContextExtension.java Mon Jul 14 16:11:36 2014
@@ -91,8 +91,8 @@ public class JAXRSContextExtension imple
public ContextBean(final Class<T> type, final AbstractRestThreadLocalProxy<T> proxy) {
this.type = type;
this.proxy =
- (T) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class<?>[] { type, Serializable.class },
- new DelegateHandler(proxy));
+ (T) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class<?>[]{type, Serializable.class},
+ new DelegateHandler(proxy));
this.types = new HashSet<Type>(asList(Object.class, type));
this.qualifiers = new HashSet<Annotation>(asList(ContextLiteral.INSTANCE, AnyLiteral.INSTANCE));
}
@@ -164,8 +164,7 @@ public class JAXRSContextExtension imple
public Object invoke(final Object ignored, final Method method, final Object[] args) throws Throwable {
try {
return method.invoke(proxy.get(), args);
- }
- catch (final InvocationTargetException ite) {
+ } catch (final InvocationTargetException ite) {
throw ite.getCause();
}
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationFromWebXmlTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationFromWebXmlTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationFromWebXmlTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationFromWebXmlTest.java Mon Jul 14 16:11:36 2014
@@ -39,13 +39,13 @@ public class ApplicationFromWebXmlTest {
public static final String BASE_URL = "http://localhost:4204/foo/bar";
@Module
- @Classes(value = { MyFirstRestClass.class }, cdi = true)
+ @Classes(value = {MyFirstRestClass.class}, cdi = true)
public WebApp war() {
return new WebApp()
- .contextRoot("foo")
- .addServlet("REST Application", Application.class.getName())
- .addInitParam("REST Application", "javax.ws.rs.Application", XmlApplication.class.getName())
- .addServletMapping("REST Application", "/bar/*");
+ .contextRoot("foo")
+ .addServlet("REST Application", Application.class.getName())
+ .addInitParam("REST Application", "javax.ws.rs.Application", XmlApplication.class.getName())
+ .addServletMapping("REST Application", "/bar/*");
}
@Test
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIApplicationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIApplicationTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIApplicationTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIApplicationTest.java Mon Jul 14 16:11:36 2014
@@ -38,12 +38,12 @@ import static org.junit.Assert.assertTru
@RunWith(ApplicationComposer.class)
public class CDIApplicationTest {
@Module
- @Classes(cdi = true, value = { MyCdiRESTApplication.class, MyFirstRestClass.class, ACdiBeanInjectedInApp.class })
+ @Classes(cdi = true, value = {MyCdiRESTApplication.class, MyFirstRestClass.class, ACdiBeanInjectedInApp.class})
public WebApp war() {
return new WebApp()
- .contextRoot("foo")
- .addServlet("REST Application", Application.class.getName())
- .addInitParam("REST Application", "javax.ws.rs.Application", MyCdiRESTApplication.class.getName());
+ .contextRoot("foo")
+ .addServlet("REST Application", Application.class.getName())
+ .addInitParam("REST Application", "javax.ws.rs.Application", MyCdiRESTApplication.class.getName());
}
@Test
@@ -52,7 +52,8 @@ public class CDIApplicationTest {
assertEquals("Hi from REST World!", WebClient.create("http://localhost:4204/foo/").path("/first/hi").get(String.class));
}
- public static class ACdiBeanInjectedInApp {}
+ public static class ACdiBeanInjectedInApp {
+ }
public static class MyCdiRESTApplication extends Application {
public static boolean injection = false;
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiConstructorInjectionTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiConstructorInjectionTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiConstructorInjectionTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiConstructorInjectionTest.java Mon Jul 14 16:11:36 2014
@@ -42,12 +42,12 @@ import org.junit.runner.RunWith;
@RunWith(ApplicationComposer.class)
public class CdiConstructorInjectionTest {
@Module
- @Classes(value = { FullCDI.class, Service.class, CDIAndContext.class }, cdi = true)
+ @Classes(value = {FullCDI.class, Service.class, CDIAndContext.class}, cdi = true)
public WebApp war() {
return new WebApp()
- .contextRoot("app")
- .addServlet("REST Application", Application.class.getName())
- .addInitParam("REST Application", "javax.ws.rs.Application", ConstructorApplication.class.getName());
+ .contextRoot("app")
+ .addServlet("REST Application", Application.class.getName())
+ .addInitParam("REST Application", "javax.ws.rs.Application", ConstructorApplication.class.getName());
}
@Test
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiInterceptorContextTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiInterceptorContextTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiInterceptorContextTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiInterceptorContextTest.java Mon Jul 14 16:11:36 2014
@@ -47,12 +47,12 @@ import static org.junit.Assert.assertEqu
@RunWith(ApplicationComposer.class)
public class CdiInterceptorContextTest {
@Module
- @Classes(value = { Endpoint.class, AnswerPerfect.class }, cdiInterceptors = AnswerPerfect.class)
+ @Classes(value = {Endpoint.class, AnswerPerfect.class}, cdiInterceptors = AnswerPerfect.class)
public WebApp war() {
return new WebApp()
- .contextRoot("app")
- .addServlet("REST Application", Application.class.getName())
- .addInitParam("REST Application", "javax.ws.rs.Application", PerfectApplication.class.getName());
+ .contextRoot("app")
+ .addServlet("REST Application", Application.class.getName())
+ .addInitParam("REST Application", "javax.ws.rs.Application", PerfectApplication.class.getName());
}
@Test
@@ -76,7 +76,8 @@ public class CdiInterceptorContextTest {
}
- @Interceptor @Perfect
+ @Interceptor
+ @Perfect
public static class AnswerPerfect {
@Context
private HttpServletRequest request;
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CheckedExceptionMapperTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CheckedExceptionMapperTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CheckedExceptionMapperTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CheckedExceptionMapperTest.java Mon Jul 14 16:11:36 2014
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertEqu
@RunWith(ApplicationComposer.class)
public class CheckedExceptionMapperTest {
@Module
- @Classes({ ExampleExceptionMapper.class })
+ @Classes({ExampleExceptionMapper.class})
public EjbModule module() {
final SingletonBean bean = new SingletonBean(ExampleRest.class);
bean.setRestService(true);
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java Mon Jul 14 16:11:36 2014
@@ -57,7 +57,7 @@ public class CustomExceptionMapperTest {
@Test
public void exceptionMapper() {
final String response = WebClient.create("http://localhost:4204/openejb-cxf-rs")
- .path("/exception-mapper/throw").get(String.class);
+ .path("/exception-mapper/throw").get(String.class);
assertEquals(FooException.class.getName(), response);
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java Mon Jul 14 16:11:36 2014
@@ -64,14 +64,14 @@ public class CustomProviderTest {
@Test
public void customProvider() {
String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").accept("openejb/reverse")
- .path("/custom1/reverse").get(String.class);
+ .path("/custom1/reverse").get(String.class);
assertEquals("provider", response);
}
@Test
public void customSpecificProvider() {
String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").accept("openejb/constant")
- .path("/custom2/constant").get(String.class);
+ .path("/custom2/constant").get(String.class);
assertEquals("it works!", response);
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderWithConfigTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderWithConfigTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderWithConfigTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderWithConfigTest.java Mon Jul 14 16:11:36 2014
@@ -64,7 +64,7 @@ public class CustomProviderWithConfigTes
@Test
public void config() {
final String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").accept("openejb/conf")
- .path("/customized/").get(String.class);
+ .path("/customized/").get(String.class);
assertEquals("done!", response);
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java Mon Jul 14 16:11:36 2014
@@ -65,8 +65,8 @@ public class DiscoverCustomProviderTest
@Test
public void customProvider() {
final String response = WebClient.create("http://localhost:4204/openejb-cxf-rs")
- .accept("discover/reverse")
- .path("the/service").get(String.class);
+ .accept("discover/reverse")
+ .path("the/service").get(String.class);
assertEquals("it rocks", response);
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSRoutingTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSRoutingTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSRoutingTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSRoutingTest.java Mon Jul 14 16:11:36 2014
@@ -43,12 +43,12 @@ public class JAXRSRoutingTest {
public static final String BASE_URL = "http://localhost:4204/foo/";
@Module
- @Classes(cdi = true, value = { RestWithInjections.class, FirstService.class, SimpleEJB.class, MyExpertRestClass.class, MyFirstRestClass.class })
+ @Classes(cdi = true, value = {RestWithInjections.class, FirstService.class, SimpleEJB.class, MyExpertRestClass.class, MyFirstRestClass.class})
public WebApp war() {
return new WebApp()
- .contextRoot("foo")
- .addServlet("REST Application", Application.class.getName())
- .addInitParam("REST Application", "javax.ws.rs.Application", NoClassAtPathApplication.class.getName());
+ .contextRoot("foo")
+ .addServlet("REST Application", Application.class.getName())
+ .addInitParam("REST Application", "javax.ws.rs.Application", NoClassAtPathApplication.class.getName());
}
@Test
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSWithInterfaceTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSWithInterfaceTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSWithInterfaceTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSWithInterfaceTest.java Mon Jul 14 16:11:36 2014
@@ -43,12 +43,12 @@ public class JAXRSWithInterfaceTest {
public static final String BASE_URL = "http://localhost:4204/foo/";
@Module
- @Classes(cdi = true, value = { Impl.class, RestWithInjections.class, SimpleEJB.class, MyExpertRestClass.class, MyFirstRestClass.class })
+ @Classes(cdi = true, value = {Impl.class, RestWithInjections.class, SimpleEJB.class, MyExpertRestClass.class, MyFirstRestClass.class})
public WebApp war() {
return new WebApp()
- .contextRoot("foo")
- .addServlet("REST Application", Application.class.getName())
- .addInitParam("REST Application", "javax.ws.rs.Application", InterfaceApp.class.getName());
+ .contextRoot("foo")
+ .addServlet("REST Application", Application.class.getName())
+ .addInitParam("REST Application", "javax.ws.rs.Application", InterfaceApp.class.getName());
}
@Test
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java Mon Jul 14 16:11:36 2014
@@ -38,11 +38,11 @@ import static org.junit.Assert.assertEqu
@RunWith(ApplicationComposer.class)
public class JndiForPojoEndpointsTest {
@Module
- @Classes(cdi = true, value = { JndiEndpoint.class })
+ @Classes(cdi = true, value = {JndiEndpoint.class})
public WebApp war() {
return new WebApp()
- .contextRoot("foo")
- .addServlet(Application.class.getName(), null, "/api/*");
+ .contextRoot("foo")
+ .addServlet(Application.class.getName(), null, "/api/*");
}
@Test
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/MultipleApplicationsTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/MultipleApplicationsTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/MultipleApplicationsTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/MultipleApplicationsTest.java Mon Jul 14 16:11:36 2014
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertEqu
@RunWith(ApplicationComposer.class)
public class MultipleApplicationsTest {
@Module
- @Classes(cdi = true, value = { Application1.class, Application2.class, MyFirstRestClass.class })
+ @Classes(cdi = true, value = {Application1.class, Application2.class, MyFirstRestClass.class})
public WebApp war() {
return new WebApp().contextRoot("foo");
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/NoPathOnImplTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/NoPathOnImplTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/NoPathOnImplTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/NoPathOnImplTest.java Mon Jul 14 16:11:36 2014
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertEqu
@RunWith(ApplicationComposer.class)
public class NoPathOnImplTest {
@Module
- @Classes({ API.class, Impl.class })
+ @Classes({API.class, Impl.class})
public static WebApp service() throws Exception {
return new WebApp().contextRoot("app");
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ProviderWithConstructorTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ProviderWithConstructorTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ProviderWithConstructorTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ProviderWithConstructorTest.java Mon Jul 14 16:11:36 2014
@@ -48,12 +48,12 @@ import static org.junit.Assert.assertEqu
@RunWith(ApplicationComposer.class)
public class ProviderWithConstructorTest {
@Module
- @Classes(value = { AnEndpointToCheckAProvider.class })
+ @Classes(value = {AnEndpointToCheckAProvider.class})
public WebApp war() {
return new WebApp()
- .contextRoot("app")
- .addServlet("REST Application", Application.class.getName())
- .addInitParam("REST Application", "javax.ws.rs.Application", ApplicationWithProvider.class.getName());
+ .contextRoot("app")
+ .addServlet("REST Application", Application.class.getName())
+ .addInitParam("REST Application", "javax.ws.rs.Application", ApplicationWithProvider.class.getName());
}
@Test
@@ -63,7 +63,8 @@ public class ProviderWithConstructorTest
@Path("/foo")
public static class AnEndpointToCheckAProvider {
- @GET @Produces("openejb/constructor")
+ @GET
+ @Produces("openejb/constructor")
public String bar() {
return "bar"; // whatever the value is the provider will return the context path
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ProvidersShouldBeScannedTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ProvidersShouldBeScannedTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ProvidersShouldBeScannedTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ProvidersShouldBeScannedTest.java Mon Jul 14 16:11:36 2014
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertEqu
@RunWith(ApplicationComposer.class)
public class ProvidersShouldBeScannedTest {
@Module
- @Classes({ NeedAProvider.class, DontLetResourcesFail.class })
+ @Classes({NeedAProvider.class, DontLetResourcesFail.class})
public static WebApp service() throws Exception {
return new WebApp().contextRoot("app");
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsCDIInterceptorTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsCDIInterceptorTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsCDIInterceptorTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsCDIInterceptorTest.java Mon Jul 14 16:11:36 2014
@@ -45,10 +45,10 @@ import static org.junit.Assert.assertEqu
@RunWith(ApplicationComposer.class)
public class RsCDIInterceptorTest {
@Module
- @Classes(cdi = true, value = { InterceptedEJBRs.class, InterceptedRs.class }, cdiInterceptors = MockingInterceptor.class)
+ @Classes(cdi = true, value = {InterceptedEJBRs.class, InterceptedRs.class}, cdiInterceptors = MockingInterceptor.class)
public WebApp war() {
return new WebApp()
- .contextRoot("foo");
+ .contextRoot("foo");
}
@Test
@@ -84,7 +84,8 @@ public class RsCDIInterceptorTest {
}
}
- @Interceptor @IBinding
+ @Interceptor
+ @IBinding
public static class MockingInterceptor {
@AroundInvoke
public Object mock(final InvocationContext ic) throws Exception {
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsJMXTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsJMXTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsJMXTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsJMXTest.java Mon Jul 14 16:11:36 2014
@@ -43,7 +43,7 @@ public class RsJMXTest {
private static ObjectName name;
@Module
- @Classes(AnEndpoint.class )
+ @Classes(AnEndpoint.class)
public WebApp war() {
return new WebApp().contextRoot("app");
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsWithInterfaceTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsWithInterfaceTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsWithInterfaceTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsWithInterfaceTest.java Mon Jul 14 16:11:36 2014
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertEqu
public class RsWithInterfaceTest {
@Module
public static Class<?>[] service() throws Exception {
- return new Class<?>[] { RsImpl.class, App.class };
+ return new Class<?>[]{RsImpl.class, App.class};
}
@Configuration
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java Mon Jul 14 16:11:36 2014
@@ -44,9 +44,9 @@ public class SimpleApplicationTest {
@Classes(cdi = true, value = {MySecondRestClass.class, HookedRest.class, RestWithInjections.class, SimpleEJB.class, MyExpertRestClass.class, MyFirstRestClass.class})
public WebApp war() {
return new WebApp()
- .contextRoot("foo")
- .addServlet("REST Application", Application.class.getName())
- .addInitParam("REST Application", "javax.ws.rs.Application", MyRESTApplication.class.getName());
+ .contextRoot("foo")
+ .addServlet("REST Application", Application.class.getName())
+ .addInitParam("REST Application", "javax.ws.rs.Application", MyRESTApplication.class.getName());
}
@Test
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingTest.java Mon Jul 14 16:11:36 2014
@@ -46,10 +46,10 @@ public class SimpleApplicationWithLongMa
@Classes(cdi = true, value = {MySecondRestClass.class, HookedRest.class, RestWithInjections.class, SimpleEJB.class, MyExpertRestClass.class, MyFirstRestClass.class})
public WebApp war() {
return new WebApp()
- .contextRoot("foo")
- .addServlet("REST Application", Application.class.getName())
- .addInitParam("REST Application", "javax.ws.rs.Application", MyRESTApplication.class.getName())
- .addServletMapping("REST Application", "/mapping/part2/*");
+ .contextRoot("foo")
+ .addServlet("REST Application", Application.class.getName())
+ .addInitParam("REST Application", "javax.ws.rs.Application", MyRESTApplication.class.getName())
+ .addServletMapping("REST Application", "/mapping/part2/*");
}
@Test
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingWithNoAppPathTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingWithNoAppPathTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingWithNoAppPathTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingWithNoAppPathTest.java Mon Jul 14 16:11:36 2014
@@ -46,13 +46,14 @@ public class SimpleApplicationWithLongMa
@Classes(cdi = true, value = {MySecondRestClass.class, HookedRest.class, RestWithInjections.class, SimpleEJB.class, MyExpertRestClass.class, MyFirstRestClass.class})
public WebApp war() {
return new WebApp()
- .contextRoot("foo")
- .addServlet("REST Application", Application.class.getName())
- .addInitParam("REST Application", "javax.ws.rs.Application", MyRootRESTApp.class.getName())
- .addServletMapping("REST Application", "/mapping/part2/*");
+ .contextRoot("foo")
+ .addServlet("REST Application", Application.class.getName())
+ .addInitParam("REST Application", "javax.ws.rs.Application", MyRootRESTApp.class.getName())
+ .addServletMapping("REST Application", "/mapping/part2/*");
}
- public static class MyRootRESTApp extends MyRESTApplication {}
+ public static class MyRootRESTApp extends MyRESTApplication {
+ }
@Test
public void first() {
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithMappingTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithMappingTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithMappingTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithMappingTest.java Mon Jul 14 16:11:36 2014
@@ -46,10 +46,10 @@ public class SimpleApplicationWithMappin
@Classes(cdi = true, value = {MySecondRestClass.class, HookedRest.class, RestWithInjections.class, SimpleEJB.class, MyExpertRestClass.class, MyFirstRestClass.class})
public WebApp war() {
return new WebApp()
- .contextRoot("foo")
- .addServlet("REST Application", Application.class.getName())
- .addInitParam("REST Application", "javax.ws.rs.Application", MyRESTApplication.class.getName())
- .addServletMapping("REST Application", "/mapping/*");
+ .contextRoot("foo")
+ .addServlet("REST Application", Application.class.getName())
+ .addInitParam("REST Application", "javax.ws.rs.Application", MyRESTApplication.class.getName())
+ .addServletMapping("REST Application", "/mapping/*");
}
@Test
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimplePojoTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimplePojoTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimplePojoTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimplePojoTest.java Mon Jul 14 16:11:36 2014
@@ -50,7 +50,7 @@ public class SimplePojoTest {
}
@Module
- @Classes(cdi = true, value = { MyFirstRestClass.class })
+ @Classes(cdi = true, value = {MyFirstRestClass.class})
public WebModule war() {
final WebModule webModule = new WebModule(new WebApp(), "/foo", Thread.currentThread().getContextClassLoader(), "", "foo");
webModule.getRestClasses().add(MyFirstRestClass.class.getName());
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/WebXmlSpecApplicationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/WebXmlSpecApplicationTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/WebXmlSpecApplicationTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/WebXmlSpecApplicationTest.java Mon Jul 14 16:11:36 2014
@@ -43,8 +43,8 @@ public class WebXmlSpecApplicationTest {
@Classes(Resource.class)
public WebApp war() {
return new WebApp()
- .contextRoot("foo")
- .addServlet(Application.class.getName(), null, "/resources/*");
+ .contextRoot("foo")
+ .addServlet(Application.class.getName(), null, "/resources/*");
}
@Test
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MyExpertRestClass.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MyExpertRestClass.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MyExpertRestClass.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MyExpertRestClass.java Mon Jul 14 16:11:36 2014
@@ -21,7 +21,9 @@ import javax.ws.rs.Path;
@Path("/expert")
public class MyExpertRestClass {
- @Path("/still-hi/") @POST public String hi(String you) {
+ @Path("/still-hi/")
+ @POST
+ public String hi(String you) {
return "hi " + you;
}
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MyNonListedRestClass.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MyNonListedRestClass.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MyNonListedRestClass.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MyNonListedRestClass.java Mon Jul 14 16:11:36 2014
@@ -22,7 +22,9 @@ import javax.ws.rs.QueryParam;
@Path("/non-listed")
public class MyNonListedRestClass {
- @Path("/yata/{did}") @GET public String yata(@QueryParam("did") String iDidIt) {
+ @Path("/yata/{did}")
+ @GET
+ public String yata(@QueryParam("did") String iDidIt) {
return "Yata! " + iDidIt;
}
}
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MySecondRestClass.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MySecondRestClass.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MySecondRestClass.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MySecondRestClass.java Mon Jul 14 16:11:36 2014
@@ -22,7 +22,9 @@ import javax.ws.rs.PathParam;
@Path("/second")
public class MySecondRestClass {
- @Path("/hi2/{you}") @GET public String hi(@PathParam("you") String you) {
+ @Path("/hi2/{you}")
+ @GET
+ public String hi(@PathParam("you") String you) {
return "hi " + you;
}
}
Modified: tomee/tomee/trunk/server/openejb-cxf-transport/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-transport/pom.xml?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-transport/pom.xml (original)
+++ tomee/tomee/trunk/server/openejb-cxf-transport/pom.xml Mon Jul 14 16:11:36 2014
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
Modified: tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java Mon Jul 14 16:11:36 2014
@@ -95,7 +95,7 @@ public final class CxfUtil {
}
// ensure client proxies can use app classes
- CXFBusFactory.setDefaultBus(Bus.class.cast(Proxy.newProxyInstance(CxfUtil.class.getClassLoader(), new Class<?>[]{ Bus.class }, new ClientAwareBusHandler())));
+ CXFBusFactory.setDefaultBus(Bus.class.cast(Proxy.newProxyInstance(CxfUtil.class.getClassLoader(), new Class<?>[]{Bus.class}, new ClientAwareBusHandler())));
return bus; // we keep as internal the real bus and just expose to cxf the client aware bus to be able to cast it easily
} finally {
@@ -126,7 +126,7 @@ public final class CxfUtil {
public static void clearBusLoader(final ClassLoader old) {
final ClassLoader loader = CxfUtil.getBus().getExtension(ClassLoader.class);
if (loader != null && CxfContainerClassLoader.class.isInstance(loader)
- && (old == null || !CxfContainerClassLoader.class.isInstance(old))) {
+ && (old == null || !CxfContainerClassLoader.class.isInstance(old))) {
CxfContainerClassLoader.class.cast(loader).clear();
}
Thread.currentThread().setContextClassLoader(old);
@@ -174,7 +174,7 @@ public final class CxfUtil {
if (!DataBinding.class.isInstance(instance)) {
throw new OpenEJBRuntimeException(instance + " is not a " + DataBinding.class.getName()
- + ", please check configuration of service [id=" + databinding + "]");
+ + ", please check configuration of service [id=" + databinding + "]");
}
svrFactory.setDataBinding((DataBinding) instance);
}
@@ -260,7 +260,7 @@ public final class CxfUtil {
if (bus instanceof CXFBusImpl) {
final ServiceConfiguration configuration = new ServiceConfiguration(SystemInstance.get().getProperties(),
- SystemInstance.get().getComponent(OpenEjbConfiguration.class).facilities.services);
+ SystemInstance.get().getComponent(OpenEjbConfiguration.class).facilities.services);
final CXFBusImpl busImpl = (CXFBusImpl) bus;
final Collection<ServiceInfo> serviceInfos = configuration.getAvailableServices();
Modified: tomee/tomee/trunk/server/openejb-cxf/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/pom.xml?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/pom.xml (original)
+++ tomee/tomee/trunk/server/openejb-cxf/pom.xml Mon Jul 14 16:11:36 2014
@@ -19,7 +19,8 @@
<!-- $Rev$ $Date$ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
Modified: tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ConfigureCxfSecurity.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ConfigureCxfSecurity.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ConfigureCxfSecurity.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ConfigureCxfSecurity.java Mon Jul 14 16:11:36 2014
@@ -73,7 +73,8 @@ public class ConfigureCxfSecurity {
} catch (Exception e) {
LOGGER.warning("validator not found " + val, e);
}
- } if (key.startsWith(processorPrefix)) {
+ }
+ if (key.startsWith(processorPrefix)) {
SplitInfo infos = new SplitInfo(key, val);
processorMap.put(infos.qname, infos.value);
} else if (key.startsWith(pattern)) {
Modified: tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java Mon Jul 14 16:11:36 2014
@@ -62,37 +62,37 @@ public abstract class CxfEndpoint {
protected Bus bus;
- protected PortData port;
-
- protected Context context;
+ protected PortData port;
- protected Object implementor;
+ protected Context context;
- protected Server server;
+ protected Object implementor;
- protected Service service;
+ protected Server server;
- protected JaxWsImplementorInfo implInfo;
+ protected Service service;
- protected JaxWsServiceFactoryBean serviceFactory;
+ protected JaxWsImplementorInfo implInfo;
- protected HandlerResolverImpl handlerResolver;
-
- protected HTTPTransportFactory httpTransportFactory;
+ protected JaxWsServiceFactoryBean serviceFactory;
+
+ protected HandlerResolverImpl handlerResolver;
+
+ protected HTTPTransportFactory httpTransportFactory;
protected ServiceConfiguration serviceConfiguration;
public CxfEndpoint(Bus bus, PortData port, Context context,
- Object implementor, HTTPTransportFactory httpTransportFactory,
- ServiceConfiguration configuration) {
- this.bus = bus;
- this.port = port;
- this.context = context;
- this.implementor = implementor;
- this.httpTransportFactory = httpTransportFactory;
+ Object implementor, HTTPTransportFactory httpTransportFactory,
+ ServiceConfiguration configuration) {
+ this.bus = bus;
+ this.port = port;
+ this.context = context;
+ this.implementor = implementor;
+ this.httpTransportFactory = httpTransportFactory;
this.serviceConfiguration = configuration;
- this.bus.setExtension(this, CxfEndpoint.class);
- }
+ this.bus.setExtension(this, CxfEndpoint.class);
+ }
protected Service doServiceCreate() {
final Level level = FACTORY_BEAN_LOG.getLevel();
@@ -105,82 +105,82 @@ public abstract class CxfEndpoint {
return service;
}
- protected Class getImplementorClass() {
- return this.implementor.getClass();
- }
-
- protected org.apache.cxf.endpoint.Endpoint getEndpoint() {
- return getServer().getEndpoint();
- }
-
- public boolean isSOAP11() {
- return SOAPBinding.SOAP11HTTP_BINDING.equals(implInfo.getBindingType()) ||
- SOAPBinding.SOAP11HTTP_MTOM_BINDING.equals(implInfo.getBindingType());
- }
-
- public boolean isHTTP() {
- return HTTPBinding.HTTP_BINDING.equals(implInfo.getBindingType());
- }
-
- public ServerImpl getServer() {
- return (ServerImpl) server;
- }
-
- public Binding getBinding() {
- return ((JaxWsEndpointImpl) getEndpoint()).getJaxwsBinding();
- }
-
- public void setExecutor(Executor executor) {
- service.setExecutor(executor);
- }
-
- public Executor getExecutor() {
- return service.getExecutor();
- }
-
- public Object getImplementor() {
- return implementor;
- }
-
- public List<Source> getMetadata() {
- return null;
- }
-
- public Map<String, Object> getProperties() {
- return null;
- }
-
- public boolean isPublished() {
- return server != null;
- }
-
- public void publish(Object arg0) {
- }
-
- public void publish(String address) {
- doPublish(address);
- }
-
- public void setMetadata(List<Source> arg0) {
- }
-
- public void setProperties(Map<String, Object> arg0) {
- }
-
- private class NoInitJaxWsServerFactoryBean extends JaxWsServerFactoryBean {
- public NoInitJaxWsServerFactoryBean() {
- // disable CXF resource injection
- doInit = false;
- }
- }
-
- protected void doPublish(String address) {
- JaxWsServerFactoryBean svrFactory = new NoInitJaxWsServerFactoryBean();
- svrFactory.setBus(bus);
- svrFactory.setAddress(address);
- svrFactory.setServiceFactory(serviceFactory);
- svrFactory.setStart(false);
- svrFactory.setServiceBean(implementor);
+ protected Class getImplementorClass() {
+ return this.implementor.getClass();
+ }
+
+ protected org.apache.cxf.endpoint.Endpoint getEndpoint() {
+ return getServer().getEndpoint();
+ }
+
+ public boolean isSOAP11() {
+ return SOAPBinding.SOAP11HTTP_BINDING.equals(implInfo.getBindingType()) ||
+ SOAPBinding.SOAP11HTTP_MTOM_BINDING.equals(implInfo.getBindingType());
+ }
+
+ public boolean isHTTP() {
+ return HTTPBinding.HTTP_BINDING.equals(implInfo.getBindingType());
+ }
+
+ public ServerImpl getServer() {
+ return (ServerImpl) server;
+ }
+
+ public Binding getBinding() {
+ return ((JaxWsEndpointImpl) getEndpoint()).getJaxwsBinding();
+ }
+
+ public void setExecutor(Executor executor) {
+ service.setExecutor(executor);
+ }
+
+ public Executor getExecutor() {
+ return service.getExecutor();
+ }
+
+ public Object getImplementor() {
+ return implementor;
+ }
+
+ public List<Source> getMetadata() {
+ return null;
+ }
+
+ public Map<String, Object> getProperties() {
+ return null;
+ }
+
+ public boolean isPublished() {
+ return server != null;
+ }
+
+ public void publish(Object arg0) {
+ }
+
+ public void publish(String address) {
+ doPublish(address);
+ }
+
+ public void setMetadata(List<Source> arg0) {
+ }
+
+ public void setProperties(Map<String, Object> arg0) {
+ }
+
+ private class NoInitJaxWsServerFactoryBean extends JaxWsServerFactoryBean {
+ public NoInitJaxWsServerFactoryBean() {
+ // disable CXF resource injection
+ doInit = false;
+ }
+ }
+
+ protected void doPublish(String address) {
+ JaxWsServerFactoryBean svrFactory = new NoInitJaxWsServerFactoryBean();
+ svrFactory.setBus(bus);
+ svrFactory.setAddress(address);
+ svrFactory.setServiceFactory(serviceFactory);
+ svrFactory.setStart(false);
+ svrFactory.setServiceBean(implementor);
svrFactory.setDestinationFactory(httpTransportFactory);
svrFactory.setServiceClass(serviceFactory.getServiceClass());
@@ -201,56 +201,56 @@ public abstract class CxfEndpoint {
// look for bean info if exists
CxfUtil.configureEndpoint(svrFactory, serviceConfiguration, CXF_JAXWS_PREFIX);
- if (HTTPBinding.HTTP_BINDING.equals(implInfo.getBindingType())) {
- svrFactory.setTransportId("http://cxf.apache.org/bindings/xformat");
- }
+ if (HTTPBinding.HTTP_BINDING.equals(implInfo.getBindingType())) {
+ svrFactory.setTransportId("http://cxf.apache.org/bindings/xformat");
+ }
final Level level = SERVER_IMPL_LOGGER.getLevel();
SERVER_IMPL_LOGGER.setLevel(Level.SEVERE);
try {
- server = svrFactory.create();
+ server = svrFactory.create();
} finally {
SERVER_IMPL_LOGGER.setLevel(level);
}
init();
- if (getBinding() instanceof SOAPBinding) {
- ((SOAPBinding) getBinding()).setMTOMEnabled(port.isMtomEnabled());
- }
+ if (getBinding() instanceof SOAPBinding) {
+ ((SOAPBinding) getBinding()).setMTOMEnabled(port.isMtomEnabled());
+ }
- server.start();
- }
+ server.start();
+ }
protected void init() {
// no-op
- }
+ }
+
+ /**
+ * Set appropriate handlers for the port/service/bindings.
+ */
+ protected void initHandlers() throws Exception {
+ PortInfoImpl portInfo = new PortInfoImpl(implInfo.getBindingType(), serviceFactory.getEndpointName(), service.getName());
+
+ handlerResolver = new HandlerResolverImpl(port.getHandlerChains(), port.getInjections(), context);
+ List<Handler> chain = handlerResolver.getHandlerChain(portInfo);
+
+ getBinding().setHandlerChain(chain);
+ }
+
+ protected void destroyHandlers() {
+ if (this.handlerResolver != null) {
+ handlerResolver.destroyHandlers();
+ handlerResolver = null;
+ }
+ }
- /**
- * Set appropriate handlers for the port/service/bindings.
- */
- protected void initHandlers() throws Exception {
- PortInfoImpl portInfo = new PortInfoImpl(implInfo.getBindingType(), serviceFactory.getEndpointName(), service.getName());
-
- handlerResolver = new HandlerResolverImpl(port.getHandlerChains(), port.getInjections(), context);
- List<Handler> chain = handlerResolver.getHandlerChain(portInfo);
-
- getBinding().setHandlerChain(chain);
- }
-
- protected void destroyHandlers() {
- if (this.handlerResolver != null) {
- handlerResolver.destroyHandlers();
- handlerResolver = null;
- }
- }
-
- public void stop() {
- // shutdown server
- if (this.server != null) {
- this.server.stop();
- }
- }
+ public void stop() {
+ // shutdown server
+ if (this.server != null) {
+ this.server.stop();
+ }
+ }
protected static JaxWsServiceFactoryBean configureService(final JaxWsServiceFactoryBean serviceFactory, final ServiceConfiguration configuration, final String prefix) {
final Properties beanConfig = configuration.getProperties();
@@ -273,7 +273,7 @@ public abstract class CxfEndpoint {
}
if (!DataBinding.class.isInstance(instance)) {
throw new OpenEJBRuntimeException(instance + " is not a " + DataBinding.class.getName()
- + ", please check configuration of service [id=" + databinding + "]");
+ + ", please check configuration of service [id=" + databinding + "]");
}
serviceFactory.setDataBinding((DataBinding) instance);
}
Modified: tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfWsContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfWsContainer.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfWsContainer.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfWsContainer.java Mon Jul 14 16:11:36 2014
@@ -60,6 +60,7 @@ public abstract class CxfWsContainer imp
}
protected abstract CxfEndpoint createEndpoint();
+
protected abstract ObjectName registerMBean();
protected abstract void setWsldUrl(String wsdl);
Modified: tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/OpenEJBLoginValidator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/OpenEJBLoginValidator.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/OpenEJBLoginValidator.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/OpenEJBLoginValidator.java Mon Jul 14 16:11:36 2014
@@ -38,7 +38,7 @@ public class OpenEJBLoginValidator exten
// get the plain text password
final WSPasswordCallback pwCb = new WSPasswordCallback(usernameToken.getName(),
- null, usernameToken.getPasswordType(), WSPasswordCallback.USERNAME_TOKEN, data);
+ null, usernameToken.getPasswordType(), WSPasswordCallback.USERNAME_TOKEN, data);
try {
data.getCallbackHandler().handle(new Callback[]{pwCb});
} catch (Exception e) {
Modified: tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajInInterceptor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajInInterceptor.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajInInterceptor.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajInInterceptor.java Mon Jul 14 16:11:36 2014
@@ -26,7 +26,7 @@ public class SaajInInterceptor extends S
public SaajInInterceptor(SaajUniverse universe) {
super(Phase.POST_INVOKE, universe);
}
-
+
public void handleMessage(Message msg) throws Fault {
this.universe.unset();
}
Modified: tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajInterceptor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajInterceptor.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajInterceptor.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajInterceptor.java Mon Jul 14 16:11:36 2014
@@ -32,7 +32,7 @@ public abstract class SaajInterceptor ex
super(phase);
this.universe = universe;
}
-
+
public static synchronized void registerInterceptors() {
if (!interceptorsRegistered) {
final Bus bus = CxfUtil.getBus();
Modified: tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajOutInterceptor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajOutInterceptor.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajOutInterceptor.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/client/SaajOutInterceptor.java Mon Jul 14 16:11:36 2014
@@ -26,11 +26,11 @@ public class SaajOutInterceptor extends
public SaajOutInterceptor(SaajUniverse universe) {
super(Phase.SETUP, universe);
}
-
+
public void handleMessage(Message msg) throws Fault {
this.universe.set(SaajUniverse.DEFAULT);
}
-
+
public void handleFault(Message msg) {
this.universe.unset();
}
Modified: tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbMethodInvoker.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbMethodInvoker.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbMethodInvoker.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbMethodInvoker.java Mon Jul 14 16:11:36 2014
@@ -64,7 +64,7 @@ public class EjbMethodInvoker extends Ab
}
protected Object invoke(Exchange exchange, Object serviceObject, Method m,
- List<Object> params) {
+ List<Object> params) {
Object result = null;
InvocationContext invContext = exchange.get(InvocationContext.class);
@@ -80,7 +80,7 @@ public class EjbMethodInvoker extends Ab
}
protected Object performInvocation(Exchange exchange, Object serviceObject,
- Method m, Object[] paramArray) throws Exception {
+ Method m, Object[] paramArray) throws Exception {
InvocationContext invContext = exchange.get(InvocationContext.class);
invContext.setParameters(paramArray);
Object res = invContext.proceed();
@@ -88,7 +88,7 @@ public class EjbMethodInvoker extends Ab
EjbMessageContext ctx = (EjbMessageContext) invContext.getContextData();
Map<String, Object> handlerProperties = (Map<String, Object>) exchange
- .get(HANDLER_PROPERTIES);
+ .get(HANDLER_PROPERTIES);
addHandlerProperties(ctx, handlerProperties);
updateWebServiceContext(exchange, ctx);
@@ -97,10 +97,10 @@ public class EjbMethodInvoker extends Ab
}
private Object preEjbInvoke(Exchange exchange, Object serviceObject,
- Method method, List<Object> params) {
+ Method method, List<Object> params) {
EjbMessageContext ctx = new EjbMessageContext(exchange.getInMessage(),
- Scope.APPLICATION);
+ Scope.APPLICATION);
WebServiceContextImpl.setMessageContext(ctx);
Map<String, Object> handlerProperties = removeHandlerProperties(ctx);
@@ -108,19 +108,19 @@ public class EjbMethodInvoker extends Ab
try {
EjbInterceptor interceptor = new EjbInterceptor(params, method,
- this.bus, exchange);
- Object[] arguments = { ctx, interceptor };
+ this.bus, exchange);
+ Object[] arguments = {ctx, interceptor};
RpcContainer container = (RpcContainer) this.beanContext
- .getContainer();
+ .getContainer();
Class callInterface = this.beanContext
- .getServiceEndpointInterface();
+ .getServiceEndpointInterface();
method = getMostSpecificMethod(beanContext, method, callInterface);
Object res = container.invoke(
- this.beanContext.getDeploymentID(),
- InterfaceType.SERVICE_ENDPOINT, callInterface, method,
- arguments, null);
+ this.beanContext.getDeploymentID(),
+ InterfaceType.SERVICE_ENDPOINT, callInterface, method,
+ arguments, null);
if (exchange.isOneWay()) {
return null;
@@ -135,15 +135,15 @@ public class EjbMethodInvoker extends Ab
Throwable t = e.getCause();
if (t != null) {
if (RuntimeException.class.isAssignableFrom(t.getClass())
- && t.getClass().isAnnotationPresent(
- javax.ejb.ApplicationException.class)) {
+ && t.getClass().isAnnotationPresent(
+ javax.ejb.ApplicationException.class)) {
// it's not a checked exception so it can not be a WebFault
throw (RuntimeException) t;
} else if (!t.getClass().isAnnotationPresent(WebFault.class)) {
// not a web fault even if it's an EJB ApplicationException
exchange.getInMessage().put(FaultMode.class,
- FaultMode.UNCHECKED_APPLICATION_FAULT);
+ FaultMode.UNCHECKED_APPLICATION_FAULT);
throw createFault(t, method, params, false);
}
@@ -152,11 +152,11 @@ public class EjbMethodInvoker extends Ab
}
// TODO may be we can change to FaultMode.CHECKED_APPLICATION_FAULT
exchange.getInMessage().put(FaultMode.class,
- FaultMode.UNCHECKED_APPLICATION_FAULT);
+ FaultMode.UNCHECKED_APPLICATION_FAULT);
throw createFault(t, method, params, false);
} catch (Exception e) {
exchange.getInMessage().put(FaultMode.class,
- FaultMode.UNCHECKED_APPLICATION_FAULT);
+ FaultMode.UNCHECKED_APPLICATION_FAULT);
throw createFault(e, method, params, false);
} finally {
WebServiceContextImpl.clear();
@@ -189,12 +189,12 @@ public class EjbMethodInvoker extends Ab
}
public Object directEjbInvoke(Exchange exchange, Method m,
- List<Object> params) throws Exception {
+ List<Object> params) throws Exception {
Object[] paramArray;
if (params != null) {
paramArray = params.toArray();
} else {
- paramArray = new Object[] {};
+ paramArray = new Object[]{};
}
return performInvocation(exchange, null, m, paramArray);
}
Modified: tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbWsContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbWsContainer.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbWsContainer.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ejb/EjbWsContainer.java Mon Jul 14 16:11:36 2014
@@ -62,12 +62,12 @@ public class EjbWsContainer extends CxfW
protected ObjectName registerMBean() {
final ObjectName name = new ObjectNameBuilder("openejb.management")
- .set("j2eeType", "JAX-WS")
- .set("J2EEServer", "openejb")
- .set("J2EEApplication", null)
- .set("EndpointType", "EJB")
- .set("name", beanContext.getEjbName())
- .build();
+ .set("j2eeType", "JAX-WS")
+ .set("J2EEServer", "openejb")
+ .set("J2EEApplication", null)
+ .set("EndpointType", "EJB")
+ .set("name", beanContext.getEjbName())
+ .build();
mbean = new WsServiceMBean(beanContext, port);
LocalMBeanServer.registerDynamicWrapperSilently(mbean, name);
@@ -147,8 +147,8 @@ public class EjbWsContainer extends CxfW
}
return LocalMBeanServer.tabularData(
- "handlers", "The list of handlers",
- names.toArray(new String[names.size()]), values.toArray(new String[values.size()]));
+ "handlers", "The list of handlers",
+ names.toArray(new String[names.size()]), values.toArray(new String[values.size()]));
}
@ManagedAttribute
@@ -167,10 +167,10 @@ public class EjbWsContainer extends CxfW
@Description("Service configuration properties")
public TabularData getProperties() {
return LocalMBeanServer.tabularData(
- "properties",
- "Service configuration properties",
- "Service configuration properties",
- port.getProperties()
+ "properties",
+ "Service configuration properties",
+ "Service configuration properties",
+ port.getProperties()
);
}
Modified: tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoWsContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoWsContainer.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoWsContainer.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/pojo/PojoWsContainer.java Mon Jul 14 16:11:36 2014
@@ -73,12 +73,12 @@ public class PojoWsContainer extends Cxf
@Override
protected ObjectName registerMBean() {
final ObjectName name = new ObjectNameBuilder("openejb.management")
- .set("j2eeType", "JAX-WS")
- .set("J2EEServer", "openejb")
- .set("J2EEApplication", null)
- .set("EndpointType", "POJO")
- .set("name", target.getSimpleName())
- .build();
+ .set("j2eeType", "JAX-WS")
+ .set("J2EEServer", "openejb")
+ .set("J2EEApplication", null)
+ .set("EndpointType", "POJO")
+ .set("name", target.getSimpleName())
+ .build();
mbean = new WsServiceMBean(context, target, port);
LocalMBeanServer.registerDynamicWrapperSilently(mbean, name);
@@ -148,8 +148,8 @@ public class PojoWsContainer extends Cxf
}
return LocalMBeanServer.tabularData(
- "handlers", "The list of handlers",
- names.toArray(new String[names.size()]), values.toArray(new String[values.size()]));
+ "handlers", "The list of handlers",
+ names.toArray(new String[names.size()]), values.toArray(new String[values.size()]));
}
@ManagedAttribute
@@ -168,10 +168,10 @@ public class PojoWsContainer extends Cxf
@Description("Service configuration properties")
public TabularData getProperties() {
return LocalMBeanServer.tabularData(
- "properties",
- "Service configuration properties",
- "Service configuration properties",
- port.getProperties()
+ "properties",
+ "Service configuration properties",
+ "Service configuration properties",
+ port.getProperties()
);
}
Modified: tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiHandlersTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiHandlersTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiHandlersTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiHandlersTest.java Mon Jul 14 16:11:36 2014
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith;
@RunWith(ApplicationComposer.class)
public class CdiHandlersTest {
@Module
- @Classes(value = { MyHandledWebservice.class, ACdiSimpleTaste.class, SimpleHandler.class }, cdi = true)
+ @Classes(value = {MyHandledWebservice.class, ACdiSimpleTaste.class, SimpleHandler.class}, cdi = true)
public WebApp module() {
return new WebApp().contextRoot("/test").addServlet("ws", MyHandledWebservice.class.getName(), "/ws");
}
@@ -48,14 +48,14 @@ public class CdiHandlersTest {
public void checkHandlersAreCDIBeans() throws MalformedURLException {
SimpleHandler.reset();
Service.create(new URL("http://localhost:4204/test/ws?wsdl"),
- new QName("http://cxf.server.openejb.apache.org/", "MyHandledWebserviceService"))
- .getPort(MyHandledWsApi.class).test();
+ new QName("http://cxf.server.openejb.apache.org/", "MyHandledWebserviceService"))
+ .getPort(MyHandledWsApi.class).test();
assertTrue(SimpleHandler.close);
assertTrue(SimpleHandler.handled);
assertTrue(SimpleHandler.pre);
assertTrue(SimpleHandler.post);
}
-
+
public static class ACdiSimpleTaste {
public String ok() {
return "ok";
Modified: tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiPojoTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiPojoTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiPojoTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiPojoTest.java Mon Jul 14 16:11:36 2014
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertTru
@RunWith(ApplicationComposer.class)
public class CdiPojoTest {
@Module
- @Classes(value = { MyWebservice.class, ACdiTaste.class }, cdi = true)
+ @Classes(value = {MyWebservice.class, ACdiTaste.class}, cdi = true)
public WebApp module() {
return new WebApp().contextRoot("/test").addServlet("ws", MyWebservice.class.getName(), "/ws");
}
@@ -50,8 +50,8 @@ public class CdiPojoTest {
@Test
public void checkInjection() throws MalformedURLException {
final MyWsApi api = Service.create(new URL("http://localhost:4204/test/ws?wsdl"),
- new QName("http://cxf.server.openejb.apache.org/", "MyWebserviceService"))
- .getPort(MyWsApi.class);
+ new QName("http://cxf.server.openejb.apache.org/", "MyWebserviceService"))
+ .getPort(MyWsApi.class);
assertEquals("ok", api.test());
}
Modified: tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java Mon Jul 14 16:11:36 2014
@@ -38,8 +38,8 @@ public class CxfJaxWsProviderTest extend
//START SNIPPET: setup
private InitialContext initialContext;
-
- //Random port to avoid test conflicts
+
+ //Random port to avoid test conflicts
private static final int port = Integer.parseInt(System.getProperty("httpejbd.port", "" + org.apache.openejb.util.NetworkUtil.getNextAvailablePort()));
protected void setUp() throws Exception {
@@ -47,9 +47,9 @@ public class CxfJaxWsProviderTest extend
properties.setProperty(DeploymentFilterable.CLASSPATH_INCLUDE, ".*openejb-cxf.*");
properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
properties.setProperty("openejb.embedded.remotable", "true");
-
- //Just for this test we change the default port from 4204 to avoid conflicts
- properties.setProperty("httpejbd.port", "" + port);
+
+ //Just for this test we change the default port from 4204 to avoid conflicts
+ properties.setProperty("httpejbd.port", "" + port);
initialContext = new InitialContext(properties);
}
Modified: tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/DynamicPortTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/DynamicPortTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/DynamicPortTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/DynamicPortTest.java Mon Jul 14 16:11:36 2014
@@ -35,18 +35,15 @@ import static org.junit.Assert.assertEqu
@EnableServices("jax-ws")
@RunWith(ApplicationComposer.class)
-public class DynamicPortTest
-{
+public class DynamicPortTest {
@Configuration
- public Properties config()
- {
+ public Properties config() {
return new PropertiesBuilder().property("httpejbd.port", "0").build();
}
@Module
@Classes(value = DynamicImpl.class)
- public WebApp module()
- {
+ public WebApp module() {
return new WebApp().contextRoot("/test").addServlet("ws", DynamicImpl.class.getName(), "/ws");
}
@@ -54,23 +51,19 @@ public class DynamicPortTest
private Dynamic client;
@Test
- public void checkHandlersAreCDIBeans() throws MalformedURLException
- {
+ public void checkHandlersAreCDIBeans() throws MalformedURLException {
assertEquals("ok", client.test());
}
@WebService
- public static interface Dynamic
- {
+ public static interface Dynamic {
String test();
}
@WebService
- public static class DynamicImpl implements Dynamic
- {
+ public static class DynamicImpl implements Dynamic {
@Override
- public String test()
- {
+ public String test() {
return "ok";
}
}
Modified: tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java?rev=1610454&r1=1610453&r2=1610454&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java Mon Jul 14 16:11:36 2014
@@ -57,9 +57,9 @@ public class WebServiceWithAnUserInterce
@Test
public void test() throws Exception {
Foo foo = Service.create(
- new URL("http://localhost:4204/openejb-cxf/FooImpl?wsdl"),
- new QName("http://cxf.server.openejb.apache.org/", "FooImplService"))
- .getPort(Foo.class);
+ new URL("http://localhost:4204/openejb-cxf/FooImpl?wsdl"),
+ new QName("http://cxf.server.openejb.apache.org/", "FooImplService"))
+ .getPort(Foo.class);
assertNotNull(foo);
assertEquals("bar", foo.hi());
}