You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2013/01/03 10:27:34 UTC
svn commit: r1428233 -
/openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
Author: rmannibucau
Date: Thu Jan 3 09:27:33 2013
New Revision: 1428233
URL: http://svn.apache.org/viewvc?rev=1428233&view=rev
Log:
oops wrong default in last commit
Modified:
openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
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=1428233&r1=1428232&r2=1428233&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 Thu Jan 3 09:27:33 2013
@@ -168,7 +168,7 @@ public abstract class RESTService implem
}
}
- if (deploymentWithApplication) {
+ if (deploymentWithApplication) { // don't do it if we detected we should use old deployment
for (Object o : singletons) {
final Class<?> clazz = o.getClass();
if (isProvider(clazz)) {
@@ -185,15 +185,17 @@ public abstract class RESTService implem
}
}
- final String path = appPrefix(appClazz);
- if (path != null) {
- prefix += path + wildcard;
- } else {
- prefix += wildcard;
+ if (deploymentWithApplication) { // don't do it if we detected we should use old deployment
+ final String path = appPrefix(appClazz);
+ if (path != null) {
+ prefix += path + wildcard;
+ } else {
+ prefix += wildcard;
+ }
}
}
- if (deploymentWithApplication) {
+ if (deploymentWithApplication) { // don't do it if we detected we should use old deployment
if (application == null) {
application = new InternalApplication();
@@ -514,7 +516,7 @@ public abstract class RESTService implem
if (bean.restService) {
final BeanContext beanContext = containerSystem.getBeanContext(bean.ejbDeploymentId);
if (containsJaxRsConfiguration(beanContext.getProperties())) {
- appInfo.properties.setProperty(OPENEJB_USE_APPLICATION_PROPERTY, "true");
+ appInfo.properties.setProperty(OPENEJB_USE_APPLICATION_PROPERTY, "false");
logOldDeploymentUsage(bean.ejbClass);
return; // no need to look further
}