Author: adc Date: Wed Jan 5 06:31:44 2005 New Revision: 124213 URL: http://svn.apache.org/viewcvs?view=rev&rev=124213 Log: Updated to reflect new GBean capabilities. Modified: geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/IMAPStoreGBean.java geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/MailGBean.java geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/POP3StoreGBean.java geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/ProtocolGBean.java geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/SMTPTransportGBean.java
Modified: geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/IMAPStoreGBean.java Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/IMAPStoreGBean.java?view=diff&rev=124213&p1=geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/IMAPStoreGBean.java&r1=124212&p2=geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/IMAPStoreGBean.java&r2=124213 ============================================================================== --- geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/IMAPStoreGBean.java (original) +++ geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/IMAPStoreGBean.java Wed Jan 5 06:31:44 2005 @@ -21,7 +21,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.geronimo.gbean.GAttributeInfo; import org.apache.geronimo.gbean.GBeanInfo; import org.apache.geronimo.gbean.GBeanInfoBuilder; import org.apache.geronimo.gbean.WaitingException; @@ -768,28 +767,28 @@ static { GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(IMAPStoreGBean.class, ProtocolGBean.GBEAN_INFO); - infoFactory.addAttribute(new GAttributeInfo("port", Integer.class.getName(), true, "getPort", "setPort")); - infoFactory.addAttribute(new GAttributeInfo("partialFetch", Boolean.class.getName(), true, "getPartialFetch", "setPartialFetch")); - infoFactory.addAttribute(new GAttributeInfo("fetchSize", Integer.class.getName(), true, "getFetchSize", "setFetchSize")); - infoFactory.addAttribute(new GAttributeInfo("connectionTimeout", Integer.class.getName(), true, "getConnectionTimeout", "setConnectionTimeout")); - infoFactory.addAttribute(new GAttributeInfo("timeout", Integer.class.getName(), true, "getTimeout", "setTimeout")); - infoFactory.addAttribute(new GAttributeInfo("statusCacheTimeout", Integer.class.getName(), true, "getStatusCacheTimeout", "setStatusCacheTimeout")); - infoFactory.addAttribute(new GAttributeInfo("appendBufferSize", Integer.class.getName(), true, "getAppendBufferSize", "setAppendBufferSize")); - infoFactory.addAttribute(new GAttributeInfo("connectionPoolSize", Integer.class.getName(), true, "getConnectionPoolSize", "setConnectionPoolSize")); - infoFactory.addAttribute(new GAttributeInfo("connectionPoolTimeout", Integer.class.getName(), true, "getConnectionPoolTimeout", "setConnectionPoolTimeout")); - infoFactory.addAttribute(new GAttributeInfo("separateStoreConnection", Boolean.class.getName(), true, "getSeparateStoreConnection", "setSeparateStoreConnection")); - infoFactory.addAttribute(new GAttributeInfo("allowReadOnlySelect", Boolean.class.getName(), true, "getAllowReadOnlySelect", "setAllowReadOnlySelect")); - infoFactory.addAttribute(new GAttributeInfo("authLoginDisable", Boolean.class.getName(), true, "getAuthLoginDisable", "setAuthLoginDisable")); - infoFactory.addAttribute(new GAttributeInfo("authPlainDisable", Boolean.class.getName(), true, "getAuthPlainDisable", "setAuthPlainDisable")); - infoFactory.addAttribute(new GAttributeInfo("startTLSEnable", Boolean.class.getName(), true, "getStartTLSEnable", "setStartTLSEnable")); - infoFactory.addAttribute(new GAttributeInfo("localaddress", String.class.getName(), true, "getLocaladdress", "setLocaladdress")); - infoFactory.addAttribute(new GAttributeInfo("localport", Integer.class.getName(), true, "getLocalport", "setLocalport")); - infoFactory.addAttribute(new GAttributeInfo("saslEnable", Boolean.class.getName(), true, "getSaslEnable", "setSaslEnable")); - infoFactory.addAttribute(new GAttributeInfo("saslMechanisms", String.class.getName(), true, "getSaslMechanisms", "setSaslMechanisms")); - infoFactory.addAttribute(new GAttributeInfo("saslAuthorizationId", String.class.getName(), true, "getSaslAuthorizationId", "setSaslAuthorizationId")); - infoFactory.addAttribute(new GAttributeInfo("socketFactoryClass", String.class.getName(), true, "getSocketFactoryClass", "setSocketFactoryClass")); - infoFactory.addAttribute(new GAttributeInfo("socketFactoryFallback", Boolean.class.getName(), true, "getSocketFactoryFallback", "setSocketFactoryFallback")); - infoFactory.addAttribute(new GAttributeInfo("socketFactoryPort", Integer.class.getName(), true, "getSocketFactoryPort", "setSocketFactoryPort")); + 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", Modified: geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/MailGBean.java Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/MailGBean.java?view=diff&rev=124213&p1=geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/MailGBean.java&r1=124212&p2=geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/MailGBean.java&r2=124213 ============================================================================== --- geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/MailGBean.java (original) +++ geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/MailGBean.java Wed Jan 5 06:31:44 2005 @@ -25,7 +25,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.geronimo.gbean.GAttributeInfo; import org.apache.geronimo.gbean.GBeanInfo; import org.apache.geronimo.gbean.GBeanInfoBuilder; import org.apache.geronimo.gbean.GBeanLifecycle; @@ -351,16 +350,16 @@ static { GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(MailGBean.class); - infoFactory.addAttribute(new GAttributeInfo("objectName", String.class.getName(), false, "getObjectName", null)); + infoFactory.addAttribute("objectName", String.class, false); infoFactory.addReference("Protocols", ProtocolGBean.class); - infoFactory.addAttribute(new GAttributeInfo("useDefault", Boolean.class.getName(), true, "getUseDefault", "setUseDefault")); - infoFactory.addAttribute(new GAttributeInfo("properties", Properties.class.getName(), true, "getProperties", "setProperties")); + infoFactory.addAttribute("useDefault", Boolean.class, true); + infoFactory.addAttribute("properties", Properties.class, true); infoFactory.addReference("Authenticator", Authenticator.class); - infoFactory.addAttribute(new GAttributeInfo("storeProtocol", String.class.getName(), true, "getStoreProtocol", "setStoreProtocol")); - infoFactory.addAttribute(new GAttributeInfo("transportProtocol", String.class.getName(), true, "getTransportProtocol", "setTransportProtocol")); - infoFactory.addAttribute(new GAttributeInfo("host", String.class.getName(), true, "getHost", "setHost")); - infoFactory.addAttribute(new GAttributeInfo("user", String.class.getName(), true, "getUser", "setUser")); - infoFactory.addAttribute(new GAttributeInfo("debug", Boolean.class.getName(), true, "isDebug", "setDebug")); + infoFactory.addAttribute("storeProtocol", String.class, true); + infoFactory.addAttribute("transportProtocol", String.class, true); + infoFactory.addAttribute("host", String.class, true); + infoFactory.addAttribute("user", String.class, true); + infoFactory.addAttribute("debug", Boolean.class, true); infoFactory.addOperation("$getResource"); infoFactory.addOperation("getProtocols"); Modified: geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/POP3StoreGBean.java Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/POP3StoreGBean.java?view=diff&rev=124213&p1=geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/POP3StoreGBean.java&r1=124212&p2=geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/POP3StoreGBean.java&r2=124213 ============================================================================== --- geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/POP3StoreGBean.java (original) +++ geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/POP3StoreGBean.java Wed Jan 5 06:31:44 2005 @@ -21,7 +21,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.geronimo.gbean.GAttributeInfo; import org.apache.geronimo.gbean.GBeanInfo; import org.apache.geronimo.gbean.GBeanInfoBuilder; import org.apache.geronimo.gbean.WaitingException; @@ -430,17 +429,17 @@ static { GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(POP3StoreGBean.class, ProtocolGBean.GBEAN_INFO); - infoFactory.addAttribute(new GAttributeInfo("port", Integer.class.getName(), true, "getPort", "setPort")); - infoFactory.addAttribute(new GAttributeInfo("connectionTimeout", Integer.class.getName(), true, "getConnectionTimeout", "setConnectionTimeout")); - infoFactory.addAttribute(new GAttributeInfo("timeout", Integer.class.getName(), true, "getTimeout", "setTimeout")); - infoFactory.addAttribute(new GAttributeInfo("rsetBeforeQuit", Boolean.class.getName(), true, "getRsetBeforeQuit", "setRsetBeforeQuit")); - infoFactory.addAttribute(new GAttributeInfo("messageClass", String.class.getName(), true, "getMessageClass", "setMessageClass")); - infoFactory.addAttribute(new GAttributeInfo("localaddress", String.class.getName(), true, "getLocaladdress", "setLocaladdress")); - infoFactory.addAttribute(new GAttributeInfo("localport", Integer.class.getName(), true, "getLocalport", "setLocalport")); - infoFactory.addAttribute(new GAttributeInfo("apopEnable", Boolean.class.getName(), true, "getApopEnable", "setApopEnable")); - infoFactory.addAttribute(new GAttributeInfo("socketFactoryClass", String.class.getName(), true, "getSocketFactoryClass", "setSocketFactoryClass")); - infoFactory.addAttribute(new GAttributeInfo("socketFactoryFallback", Boolean.class.getName(), true, "getSocketFactoryFallback", "setSocketFactoryFallback")); - infoFactory.addAttribute(new GAttributeInfo("socketFactoryPort", Integer.class.getName(), true, "getSocketFactoryPort", "setSocketFactoryPort")); + 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", Modified: geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/ProtocolGBean.java Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/ProtocolGBean.java?view=diff&rev=124213&p1=geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/ProtocolGBean.java&r1=124212&p2=geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/ProtocolGBean.java&r2=124213 ============================================================================== --- geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/ProtocolGBean.java (original) +++ geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/ProtocolGBean.java Wed Jan 5 06:31:44 2005 @@ -21,7 +21,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.geronimo.gbean.GAttributeInfo; import org.apache.geronimo.gbean.GBeanInfo; import org.apache.geronimo.gbean.GBeanInfoBuilder; import org.apache.geronimo.gbean.GBeanLifecycle; @@ -170,11 +169,11 @@ static { GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ProtocolGBean.class); - infoFactory.addAttribute(new GAttributeInfo("objectName", String.class.getName(), false, "getObjectName", null)); - infoFactory.addAttribute(new GAttributeInfo("protocol", String.class.getName(), true, "getProtocol", null)); - infoFactory.addAttribute(new GAttributeInfo("properties", Properties.class.getName(), true, "getProperties", "setProperties")); - infoFactory.addAttribute(new GAttributeInfo("host", String.class.getName(), true, "getHost", "setHost")); - infoFactory.addAttribute(new GAttributeInfo("user", String.class.getName(), true, "getUser", "setUser")); + 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.setConstructor(new String[]{"objectName", "protocol", "properties", "host", "user"}); Modified: geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/SMTPTransportGBean.java Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/SMTPTransportGBean.java?view=diff&rev=124213&p1=geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/SMTPTransportGBean.java&r1=124212&p2=geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/SMTPTransportGBean.java&r2=124213 ============================================================================== --- geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/SMTPTransportGBean.java (original) +++ geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/SMTPTransportGBean.java Wed Jan 5 06:31:44 2005 @@ -21,7 +21,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.geronimo.gbean.GAttributeInfo; import org.apache.geronimo.gbean.GBeanInfo; import org.apache.geronimo.gbean.GBeanInfoBuilder; import org.apache.geronimo.gbean.WaitingException; @@ -735,27 +734,27 @@ static { GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(SMTPTransportGBean.class, ProtocolGBean.GBEAN_INFO); - infoFactory.addAttribute(new GAttributeInfo("port", Integer.class.getName(), true, "getPort", "setPort")); - infoFactory.addAttribute(new GAttributeInfo("connectionTimeout", Integer.class.getName(), true, "getConnectionTimeout", "setConnectionTimeout")); - infoFactory.addAttribute(new GAttributeInfo("timeout", Integer.class.getName(), true, "getTimeout", "setTimeout")); - infoFactory.addAttribute(new GAttributeInfo("from", String.class.getName(), true, "getFrom", "setFrom")); - infoFactory.addAttribute(new GAttributeInfo("localhost", String.class.getName(), true, "getLocalhost", "setLocalhost")); - infoFactory.addAttribute(new GAttributeInfo("localaddress", String.class.getName(), true, "getLocaladdress", "setLocaladdress")); - infoFactory.addAttribute(new GAttributeInfo("localport", Integer.class.getName(), true, "getLocalport", "setLocalport")); - infoFactory.addAttribute(new GAttributeInfo("ehlo", Boolean.class.getName(), true, "getEhlo", "setEhlo")); - infoFactory.addAttribute(new GAttributeInfo("auth", Boolean.class.getName(), true, "getAuth", "setAuth")); - infoFactory.addAttribute(new GAttributeInfo("submitter", String.class.getName(), true, "getSubmitter", "setSubmitter")); - infoFactory.addAttribute(new GAttributeInfo("dsnNotify", String.class.getName(), true, "getDsnNotify", "setDsnNotify")); - infoFactory.addAttribute(new GAttributeInfo("dsnRet", String.class.getName(), true, "getDsnRet", "setDsnRet")); - infoFactory.addAttribute(new GAttributeInfo("allow8bitmime", Boolean.class.getName(), true, "getAllow8bitmime", "setAllow8bitmime")); - infoFactory.addAttribute(new GAttributeInfo("sendPartial", Boolean.class.getName(), true, "getSendPartial", "setSendPartial")); - infoFactory.addAttribute(new GAttributeInfo("saslRealm", String.class.getName(), true, "getSaslRealm", "setSaslRealm")); - infoFactory.addAttribute(new GAttributeInfo("quitWait", Boolean.class.getName(), true, "getQuitWait", "setQuitWait")); - infoFactory.addAttribute(new GAttributeInfo("reportSuccess", Boolean.class.getName(), true, "getReportSuccess", "setReportSuccess")); - infoFactory.addAttribute(new GAttributeInfo("socketFactoryClass", String.class.getName(), true, "getSocketFactoryClass", "setSocketFactoryClass")); - infoFactory.addAttribute(new GAttributeInfo("socketFactoryFallback", Boolean.class.getName(), true, "getSocketFactoryFallback", "setSocketFactoryFallback")); - infoFactory.addAttribute(new GAttributeInfo("socketFactoryPort", Integer.class.getName(), true, "getSocketFactoryPort", "setSocketFactoryPort")); - infoFactory.addAttribute(new GAttributeInfo("mailExtension", String.class.getName(), true, "getMailExtension", "setMailExtension")); + 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.setConstructor(new String[]{"objectName", "properties", "host", "user", "port",
