svn commit: r1476082 - in /tomee/tomee/trunk: server/openejb-rest/src/main/java/org/apache/openejb/server/rest/ server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/ tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/

[rm...@apache.org]

Author: rmannibucau
Date: Fri Apr 26 07:19:07 2013
New Revision: 1476082

URL: http://svn.apache.org/r1476082
Log:
ensuring to call init of cxf and cxf-rs services when service manager is disabled in tomee > webprofile - we do init in this methods now

Modified:
    tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
    tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
    tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java

Modified: tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java?rev=1476082&r1=1476081&r2=1476082&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java (original)
+++ tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java Fri Apr 26 07:19:07 2013
@@ -71,7 +71,7 @@ public abstract class RESTService implem
     private CoreContainerSystem containerSystem;
     private RsRegistry rsRegistry;
     private List<DeployedService> services = new ArrayList<DeployedService>();
-    private String virtualHost;
+    private String virtualHost = "localhost";
     private boolean enabled = true;
     private String wildcard = SystemInstance.get().getProperty("openejb.rest.wildcard", ".*"); // embedded = regex, tomee = servlet
 
@@ -912,7 +912,10 @@ public abstract class RESTService implem
 
     @Override
     public void init(final Properties props) throws Exception {
-        virtualHost = props.getProperty("virtualHost");
+        if (props == null) {
+            return;
+        }
+        virtualHost = props.getProperty("virtualHost", "localhost");
         enabled = ServiceManager.isEnabled(props);
     }
 

Modified: tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java?rev=1476082&r1=1476081&r2=1476082&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java (original)
+++ tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java Fri Apr 26 07:19:07 2013
@@ -163,7 +163,7 @@ public abstract class WsService implemen
         realmName = props.getProperty("realmName");
         transportGuarantee = props.getProperty("transportGuarantee");
         authMethod = props.getProperty("authMethod");
-        virtualHost = props.getProperty("virtualHost");
+        virtualHost = props.getProperty("virtualHost", "localhost");
     }
 
     @Override

Modified: tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java?rev=1476082&r1=1476081&r2=1476082&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java (original)
+++ tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java Fri Apr 26 07:19:07 2013
@@ -266,6 +266,7 @@ public class TomcatLoader implements Loa
             // WS
             try {
                 ServerService cxfService = (ServerService) cl.loadClass("org.apache.openejb.server.cxf.CxfService").newInstance();
+                cxfService.init(properties);
                 cxfService.start();
                 services.add(cxfService);
             } catch (ClassNotFoundException ignored) {
@@ -277,6 +278,7 @@ public class TomcatLoader implements Loa
             // REST
             try {
                 ServerService restService = (ServerService) cl.loadClass("org.apache.openejb.server.cxf.rs.CxfRSService").newInstance();
+                restService.init(properties);
                 restService.start();
                 services.add(restService);
             } catch (ClassNotFoundException ignored) {