geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r442193 [3/3] - in /geronimo/server/branches/sachin: ./ applications/geronimo-examples/geronimo-jsp-examples/ applications/geronimo-examples/geronimo-servlet-examples/ applications/magicGball/magicGball-client/ applications/magicGball/magic...
Date Mon, 11 Sep 2006 12:28:30 GMT
Propchange: geronimo/server/branches/sachin/applications/geronimo-examples/geronimo-jsp-examples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 11 05:28:29 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Propchange: geronimo/server/branches/sachin/applications/geronimo-examples/geronimo-servlet-examples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 11 05:28:29 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Propchange: geronimo/server/branches/sachin/applications/magicGball/magicGball-client/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 11 05:28:29 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Propchange: geronimo/server/branches/sachin/applications/magicGball/magicGball-ear/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 11 05:28:29 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Propchange: geronimo/server/branches/sachin/applications/magicGball/magicGball-ejb/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 11 05:28:29 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Propchange: geronimo/server/branches/sachin/applications/magicGball/magicGball-web/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 11 05:28:29 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Propchange: geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 11 05:28:29 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Modified: geronimo/server/branches/sachin/configs/client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/client-deployer/src/plan/plan.xml?view=diff&rev=442193&r1=442192&r2=442193
==============================================================================
--- geronimo/server/branches/sachin/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/client-deployer/src/plan/plan.xml Mon Sep 11 05:28:29 2006
@@ -36,10 +36,10 @@
             </pattern>
         </references>
         <reference name="ConnectorModuleBuilder">
-            <name>ConnectorBuilder</name>
+            <name>ClientConnectorBuilder</name>
         </reference>
         <reference name="ResourceReferenceBuilder">
-            <name>ConnectorBuilder</name>
+            <name>ClientConnectorBuilder</name>
         </reference>
         <references name="ServiceReferenceBuilder">
             <pattern>
@@ -69,6 +69,23 @@
                         <type>car</type>
                     </dependency>
                 </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+
+    <gbean name="ClientConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
+        <attribute name="defaultMaxSize">10</attribute>
+        <attribute name="defaultMinSize">0</attribute>
+        <attribute name="defaultBlockingTimeoutMilliseconds">5000</attribute>
+        <attribute name="defaultIdleTimeoutMinutes">15</attribute>
+        <attribute name="defaultXATransactionCaching">true</attribute>
+        <attribute name="defaultXAThreadCaching">false</attribute>
+        <reference name="ServiceBuilders">
+            <name>GBeanBuilder</name>
+        </reference>
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
             </environment>
         </xml-attribute>
     </gbean>

Modified: geronimo/server/branches/sachin/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/client-system/pom.xml?view=diff&rev=442193&r1=442192&r2=442193
==============================================================================
--- geronimo/server/branches/sachin/configs/client-system/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/client-system/pom.xml Mon Sep 11 05:28:29 2006
@@ -103,6 +103,10 @@
                             <artifactId>geronimo-qname_1.1_spec</artifactId>
                         </element>
                         <element>
+                            <groupId>backport-util-concurrent</groupId>
+                            <artifactId>backport-util-concurrent</artifactId>
+                        </element>
+                        <element>
                             <groupId>mx4j</groupId>
                             <artifactId>mx4j</artifactId>
                         </element>

Modified: geronimo/server/branches/sachin/configs/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/client/pom.xml?view=diff&rev=442193&r1=442192&r2=442193
==============================================================================
--- geronimo/server/branches/sachin/configs/client/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/client/pom.xml Mon Sep 11 05:28:29 2006
@@ -97,11 +97,11 @@
             <version>${pom.version}</version>
         </dependency>
 
-        <!-- ??? 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security</artifactId>
-        </dependency> -->
+            <version>${pom.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -123,14 +123,74 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_2.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
+        </dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-jsp_2.0_spec</artifactId>-->
+        <!--</dependency>-->
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
         </dependency>
-            
+
+        <!--dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
+        </dependency-->
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-saaj_1.1_spec</artifactId>
+        </dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-servlet_2.4_spec</artifactId>-->
+        <!--</dependency>-->
+
         <!-- geronimo-spec-corba, geronimo-j2ee_1.4_spec -->
         <!-- openejb-core, tranql, asm, activemq, activeio, scout, juddi, 
              concurrent, jdom -->
@@ -138,6 +198,12 @@
         <dependency>
             <groupId>concurrent</groupId>
             <artifactId>concurrent</artifactId>
+        </dependency>
+        
+        <!-- REMOVE WHEN G-2383 is applied -->
+        <dependency>
+            <groupId>org.openejb</groupId>
+            <artifactId>openejb-core</artifactId>
         </dependency>
         
         <!--

Propchange: geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 11 05:28:29 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Propchange: geronimo/server/branches/sachin/maven-plugins/geronimo-deployment-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 11 05:28:29 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Propchange: geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 11 05:28:29 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Propchange: geronimo/server/branches/sachin/maven-plugins/selenium-maven-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 11 05:28:29 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Modified: geronimo/server/branches/sachin/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java?view=diff&rev=442193&r1=442192&r2=442193
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java Mon Sep 11 05:28:29 2006
@@ -38,6 +38,48 @@
  */
 public class IMAPStoreGBean extends ProtocolGBean {
 
+    // the IMAP configuration property names
+    static public final String IMAP_PORT = "mail.imap.port";
+    static public final String IMAP_CONNECTION_TIMEOUT = "mail.imap.connectiontimeout";
+    static public final String IMAP_TIMEOUT = "mail.imap.timeout";
+    static public final String IMAP_FACTORY_CLASS = "mail.imap.socketFactory.class";
+    static public final String IMAP_FACTORY_FALLBACK = "mail.imap.socketFactory.fallback";
+    static public final String IMAP_FACTORY_PORT = "mail.imap.socketFactory.port";
+    static public final String IMAP_LOCALHOST = "mail.imap.localhost";
+    static public final String IMAP_LOCALADDRESS = "mail.imap.localaddress";
+    static public final String IMAP_LOCALPORT = "mail.imap.localport";
+    static public final String IMAP_PARTIAL_FETCH = "mail.imap.partialfetch";
+    static public final String IMAP_FETCH_SIZE = "mail.imap.fetchsize";
+    static public final String IMAP_STATUS_TIMEOUT = "mail.imap.statuscachetimeout";
+    static public final String IMAP_APPEND_SIZE = "mail.imap.appendbuffersize";
+    static public final String IMAP_POOL_SIZE = "mail.imap.connectionpoolsize";
+    static public final String IMAP_POOL_TIMEOUT = "mail.imap.connectionpooltimeout";
+    static public final String IMAP_SEPARATE_STORE_CONNECTION = "mail.imap.separatestoreconnection";
+    static public final String IMAP_READONLY_SELECT = "mail.imap.alloreadonlyselect";
+    static public final String IMAP_LOGIN_DISABLE = "mail.imap.auth.login.disable";
+    static public final String IMAP_PLAIN_DISABLE = "mail.imap.auth.plain.disable";
+    static public final String IMAP_STARTTLS_ENABLE = "mail.imap.auth.starttls.enable";
+    static public final String IMAP_SASL_ENABLE = "mail.imap.sasl.enable";
+    static public final String IMAP_SASL_MECHANISMS = "mail.imap.sasl.mechanisms";
+    static public final String IMAP_SASL_AUTHORIZATIONID = "mail.imap.sasl.authorizationid";
+
+
+    // the GBEAN property names
+    static public final String GBEAN_PARTIAL_FETCH = "partialFetch";
+    static public final String GBEAN_FETCH_SIZE = "fetchSize";
+    static public final String GBEAN_STATUS_TIMEOUT = "statusCacheTimeout";
+    static public final String GBEAN_APPEND_SIZE = "appendBufferSize";
+    static public final String GBEAN_POOL_SIZE = "connectionPoolSize";
+    static public final String GBEAN_POOL_TIMEOUT = "connectionPoolTimeout";
+    static public final String GBEAN_SEPARATE_STORE_CONNECTION = "separateStoreConnection";
+    static public final String GBEAN_READONLY_SELECT = "allowReadOnlySelect";
+    static public final String GBEAN_LOGIN_DISABLE = "authLoginDisable";
+    static public final String GBEAN_PLAIN_DISABLE = "authPlainDisable";
+    static public final String GBEAN_STARTTLS_ENABLE = "startTLSEnable";
+    static public final String GBEAN_SASL_ENABLE = "saslEnable";
+    static public final String GBEAN_SASL_MECHANISMS = "saslMechanisms";
+    static public final String GBEAN_SASL_AUTHORIZATIONID = "saslAuthorizationId";
+
     private final Log log = LogFactory.getLog(IMAPStoreGBean.class);
 
     private Integer port;
@@ -724,28 +766,28 @@
     public void addOverrides(Properties props) {
         super.addOverrides(props);
 
-        if (port != null) props.put("mail.imap.port", port);
-        if (partialFetch != null) props.put("mail.imap.partialfetch", partialFetch);
-        if (fetchSize != null) props.put("mail.imap.fetchsize", fetchSize);
-        if (connectionTimeout != null) props.put("mail.imap.connectiontimeout", connectionTimeout);
-        if (timeout != null) props.put("mail.imap.timeout", timeout);
-        if (statusCacheTimeout != null) props.put("mail.imap.statuscachetimeout", statusCacheTimeout);
-        if (appendBufferSize != null) props.put("mail.imap.appendbuffersize", appendBufferSize);
-        if (connectionPoolSize != null) props.put("mail.imap.connectionpoolsize", connectionPoolSize);
-        if (connectionPoolTimeout != null) props.put("mail.imap.connectionpooltimeout", connectionPoolTimeout);
-        if (separateStoreConnection != null) props.put("mail.imap.separatestoreconnection", separateStoreConnection);
-        if (allowReadOnlySelect != null) props.put("mail.imap.allowreadonlyselect", allowReadOnlySelect);
-        if (authLoginDisable != null) props.put("mail.imap.auth.login.disable", authLoginDisable);
-        if (authPlainDisable != null) props.put("mail.imap.auth.plain.disable", authPlainDisable);
-        if (startTLSEnable != null) props.put("mail.imap.auth.starttls.enable", startTLSEnable);
-        if (localaddress != null) props.put("mail.imap.localaddress", localaddress);
-        if (localport != null) props.put("mail.imap.localport", localport);
-        if (saslEnable != null) props.put("mail.imap.sasl.enable", saslEnable);
-        if (saslMechanisms != null) props.put("mail.imap.sasl.mechanisms", saslMechanisms);
-        if (saslAuthorizationId != null) props.put("mail.imap.sasl.authorizationid", saslAuthorizationId);
-        if (socketFactoryClass != null) props.put("mail.imap.socketFactory.class", socketFactoryClass);
-        if (socketFactoryFallback != null) props.put("mail.imap.socketFactory.fallback", socketFactoryFallback);
-        if (socketFactoryPort != null) props.put("mail.imap.socketFactory.port", socketFactoryPort);
+        if (port != null) props.put(IMAP_PORT, port);
+        if (partialFetch != null) props.put(IMAP_PARTIAL_FETCH, partialFetch);
+        if (fetchSize != null) props.put(IMAP_FETCH_SIZE, fetchSize);
+        if (connectionTimeout != null) props.put(IMAP_CONNECTION_TIMEOUT, connectionTimeout);
+        if (timeout != null) props.put(IMAP_TIMEOUT, timeout);
+        if (statusCacheTimeout != null) props.put(IMAP_STATUS_TIMEOUT, statusCacheTimeout);
+        if (appendBufferSize != null) props.put(IMAP_APPEND_SIZE, appendBufferSize);
+        if (connectionPoolSize != null) props.put(IMAP_POOL_SIZE, connectionPoolSize);
+        if (connectionPoolTimeout != null) props.put(IMAP_POOL_TIMEOUT, connectionPoolTimeout);
+        if (separateStoreConnection != null) props.put(IMAP_SEPARATE_STORE_CONNECTION, separateStoreConnection);
+        if (allowReadOnlySelect != null) props.put(IMAP_READONLY_SELECT, allowReadOnlySelect);
+        if (authLoginDisable != null) props.put(IMAP_LOGIN_DISABLE, authLoginDisable);
+        if (authPlainDisable != null) props.put(IMAP_PLAIN_DISABLE, authPlainDisable);
+        if (startTLSEnable != null) props.put(IMAP_STARTTLS_ENABLE, startTLSEnable);
+        if (localaddress != null) props.put(IMAP_LOCALADDRESS, localaddress);
+        if (localport != null) props.put(IMAP_LOCALPORT, localport);
+        if (saslEnable != null) props.put(IMAP_SASL_ENABLE, saslEnable);
+        if (saslMechanisms != null) props.put(IMAP_SASL_MECHANISMS, saslMechanisms);
+        if (saslAuthorizationId != null) props.put(IMAP_SASL_AUTHORIZATIONID, saslAuthorizationId);
+        if (socketFactoryClass != null) props.put(IMAP_FACTORY_CLASS, socketFactoryClass);
+        if (socketFactoryFallback != null) props.put(IMAP_FACTORY_FALLBACK, socketFactoryFallback);
+        if (socketFactoryPort != null) props.put(IMAP_FACTORY_PORT, socketFactoryPort);
     }
 
     public void doStart() throws Exception {
@@ -765,52 +807,59 @@
     static {
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(IMAPStoreGBean.class, ProtocolGBean.GBEAN_INFO);
 
-        infoFactory.addAttribute("port", Integer.class, true);
-        infoFactory.addAttribute("partialFetch", Boolean.class, true);
-        infoFactory.addAttribute("fetchSize", Integer.class, true);
-        infoFactory.addAttribute("connectionTimeout", Integer.class, true);
-        infoFactory.addAttribute("timeout", Integer.class, true);
-        infoFactory.addAttribute("statusCacheTimeout", Integer.class, true);
-        infoFactory.addAttribute("appendBufferSize", Integer.class, true);
-        infoFactory.addAttribute("connectionPoolSize", Integer.class, true);
-        infoFactory.addAttribute("connectionPoolTimeout", Integer.class, true);
-        infoFactory.addAttribute("separateStoreConnection", Boolean.class, true);
-        infoFactory.addAttribute("allowReadOnlySelect", Boolean.class, true);
-        infoFactory.addAttribute("authLoginDisable", Boolean.class, true);
-        infoFactory.addAttribute("authPlainDisable", Boolean.class, true);
-        infoFactory.addAttribute("startTLSEnable", Boolean.class, true);
-        infoFactory.addAttribute("localaddress", String.class, true);
-        infoFactory.addAttribute("localport", Integer.class, true);
-        infoFactory.addAttribute("saslEnable", Boolean.class, true);
-        infoFactory.addAttribute("saslMechanisms", String.class, true);
-        infoFactory.addAttribute("saslAuthorizationId", String.class, true);
-        infoFactory.addAttribute("socketFactoryClass", String.class, true);
-        infoFactory.addAttribute("socketFactoryFallback", Boolean.class, true);
-        infoFactory.addAttribute("socketFactoryPort", Integer.class, true);
-
-        infoFactory.setConstructor(new String[]{"objectName", "properties", "host", "user",
-                                                "port",
-                                                "partialFetch",
-                                                "fetchSize",
-                                                "connectionTimeout",
-                                                "timeout",
-                                                "statusCacheTimeout",
-                                                "appendBufferSize",
-                                                "connectionPoolSize",
-                                                "connectionPoolTimeout",
-                                                "separateStoreConnection",
-                                                "allowReadOnlySelect",
-                                                "authLoginDisable",
-                                                "authPlainDisable",
-                                                "startTLSEnable",
-                                                "localaddress",
-                                                "localport",
-                                                "saslEnable",
-                                                "saslMechanisms",
-                                                "saslAuthorizationId",
-                                                "socketFactoryClass",
-                                                "socketFactoryFallback",
-                                                "socketFactoryPort"});
+        infoFactory.addAttribute(GBEAN_PORT, Integer.class, true);
+        infoFactory.addAttribute(GBEAN_CONNECTION_TIMEOUT, Integer.class, true);
+        infoFactory.addAttribute(GBEAN_TIMEOUT, Integer.class, true);
+        infoFactory.addAttribute(GBEAN_LOCALADDRESS, String.class, true);
+        infoFactory.addAttribute(GBEAN_LOCALPORT, Integer.class, true);
+        infoFactory.addAttribute(GBEAN_FACTORY_CLASS, String.class, true);
+        infoFactory.addAttribute(GBEAN_FACTORY_FALLBACK, Boolean.class, true);
+        infoFactory.addAttribute(GBEAN_FACTORY_PORT, Integer.class, true);
+        infoFactory.addAttribute(GBEAN_PARTIAL_FETCH, Boolean.class, true);
+        infoFactory.addAttribute(GBEAN_FETCH_SIZE, Integer.class, true);
+        infoFactory.addAttribute(GBEAN_STATUS_TIMEOUT, Integer.class, true);
+        infoFactory.addAttribute(GBEAN_APPEND_SIZE, Integer.class, true);
+        infoFactory.addAttribute(GBEAN_POOL_SIZE, Integer.class, true);
+        infoFactory.addAttribute(GBEAN_POOL_TIMEOUT, Integer.class, true);
+        infoFactory.addAttribute(GBEAN_SEPARATE_STORE_CONNECTION, Boolean.class, true);
+        infoFactory.addAttribute(GBEAN_READONLY_SELECT, Boolean.class, true);
+        infoFactory.addAttribute(GBEAN_LOGIN_DISABLE, Boolean.class, true);
+        infoFactory.addAttribute(GBEAN_PLAIN_DISABLE, Boolean.class, true);
+        infoFactory.addAttribute(GBEAN_STARTTLS_ENABLE, Boolean.class, true);
+        infoFactory.addAttribute(GBEAN_SASL_ENABLE, Boolean.class, true);
+        infoFactory.addAttribute(GBEAN_SASL_MECHANISMS, String.class, true);
+        infoFactory.addAttribute(GBEAN_SASL_AUTHORIZATIONID, String.class, true);
+
+        infoFactory.addAttribute(GBEAN_OBJECTNAME, String.class, false);
+        infoFactory.addAttribute(GBEAN_PROTOCOL, String.class, true);
+        infoFactory.addAttribute(GBEAN_PROPERTIES, Properties.class, true);
+        infoFactory.addAttribute(GBEAN_HOST, String.class, true);
+        infoFactory.addAttribute(GBEAN_USER, String.class, true);
+        infoFactory.addOperation(GBEAN_ADD_OVERRIDES, new Class[]{Properties.class});
+
+        infoFactory.setConstructor(new String[]{GBEAN_OBJECTNAME, GBEAN_PROPERTIES, GBEAN_HOST, GBEAN_USER,
+                                                GBEAN_PORT,
+                                                GBEAN_PARTIAL_FETCH,
+                                                GBEAN_FETCH_SIZE,
+                                                GBEAN_CONNECTION_TIMEOUT,
+                                                GBEAN_TIMEOUT,
+                                                GBEAN_STATUS_TIMEOUT,
+                                                GBEAN_APPEND_SIZE,
+                                                GBEAN_POOL_SIZE,
+                                                GBEAN_POOL_TIMEOUT,
+                                                GBEAN_SEPARATE_STORE_CONNECTION,
+                                                GBEAN_READONLY_SELECT,
+                                                GBEAN_LOGIN_DISABLE,
+                                                GBEAN_PLAIN_DISABLE,
+                                                GBEAN_STARTTLS_ENABLE,
+                                                GBEAN_LOCALADDRESS,
+                                                GBEAN_LOCALPORT,
+                                                GBEAN_SASL_ENABLE,
+                                                GBEAN_SASL_MECHANISMS,
+                                                GBEAN_SASL_AUTHORIZATIONID,
+                                                GBEAN_FACTORY_CLASS,
+                                                GBEAN_FACTORY_FALLBACK,
+                                                GBEAN_FACTORY_PORT});
 
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/server/branches/sachin/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/POP3StoreGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/POP3StoreGBean.java?view=diff&rev=442193&r1=442192&r2=442193
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/POP3StoreGBean.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/POP3StoreGBean.java Mon Sep 11 05:28:29 2006
@@ -39,6 +39,24 @@
  */
 public class POP3StoreGBean extends ProtocolGBean {
 
+    // the POP3 configuration property names
+    static public final String POP3_PORT = "mail.pop3.port";
+    static public final String POP3_CONNECTION_TIMEOUT = "mail.pop3.connectiontimeout";
+    static public final String POP3_TIMEOUT = "mail.pop3.timeout";
+    static public final String POP3_FACTORY_CLASS = "mail.pop3.socketFactory.class";
+    static public final String POP3_FACTORY_FALLBACK = "mail.pop3.socketFactory.fallback";
+    static public final String POP3_FACTORY_PORT = "mail.pop3.socketFactory.port";
+    static public final String POP3_LOCALHOST = "mail.pop3.localhost";
+    static public final String POP3_LOCALADDRESS = "mail.pop3.localaddress";
+    static public final String POP3_LOCALPORT = "mail.pop3.localport";
+    static public final String POP3_RESET = "mail.pop3.resetbeforequit";
+    static public final String POP3_MESSAGE_CLASS = "mail.pop3.message.class";
+    static public final String POP3_APOP = "mail.pop3.apop.enable";
+
+    static public final String GBEAN_RESET = "rsetBeforeQuit";
+    static public final String GBEAN_APOP = "apopEnable";
+    static public final String GBEAN_MESSAGE_CLASS = "messageClass";
+
     private final Log log = LogFactory.getLog(POP3StoreGBean.class);
 
     private Integer port;
@@ -398,17 +416,17 @@
     public void addOverrides(Properties props) {
         super.addOverrides(props);
 
-        if (port != null) props.put("mail.pop3.port", port);
-        if (connectionTimeout != null) props.put("mail.pop3.connectiontimeout", connectionTimeout);
-        if (timeout != null) props.put("mail.pop3.timeout", timeout);
-        if (rsetBeforeQuit != null) props.put("mail.pop3.rsetbeforequit", rsetBeforeQuit);
-        if (messageClass != null) props.put("mail.pop3.message.class", messageClass);
-        if (localaddress != null) props.put("mail.pop3.localaddress", localaddress);
-        if (localport != null) props.put("mail.pop3.localport", localport);
-        if (apopEnable != null) props.put("mail.pop3.apop.enable", apopEnable);
-        if (socketFactoryClass != null) props.put("mail.pop3.socketFactory.class", socketFactoryClass);
-        if (socketFactoryFallback != null) props.put("mail.pop3.socketFactory.fallback", socketFactoryFallback);
-        if (socketFactoryPort != null) props.put("mail.pop3.socketFactory.port", socketFactoryPort);
+        if (port != null) props.put(POP3_PORT, port);
+        if (connectionTimeout != null) props.put(POP3_CONNECTION_TIMEOUT, connectionTimeout);
+        if (timeout != null) props.put(POP3_TIMEOUT, timeout);
+        if (rsetBeforeQuit != null) props.put(POP3_RESET, rsetBeforeQuit);
+        if (messageClass != null) props.put(POP3_MESSAGE_CLASS, messageClass);
+        if (localaddress != null) props.put(POP3_LOCALADDRESS, localaddress);
+        if (localport != null) props.put(POP3_LOCALPORT, localport);
+        if (apopEnable != null) props.put(POP3_APOP, apopEnable);
+        if (socketFactoryClass != null) props.put(POP3_FACTORY_CLASS, socketFactoryClass);
+        if (socketFactoryFallback != null) props.put(POP3_FACTORY_FALLBACK, socketFactoryFallback);
+        if (socketFactoryPort != null) props.put(POP3_FACTORY_PORT, socketFactoryPort);
     }
 
     public void doStart() throws Exception {
@@ -428,30 +446,37 @@
     static {
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(POP3StoreGBean.class, ProtocolGBean.GBEAN_INFO);
 
-        infoFactory.addAttribute("port", Integer.class, true);
-        infoFactory.addAttribute("connectionTimeout", Integer.class, true);
-        infoFactory.addAttribute("timeout", Integer.class, true);
-        infoFactory.addAttribute("rsetBeforeQuit", Boolean.class, true);
-        infoFactory.addAttribute("messageClass", String.class, true);
-        infoFactory.addAttribute("localaddress", String.class, true);
-        infoFactory.addAttribute("localport", Integer.class, true);
-        infoFactory.addAttribute("apopEnable", Boolean.class, true);
-        infoFactory.addAttribute("socketFactoryClass", String.class, true);
-        infoFactory.addAttribute("socketFactoryFallback", Boolean.class, true);
-        infoFactory.addAttribute("socketFactoryPort", Integer.class, true);
-
-        infoFactory.setConstructor(new String[]{"objectName", "properties", "host", "user",
-                                                "port",
-                                                "connectionTimeout",
-                                                "timeout",
-                                                "rsetBeforeQuit",
-                                                "messageClass",
-                                                "localaddress",
-                                                "localport",
-                                                "apopEnable",
-                                                "socketFactoryClass",
-                                                "socketFactoryFallback",
-                                                "socketFactoryPort"});
+        infoFactory.addAttribute(GBEAN_PORT, Integer.class, true);
+        infoFactory.addAttribute(GBEAN_CONNECTION_TIMEOUT, Integer.class, true);
+        infoFactory.addAttribute(GBEAN_TIMEOUT, Integer.class, true);
+        infoFactory.addAttribute(GBEAN_RESET, Boolean.class, true);
+        infoFactory.addAttribute(GBEAN_MESSAGE_CLASS, String.class, true);
+        infoFactory.addAttribute(GBEAN_LOCALADDRESS, String.class, true);
+        infoFactory.addAttribute(GBEAN_LOCALPORT, Integer.class, true);
+        infoFactory.addAttribute(GBEAN_APOP, Boolean.class, true);
+        infoFactory.addAttribute(GBEAN_FACTORY_CLASS, String.class, true);
+        infoFactory.addAttribute(GBEAN_FACTORY_FALLBACK, Boolean.class, true);
+        infoFactory.addAttribute(GBEAN_FACTORY_PORT, Integer.class, true);
+
+        infoFactory.addAttribute(GBEAN_OBJECTNAME, String.class, false);
+        infoFactory.addAttribute(GBEAN_PROTOCOL, String.class, true);
+        infoFactory.addAttribute(GBEAN_PROPERTIES, Properties.class, true);
+        infoFactory.addAttribute(GBEAN_HOST, String.class, true);
+        infoFactory.addAttribute(GBEAN_USER, String.class, true);
+        infoFactory.addOperation(GBEAN_ADD_OVERRIDES, new Class[]{Properties.class});
+
+        infoFactory.setConstructor(new String[]{GBEAN_OBJECTNAME, GBEAN_PROPERTIES, GBEAN_HOST, GBEAN_USER,
+                                                GBEAN_PORT,
+                                                GBEAN_CONNECTION_TIMEOUT,
+                                                GBEAN_TIMEOUT,
+                                                GBEAN_RESET,
+                                                GBEAN_MESSAGE_CLASS,
+                                                GBEAN_LOCALADDRESS,
+                                                GBEAN_LOCALPORT,
+                                                GBEAN_APOP,
+                                                GBEAN_FACTORY_CLASS,
+                                                GBEAN_FACTORY_FALLBACK,
+                                                GBEAN_FACTORY_PORT});
 
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/server/branches/sachin/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/ProtocolGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/ProtocolGBean.java?view=diff&rev=442193&r1=442192&r2=442193
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/ProtocolGBean.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/ProtocolGBean.java Mon Sep 11 05:28:29 2006
@@ -35,6 +35,29 @@
  */
 public class ProtocolGBean implements GBeanLifecycle {
 
+    // common attributes exported by all ProtocolBeans
+    static public final String GBEAN_OBJECTNAME = "objectName";
+    static public final String GBEAN_PROTOCOL = "protocol";
+    static public final String GBEAN_PROPERTIES = "properties";
+    static public final String GBEAN_HOST = "host";
+    static public final String GBEAN_USER = "user";
+    static public final String GBEAN_ADD_OVERRIDES = "addOverrides";
+
+    // common constants for GBEAN properties that are used by a number of transports.
+    static public final String GBEAN_PORT = "port";
+    static public final String GBEAN_CONNECTION_TIMEOUT = "connectionTimeout";
+    static public final String GBEAN_TIMEOUT = "timeout";
+    static public final String GBEAN_FROM = "from";
+    static public final String GBEAN_AUTH = "auth";
+    static public final String GBEAN_REALM = "saslRealm";
+    static public final String GBEAN_QUITWAIT = "quitWait";
+    static public final String GBEAN_FACTORY_CLASS = "socketFactoryClass";
+    static public final String GBEAN_FACTORY_FALLBACK = "socketFactoryFallback";
+    static public final String GBEAN_FACTORY_PORT = "socketFactoryPort";
+    static public final String GBEAN_LOCALHOST = "localhost";
+    static public final String GBEAN_LOCALADDRESS = "localaddress";
+    static public final String GBEAN_LOCALPORT = "localport";
+
     private final Log log = LogFactory.getLog(ProtocolGBean.class);
 
     private final String objectName;
@@ -167,14 +190,14 @@
     static {
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(ProtocolGBean.class); //TODO just a gbean?
 
-        infoFactory.addAttribute("objectName", String.class, false);
-        infoFactory.addAttribute("protocol", String.class, true);
-        infoFactory.addAttribute("properties", Properties.class, true);
-        infoFactory.addAttribute("host", String.class, true);
-        infoFactory.addAttribute("user", String.class, true);
-        infoFactory.addOperation("addOverrides", new Class[]{Properties.class});
+        infoFactory.addAttribute(GBEAN_OBJECTNAME, String.class, false);
+        infoFactory.addAttribute(GBEAN_PROTOCOL, String.class, true);
+        infoFactory.addAttribute(GBEAN_PROPERTIES, Properties.class, true);
+        infoFactory.addAttribute(GBEAN_HOST, String.class, true);
+        infoFactory.addAttribute(GBEAN_USER, String.class, true);
+        infoFactory.addOperation(GBEAN_ADD_OVERRIDES, new Class[]{Properties.class});
 
-        infoFactory.setConstructor(new String[]{"objectName", "protocol", "properties", "host", "user"});
+        infoFactory.setConstructor(new String[]{GBEAN_OBJECTNAME, GBEAN_PROTOCOL, GBEAN_PROPERTIES, GBEAN_HOST, GBEAN_USER});
 
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/server/branches/sachin/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPTransportGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPTransportGBean.java?view=diff&rev=442193&r1=442192&r2=442193
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPTransportGBean.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPTransportGBean.java Mon Sep 11 05:28:29 2006
@@ -38,6 +38,41 @@
  */
 public class SMTPTransportGBean extends ProtocolGBean {
 
+    // the SMTP configuration property names
+    static public final String SMTP_PORT = "mail.smtp.port";
+    static public final String SMTP_CONNECTION_TIMEOUT = "mail.smtp.connectiontimeout";
+    static public final String SMTP_TIMEOUT = "mail.smtp.timeout";
+    static public final String SMTP_FROM = "mail.smtp.from";
+    static public final String SMTP_AUTH = "mail.smtp.auth";
+    static public final String SMTP_REALM = "mail.smtp.sasl.realm";
+    static public final String SMTP_QUITWAIT = "mail.smtp.quitwait";
+    static public final String SMTP_FACTORY_CLASS = "mail.smtp.socketFactory.class";
+    static public final String SMTP_FACTORY_FALLBACK = "mail.smtp.socketFactory.fallback";
+    static public final String SMTP_FACTORY_PORT = "mail.smtp.socketFactory.port";
+    static public final String SMTP_LOCALHOST = "mail.smtp.localhost";
+    static public final String SMTP_LOCALADDRESS = "mail.smtp.localaddress";
+    static public final String SMTP_LOCALPORT = "mail.smtp.localport";
+    static public final String SMTP_EHLO = "mail.smtp.ehlo";
+    static public final String SMTP_SUBMITTER = "mail.smtp.submitter";
+    static public final String SMTP_DSN_NOTIFY = "mail.smtp.dsn.notify";
+    static public final String SMTP_DSN_RET = "mail.smtp.dsn.ret";
+    static public final String SMTP_8BITMIME = "mail.smtp.allow8bitmime";
+    static public final String SMTP_SEND_PARTIAL = "mail.smtp.sendpartial";
+    static public final String SMTP_REPORT_SUCCESS = "mail.smtp.reportsuccess";
+    static public final String SMTP_MAIL_EXTENSION = "mail.smtp.mailextension";
+    static public final String SMTP_STARTTLS_ENABLE = "mail.smtp.starttls.enable";
+
+    static public final String GBEAN_EHLO = "ehlo";
+    static public final String GBEAN_SUBMITTER = "submitter";
+    static public final String GBEAN_DSN_NOTIFY = "dsnNotify";
+    static public final String GBEAN_DSN_RET = "dsnRet";
+    static public final String GBEAN_8BITMIME = "allow8bitmime";
+    static public final String GBEAN_SEND_PARTIAL = "sendPartical";
+    static public final String GBEAN_REPORT_SUCCESS = "reportSuccess";
+    static public final String GBEAN_MAIL_EXTENSION = "mailExtension";
+static public final String GBEAN_STARTTLS_ENABLE = "startTLSEnable";
+
+
     private final Log log = LogFactory.getLog(SMTPTransportGBean.class);
 
     private Integer port;
@@ -61,6 +96,7 @@
     private Boolean socketFactoryFallback;
     private Integer socketFactoryPort;
     private String mailExtension;
+    private Boolean startTLSEnable;
 
 
     /**
@@ -83,6 +119,7 @@
      * @param ehlo                  whether an attempt will be made to sign on with the EHLO command
      * @param auth                  whether an attempt will be made to authenticate the user using
      *                              the AUTH command
+     * @param startTLSEnable          the flag that enables the use of the STARTTLS command (if supported by the server) to switch the connection to a TLS-protected connection before issuing any login commands
      * @param submitter             the submitter to use in the AUTH tag in the MAIL FROM command
      * @param dsnNotify             the NOTIFY option to the RCPT command
      * @param dsnRet                the RET option to the MAIL command
@@ -110,6 +147,7 @@
                               Integer localport,
                               Boolean ehlo,
                               Boolean auth,
+                              Boolean startTLSEnable,
                               String submitter,
                               String dsnNotify,
                               String dsnRet,
@@ -133,6 +171,7 @@
         setLocalport(localport);
         setEhlo(ehlo);
         setAuth(auth);
+        setStartTLSEnable(startTLSEnable);
         setSubmitter(submitter);
         setDsnNotify(dsnNotify);
         setDsnRet(dsnRet);
@@ -360,6 +399,43 @@
     }
 
     /**
+     * Returns the flag that enables the use of the STARTTLS command (if
+     * supported by the server) to switch the connection to a TLS-protected
+     * connection before issuing any login commands.
+     * <p/>
+     * If true, enables the use of the STARTTLS command (if supported by the
+     * server) to switch the connection to a TLS-protected connection before
+     * issuing any login commands. Note that an appropriate trust store must
+     * configured so that the client will trust the server's certificate.
+     * This feature only works on J2SE 1.4 and newer systems. Default is false.
+     */
+    public Boolean getStartTLSEnable() {
+        return startTLSEnable;
+    }
+
+    /**
+     * Sets the flag that enables the use of the STARTTLS command (if
+     * supported by the server) to switch the connection to a TLS-protected
+     * connection before issuing any login commands.
+     * <p/>
+     * If true, enables the use of the STARTTLS command (if supported by the
+     * server) to switch the connection to a TLS-protected connection before
+     * issuing any login commands. Note that an appropriate trust store must
+     * configured so that the client will trust the server's certificate.
+     * This feature only works on J2SE 1.4 and newer systems. Default is false.
+     * <p/>
+     * Values that are set here will override any of the corresponding value
+     * that has been set in the properties.
+     *
+     * @param startTLSEnable the flag that enables the use of the STARTTLS command (if
+     *                       supported by the server) to switch the connection to a TLS-protected
+     *                       connection before issuing any login commands
+     */
+    public void setStartTLSEnable(Boolean startTLSEnable) {
+        this.startTLSEnable = startTLSEnable;
+    }
+
+    /**
      * Returns the submitter to use in the AUTH tag in the MAIL FROM command.
      * <p/>
      * Typically used by a mail relay to pass along information about the
@@ -692,27 +768,28 @@
     public void addOverrides(Properties props) {
         super.addOverrides(props);
 
-        if (port != null) props.put("mail.smtp.port", port);
-        if (connectionTimeout != null) props.put("mail.smtp.connectiontimeout", connectionTimeout);
-        if (timeout != null) props.put("mail.smtp.timeout", timeout);
-        if (from != null) props.put("mail.smtp.from", from);
-        if (localhost != null) props.put("mail.smtp.localhost", localhost);
-        if (localaddress != null) props.put("mail.smtp.localaddress", localaddress);
-        if (localport != null) props.put("mail.smtp.localport", localport);
-        if (ehlo != null) props.put("mail.smtp.ehlo", ehlo);
-        if (auth != null) props.put("mail.smtp.auth", auth);
-        if (submitter != null) props.put("mail.smtp.submitter", submitter);
-        if (dsnNotify != null) props.put("mail.smtp.dsn.notify", dsnNotify);
-        if (dsnRet != null) props.put("mail.smtp.dsn.ret", dsnRet);
-        if (allow8bitmime != null) props.put("mail.smtp.allow8bitmime", allow8bitmime);
-        if (sendPartial != null) props.put("mail.smtp.sendpartial", sendPartial);
-        if (saslRealm != null) props.put("mail.smtp.sasl.realm", saslRealm);
-        if (quitWait != null) props.put("mail.smtp.quitwait", quitWait);
-        if (reportSuccess != null) props.put("mail.smtp.reportsuccess", reportSuccess);
-        if (socketFactoryClass != null) props.put("mail.smtp.socketFactory.class", socketFactoryClass);
-        if (socketFactoryFallback != null) props.put("mail.smtp.socketFactory.fallback", socketFactoryFallback);
-        if (socketFactoryPort != null) props.put("mail.smtp.socketFactory.port", socketFactoryPort);
-        if (mailExtension != null) props.put("mail.smtp.mailextension", mailExtension);
+        if (port != null) props.put(SMTP_PORT, port);
+        if (connectionTimeout != null) props.put(SMTP_CONNECTION_TIMEOUT, connectionTimeout);
+        if (timeout != null) props.put(SMTP_TIMEOUT, timeout);
+        if (from != null) props.put(SMTP_FROM, from);
+        if (localhost != null) props.put(SMTP_LOCALHOST, localhost);
+        if (localaddress != null) props.put(SMTP_LOCALADDRESS, localaddress);
+        if (localport != null) props.put(SMTP_LOCALPORT, localport);
+        if (ehlo != null) props.put(SMTP_EHLO, ehlo);
+        if (auth != null) props.put(SMTP_AUTH, auth);
+        if (startTLSEnable != null) props.put(SMTP_STARTTLS_ENABLE, startTLSEnable);
+        if (submitter != null) props.put(SMTP_SUBMITTER, submitter);
+        if (dsnNotify != null) props.put(SMTP_DSN_NOTIFY, dsnNotify);
+        if (dsnRet != null) props.put(SMTP_DSN_RET, dsnRet);
+        if (allow8bitmime != null) props.put(SMTP_8BITMIME, allow8bitmime);
+        if (sendPartial != null) props.put(SMTP_SEND_PARTIAL, sendPartial);
+        if (saslRealm != null) props.put(SMTP_REALM, saslRealm);
+        if (quitWait != null) props.put(SMTP_QUITWAIT, quitWait);
+        if (reportSuccess != null) props.put(SMTP_REPORT_SUCCESS, reportSuccess);
+        if (socketFactoryClass != null) props.put(SMTP_FACTORY_CLASS, socketFactoryClass);
+        if (socketFactoryFallback != null) props.put(SMTP_FACTORY_FALLBACK, socketFactoryFallback);
+        if (socketFactoryPort != null) props.put(SMTP_FACTORY_PORT, socketFactoryPort);
+        if (mailExtension != null) props.put(SMTP_MAIL_EXTENSION, mailExtension);
     }
 
     public void doStart() throws Exception {
@@ -732,57 +809,60 @@
     static {
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(SMTPTransportGBean.class);
 
-        infoFactory.addAttribute("port", Integer.class, true);
-        infoFactory.addAttribute("connectionTimeout", Integer.class, true);
-        infoFactory.addAttribute("timeout", Integer.class, true);
-        infoFactory.addAttribute("from", String.class, true);
-        infoFactory.addAttribute("localhost", String.class, true);
-        infoFactory.addAttribute("localaddress", String.class, true);
-        infoFactory.addAttribute("localport", Integer.class, true);
-        infoFactory.addAttribute("ehlo", Boolean.class, true);
-        infoFactory.addAttribute("auth", Boolean.class, true);
-        infoFactory.addAttribute("submitter", String.class, true);
-        infoFactory.addAttribute("dsnNotify", String.class, true);
-        infoFactory.addAttribute("dsnRet", String.class, true);
-        infoFactory.addAttribute("allow8bitmime", Boolean.class, true);
-        infoFactory.addAttribute("sendPartial", Boolean.class, true);
-        infoFactory.addAttribute("saslRealm", String.class, true);
-        infoFactory.addAttribute("quitWait", Boolean.class, true);
-        infoFactory.addAttribute("reportSuccess", Boolean.class, true);
-        infoFactory.addAttribute("socketFactoryClass", String.class, true);
-        infoFactory.addAttribute("socketFactoryFallback", Boolean.class, true);
-        infoFactory.addAttribute("socketFactoryPort", Integer.class, true);
-        infoFactory.addAttribute("mailExtension", String.class, true);
-
-        infoFactory.addAttribute("objectName", String.class, false);
-        infoFactory.addAttribute("protocol", String.class, false);
-        infoFactory.addAttribute("properties", Properties.class, true);
-        infoFactory.addAttribute("host", String.class, true);
-        infoFactory.addAttribute("user", String.class, true);
-        infoFactory.addOperation("addOverrides", new Class[]{Properties.class});
-
-        infoFactory.setConstructor(new String[]{"objectName", "properties", "host", "user",
-                                                "port",
-                                                "connectionTimeout",
-                                                "timeout",
-                                                "from",
-                                                "localhost",
-                                                "localaddress",
-                                                "localport",
-                                                "ehlo",
-                                                "auth",
-                                                "submitter",
-                                                "dsnNotify",
-                                                "dsnRet",
-                                                "allow8bitmime",
-                                                "sendPartial",
-                                                "saslRealm",
-                                                "quitWait",
-                                                "reportSuccess",
-                                                "socketFactoryClass",
-                                                "socketFactoryFallback",
-                                                "socketFactoryPort",
-                                                "mailExtension"});
+        infoFactory.addAttribute(GBEAN_PORT, Integer.class, true);
+        infoFactory.addAttribute(GBEAN_CONNECTION_TIMEOUT, Integer.class, true);
+        infoFactory.addAttribute(GBEAN_TIMEOUT, Integer.class, true);
+        infoFactory.addAttribute(GBEAN_AUTH, Boolean.class, true);
+        infoFactory.addAttribute(GBEAN_STARTTLS_ENABLE, Boolean.class, true);
+        infoFactory.addAttribute(GBEAN_EHLO, Boolean.class, true);
+        infoFactory.addAttribute(GBEAN_FROM, String.class, true);
+        infoFactory.addAttribute(GBEAN_LOCALHOST, String.class, true);
+        infoFactory.addAttribute(GBEAN_LOCALADDRESS, String.class, true);
+        infoFactory.addAttribute(GBEAN_LOCALPORT, Integer.class, true);
+        infoFactory.addAttribute(GBEAN_REALM, String.class, true);
+        infoFactory.addAttribute(GBEAN_QUITWAIT, Boolean.class, true);
+        infoFactory.addAttribute(GBEAN_FACTORY_CLASS, String.class, true);
+        infoFactory.addAttribute(GBEAN_FACTORY_FALLBACK, Boolean.class, true);
+        infoFactory.addAttribute(GBEAN_FACTORY_PORT, Integer.class, true);
+
+        infoFactory.addAttribute(GBEAN_SUBMITTER, String.class, true);
+        infoFactory.addAttribute(GBEAN_DSN_NOTIFY, String.class, true);
+        infoFactory.addAttribute(GBEAN_DSN_RET, String.class, true);
+        infoFactory.addAttribute(GBEAN_8BITMIME, Boolean.class, true);
+        infoFactory.addAttribute(GBEAN_SEND_PARTIAL, Boolean.class, true);
+        infoFactory.addAttribute(GBEAN_REPORT_SUCCESS, Boolean.class, true);
+        infoFactory.addAttribute(GBEAN_MAIL_EXTENSION, String.class, true);
+
+        infoFactory.addAttribute(GBEAN_OBJECTNAME, String.class, false);
+        infoFactory.addAttribute(GBEAN_PROTOCOL, String.class, true);
+        infoFactory.addAttribute(GBEAN_PROPERTIES, Properties.class, true);
+        infoFactory.addAttribute(GBEAN_HOST, String.class, true);
+        infoFactory.addAttribute(GBEAN_USER, String.class, true);
+        infoFactory.addOperation(GBEAN_ADD_OVERRIDES, new Class[]{Properties.class});
+
+        infoFactory.setConstructor(new String[]{GBEAN_OBJECTNAME, GBEAN_PROPERTIES, GBEAN_HOST, GBEAN_USER,
+                                                GBEAN_PORT,
+                                                GBEAN_CONNECTION_TIMEOUT,
+                                                GBEAN_TIMEOUT,
+                                                GBEAN_FROM,
+                                                GBEAN_LOCALHOST,
+                                                GBEAN_LOCALADDRESS,
+                                                GBEAN_LOCALPORT,
+                                                GBEAN_EHLO,
+                                                GBEAN_AUTH,
+                                                GBEAN_STARTTLS_ENABLE,
+                                                GBEAN_SUBMITTER,
+                                                GBEAN_DSN_NOTIFY,
+                                                GBEAN_DSN_RET,
+                                                GBEAN_8BITMIME,
+                                                GBEAN_SEND_PARTIAL,
+                                                GBEAN_REALM,
+                                                GBEAN_QUITWAIT,
+                                                GBEAN_REPORT_SUCCESS,
+                                                GBEAN_FACTORY_CLASS,
+                                                GBEAN_FACTORY_FALLBACK,
+                                                GBEAN_FACTORY_PORT,
+                                                GBEAN_MAIL_EXTENSION});
 
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/server/branches/sachin/modules/geronimo-mail/src/test/java/org/apache/geronimo/mail/MailGBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-mail/src/test/java/org/apache/geronimo/mail/MailGBeanTest.java?view=diff&rev=442193&r1=442192&r2=442193
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-mail/src/test/java/org/apache/geronimo/mail/MailGBeanTest.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-mail/src/test/java/org/apache/geronimo/mail/MailGBeanTest.java Mon Sep 11 05:28:29 2006
@@ -81,7 +81,7 @@
         properties.put("mail.transport.protocol", "BEAR");
         properties.put("mail.smtp.ehlo", "true");
 
-        SMTPTransportGBean protocol = new SMTPTransportGBean("test:name=smtp", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+        SMTPTransportGBean protocol = new SMTPTransportGBean("test:name=smtp", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
         protocol.doStart();
 
         MailGBean mail = new MailGBean("test:name=mail", Collections.singleton(protocol), Boolean.TRUE, properties, null, "test", "test", null, null, null);

Modified: geronimo/server/branches/sachin/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/ConnectorGBean.java?view=diff&rev=442193&r1=442192&r2=442193
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/ConnectorGBean.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/ConnectorGBean.java Mon Sep 11 05:28:29 2006
@@ -456,6 +456,118 @@
         connector.setAttribute("useBodyEncodingForURI", new Boolean(enabled));
     }
 
+    public void setAllowTrace(boolean allow) {
+        connector.setAllowTrace(allow);
+    }
+
+    public boolean getAllowTrace() {
+        return connector.getAllowTrace();
+    }
+
+    public void setProxyName(String proxyName) {
+        connector.setProxyName(proxyName);
+    }
+
+    public String getProxyName() {
+        return connector.getProxyName();
+    }
+
+    public void setProxyPort(int port) {
+        connector.setProxyPort(port);
+    }
+
+    public int getProxyPort() {
+        return connector.getProxyPort();
+    }
+
+    public void setScheme(String scheme) {
+        connector.setScheme(scheme);
+    }
+
+    public String getSceme() {
+        return connector.getScheme();
+    }
+
+    public void setUriEncoding(String encoding) {
+        connector.setURIEncoding(encoding);
+    }
+
+    public String getUriEncoding() {
+        return connector.getURIEncoding();
+    }
+
+    public void setUseIPVHosts(boolean useIPVHosts) {
+        connector.setUseIPVHosts(useIPVHosts);
+    }
+
+    public boolean getUseIPVHosts() {
+        return connector.getUseIPVHosts();
+    }
+
+    public void setXpoweredBy(boolean xpoweredBy) {
+        connector.setXpoweredBy(xpoweredBy);
+    }
+
+    public boolean getXpoweredBy() {
+        return connector.getXpoweredBy();
+    }
+
+    public void setCompressableMimeType(String compressableMimeType) {
+        connector.setAttribute("compressableMimeType", compressableMimeType);
+    }
+
+    public String getCompressableMimeType() {
+        return (String) connector.getAttribute("compressableMimeType");
+    }
+
+    public void setCompression(String compression) {
+        connector.setAttribute("compression", compression);
+    }
+
+    public String getCompression() {
+        return (String) connector.getAttribute("compression");
+    }
+
+    public void setNoCompressionUserAgents(String noCompressionUserAgents) {
+        connector.setAttribute("noCompressionUserAgents", noCompressionUserAgents);
+    }
+
+    public String getNoCompressionUserAgents() {
+        return (String) connector.getAttribute("noCompressionUserAgents");
+    }
+
+    public void setRestrictedUserAgents(String restrictedUserAgents) {
+        connector.setAttribute("restrictedUserAgents", restrictedUserAgents);
+    }
+
+    public String getRestrictedUserAgents() {
+        return (String) connector.getAttribute("restrictedUserAgents");
+    }
+
+    public void setThreadPriority(int threadPriority) {
+        connector.setAttribute("threadPriority", new Integer(threadPriority));
+    }
+
+    public int getThreadPriority() {
+        Object value = connector.getAttribute("threadPriority");
+        return Integer.parseInt(value.toString());
+    }
+
+    public void setServer(String server) {
+        connector.setAttribute("server", server);
+    }
+
+    public String getServer() {
+        return (String) connector.getAttribute("server");
+    }
+
+    public void setStrategy(String strategy) {
+        connector.setAttribute("strategy", strategy);
+    }
+
+    public String getStrategy() {
+        return (String) connector.getAttribute("strategy");
+    }
 
     public static final GBeanInfo GBEAN_INFO;
 
@@ -465,8 +577,51 @@
         infoFactory.addAttribute("protocol", String.class, true);
         infoFactory.addReference(CONNECTOR_CONTAINER_REFERENCE, TomcatContainer.class, NameFactory.GERONIMO_SERVICE);
         infoFactory.addOperation("getInternalObject");
-        infoFactory.addInterface(TomcatWebConnector.class, new String[]{"host","port","bufferSizeBytes","maxThreads","acceptQueueSize","lingerMillis","tcpNoDelay","redirectPort","minSpareThreads","maxSpareThreads","maxHttpHeaderSizeBytes","hostLookupEnabled","connectionTimeoutMillis","uploadTimeoutEnabled","connectUrl","maxPostSize","maxSavePostSize","emptySessionPath", "maxKeepAliveRequests", "socketBuffer", "useBodyEncodingForURI"},
-                                                           new String[]{"host","port","redirectPort","maxThreads"});
+        infoFactory.addInterface(TomcatWebConnector.class,
+                new String[]{
+                        "host",
+                        "port",
+                        "bufferSizeBytes",
+                        "maxThreads",
+                        "acceptQueueSize",
+                        "lingerMillis",
+                        "tcpNoDelay",
+                        "redirectPort",
+                        "minSpareThreads",
+                        "maxSpareThreads",
+                        "maxHttpHeaderSizeBytes",
+                        "hostLookupEnabled",
+                        "connectionTimeoutMillis",
+                        "uploadTimeoutEnabled",
+                        "connectUrl",
+                        "maxPostSize",
+                        "maxSavePostSize",
+                        "emptySessionPath",
+                        "maxKeepAliveRequests",
+                        "socketBuffer",
+                        "useBodyEncodingForURI",
+                        "allowTrace",
+                        "proxyName",
+                        "proxyPort",
+                        "scheme",
+                        "secure",
+                        "uriEncoding",
+                        "useIPVHosts",
+                        "xpoweredBy",
+                        "compressableMimeType",
+                        "compression",
+                        "noCompressionUserAgents",
+                        "restrictedUserAgents",
+                        "threadPriority",
+                        "server",
+                        "strategy"
+                },
+
+                new String[]{
+                        "host",
+                        "port",
+                        "redirectPort",
+                        "maxThreads"});
         infoFactory.setConstructor(new String[] { "name", "protocol", "host", "port", "TomcatContainer"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/server/branches/sachin/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java?view=diff&rev=442193&r1=442192&r2=442193
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java Mon Sep 11 05:28:29 2006
@@ -191,6 +191,22 @@
         connector.setAttribute("clientAuth", new Boolean(clientCert));
     }
 
+    /**
+     * Gets a comma seperated list of the encryption ciphers that may be used. If not
+     * specified, then any available cipher may be used.
+     */
+     public String getCiphers() {
+        return (String)connector.getAttribute("ciphers");
+    }
+
+    /**
+     * Sets a comma seperated list of the encryption ciphers that may be used. If not
+     * specified, then any available cipher may be used.
+     */
+     public void setCiphers(String ciphers) {
+        connector.setAttribute("ciphers", ciphers);
+    }
+
     public static final GBeanInfo GBEAN_INFO;
 
     static {
@@ -206,6 +222,7 @@
         infoFactory.addAttribute("keystoreType", String.class, true, true);
         infoFactory.addAttribute("truststoreType", String.class, true, true);
         infoFactory.addAttribute("clientAuthRequired", boolean.class, true, true);
+        infoFactory.addAttribute("ciphers", String.class, true, true);
         infoFactory.addInterface(TomcatSecureConnector.class);
 
         infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");

Modified: geronimo/server/branches/sachin/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatSecureConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatSecureConnector.java?view=diff&rev=442193&r1=442192&r2=442193
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatSecureConnector.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatSecureConnector.java Mon Sep 11 05:28:29 2006
@@ -50,4 +50,16 @@
      * PCKS12 (and possibly other formats).
      */
     public void setTruststoreType(String type);
+
+    /**
+     * Gets a comma seperated list of the encryption ciphers that may be used. If not
+     * specified, then any available cipher may be used.
+     */
+    public String getCiphers();
+
+    /**
+     * Sets a comma seperated list of the encryption ciphers that may be used. If not
+     * specified, then any available cipher may be used.
+     */
+    public void setCiphers(String ciphers);
 }

Modified: geronimo/server/branches/sachin/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatWebConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatWebConnector.java?view=diff&rev=442193&r1=442192&r2=442193
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatWebConnector.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatWebConnector.java Mon Sep 11 05:28:29 2006
@@ -34,4 +34,32 @@
     public void setUseBodyEncodingForURI(boolean enabled);
     public int getMaxKeepAliveRequests();
     public void setMaxKeepAliveRequests(int maxKeepAliveRequests);
+    public void setAllowTrace(boolean allow);
+    public boolean getAllowTrace();
+    public void setProxyName(String proxyName);
+    public String getProxyName();
+    public void setProxyPort(int port);
+    public int getProxyPort();
+    public void setScheme(String scheme);
+    public String getSceme();
+    public void setUriEncoding(String scheme);
+    public String getUriEncoding();
+    public void setUseIPVHosts(boolean useIPVHosts);
+    public boolean getUseIPVHosts();
+    public void setXpoweredBy(boolean xpoweredBy);
+    public boolean getXpoweredBy();
+    public void setCompressableMimeType(String compressableMimeType);
+    public String getCompressableMimeType();
+    public void setCompression(String compression);
+    public String getCompression();
+    public void setNoCompressionUserAgents(String noRestrictedUserAgents);
+    public String getNoCompressionUserAgents();
+    public void setRestrictedUserAgents(String noRestrictedUserAgents);
+    public String getRestrictedUserAgents();
+    public void setThreadPriority(int threadPriority);
+    public int getThreadPriority();
+    public void setServer(String server);
+    public String getServer();
+    public void setStrategy(String strategy);
+    public String getStrategy();
 }

Propchange: geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 11 05:28:29 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Propchange: geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-ejb-j2ee_1.3/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 11 05:28:29 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Propchange: geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 11 05:28:29 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Propchange: geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 11 05:28:29 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Propchange: geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 11 05:28:29 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Propchange: geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 11 05:28:29 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Propchange: geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 11 05:28:29 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Propchange: geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 11 05:28:29 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target

Propchange: geronimo/server/branches/sachin/testsupport/testsupport-common/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 11 05:28:29 2006
@@ -0,0 +1,6 @@
+*.iml
+.project
+.classpath
+maven.log
+junit*.properties
+target



Mime
View raw message