mx4j/src/tools/mx4j/tools/remote/http HTTPConnector.java,1.3,1.4 HTTPConnectorServer.java,1.3,1.4 HTTPService.java,1.3,1.4

Update of /cvsroot/mx4j/mx4j/src/tools/mx4j/tools/remote/http
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20952/src/tools/mx4j/tools/remote/http

Modified Files:
	HTTPConnector.java HTTPConnectorServer.java HTTPService.java 
Log Message:
+ Refactored the ConnectionResolver "framework", to support protocols containing the "+" character, as in soap+ssl.
+ Renamed classes from <PROTOCOL>Resolver to Resolver
+ Added SSL specific classes for hessian, burlap and soap protocols
+ Removed unnecessary classes

Index: HTTPService.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/tools/mx4j/tools/remote/http/HTTPService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HTTPService.java	13 Nov 2004 16:38:47 -0000	1.3
--- HTTPService.java	16 Feb 2005 15:28:40 -0000	1.4
***************
*** 14,17 ****
--- 14,18 ----
  import java.util.Map;
  import java.util.Set;
+ 
  import javax.management.AttributeList;
  import javax.management.AttributeNotFoundException;
***************
*** 55,59 ****
        // Lookup the ConnectionManager
        ConnectionManager connectionManager = HTTPConnectorServer.find(address);
!       if (connectionManager == null) throw new IOException("Could not find ConnectionManager. Make sure a SOAPConnectorServer is in classloader scope and bound at this address " + address);
  
        Connection connection = connectionManager.connect(credentials);
--- 56,60 ----
        // Lookup the ConnectionManager
        ConnectionManager connectionManager = HTTPConnectorServer.find(address);
!       if (connectionManager == null) throw new IOException("Could not find ConnectionManager. Make sure a HTTPConnectorServer is in classloader scope and bound at this address " + address);
  
        Connection connection = connectionManager.connect(credentials);

Index: HTTPConnectorServer.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/tools/mx4j/tools/remote/http/HTTPConnectorServer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HTTPConnectorServer.java	13 Nov 2004 16:38:47 -0000	1.3
--- HTTPConnectorServer.java	16 Feb 2005 15:28:40 -0000	1.4
***************
*** 13,16 ****
--- 13,17 ----
  import java.util.HashMap;
  import java.util.Map;
+ 
  import javax.management.MBeanServer;
  import javax.management.remote.JMXServiceURL;
***************
*** 25,29 ****
   * @version $Revision$
   */
! public abstract class HTTPConnectorServer extends AbstractJMXConnectorServer
  {
     public static final String USE_EXTERNAL_WEB_CONTAINER = "jmx.remote.x.http.use.external.web.container";
--- 26,30 ----
   * @version $Revision$
   */
! public class HTTPConnectorServer extends AbstractJMXConnectorServer
  {
     public static final String USE_EXTERNAL_WEB_CONTAINER = "jmx.remote.x.http.use.external.web.container";
***************
*** 55,59 ****
        setAddress(resolver.bindServer(webContainer, address, environment));
  
!       connectionManager = createConnectionManager(this, environment);
  
        // Here is where we give to clients the possibility to access us
--- 56,60 ----
        setAddress(resolver.bindServer(webContainer, address, environment));
  
!       connectionManager = createConnectionManager(this, address, environment);
  
        // Here is where we give to clients the possibility to access us
***************
*** 61,65 ****
     }
  
!    protected abstract ConnectionManager createConnectionManager(AbstractJMXConnectorServer server, Map environment);
  
     private void register(JMXServiceURL url, ConnectionManager manager) throws IOException
--- 62,69 ----
     }
  
!    protected ConnectionManager createConnectionManager(AbstractJMXConnectorServer server, JMXServiceURL url, Map environment)
!    {
!       return new HTTPConnectionManager(server, url.getProtocol(), environment);
!    }
  
     private void register(JMXServiceURL url, ConnectionManager manager) throws IOException

Index: HTTPConnector.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/tools/mx4j/tools/remote/http/HTTPConnector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HTTPConnector.java	13 Nov 2004 16:38:47 -0000	1.3
--- HTTPConnector.java	16 Feb 2005 15:28:39 -0000	1.4
***************
*** 12,16 ****
--- 12,19 ----
  import java.net.MalformedURLException;
  import java.util.Map;
+ 
+ import javax.management.MBeanServerConnection;
  import javax.management.remote.JMXServiceURL;
+ import javax.security.auth.Subject;
  
  import mx4j.remote.ConnectionNotificationEmitter;
***************
*** 23,27 ****
   * @version $
   */
! public abstract class HTTPConnector extends AbstractJMXConnector
  {
     private transient HTTPConnection connection;
--- 26,30 ----
   * @version $
   */
! public class HTTPConnector extends AbstractJMXConnector
  {
     private transient HTTPConnection connection;
***************
*** 30,34 ****
     private transient RemoteNotificationClientHandler notificationHandler;
  
!    protected HTTPConnector(JMXServiceURL address) throws IOException
     {
        super(address);
--- 33,37 ----
     private transient RemoteNotificationClientHandler notificationHandler;
  
!    public HTTPConnector(JMXServiceURL address, Map environment) throws IOException
     {
        super(address);
***************
*** 65,68 ****
--- 68,76 ----
     }
  
+    protected MBeanServerConnection doGetMBeanServerConnection(Subject delegate) throws IOException
+    {
+       return new HTTPConnectionMBeanServerConnection(getHTTPConnection(), delegate, getRemoteNotificationClientHandler());
+    }
+ 
     protected void doClose() throws IOException
     {



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click