Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 11547 invoked from network); 30 May 2004 18:14:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 30 May 2004 18:14:58 -0000 Received: (qmail 73278 invoked by uid 500); 30 May 2004 18:14:56 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 73258 invoked by uid 500); 30 May 2004 18:14:56 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: dev@geronimo.apache.org Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 73244 invoked by uid 500); 30 May 2004 18:14:56 -0000 Delivered-To: apmail-incubator-geronimo-cvs@apache.org Received: (qmail 73241 invoked by uid 99); 30 May 2004 18:14:56 -0000 Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Sun, 30 May 2004 11:14:55 -0700 Received: (qmail 11523 invoked by uid 1712); 30 May 2004 18:14:55 -0000 Date: 30 May 2004 18:14:55 -0000 Message-ID: <20040530181455.11522.qmail@minotaur.apache.org> From: djencks@apache.org To: incubator-geronimo-cvs@apache.org Subject: cvs commit: incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment RAR_1_0ConfigBuilder.java RAR_1_5ConfigBuilder.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N djencks 2004/05/30 11:14:55 Modified: modules/connector/src/java/org/apache/geronimo/connector/deployment RAR_1_0ConfigBuilder.java RAR_1_5ConfigBuilder.java Log: remove unnecessary existence checks (element required by schema) Revision Changes Path 1.8 +4 -7 incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilder.java Index: RAR_1_0ConfigBuilder.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilder.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- RAR_1_0ConfigBuilder.java 6 May 2004 03:58:22 -0000 1.7 +++ RAR_1_0ConfigBuilder.java 30 May 2004 18:14:55 -0000 1.8 @@ -159,19 +159,16 @@ return gbean; } -//ManagedConnectionFactories are extremely restricted as to the attribute types. + //ManagedConnectionFactories are extremely restricted as to the attribute types. private void setDynamicAttributes(GBeanMBean gBean, ConfigPropertyType[] configProperties, GerConfigPropertySettingType[] configPropertySettings) throws DeploymentException, ReflectionException, MBeanException, InvalidAttributeValueException, AttributeNotFoundException { for (int i = 0; i < configProperties.length; i++) { ConfigPropertyType configProperty = configProperties[i]; - if (configProperty.getConfigPropertyType() == null) { - continue; - } Object value; try { PropertyEditor editor = PropertyEditors.findEditor(configProperty.getConfigPropertyType().getStringValue()); String valueString = null; if (editor != null) { -//look for explicit value setting + //look for explicit value setting for (int j = 0; j < configPropertySettings.length; j++) { GerConfigPropertySettingType configPropertySetting = configPropertySettings[j]; if (configPropertySetting.getName().equals(configProperty.getConfigPropertyName().getStringValue())) { @@ -179,7 +176,7 @@ break; } } -//look for default value + //look for default value if (valueString == null) { if (configProperty.getConfigPropertyValue() != null) { valueString = configProperty.getConfigPropertyValue().getStringValue(); 1.13 +5 -8 incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RAR_1_5ConfigBuilder.java Index: RAR_1_5ConfigBuilder.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RAR_1_5ConfigBuilder.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- RAR_1_5ConfigBuilder.java 29 May 2004 05:13:52 -0000 1.12 +++ RAR_1_5ConfigBuilder.java 30 May 2004 18:14:55 -0000 1.13 @@ -239,19 +239,16 @@ return gbean; } -//ManagedConnectionFactories are extremely restricted as to the attribute types. + //ManagedConnectionFactories are extremely restricted as to the attribute types. private void setDynamicAttributes(GBeanMBean gBean, ConfigPropertyType[] configProperties, GerConfigPropertySettingType[] configPropertySettings) throws DeploymentException, ReflectionException, MBeanException, InvalidAttributeValueException, AttributeNotFoundException { for (int i = 0; i < configProperties.length; i++) { ConfigPropertyType configProperty = configProperties[i]; - if (configProperty.getConfigPropertyValue() == null) { - continue; - } Object value; try { PropertyEditor editor = PropertyEditors.findEditor(configProperty.getConfigPropertyType().getStringValue()); String valueString = null; if (editor != null) { -//look for explicit value setting + //look for explicit value setting for (int j = 0; j < configPropertySettings.length; j++) { GerConfigPropertySettingType configPropertySetting = configPropertySettings[j]; if (configPropertySetting.getName().equals(configProperty.getConfigPropertyName().getStringValue())) { @@ -259,7 +256,7 @@ break; } } -//look for default value + //look for default value if (valueString == null) { if (configProperty.getConfigPropertyValue() != null) { valueString = configProperty.getConfigPropertyValue().getStringValue(); @@ -271,7 +268,7 @@ gBean.setAttribute(configProperty.getConfigPropertyName().getStringValue(), value); } } else { - throw new DeploymentException("No property editor for type: " + configProperty.getConfigPropertyType()); + throw new DeploymentException("No property editor for type: " + configProperty.getConfigPropertyType().getStringValue()); } } catch (ClassNotFoundException e) { throw new DeploymentException("Could not load attribute class: attribute: " + configProperty.getConfigPropertyName() + ", type: " + configProperty.getConfigPropertyType(), e);