Author: rmannibucau
Date: Fri Jan 11 16:35:22 2013
New Revision: 1432143
URL: http://svn.apache.org/viewvc?rev=1432143&view=rev
Log:
slight refactoring of rest utility method - now we have a better config some
parameters are useless, in particular a string so removing it
Modified:
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java
openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java
openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
Modified:
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java?rev=1432143&r1=1432142&r2=1432143&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
(original)
+++
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
Fri Jan 11 16:35:22 2013
@@ -40,7 +40,6 @@ import org.apache.openejb.server.httpd.H
import org.apache.openejb.server.httpd.HttpRequestImpl;
import org.apache.openejb.server.httpd.HttpResponse;
import org.apache.openejb.server.rest.EJBRestServiceInfo;
-import org.apache.openejb.server.rest.InternalApplication;
import org.apache.openejb.server.rest.RsHttpListener;
import org.apache.openejb.util.Classes;
import org.apache.openejb.util.LogCategory;
@@ -154,18 +153,10 @@ public class CxfRsHttpListener implement
private void deploy(Class<?> clazz, String address, ResourceProvider rp,
Object serviceBean, Application app, Invoker invoker,
Collection<Object> additionalProviders,
ServiceConfiguration configuration) {
- final String impl;
- if (serviceBean != null) {
- impl = serviceBean.getClass().getName();
- } else {
- impl = clazz.getName();
- }
-
final JAXRSServerFactoryBean factory = newFactory(address);
- configureFactory(impl, additionalProviders, configuration, factory);
+ configureFactory(additionalProviders, configuration, factory);
factory.setResourceClasses(clazz);
-
if (rp != null) {
factory.setResourceProvider(rp);
}
@@ -218,16 +209,7 @@ public class CxfRsHttpListener implement
final Collection<Injection> injections,
final Context context, final WebBeansContext owbCtx,
final ServiceConfiguration
serviceConfiguration) {
final JAXRSServerFactoryBean factory = newFactory(prefix);
- if (InternalApplication.class.equals(application.getClass())) { //
todo: check it is the good choice
- final Application original =
InternalApplication.class.cast(application).getOriginal();
- if (original == null) {
- configureFactory("jaxrs-application", additionalProviders,
serviceConfiguration, factory);
- } else {
- configureFactory(original.getClass().getName(),
additionalProviders, serviceConfiguration, factory);
- }
- } else {
- configureFactory(application.getClass().getName(),
additionalProviders, serviceConfiguration, factory);
- }
+ configureFactory(additionalProviders, serviceConfiguration, factory);
factory.setApplication(application);
final List<Class<?>> classes = new ArrayList<Class<?>>();
@@ -379,8 +361,8 @@ public class CxfRsHttpListener implement
return factory;
}
- private void configureFactory(String application, Collection<Object>
additionalProviders, ServiceConfiguration serviceConfiguration,
JAXRSServerFactoryBean factory) {
- CxfUtil.configureEndpoint(factory, serviceConfiguration,
CXF_JAXRS_PREFIX, application);
+ private void configureFactory(Collection<Object> additionalProviders,
ServiceConfiguration serviceConfiguration, JAXRSServerFactoryBean factory) {
+ CxfUtil.configureEndpoint(factory, serviceConfiguration,
CXF_JAXRS_PREFIX);
final Collection<ServiceInfo> services =
serviceConfiguration.getAvailableServices();
Modified:
openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java?rev=1432143&r1=1432142&r2=1432143&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java
(original)
+++
openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/util/CxfUtil.java
Fri Jan 11 16:35:22 2013
@@ -79,7 +79,7 @@ public final class CxfUtil {
}
}
- public static void configureEndpoint(final AbstractEndpointFactory
svrFactory, final ServiceConfiguration configuration, final String prefix,
final String beanId) {
+ public static void configureEndpoint(final AbstractEndpointFactory
svrFactory, final ServiceConfiguration configuration, final String prefix) {
final Properties beanConfig = configuration.getProperties();
if (beanConfig == null || beanConfig.isEmpty()) {
return;
Modified:
openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java?rev=1432143&r1=1432142&r2=1432143&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java
(original)
+++
openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfEndpoint.java
Fri Jan 11 16:35:22 2013
@@ -158,7 +158,7 @@ public abstract class CxfEndpoint {
svrFactory.setServiceClass(serviceFactory.getServiceClass());
// look for bean info if exists
- CxfUtil.configureEndpoint(svrFactory, serviceConfiguration,
CXF_JAXWS_PREFIX, getImplementorClass().getName());
+ CxfUtil.configureEndpoint(svrFactory, serviceConfiguration,
CXF_JAXWS_PREFIX);
if (HTTPBinding.HTTP_BINDING.equals(implInfo.getBindingType()))
{
svrFactory.setTransportId("http://cxf.apache.org/bindings/xformat";);
Modified:
openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java?rev=1432143&r1=1432142&r2=1432143&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
(original)
+++
openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
Fri Jan 11 16:35:22 2013
@@ -375,13 +375,20 @@ public abstract class RESTService implem
private void deployApplication(final AppInfo appInfo, final String
contextRoot, final Map<String, EJBRestServiceInfo> restEjbs, final ClassLoader
classLoader, final Collection<Injection> injections, final WebBeansContext
owbCtx, final Context context, final Collection<Object> additionalProviders,
final Collection<IdPropertiesInfo> pojoConfigurations, final Application
application, final String prefix) {
// get configuration
- Properties configuration =
PojoUtil.findConfiguration(pojoConfigurations,
application.getClass().getName());
+ Properties configuration = null;
+ if (InternalApplication.class.equals(application.getClass())) {
+ final Application original =
InternalApplication.class.cast(application).getOriginal();
+ if (original == null) {
+ configuration = PojoUtil.findConfiguration(pojoConfigurations,
"jaxrs-application");
+ } else {
+ configuration = PojoUtil.findConfiguration(pojoConfigurations,
original.getClass().getName());
+ }
+ } else {
+ configuration = PojoUtil.findConfiguration(pojoConfigurations,
application.getClass().getName());
+ }
if (configuration == null) { // try a constant (common in half of
cases)
configuration = PojoUtil.findConfiguration(pojoConfigurations,
"jaxrs-application");
}
- if (configuration == null) { // try with context
- configuration = PojoUtil.findConfiguration(pojoConfigurations,
contextRoot);
- }
final String base = getAddress(contextRoot);
final String nopath;
