You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by is...@apache.org on 2007/05/03 16:59:39 UTC

svn commit: r534900 - /incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/http/jetty/JettyServer.java

Author: isilval
Date: Thu May  3 07:59:38 2007
New Revision: 534900

URL: http://svn.apache.org/viewvc?view=rev&rev=534900
Log:
Use port from the uri

Modified:
    incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/http/jetty/JettyServer.java

Modified: incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/http/jetty/JettyServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/http/jetty/JettyServer.java?view=diff&rev=534900&r1=534899&r2=534900
==============================================================================
--- incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/http/jetty/JettyServer.java (original)
+++ incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/http/jetty/JettyServer.java Thu May  3 07:59:38 2007
@@ -135,11 +135,14 @@
         }
     }
 
-    public void addServletMapping(String uri, Servlet servlet) throws ServletMappingException {
+    public void addServletMapping(String uriStr, Servlet servlet) throws ServletMappingException {
+        URI uri = URI.create(uriStr);
         if (state == STARTING) {
 
-            // TODO: use the port from the uri, but thats a bit harder to do 
-            int port = DEFAULT_PORT;
+            int port = uri.getPort();
+            if (port == -1) {
+                port = DEFAULT_PORT;
+            }
             
             try {
                 server = new Server();
@@ -189,7 +192,7 @@
         servletHandler.addServlet(holder);
         ServletMapping mapping = new ServletMapping();
         mapping.setServletName(holder.getName());
-        String path = URI.create(uri).getPath();
+        String path = uri.getPath();
         mapping.setPathSpec(path);
         servletHandler.addServletMapping(mapping);
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org