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/17 09:53:05 UTC
svn commit: r1611274 [8/15] - in /tomee/tomee/branches/tomee-1.7.x/server:
./ openejb-activemq/
openejb-activemq/src/main/java/org/apache/openejb/server/activemq/
openejb-axis/ openejb-axis/src/main/java/org/apache/openejb/server/axis/
openejb-axis/src...
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/cdi/JAXRSContextExtension.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/cdi/JAXRSContextExtension.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/cdi/JAXRSContextExtension.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/cdi/JAXRSContextExtension.java Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationFromWebXmlTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationFromWebXmlTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationFromWebXmlTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationFromWebXmlTest.java Thu Jul 17 07:52:58 2014
@@ -39,18 +39,18 @@ 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
public void first() {
- String hi = WebClient.create(BASE_URL).path("/first/hi").get(String.class);
+ final String hi = WebClient.create(BASE_URL).path("/first/hi").get(String.class);
assertEquals("Hi from REST World!", hi);
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIApplicationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIApplicationTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIApplicationTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIApplicationTest.java Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiConstructorInjectionTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiConstructorInjectionTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiConstructorInjectionTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiConstructorInjectionTest.java Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiInterceptorContextTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiInterceptorContextTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiInterceptorContextTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CdiInterceptorContextTest.java Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CheckedExceptionMapperTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CheckedExceptionMapperTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CheckedExceptionMapperTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CheckedExceptionMapperTest.java Thu Jul 17 07:52:58 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);
@@ -70,7 +70,7 @@ public class CheckedExceptionMapperTest
}
public static class ExampleException extends Exception {
- public ExampleException(String message) {
+ public ExampleException(final String message) {
super(message);
}
}
@@ -78,7 +78,7 @@ public class CheckedExceptionMapperTest
@Provider
public static class ExampleExceptionMapper implements ExceptionMapper<ExampleException> {
@Override
- public Response toResponse(ExampleException ex) {
+ public Response toResponse(final ExampleException ex) {
return Response.ok("Exception!").build();
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java Thu Jul 17 07:52:58 2014
@@ -63,15 +63,15 @@ 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);
+ final String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").accept("openejb/reverse")
+ .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);
+ final String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").accept("openejb/constant")
+ .path("/custom2/constant").get(String.class);
assertEquals("it works!", response);
}
@@ -100,12 +100,12 @@ public class CustomProviderTest {
@Provider
@Produces("openejb/reverse")
public static class ReverseProvider<T> implements MessageBodyWriter<T> {
- private String reverse(String str) {
+ private String reverse(final String str) {
if (str == null) {
return "";
}
- StringBuilder s = new StringBuilder(str.length());
+ final StringBuilder s = new StringBuilder(str.length());
for (int i = str.length() - 1; i >= 0; i--) {
s.append(str.charAt(i));
}
@@ -113,17 +113,17 @@ public class CustomProviderTest {
}
@Override
- public long getSize(T t, Class<?> rawType, Type genericType, Annotation[] annotations, MediaType mediaType) {
+ public long getSize(final T t, final Class<?> rawType, final Type genericType, final Annotation[] annotations, final MediaType mediaType) {
return -1;
}
@Override
- public boolean isWriteable(Class<?> rawType, Type genericType, Annotation[] annotations, MediaType mediaType) {
+ public boolean isWriteable(final Class<?> rawType, final Type genericType, final Annotation[] annotations, final MediaType mediaType) {
return true;
}
@Override
- public void writeTo(T t, Class<?> rawType, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException {
+ public void writeTo(final T t, final Class<?> rawType, final Type genericType, final Annotation[] annotations, final MediaType mediaType, final MultivaluedMap<String, Object> httpHeaders, final OutputStream entityStream) throws IOException {
entityStream.write(reverse((String) t).getBytes());
}
}
@@ -132,17 +132,17 @@ public class CustomProviderTest {
@Produces("openejb/constant")
public static class ConstantProvider<T> implements MessageBodyWriter<T> {
@Override
- public long getSize(T t, Class<?> rawType, Type genericType, Annotation[] annotations, MediaType mediaType) {
+ public long getSize(final T t, final Class<?> rawType, final Type genericType, final Annotation[] annotations, final MediaType mediaType) {
return -1;
}
@Override
- public boolean isWriteable(Class<?> rawType, Type genericType, Annotation[] annotations, MediaType mediaType) {
+ public boolean isWriteable(final Class<?> rawType, final Type genericType, final Annotation[] annotations, final MediaType mediaType) {
return true;
}
@Override
- public void writeTo(T t, Class<?> rawType, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException {
+ public void writeTo(final T t, final Class<?> rawType, final Type genericType, final Annotation[] annotations, final MediaType mediaType, final MultivaluedMap<String, Object> httpHeaders, final OutputStream entityStream) throws IOException {
entityStream.write("it works!".getBytes());
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderWithConfigTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderWithConfigTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderWithConfigTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderWithConfigTest.java Thu Jul 17 07:52:58 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);
}
@@ -84,17 +84,17 @@ public class CustomProviderWithConfigTes
private String str;
@Override
- public long getSize(T t, Class<?> rawType, Type genericType, Annotation[] annotations, MediaType mediaType) {
+ public long getSize(final T t, final Class<?> rawType, final Type genericType, final Annotation[] annotations, final MediaType mediaType) {
return -1;
}
@Override
- public boolean isWriteable(Class<?> rawType, Type genericType, Annotation[] annotations, MediaType mediaType) {
+ public boolean isWriteable(final Class<?> rawType, final Type genericType, final Annotation[] annotations, final MediaType mediaType) {
return true;
}
@Override
- public void writeTo(T t, Class<?> rawType, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException {
+ public void writeTo(final T t, final Class<?> rawType, final Type genericType, final Annotation[] annotations, final MediaType mediaType, final MultivaluedMap<String, Object> httpHeaders, final OutputStream entityStream) throws IOException {
entityStream.write(str.getBytes());
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java Thu Jul 17 07:52:58 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);
}
@@ -84,7 +84,7 @@ public class DiscoverCustomProviderTest
@Provider
@Produces("discover/reverse")
public static class ReverseProvider<T> implements MessageBodyWriter<T> {
- private String reverse(String str) {
+ private String reverse(final String str) {
if (str == null) {
return "";
}
@@ -92,17 +92,17 @@ public class DiscoverCustomProviderTest
}
@Override
- public long getSize(T t, Class<?> rawType, Type genericType, Annotation[] annotations, MediaType mediaType) {
+ public long getSize(final T t, final Class<?> rawType, final Type genericType, final Annotation[] annotations, final MediaType mediaType) {
return -1;
}
@Override
- public boolean isWriteable(Class<?> rawType, Type genericType, Annotation[] annotations, MediaType mediaType) {
+ public boolean isWriteable(final Class<?> rawType, final Type genericType, final Annotation[] annotations, final MediaType mediaType) {
return true;
}
@Override
- public void writeTo(T t, Class<?> rawType, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException {
+ public void writeTo(final T t, final Class<?> rawType, final Type genericType, final Annotation[] annotations, final MediaType mediaType, final MultivaluedMap<String, Object> httpHeaders, final OutputStream entityStream) throws IOException {
entityStream.write(reverse((String) t).getBytes());
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java Thu Jul 17 07:52:58 2014
@@ -47,7 +47,7 @@ public class DynamicSubclassEjbDeploymen
@BeforeClass
public static void start() throws Exception {
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setProperty(DeploymentFilterable.CLASSPATH_INCLUDE, ".*openejb-cxf-rs.*");
properties.setProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true");
container = EJBContainer.createEJBContainer(properties);
@@ -69,7 +69,7 @@ public class DynamicSubclassEjbDeploymen
@Test
public void rest() {
- String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/ejb/rest").get(String.class);
+ final String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/ejb/rest").get(String.class);
assertEquals("ok", response);
}
@@ -84,7 +84,7 @@ public class DynamicSubclassEjbDeploymen
@Test
public void restFieldInjected() {
- Boolean response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/ejb/field").get(Boolean.class);
+ final Boolean response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/ejb/field").get(Boolean.class);
assertEquals(true, response.booleanValue());
}
@@ -108,7 +108,7 @@ public class DynamicSubclassEjbDeploymen
@Path("/param")
@GET
- public String param(@QueryParam("arg") @DefaultValue("true") String p) {
+ public String param(@QueryParam("arg") @DefaultValue("true") final String p) {
return p;
}
@@ -119,7 +119,7 @@ public class DynamicSubclassEjbDeploymen
}
@Override
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
return simpleEJB.ok();
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/FeatureTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/FeatureTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/FeatureTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/FeatureTest.java Thu Jul 17 07:52:58 2014
@@ -87,7 +87,7 @@ public class FeatureTest {
public static boolean ok = false;
@Override
- public void initialize(Server server, Bus bus) {
+ public void initialize(final Server server, final Bus bus) {
ok = true;
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSRoutingTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSRoutingTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSRoutingTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSRoutingTest.java Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSWithInterfaceTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSWithInterfaceTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSWithInterfaceTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JAXRSWithInterfaceTest.java Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/JndiForPojoEndpointsTest.java Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/MultipleApplicationsTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/MultipleApplicationsTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/MultipleApplicationsTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/MultipleApplicationsTest.java Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/NoPathOnImplTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/NoPathOnImplTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/NoPathOnImplTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/NoPathOnImplTest.java Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/PathParamAtClassLevelTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/PathParamAtClassLevelTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/PathParamAtClassLevelTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/PathParamAtClassLevelTest.java Thu Jul 17 07:52:58 2014
@@ -38,7 +38,7 @@ public class PathParamAtClassLevelTest {
@BeforeClass
public static void start() throws Exception {
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.setProperty(DeploymentFilterable.CLASSPATH_INCLUDE, ".*openejb-cxf-rs.*");
properties.setProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true");
container = EJBContainer.createEJBContainer(properties);
@@ -53,7 +53,7 @@ public class PathParamAtClassLevelTest {
@Test
public void rest() {
- String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/match/openejb/test/normal").get(String.class);
+ final String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/match/openejb/test/normal").get(String.class);
assertEquals("openejb", response);
}
@@ -62,7 +62,7 @@ public class PathParamAtClassLevelTest {
public static class DoesItMatchWithPathParamAtClassLevel {
@Path("/normal")
@GET
- public String normal(@PathParam("name") String name) {
+ public String normal(@PathParam("name") final String name) {
return name;
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ProviderWithConstructorTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ProviderWithConstructorTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ProviderWithConstructorTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ProviderWithConstructorTest.java Thu Jul 17 07:52:58 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
}
@@ -92,17 +93,17 @@ public class ProviderWithConstructorTest
}
@Override
- public long getSize(T t, Class<?> rawType, Type genericType, Annotation[] annotations, MediaType mediaType) {
+ public long getSize(final T t, final Class<?> rawType, final Type genericType, final Annotation[] annotations, final MediaType mediaType) {
return -1;
}
@Override
- public boolean isWriteable(Class<?> rawType, Type genericType, Annotation[] annotations, MediaType mediaType) {
+ public boolean isWriteable(final Class<?> rawType, final Type genericType, final Annotation[] annotations, final MediaType mediaType) {
return true;
}
@Override
- public void writeTo(T t, Class<?> rawType, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException {
+ public void writeTo(final T t, final Class<?> rawType, final Type genericType, final Annotation[] annotations, final MediaType mediaType, final MultivaluedMap<String, Object> httpHeaders, final OutputStream entityStream) throws IOException {
entityStream.write(request.getContextPath().getBytes());
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ProvidersShouldBeScannedTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ProvidersShouldBeScannedTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ProvidersShouldBeScannedTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ProvidersShouldBeScannedTest.java Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsCDIInterceptorTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsCDIInterceptorTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsCDIInterceptorTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsCDIInterceptorTest.java Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInterceptorInjectionTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInterceptorInjectionTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInterceptorInjectionTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsInterceptorInjectionTest.java Thu Jul 17 07:52:58 2014
@@ -119,7 +119,7 @@ public class RsInterceptorInjectionTest
@AroundInvoke
- private Object invoke(InvocationContext context) throws Exception {
+ private Object invoke(final InvocationContext context) throws Exception {
// Are they injected?
Assert.assertNotNull("httpHeaders", httpHeaders);
Assert.assertNotNull("providers", providers);
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsJMXTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsJMXTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsJMXTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsJMXTest.java Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsWithInterfaceTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsWithInterfaceTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsWithInterfaceTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RsWithInterfaceTest.java Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationTest.java Thu Jul 17 07:52:58 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
@@ -65,7 +65,7 @@ public class SimpleApplicationTest {
if (br != null) {
try {
br.close();
- } catch (IOException e) {
+ } catch (final IOException e) {
//Ignore
}
}
@@ -91,7 +91,7 @@ public class SimpleApplicationTest {
if (br != null) {
try {
br.close();
- } catch (IOException e) {
+ } catch (final IOException e) {
//Ignore
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingTest.java Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingWithNoAppPathTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingWithNoAppPathTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingWithNoAppPathTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithLongMappingWithNoAppPathTest.java Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithMappingTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithMappingTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithMappingTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimpleApplicationWithMappingTest.java Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimplePojoTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimplePojoTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimplePojoTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/SimplePojoTest.java Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/WebXmlSpecApplicationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/WebXmlSpecApplicationTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/WebXmlSpecApplicationTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/WebXmlSpecApplicationTest.java Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MyExpertRestClass.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MyExpertRestClass.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MyExpertRestClass.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MyExpertRestClass.java Thu Jul 17 07:52:58 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(final String you) {
return "hi " + you;
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MyNonListedRestClass.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MyNonListedRestClass.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MyNonListedRestClass.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MyNonListedRestClass.java Thu Jul 17 07:52:58 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") final String iDidIt) {
return "Yata! " + iDidIt;
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MySecondRestClass.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MySecondRestClass.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MySecondRestClass.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/MySecondRestClass.java Thu Jul 17 07:52:58 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") final String you) {
return "hi " + you;
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-transport/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-transport/pom.xml?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-transport/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-transport/pom.xml Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/HttpDestination.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/HttpDestination.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/HttpDestination.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/HttpDestination.java Thu Jul 17 07:52:58 2014
@@ -26,7 +26,7 @@ import java.io.IOException;
import java.util.logging.Logger;
public class HttpDestination extends AbstractHTTPDestination {
- public HttpDestination(Bus bus, DestinationRegistry registry, EndpointInfo endpointInfo, String path) throws IOException {
+ public HttpDestination(final Bus bus, final DestinationRegistry registry, final EndpointInfo endpointInfo, final String path) throws IOException {
super(bus, registry, endpointInfo, path, true);
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/HttpTransportFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/HttpTransportFactory.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/HttpTransportFactory.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/HttpTransportFactory.java Thu Jul 17 07:52:58 2014
@@ -29,13 +29,13 @@ public class HttpTransportFactory extend
// no-op
}
- public HttpTransportFactory(Bus bus) {
+ public HttpTransportFactory(final Bus bus) {
setBus(bus);
}
@Override
- public Destination getDestination(EndpointInfo endpointInfo) throws IOException {
+ public Destination getDestination(final EndpointInfo endpointInfo) throws IOException {
return new HttpDestination(getBus(), getRegistry(), endpointInfo, endpointInfo.getAddress());
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfContainerClassLoader.java Thu Jul 17 07:52:58 2014
@@ -63,7 +63,7 @@ public class CxfContainerClassLoader ext
@Override
protected Class<?> findClass(final String name) throws ClassNotFoundException {
if (name.startsWith(CXF_PACKAGE)) {
- Throwable th;
+ final Throwable th;
try {
return CONTAINER_LOADER.loadClass(name);
} catch (final Exception e) {
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java Thu Jul 17 07:52:58 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);
@@ -167,14 +167,14 @@ public final class CxfUtil {
if (instance == null) { // maybe id == classname
try {
instance = Thread.currentThread().getContextClassLoader().loadClass(databinding).newInstance();
- } catch (Exception e) {
+ } catch (final Exception e) {
// ignore
}
}
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);
}
@@ -211,7 +211,7 @@ public final class CxfUtil {
public static List<AbstractFeature> createFeatures(final Collection<ServiceInfo> availableServices, final String featuresIds) {
final List<?> features = ServiceInfos.resolve(availableServices, featuresIds.split(","));
- for (Object instance : features) {
+ for (final Object instance : features) {
if (!AbstractFeature.class.isInstance(instance)) {
throw new OpenEJBRuntimeException("feature should inherit from " + AbstractFeature.class.getName());
}
@@ -221,7 +221,7 @@ public final class CxfUtil {
public static List<Interceptor<? extends Message>> createInterceptors(final Collection<ServiceInfo> availableServices, final String ids) {
final List<?> instances = ServiceInfos.resolve(availableServices, ids.split(","));
- for (Object instance : instances) {
+ for (final Object instance : instances) {
if (!Interceptor.class.isInstance(instance)) {
throw new OpenEJBRuntimeException("interceptors should implement " + Interceptor.class.getName());
}
@@ -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/branches/tomee-1.7.x/server/openejb-cxf/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/pom.xml?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/pom.xml Thu Jul 17 07:52:58 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/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ConfigureCxfSecurity.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ConfigureCxfSecurity.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ConfigureCxfSecurity.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/ConfigureCxfSecurity.java Thu Jul 17 07:52:58 2014
@@ -45,7 +45,7 @@ public class ConfigureCxfSecurity {
private static final String OPENEJB_ENDPOINT_CONFIGURATOR = "openejb.endpoint.configurator";
- public static final void setupWSS4JChain(Endpoint endpoint, Properties inProps) {
+ public static final void setupWSS4JChain(final Endpoint endpoint, final Properties inProps) {
final Map<String, Object> in = getPropsFromProperties(inProps, "wss4j.in.");
final Map<String, Object> out = getPropsFromProperties(inProps, "wss4j.out.");
if (!in.containsKey(WSS4JInInterceptor.VALIDATOR_MAP)) {
@@ -55,7 +55,7 @@ public class ConfigureCxfSecurity {
setupWSS4JChain(endpoint, in, out);
}
- public static Map<String, Object> getPropsFromProperties(Properties inProps, String pattern) {
+ public static Map<String, Object> getPropsFromProperties(final Properties inProps, final String pattern) {
final String validatorPrefix = pattern + "validator";
final String processorPrefix = pattern + "processor";
final Map<QName, Object> validatorMap = new HashMap<QName, Object>();
@@ -63,18 +63,19 @@ public class ConfigureCxfSecurity {
final Map<String, Object> props = new HashMap<String, Object>();
String key, val;
- for (Map.Entry<Object, Object> entry : inProps.entrySet()) {
+ for (final Map.Entry<Object, Object> entry : inProps.entrySet()) {
key = String.valueOf(entry.getKey()).trim();
val = String.valueOf(entry.getValue()).trim();
if (key.startsWith(validatorPrefix)) {
- SplitInfo infos = new SplitInfo(key, val);
+ final SplitInfo infos = new SplitInfo(key, val);
try {
validatorMap.put(infos.qname, getValidator(infos.value));
- } catch (Exception e) {
+ } catch (final Exception e) {
LOGGER.warning("validator not found " + val, e);
}
- } if (key.startsWith(processorPrefix)) {
- SplitInfo infos = new SplitInfo(key, val);
+ }
+ if (key.startsWith(processorPrefix)) {
+ final SplitInfo infos = new SplitInfo(key, val);
processorMap.put(infos.qname, infos.value);
} else if (key.startsWith(pattern)) {
props.put(key.substring(pattern.length()), val);
@@ -90,7 +91,7 @@ public class ConfigureCxfSecurity {
return props;
}
- private static Object getValidator(String validator) throws ClassNotFoundException, IllegalAccessException, InstantiationException {
+ private static Object getValidator(final String validator) throws ClassNotFoundException, IllegalAccessException, InstantiationException {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
if (cl == null) {
cl = ConfigureCxfSecurity.class.getClassLoader();
@@ -98,7 +99,7 @@ public class ConfigureCxfSecurity {
return cl.loadClass(validator).newInstance();
}
- public static final void setupWSS4JChain(Endpoint endpoint, Map<String, Object> inProps, Map<String, Object> outProps) {
+ public static final void setupWSS4JChain(final Endpoint endpoint, final Map<String, Object> inProps, final Map<String, Object> outProps) {
if (null != inProps && !inProps.isEmpty()) {
endpoint.getInInterceptors().add(new SAAJInInterceptor());
@@ -116,14 +117,14 @@ public class ConfigureCxfSecurity {
}
- public static final void configure(Endpoint endpoint, PortData port) {
+ public static final void configure(final Endpoint endpoint, final PortData port) {
final Properties p = port.getProperties();
if (p != null && p.containsKey(OPENEJB_ENDPOINT_CONFIGURATOR)) {
final String classname = p.getProperty(OPENEJB_ENDPOINT_CONFIGURATOR);
try {
final EndpointConfigurator configurator = (EndpointConfigurator) Thread.currentThread().getContextClassLoader().loadClass(classname).newInstance();
configurator.configure(endpoint, p);
- } catch (Exception e) {
+ } catch (final Exception e) {
LOGGER.error("can't configure endpoint " + endpoint + " with configurator " + classname + ", using default config", e);
if (port.isSecure()) {
setupWSS4JChain(endpoint, p);
@@ -147,14 +148,14 @@ public class ConfigureCxfSecurity {
public SplitInfo(final String key, final String val) {
String k = key;
- int startIdx = k.indexOf('{');
+ final int startIdx = k.indexOf('{');
if (startIdx > 0) {
k = k.substring(startIdx);
}
value = val;
- int idx = value.indexOf("=");
+ final int idx = value.indexOf("=");
if (idx > 0) {
k = k + ':' + value.substring(0, idx);
value = value.substring(idx + 1);
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfCatalogUtils.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfCatalogUtils.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfCatalogUtils.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfCatalogUtils.java Thu Jul 17 07:52:58 2014
@@ -31,7 +31,7 @@ import java.net.URL;
public final class CxfCatalogUtils {
private static final Logger logger = Logger.getInstance(LogCategory.CXF, CxfCatalogUtils.class);
- public static void loadOASISCatalog(Bus bus, URL baseURL, String catalogName) {
+ public static void loadOASISCatalog(final Bus bus, final URL baseURL, final String catalogName) {
if (baseURL == null) {
logger.debug("baseUrl is not valid for catalog '" + catalogName + "'");
return;
@@ -47,22 +47,22 @@ public final class CxfCatalogUtils {
} else {
logger.info("catalog '" + catalogName + "' not found");
}
- } catch (MalformedURLException e) {
+ } catch (final MalformedURLException e) {
logger.warning("Error constructing catalog URL: " + baseURL + " " + catalogName);
- } catch (FileNotFoundException e) {
+ } catch (final FileNotFoundException e) {
logger.debug("Catalog " + catalogURL + " is not present in the module");
- } catch (IOException e) {
+ } catch (final IOException e) {
logger.warning("Failed to load catalog file: " + catalogURL, e);
}
}
- private static void loadOASISCatalog(Bus bus, URL catalogURL) {
- OASISCatalogManager catalog = new OASISCatalogManager();
+ private static void loadOASISCatalog(final Bus bus, final URL catalogURL) {
+ final OASISCatalogManager catalog = new OASISCatalogManager();
try {
catalog.loadCatalog(catalogURL);
logger.debug("Loaded " + catalogURL + " catalog.");
bus.setExtension(catalog, OASISCatalogManager.class);
- } catch (IOException e) {
+ } catch (final IOException e) {
logger.warning("Failed to load catalog file: " + catalogURL, e);
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java Thu Jul 17 07:52:58 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;
+ public CxfEndpoint(final Bus bus, final PortData port, final Context context,
+ final Object implementor, final HTTPTransportFactory httpTransportFactory,
+ final 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(final 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(final Object arg0) {
+ }
+
+ public void publish(final String address) {
+ doPublish(address);
+ }
+
+ public void setMetadata(final List<Source> arg0) {
+ }
+
+ public void setProperties(final Map<String, Object> arg0) {
+ }
+
+ private class NoInitJaxWsServerFactoryBean extends JaxWsServerFactoryBean {
+ public NoInitJaxWsServerFactoryBean() {
+ // disable CXF resource injection
+ doInit = false;
+ }
+ }
+
+ protected void doPublish(final String address) {
+ final 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 {
+ final PortInfoImpl portInfo = new PortInfoImpl(implInfo.getBindingType(), serviceFactory.getEndpointName(), service.getName());
+
+ handlerResolver = new HandlerResolverImpl(port.getHandlerChains(), port.getInjections(), context);
+ final 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();
@@ -267,13 +267,13 @@ public abstract class CxfEndpoint {
if (instance == null) { // maybe id == classname
try {
instance = Thread.currentThread().getContextClassLoader().loadClass(databinding).newInstance();
- } catch (Exception e) {
+ } catch (final Exception e) {
// ignore
}
}
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/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfService.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfService.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfService.java Thu Jul 17 07:52:58 2014
@@ -71,7 +71,7 @@ public class CxfService extends WsServic
}
}
- protected HttpListener createEjbWsContainer(URL moduleBaseUrl, PortData port, BeanContext beanContext, ServiceConfiguration config) {
+ protected HttpListener createEjbWsContainer(final URL moduleBaseUrl, final PortData port, final BeanContext beanContext, final ServiceConfiguration config) {
final Bus bus = CxfUtil.getBus();
final ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
@@ -90,15 +90,15 @@ public class CxfService extends WsServic
}
}
- protected HttpListener createPojoWsContainer(ClassLoader loader, URL moduleBaseUrl, PortData port, String serviceId, Class target, Context context, String contextRoot, Map<String, Object> bdgs, ServiceConfiguration services) {
- Bus bus = CxfUtil.getBus();
+ protected HttpListener createPojoWsContainer(final ClassLoader loader, final URL moduleBaseUrl, final PortData port, final String serviceId, final Class target, final Context context, final String contextRoot, final Map<String, Object> bdgs, final ServiceConfiguration services) {
+ final Bus bus = CxfUtil.getBus();
final ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(CxfUtil.initBusLoader());
try {
CxfCatalogUtils.loadOASISCatalog(bus, moduleBaseUrl, "META-INF/jax-ws-catalog.xml");
- PojoWsContainer container = new PojoWsContainer(loader, httpTransportFactory, bus, port, context, target, bdgs, services);
+ final PojoWsContainer container = new PojoWsContainer(loader, httpTransportFactory, bus, port, context, target, bdgs, services);
container.start();
wsContainers.put(serviceId, container);
return container;
@@ -118,7 +118,7 @@ public class CxfService extends WsServic
}
protected void destroyWsContainer(final String serviceId) {
- CxfWsContainer container = wsContainers.remove(serviceId);
+ final CxfWsContainer container = wsContainers.remove(serviceId);
if (container != null) {
final ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(CxfUtil.initBusLoader());