cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r529722 - in /incubator/cxf/trunk: parent/ rt/core/src/main/java/org/apache/cxf/transport/http/ rt/transports/http-jetty/ rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ systests/src/test/java/org/apache/cxf/systest/http/...
Date Tue, 17 Apr 2007 19:24:40 GMT
Author: dkulp
Date: Tue Apr 17 12:24:38 2007
New Revision: 529722

URL: http://svn.apache.org/viewvc?view=rev&rev=529722
Log:
Update servlet to note "hard code" services as the context
Add slf4j to jetty runtime dependency to direct logging to j.u.l
Fix some stdout stuff in system tests
Add better exception handling to WSDL stuff
Update to remote-resources 1.0-alpha-5 to pick up the supplement information to fill in some
missing details in the NOTICE files

Added:
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/Messages.properties
  (with props)
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryException.java
  (with props)
Modified:
    incubator/cxf/trunk/parent/pom.xml
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java
    incubator/cxf/trunk/rt/transports/http-jetty/pom.xml
    incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/Server.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedClientServerTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/spring-js.xml
    incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java

Modified: incubator/cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/parent/pom.xml?view=diff&rev=529722&r1=529721&r2=529722
==============================================================================
--- incubator/cxf/trunk/parent/pom.xml (original)
+++ incubator/cxf/trunk/parent/pom.xml Tue Apr 17 12:24:38 2007
@@ -222,7 +222,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-remote-resources-plugin</artifactId>
-                <version>1.0-alpha-4</version>
+                <version>1.0-alpha-5</version>
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.cxf</groupId>

Added: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/Messages.properties?view=auto&rev=529722
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/Messages.properties
(added)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/Messages.properties
Tue Apr 17 12:24:38 2007
@@ -0,0 +1,21 @@
+#
+#
+#    Licensed to the Apache Software Foundation (ASF) under one
+#    or more contributor license agreements. See the NOTICE file
+#    distributed with this work for additional information
+#    regarding copyright ownership. The ASF licenses this file
+#    to you under the Apache License, Version 2.0 (the
+#    "License"); you may not use this file except in compliance
+#    with the License. You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing,
+#    software distributed under the License is distributed on an
+#    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#    KIND, either express or implied. See the License for the
+#    specific language governing permissions and limitations
+#    under the License.
+#
+#
+COULD_NOT_PROVIDE_WSDL = Exception occured while trying to process {0}
\ No newline at end of file

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/Messages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/Messages.properties
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/Messages.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryException.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryException.java?view=auto&rev=529722
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryException.java
(added)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryException.java
Tue Apr 17 12:24:38 2007
@@ -0,0 +1,30 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.transport.http;
+
+import org.apache.cxf.common.i18n.Message;
+import org.apache.cxf.common.i18n.UncheckedException;
+
+public class WSDLQueryException extends UncheckedException {
+
+    public WSDLQueryException(Message msg, Throwable t) {
+        super(msg, t);
+    }
+
+}

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryException.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java?view=diff&rev=529722&r1=529721&r2=529722
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java
(original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/http/WSDLQueryHandler.java
Tue Apr 17 12:24:38 2007
@@ -21,9 +21,12 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.ResourceBundle;
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.wsdl.Definition;
@@ -47,6 +50,8 @@
 
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.common.i18n.BundleUtils;
+import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.helpers.XMLUtils;
 import org.apache.cxf.service.model.EndpointInfo;
@@ -56,6 +61,7 @@
 
 
 public class WSDLQueryHandler implements QueryHandler {
+    private static final ResourceBundle BUNDLE = BundleUtils.getBundle(WSDLQueryHandler.class);
 
     Bus bus;
     public WSDLQueryHandler(Bus b) {
@@ -164,20 +170,26 @@
             
             XMLUtils.writeTo(doc, os);
         } catch (WSDLException wex) {
-            wex.printStackTrace();
+            throw new WSDLQueryException(new Message("COULD_NOT_PROVIDE_WSDL",
+                                                     BUNDLE,
+                                                     baseUri), wex);
         } catch (SAXException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            throw new WSDLQueryException(new Message("COULD_NOT_PROVIDE_WSDL",
+                                                     BUNDLE,
+                                                     baseUri), e);
         } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            throw new WSDLQueryException(new Message("COULD_NOT_PROVIDE_WSDL",
+                                                     BUNDLE,
+                                                     baseUri), e);
         } catch (ParserConfigurationException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            throw new WSDLQueryException(new Message("COULD_NOT_PROVIDE_WSDL",
+                                                     BUNDLE,
+                                                     baseUri), e);
         }
     }
     
-    private void updateDefinition(Definition def, Map<String, Definition> done,
+    
+    protected void updateDefinition(Definition def, Map<String, Definition> done,
                                   Map<String, SchemaReference> doneSchemas,
                                   String base, EndpointInfo ei) {
         Collection<List> imports = CastUtils.cast((Collection<?>)def.getImports().values());
@@ -185,13 +197,18 @@
             List<Import> impLst = CastUtils.cast(lst);
             for (Import imp : impLst) {
                 String start = imp.getLocationURI();
-                String uri = start;
-                if (!uri.startsWith(base)) {
-                    uri = base + "?wsdl=" + uri;
-                }
-                imp.setLocationURI(uri);
-                done.put(start, imp.getDefinition());
-                updateDefinition(imp.getDefinition(), done, doneSchemas, base, ei);
+                try {
+                    //check to see if it's aleady in a URL format.  If so, leave it.
+                    new URL(start);
+                } catch (MalformedURLException e) {
+                    String uri = start;
+                    if (!uri.startsWith(base)) {
+                        uri = base + "?wsdl=" + uri;
+                    }
+                    imp.setLocationURI(uri);
+                    done.put(start, imp.getDefinition());
+                    updateDefinition(imp.getDefinition(), done, doneSchemas, base, ei);
+                }
             }
         }      
         
@@ -211,22 +228,28 @@
         }
     }
     
-    private void updateSchemaImports(Schema schema,
-                                     Map<String, SchemaReference> doneSchemas,
-                                     String base) {
+    protected void updateSchemaImports(Schema schema,
+                                           Map<String, SchemaReference> doneSchemas,
+                                           String base) {
         Collection<List>  imports = CastUtils.cast((Collection<?>)schema.getImports().values());
         for (List lst : imports) {
             List<SchemaImport> impLst = CastUtils.cast(lst);
             for (SchemaImport imp : impLst) {
                 String start = imp.getSchemaLocationURI();
                 if (start != null) {
-                    String uri = start;
-                    if (!uri.startsWith(base)) {
-                        uri = base + "?xsd=" + uri;
+                    try {
+                        //check to see if it's aleady in a URL format.  If so, leave it.
+                        new URL(start);
+                    } catch (MalformedURLException e) {
+                    
+                        String uri = start;
+                        if (!uri.startsWith(base)) {
+                            uri = base + "?xsd=" + uri;
+                        }
+                        imp.setSchemaLocationURI(uri);
+                        doneSchemas.put(start, imp);
+                        updateSchemaImports(imp.getReferencedSchema(), doneSchemas, base);
                     }
-                    imp.setSchemaLocationURI(uri);
-                    doneSchemas.put(start, imp);
-                    updateSchemaImports(imp.getReferencedSchema(), doneSchemas, base);
                 }
             }
         }
@@ -234,16 +257,19 @@
         for (SchemaReference included : includes) {
             String start = included.getSchemaLocationURI();
             if (start != null) {
-                String uri = start;
-                if (!uri.startsWith(base)) {
-                    uri = base + "?xsd=" + uri;
-                }
-                included.setSchemaLocationURI(uri);
-                doneSchemas.put(start, included);
-                updateSchemaImports(included.getReferencedSchema(), doneSchemas, base);
+                try {
+                    //check to see if it's aleady in a URL format.  If so, leave it.
+                    new URL(start);
+                } catch (MalformedURLException e) {
+                    String uri = start;
+                    if (!uri.startsWith(base)) {
+                        uri = base + "?xsd=" + uri;
+                    }
+                    included.setSchemaLocationURI(uri);
+                    doneSchemas.put(start, included);
+                    updateSchemaImports(included.getReferencedSchema(), doneSchemas, base);
+                }
             }
         }
-        
     }
-
 }

Modified: incubator/cxf/trunk/rt/transports/http-jetty/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/pom.xml?view=diff&rev=529722&r1=529721&r2=529722
==============================================================================
--- incubator/cxf/trunk/rt/transports/http-jetty/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/http-jetty/pom.xml Tue Apr 17 12:24:38 2007
@@ -83,6 +83,12 @@
             <artifactId>jetty-sslengine</artifactId>
             <version>6.1.2rc0</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <version>1.3.1</version>
+            <scope>runtime</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?view=diff&rev=529722&r1=529721&r2=529722
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
(original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
Tue Apr 17 12:24:38 2007
@@ -30,6 +30,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.cxf.Bus;
+import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.service.model.EndpointInfo;
@@ -53,20 +54,19 @@
     public void invoke(HttpServletRequest request, HttpServletResponse res) throws ServletException
{
         try {
             EndpointInfo ei = new EndpointInfo();
-            String address = "http://localhost" + request.getServletPath() 
+            String address = "http://localhost" 
                 + (request.getPathInfo() == null ? "" : request.getPathInfo());
-            
+
             ei.setAddress(address);
             ServletDestination d = (ServletDestination)transport.getDestination(ei);
 
             if (d.getMessageObserver() == null) {
                 if (request.getRequestURI().endsWith("services")
-                    || request.getRequestURI().endsWith("services/")) {
+                    || request.getRequestURI().endsWith("services/")
+                    || StringUtils.isEmpty(request.getPathInfo())) {
                     generateServiceList(request, res);
                 } else {
                     LOG.warning("Can't find the the request for " + request.getRequestURI()
+ "'s Observer ");
-                    LOG.warning(transport.getDestinationsPaths().toString());
-                    LOG.warning(transport.getDestinations().toString());
                     generateNotFound(request, res);
                 }
             } else {
@@ -109,8 +109,11 @@
         response.setContentType("text/html");        
         response.getWriter().write("<html><body>");
         
-        String reqPerfix = request.getRequestURL().toString();
-        reqPerfix = reqPerfix.substring(0, reqPerfix.lastIndexOf("services"));
+        String reqPerfix = request.getScheme() + "://" + request.getServerName();
+        if (request.getServerPort() != 80 && request.getServerPort() != 0) {
+            reqPerfix += ":" + request.getServerPort();
+        }
+        reqPerfix += request.getContextPath() + request.getServletPath() + "/";
         
         if (destinations.size() > 0) {  
             for (ServletDestination sd : destinations) {

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/Server.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/Server.java?view=diff&rev=529722&r1=529721&r2=529722
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/Server.java (original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/http/Server.java Tue
Apr 17 12:24:38 2007
@@ -20,6 +20,7 @@
 package org.apache.cxf.systest.http;
 
 import java.net.URL;
+
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
@@ -77,7 +78,7 @@
 
     public static void main(String[] args) {
         try {
-            Server s = new Server(args[0], args[1], args[3]);
+            Server s = new Server(args);
             s.start();
         } catch (Exception ex) {
             ex.printStackTrace();

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedClientServerTest.java?view=diff&rev=529722&r1=529721&r2=529722
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedClientServerTest.java
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/management/ManagedClientServerTest.java
Tue Apr 17 12:24:38 2007
@@ -89,13 +89,8 @@
         ObjectName name = new ObjectName(ManagementConstants.DEFAULT_DOMAIN_NAME 
                                          + ":type=Bus.Service.Endpoint,*");
         Set s = mbs.queryNames(name, null);
-        //assertTrue(s.size() == 1);
-        Iterator it = s.iterator();
-        
-        while (it.hasNext()) {
-            name = (ObjectName)it.next();
-            System.out.println("ObjectName: " + name);           
-        }
+        assertTrue(s.size() == 1);
+        name = (ObjectName)s.iterator().next();
         
         Object val = mbs.invoke(name, "getState", new Object[0], new String[0]);    
         assertEquals("Service should have been started.", "STARTED", val);

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java?view=diff&rev=529722&r1=529721&r2=529722
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
Tue Apr 17 12:24:38 2007
@@ -94,14 +94,14 @@
         WebResponse res = client.getResponse("http://localhost/services");    
         
         WebLink[] links = res.getLinks();
-        assertEquals("There should get one link for service", links.length, 1);
-        assertEquals(links[0].getURLString(), "http://localhost/services/greeter?wsdl");
      
+        assertEquals("There should get one link for service", 1, links.length);
+        assertEquals("http://localhost/services/greeter?wsdl", links[0].getURLString());
      
         assertEquals("text/html", res.getContentType());
         
         res = client.getResponse("http://localhost/services/");
         links = res.getLinks();
-        assertEquals("There should get one link for service", links.length, 1);
-        assertEquals(links[0].getURLString(), "http://localhost/services/greeter?wsdl");
      
+        assertEquals("There should get one link for service", 1, links.length);
+        assertEquals("http://localhost/services/greeter?wsdl", links[0].getURLString());
      
         assertEquals("text/html", res.getContentType());
     }
     

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml?view=diff&rev=529722&r1=529721&r2=529722
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml
Tue Apr 17 12:24:38 2007
@@ -27,7 +27,7 @@
   
   <jaxws:endpoint 
     id="greeter1" 
-    address="/services/greeter"
+    address="/greeter"
   	implementor="org.apache.hello_world_soap_http.GreeterImpl"
   	wsdlLocation="/org/apache/cxf/systest/servlet/hello_world.wsdl"      />
 

Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/spring-js.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/spring-js.xml?view=diff&rev=529722&r1=529721&r2=529722
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/spring-js.xml
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/servlet/spring-js.xml
Tue Apr 17 12:24:38 2007
@@ -29,7 +29,7 @@
     class="org.apache.cxf.js.rhino.JsServiceFactoryBean" init-method="create">
     <property name="js" value="/org/apache/cxf/systest/servlet/hello_world.js" />
     <property name="isBaseAddr" value="false" />     
-    <property name="address" value="http://localhost/services/Greeter"/>
+    <property name="address" value="/Greeter"/>
     <property name="bus" ref="cxf"/>    
   </bean>
 

Modified: incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java?view=diff&rev=529722&r1=529721&r2=529722
==============================================================================
--- incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java
(original)
+++ incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/testutil/common/AbstractTestServerBase.java
Tue Apr 17 12:24:38 2007
@@ -24,6 +24,7 @@
 import junit.framework.Assert;
 
 public abstract class AbstractTestServerBase extends Assert {
+    boolean inProcess;
     
     /** 
      * method implemented by test servers.  Initialise 
@@ -39,16 +40,19 @@
     
     
     public void startInProcess() throws Exception {
-        System.out.println("running server in-process");
+        inProcess = true;
+        //System.out.println("running server in-process");
         run();
-        System.out.println("signal ready");
+        //System.out.println("signal ready");
         ready();
     }
     
     public boolean stopInProcess() throws Exception {
         boolean ret = true;
         if (verify(getLog())) {
-            System.out.println("server passed");
+            if (!inProcess) {
+                System.out.println("server passed");
+            }
         } else {
             ret = false;
         }
@@ -91,7 +95,9 @@
     }
     
     protected void ready() {
-        System.out.println("server ready");
+        if (!inProcess) {
+            System.out.println("server ready");
+        }
     }
     
     protected void startFailed() {



Mime
View raw message