[jboss-cvs] JBossAS SVN: r57703 - in branches/JBoss_4_0_4_GA_CP: messaging/src/etc/server/examples/deploy messaging/src/main/org/jboss/mq/il/uil2 security/src/main/org/jboss/security/ssl

[jboss-cvs-commits at lists.jboss.org]

Author: fnasser at redhat.com
Date: 2006-10-18 12:58:20 -0400 (Wed, 18 Oct 2006)
New Revision: 57703

Added:
   branches/JBoss_4_0_4_GA_CP/messaging/src/etc/server/examples/deploy/sslext-uil2-service.xml
Modified:
   branches/JBoss_4_0_4_GA_CP/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java
   branches/JBoss_4_0_4_GA_CP/messaging/src/main/org/jboss/mq/il/uil2/UILServerILServiceMBean.java
   branches/JBoss_4_0_4_GA_CP/security/src/main/org/jboss/security/ssl/DomainServerSocketFactory.java
Log:
ASPATCH-106: JBAS-3755: Expose all SSL socket factory settings via properties or attributes for UIL2

Copied: branches/JBoss_4_0_4_GA_CP/messaging/src/etc/server/examples/deploy/sslext-uil2-service.xml (from rev 57702, branches/JBoss_4_0_4_GA_JBAS-3755/messaging/src/etc/server/examples/deploy/sslext-uil2-service.xml)

Modified: branches/JBoss_4_0_4_GA_CP/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java
===================================================================
--- branches/JBoss_4_0_4_GA_CP/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java	2006-10-18 15:35:13 UTC (rev 57702)
+++ branches/JBoss_4_0_4_GA_CP/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java	2006-10-18 16:58:20 UTC (rev 57703)
@@ -188,7 +188,7 @@
       // Use the default javax.net.ServerSocketFactory if none was set
       if (serverSocketFactory == null)
          serverSocketFactory = ServerSocketFactory.getDefault();
-
+      log.debug("Using serverSocketFactory: "+serverSocketFactory);
       /* See if the server socket supports setSecurityDomain(SecurityDomain)
       if an securityDomain was specified
       */
@@ -481,6 +481,22 @@
       return name;
    }
 
+   /** Set the javax.net.ServerSocketFactory instance to use to
+    * create the service SocketFactory.
+    */
+   public void setServerSocketFactoryBean(ServerSocketFactory factory)
+   {
+      serverSocketFactory = factory;
+   }
+
+   /** Get the javax.net.ServerSocketFactory instance used to
+    * create the service SocketFactory.
+    */
+   public ServerSocketFactory getServerSocketFactoryBean()
+   {
+      return serverSocketFactory;
+   }
+
    /** Set the security domain name to use with SSL aware socket factories
     *@jmx:managed-attribute
     */

Modified: branches/JBoss_4_0_4_GA_CP/messaging/src/main/org/jboss/mq/il/uil2/UILServerILServiceMBean.java
===================================================================
--- branches/JBoss_4_0_4_GA_CP/messaging/src/main/org/jboss/mq/il/uil2/UILServerILServiceMBean.java	2006-10-18 15:35:13 UTC (rev 57702)
+++ branches/JBoss_4_0_4_GA_CP/messaging/src/main/org/jboss/mq/il/uil2/UILServerILServiceMBean.java	2006-10-18 16:58:20 UTC (rev 57703)
@@ -140,6 +140,15 @@
    java.lang.String getServerSocketFactory();
 
    /**
+    * Set the javax.net.ServerSocketFactory instance used to create the service SocketFactory.
+    */
+   void setServerSocketFactoryBean(javax.net.ServerSocketFactory factory);
+   /**
+    * Get the javax.net.ServerSocketFactory instance used to create the service SocketFactory.
+    */
+   javax.net.ServerSocketFactory getServerSocketFactoryBean();
+
+   /**
     * Set the security domain name to use with SSL aware socket factories
     */
    void setSecurityDomain(java.lang.String domainName);

Modified: branches/JBoss_4_0_4_GA_CP/security/src/main/org/jboss/security/ssl/DomainServerSocketFactory.java
===================================================================
--- branches/JBoss_4_0_4_GA_CP/security/src/main/org/jboss/security/ssl/DomainServerSocketFactory.java	2006-10-18 15:35:13 UTC (rev 57702)
+++ branches/JBoss_4_0_4_GA_CP/security/src/main/org/jboss/security/ssl/DomainServerSocketFactory.java	2006-10-18 16:58:20 UTC (rev 57703)
@@ -226,7 +226,6 @@
       SSLServerSocketFactory factory = sslCtx.getServerSocketFactory();
       SSLServerSocket socket = (SSLServerSocket) factory.createServerSocket(port, backlog, ifAddress);
       SSLSessionContext ctx = sslCtx.getServerSessionContext();
-      System.out.println(ctx);
       if( log.isTraceEnabled() )
       {
          String[] supportedProtocols = socket.getSupportedProtocols();