diff -uNr ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1.iml ./commons-dbcp-1.2.1.iml
--- ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1.iml	1970-01-01 08:00:00.000000000 +0800
+++ ./commons-dbcp-1.2.1.iml	2009-01-14 17:42:00.000000000 +0800
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff -uNr ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1.ipr ./commons-dbcp-1.2.1.ipr
--- ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1.ipr	1970-01-01 08:00:00.000000000 +0800
+++ ./commons-dbcp-1.2.1.ipr	2009-01-09 23:08:08.000000000 +0800
@@ -0,0 +1,328 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project relativePaths="false" version="4">
+  <component name="AntConfiguration">
+    <defaultAnt bundledAnt="true" />
+  </component>
+  <component name="BuildJarProjectSettings">
+    <option name="BUILD_JARS_ON_MAKE" value="false" />
+  </component>
+  <component name="CCaseConfig">
+    <option name="checkoutReserved" value="false" />
+    <option name="markExternalChangeAsUpToDate" value="true" />
+    <option name="checkInUseHijack" value="true" />
+    <option name="useUcmModel" value="true" />
+    <option name="isOffline" value="false" />
+    <option name="synchOutside" value="false" />
+    <option name="isHistoryResticted" value="true" />
+    <option name="useIdenticalSwitch" value="true" />
+    <option name="synchActivitiesOnRefresh" value="true" />
+    <option name="lastScr" value="" />
+    <option name="scrTextFileName" value="" />
+    <option name="historyRevisionsNumber" value="4" />
+  </component>
+  <component name="CodeStyleProjectProfileManger">
+    <option name="PROJECT_PROFILE" />
+    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+  </component>
+  <component name="CodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS" />
+    <option name="USE_PER_PROJECT_SETTINGS" value="false" />
+  </component>
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+    <option name="DEPLOY_AFTER_MAKE" value="0" />
+    <resourceExtensions>
+      <entry name=".+\.(properties|xml|html|dtd|tld)" />
+      <entry name=".+\.(gif|png|jpeg|jpg)" />
+    </resourceExtensions>
+    <wildcardResourcePatterns>
+      <entry name="?*.properties" />
+      <entry name="?*.xml" />
+      <entry name="?*.gif" />
+      <entry name="?*.png" />
+      <entry name="?*.jpeg" />
+      <entry name="?*.jpg" />
+      <entry name="?*.html" />
+      <entry name="?*.dtd" />
+      <entry name="?*.tld" />
+    </wildcardResourcePatterns>
+  </component>
+  <component name="DependenciesAnalyzeManager">
+    <option name="myForwardDirection" value="false" />
+  </component>
+  <component name="DependencyValidationManager">
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </component>
+  <component name="EclipseCompilerSettings">
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="true" />
+    <option name="DEPRECATION" value="false" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+    <option name="MAXIMUM_HEAP_SIZE" value="128" />
+  </component>
+  <component name="EclipseEmbeddedCompilerSettings">
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="true" />
+    <option name="DEPRECATION" value="false" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+    <option name="MAXIMUM_HEAP_SIZE" value="128" />
+  </component>
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
+  <component name="ErrorTreeViewConfiguration">
+    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+    <option name="HIDE_WARNINGS" value="false" />
+  </component>
+  <component name="HierarchyBrowserManager">
+    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+    <option name="SORT_ALPHABETICALLY" value="false" />
+    <option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" />
+  </component>
+  <component name="IdProvider" IDEtalkID="C6A49ECD75ED7164A26CE3371D004C3B" />
+  <component name="InspectionProjectProfileManager">
+    <option name="PROJECT_PROFILE" value="Project Default" />
+    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+    <scopes />
+    <profiles>
+      <profile version="1.0" is_locked="false">
+        <option name="myName" value="Project Default" />
+        <option name="myLocal" value="false" />
+      </profile>
+    </profiles>
+    <list size="0" />
+  </component>
+  <component name="JavacSettings">
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="false" />
+    <option name="DEPRECATION" value="true" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+    <option name="MAXIMUM_HEAP_SIZE" value="128" />
+  </component>
+  <component name="JavadocGenerationManager">
+    <option name="OUTPUT_DIRECTORY" />
+    <option name="OPTION_SCOPE" value="protected" />
+    <option name="OPTION_HIERARCHY" value="true" />
+    <option name="OPTION_NAVIGATOR" value="true" />
+    <option name="OPTION_INDEX" value="true" />
+    <option name="OPTION_SEPARATE_INDEX" value="true" />
+    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
+    <option name="OPTION_DEPRECATED_LIST" value="true" />
+    <option name="OTHER_OPTIONS" value="" />
+    <option name="HEAP_SIZE" />
+    <option name="LOCALE" />
+    <option name="OPEN_IN_BROWSER" value="true" />
+  </component>
+  <component name="JikesSettings">
+    <option name="JIKES_PATH" value="" />
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="DEPRECATION" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="false" />
+    <option name="IS_EMACS_ERRORS_MODE" value="true" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+  </component>
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+  <component name="ProjectDetails">
+    <option name="projectName" value="commons-dbcp-1.2.1" />
+  </component>
+  <component name="ProjectFileVersion" converted="true" />
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/commons-dbcp-1.2.1.iml" filepath="$PROJECT_DIR$/commons-dbcp-1.2.1.iml" />
+    </modules>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6 (1)" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+  <component name="ResourceManagerContainer">
+    <option name="myResourceBundles">
+      <value>
+        <list size="0" />
+      </value>
+    </option>
+  </component>
+  <component name="RmicSettings">
+    <option name="IS_EANABLED" value="false" />
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="false" />
+    <option name="GENERATE_IIOP_STUBS" value="false" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+  </component>
+  <component name="StarteamConfiguration">
+    <option name="SERVER" value="" />
+    <option name="PORT" value="49201" />
+    <option name="USER" value="" />
+    <option name="PASSWORD" value="" />
+    <option name="PROJECT" value="" />
+    <option name="VIEW" value="" />
+    <option name="ALTERNATIVE_WORKING_PATH" value="" />
+    <option name="LOCK_ON_CHECKOUT" value="false" />
+    <option name="UNLOCK_ON_CHECKIN" value="false" />
+  </component>
+  <component name="SvnBranchConfigurationManager">
+    <option name="myVersion" value="124" />
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="" />
+  </component>
+  <component name="VssConfiguration">
+    <option name="CLIENT_PATH" value="" />
+    <option name="SRCSAFEINI_PATH" value="" />
+    <option name="USER_NAME" value="" />
+    <option name="PWD" value="" />
+    <CheckoutOptions>
+      <option name="COMMENT" value="" />
+      <option name="DO_NOT_GET_LATEST_VERSION" value="false" />
+      <option name="REPLACE_WRITABLE" value="false" />
+      <option name="RECURSIVE" value="false" />
+    </CheckoutOptions>
+    <CheckinOptions>
+      <option name="COMMENT" value="" />
+      <option name="KEEP_CHECKED_OUT" value="false" />
+      <option name="RECURSIVE" value="false" />
+    </CheckinOptions>
+    <AddOptions>
+      <option name="STORE_ONLY_LATEST_VERSION" value="false" />
+      <option name="CHECK_OUT_IMMEDIATELY" value="false" />
+    </AddOptions>
+    <UndocheckoutOptions>
+      <option name="MAKE_WRITABLE" value="false" />
+      <option name="REPLACE_LOCAL_COPY" value="2" />
+      <option name="RECURSIVE" value="false" />
+    </UndocheckoutOptions>
+    <GetOptions>
+      <option name="REPLACE_WRITABLE" value="0" />
+      <option name="MAKE_WRITABLE" value="false" />
+      <option name="ANSWER_NEGATIVELY" value="false" />
+      <option name="ANSWER_POSITIVELY" value="false" />
+      <option name="RECURSIVE" value="false" />
+      <option name="VERSION" />
+    </GetOptions>
+  </component>
+  <component name="WebServicesPlugin" addRequiredLibraries="true" />
+</project>
+
diff -uNr ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1.iws ./commons-dbcp-1.2.1.iws
--- ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1.iws	1970-01-01 08:00:00.000000000 +0800
+++ ./commons-dbcp-1.2.1.iws	2009-01-14 17:54:25.000000000 +0800
@@ -0,0 +1,684 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project relativePaths="false" version="4">
+  <component name="ChangeListManager">
+    <list default="true" name="Default" comment="" />
+    <ignored path="commons-dbcp-1.2.1.iws" />
+    <ignored path=".idea/workspace.xml" />
+  </component>
+  <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
+  <component name="Commander">
+    <leftPanel />
+    <rightPanel />
+    <splitter proportion="0.5" />
+  </component>
+  <component name="CreatePatchCommitExecutor">
+    <option name="PATCH_PATH" value="" />
+    <option name="REVERSE_PATCH" value="false" />
+  </component>
+  <component name="DaemonCodeAnalyzer">
+    <disable_hints />
+  </component>
+  <component name="DebuggerManager">
+    <breakpoint_any>
+      <breakpoint>
+        <option name="NOTIFY_CAUGHT" value="true" />
+        <option name="NOTIFY_UNCAUGHT" value="true" />
+        <option name="ENABLED" value="false" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint>
+        <option name="NOTIFY_CAUGHT" value="true" />
+        <option name="NOTIFY_UNCAUGHT" value="true" />
+        <option name="ENABLED" value="false" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+    </breakpoint_any>
+    <breakpoint_rules />
+    <ui_properties />
+  </component>
+  <component name="FavoritesManager">
+    <favorites_list name="commons-dbcp-1.2.1" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file leaf-file-name="SharedPoolDataSource.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="42" column="13" selection-start="1545" selection-end="1545" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PerUserPoolDataSource.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="101" column="35" selection-start="3545" selection-end="3545" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="TesterConnection.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/test/org/apache/commons/dbcp/TesterConnection.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="286" column="0" selection-start="8497" selection-end="8497" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="TesterPreparedStatement.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="298" column="8" selection-start="8558" selection-end="8635" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="TesterResultSet.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/test/org/apache/commons/dbcp/TesterResultSet.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="766" column="0" selection-start="19605" selection-end="19605" vertical-scroll-proportion="0.30186722">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="TesterStatement.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/test/org/apache/commons/dbcp/TesterStatement.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="66" column="32" selection-start="2312" selection-end="2312" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="InstanceKeyDataSource.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="755" column="8" selection-start="26162" selection-end="26253" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ConnectionImpl.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="463" column="0" selection-start="15666" selection-end="15666" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="DelegatingPreparedStatement.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="67" column="11" selection-start="2278" selection-end="2278" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="DelegatingCallableStatement.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="338" column="0" selection-start="18964" selection-end="18964" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FindManager">
+    <FindUsagesManager>
+      <setting name="OPEN_NEW_TAB" value="false" />
+    </FindUsagesManager>
+  </component>
+  <component name="ModuleEditorState">
+    <option name="LAST_EDITED_MODULE_NAME" />
+    <option name="LAST_EDITED_TAB_NAME" />
+  </component>
+  <component name="ProjectLevelVcsManager">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectPane">
+    <subPane>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-dbcp-1.2.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-dbcp-1.2.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-dbcp-1.2.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-dbcp-1.2.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-dbcp-1.2.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-dbcp-1.2.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-dbcp-1.2.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-dbcp-1.2.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="test" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-dbcp-1.2.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-dbcp-1.2.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-dbcp-1.2.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="test" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-dbcp-1.2.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-dbcp-1.2.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-dbcp-1.2.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="test" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="dbcp" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-dbcp-1.2.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-dbcp-1.2.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="commons-dbcp-1.2.1" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+    </subPane>
+  </component>
+  <component name="ProjectReloadState">
+    <option name="STATE" value="0" />
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="0.5" version="1" splitterProportion="0.5">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <showStructure ProjectPane="false" />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+    </navigator>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="GoToFile.includeJavaFiles" value="false" />
+    <property name="project.structure.last.edited" value="Modules" />
+    <property name="project.structure.proportion" value="0.0" />
+    <property name="options.splitter.main.proportions" value="0.3" />
+    <property name="MemberChooser.sorted" value="false" />
+    <property name="options.lastSelected" value="MavenSettings" />
+    <property name="project.structure.side.proportion" value="0.2" />
+    <property name="MemberChooser.copyJavadoc" value="false" />
+    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+    <property name="MemberChooser.showClasses" value="true" />
+    <property name="GoToClass.includeLibraries" value="false" />
+    <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="options.searchVisible" value="true" />
+  </component>
+  <component name="RunManager">
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+    </configuration>
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false" runner="emma">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false" runner="emma">
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="ADDITIONAL_CLASS_PATH" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="wholeProject" />
+      </option>
+      <envs />
+    </configuration>
+    <list size="0" />
+    <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
+      <Host>localhost</Host>
+      <Port>5050</Port>
+    </configuration>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false" />
+  <component name="StructureViewFactory">
+    <option name="AUTOSCROLL_MODE" value="true" />
+    <option name="AUTOSCROLL_FROM_SOURCE" value="false" />
+    <option name="ACTIVE_ACTIONS" value="" />
+  </component>
+  <component name="SvnConfiguration">
+    <option name="USER" value="" />
+    <option name="PASSWORD" value="" />
+    <option name="LAST_MERGED_REVISION" />
+    <option name="UPDATE_RUN_STATUS" value="false" />
+    <option name="MERGE_DRY_RUN" value="false" />
+    <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
+    <option name="UPDATE_LOCK_ON_DEMAND" value="false" />
+    <configuration useDefault="true">/home/yyang/.subversion</configuration>
+    <myIsUseDefaultProxy>true</myIsUseDefaultProxy>
+  </component>
+  <component name="TodoView" selected-index="0">
+    <todo-panel id="selected-file">
+      <are-packages-shown value="false" />
+      <are-modules-shown value="false" />
+      <flatten-packages value="false" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <are-modules-shown value="false" />
+      <flatten-packages value="false" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="default-changelist">
+      <are-packages-shown value="false" />
+      <are-modules-shown value="false" />
+      <flatten-packages value="false" />
+      <is-autoscroll-to-source value="false" />
+    </todo-panel>
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="0" y="0" width="1920" height="1135" extended-state="0" />
+    <editor active="true" />
+    <layout>
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
+      <window_info id="Ant Build" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="6" side_tool="false" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="9" side_tool="false" />
+      <window_info id="Dataflow to this" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" />
+      <window_info id="IDEtalk" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="14" side_tool="false" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="13" side_tool="false" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" />
+      <window_info id="Commander" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32975295" sideWeight="0.0" order="1" side_tool="false" />
+      <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" />
+      <window_info id="Web Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="12" side_tool="false" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" />
+      <window_info id="Maven projects" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="11" side_tool="false" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" />
+      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" />
+      <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="10" side_tool="false" />
+      <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" />
+      <window_info id="Duplicates" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" />
+    </layout>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
+    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
+    <option name="PERFORM_UPDATE_IN_BACKGROUND" value="false" />
+    <option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" />
+    <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
+    <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
+    <option name="LAST_COMMIT_MESSAGE" />
+    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
+    <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
+    <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
+    <option name="ACTIVE_VCS_NAME" />
+    <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
+    <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
+    <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
+    <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager />
+  </component>
+  <component name="XPathView.XPathProjectComponent">
+    <history />
+    <find-history />
+  </component>
+  <component name="antWorkspaceConfiguration">
+    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+    <option name="FILTER_TARGETS" value="false" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/PoolableConnection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="97" column="1" selection-start="2990" selection-end="2990" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/DelegatingStatement.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="133" column="19" selection-start="4147" selection-end="4147" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/DelegatingConnection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="420" column="5" selection-start="15077" selection-end="15077" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/PoolingDataSource.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="396" column="28" selection-start="12745" selection-end="12745" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/cpdsadapter/PoolablePreparedStatementStub.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="54" column="0" selection-start="1844" selection-end="1844" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="364" column="152" selection-start="12259" selection-end="12259" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="42" column="13" selection-start="1545" selection-end="1545" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="755" column="8" selection-start="26162" selection-end="26253" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="463" column="0" selection-start="15666" selection-end="15666" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="67" column="11" selection-start="2278" selection-end="2278" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="338" column="0" selection-start="18964" selection-end="18964" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="101" column="35" selection-start="3545" selection-end="3545" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/org/apache/commons/dbcp/TesterConnection.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="286" column="0" selection-start="8497" selection-end="8497" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/org/apache/commons/dbcp/TesterStatement.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="66" column="32" selection-start="2312" selection-end="2312" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="298" column="8" selection-start="8558" selection-end="8635" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/org/apache/commons/dbcp/TesterResultSet.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="766" column="0" selection-start="19605" selection-end="19605" vertical-scroll-proportion="0.30186722">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+  </component>
+  <component name="masterDetails">
+    <option name="states">
+      <map>
+        <entry key="Errors.UI">
+          <value>
+            <UIState>
+              <option name="proportions">
+                <SplitterProportionsDataImpl />
+              </option>
+            </UIState>
+          </value>
+        </entry>
+        <entry key="ProjectJDKs.UI">
+          <value>
+            <UIState>
+              <option name="proportions">
+                <SplitterProportionsDataImpl>
+                  <option name="proportions">
+                    <list>
+                      <option value="0.2" />
+                    </list>
+                  </option>
+                </SplitterProportionsDataImpl>
+              </option>
+              <option name="lastEditedConfigurable" value="1.6" />
+            </UIState>
+          </value>
+        </entry>
+        <entry key="ScopeChooserConfigurable.UI">
+          <value>
+            <UIState>
+              <option name="proportions">
+                <SplitterProportionsDataImpl />
+              </option>
+            </UIState>
+          </value>
+        </entry>
+      </map>
+    </option>
+    <option name="myStates">
+      <map>
+        <entry key="Errors.UI">
+          <value>
+            <UIState>
+              <option name="proportions">
+                <SplitterProportionsDataImpl />
+              </option>
+            </UIState>
+          </value>
+        </entry>
+        <entry key="ProjectJDKs.UI">
+          <value>
+            <UIState>
+              <option name="proportions">
+                <SplitterProportionsDataImpl>
+                  <option name="proportions">
+                    <list>
+                      <option value="0.2" />
+                    </list>
+                  </option>
+                </SplitterProportionsDataImpl>
+              </option>
+              <option name="lastEditedConfigurable" value="1.6" />
+            </UIState>
+          </value>
+        </entry>
+        <entry key="ScopeChooserConfigurable.UI">
+          <value>
+            <UIState>
+              <option name="proportions">
+                <SplitterProportionsDataImpl />
+              </option>
+            </UIState>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
+
diff -uNr ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1-jdk6.patch ./commons-dbcp-1.2.1-jdk6.patch
--- ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1-jdk6.patch	1970-01-01 08:00:00.000000000 +0800
+++ ./commons-dbcp-1.2.1-jdk6.patch	2009-01-14 17:54:55.000000000 +0800
@@ -0,0 +1,1037 @@
+diff -uNr ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1.iml ./commons-dbcp-1.2.1.iml
+--- ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1.iml	1970-01-01 08:00:00.000000000 +0800
++++ ./commons-dbcp-1.2.1.iml	2009-01-14 17:42:00.000000000 +0800
+@@ -0,0 +1,13 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<module relativePaths="true" type="JAVA_MODULE" version="4">
++  <component name="NewModuleRootManager" inherit-compiler-output="true">
++    <exclude-output />
++    <content url="file://$MODULE_DIR$">
++      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
++      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
++    </content>
++    <orderEntry type="inheritedJdk" />
++    <orderEntry type="sourceFolder" forTests="false" />
++  </component>
++</module>
++
+diff -uNr ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1.ipr ./commons-dbcp-1.2.1.ipr
+--- ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1.ipr	1970-01-01 08:00:00.000000000 +0800
++++ ./commons-dbcp-1.2.1.ipr	2009-01-09 23:08:08.000000000 +0800
+@@ -0,0 +1,328 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project relativePaths="false" version="4">
++  <component name="AntConfiguration">
++    <defaultAnt bundledAnt="true" />
++  </component>
++  <component name="BuildJarProjectSettings">
++    <option name="BUILD_JARS_ON_MAKE" value="false" />
++  </component>
++  <component name="CCaseConfig">
++    <option name="checkoutReserved" value="false" />
++    <option name="markExternalChangeAsUpToDate" value="true" />
++    <option name="checkInUseHijack" value="true" />
++    <option name="useUcmModel" value="true" />
++    <option name="isOffline" value="false" />
++    <option name="synchOutside" value="false" />
++    <option name="isHistoryResticted" value="true" />
++    <option name="useIdenticalSwitch" value="true" />
++    <option name="synchActivitiesOnRefresh" value="true" />
++    <option name="lastScr" value="" />
++    <option name="scrTextFileName" value="" />
++    <option name="historyRevisionsNumber" value="4" />
++  </component>
++  <component name="CodeStyleProjectProfileManger">
++    <option name="PROJECT_PROFILE" />
++    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
++  </component>
++  <component name="CodeStyleSettingsManager">
++    <option name="PER_PROJECT_SETTINGS" />
++    <option name="USE_PER_PROJECT_SETTINGS" value="false" />
++  </component>
++  <component name="CompilerConfiguration">
++    <option name="DEFAULT_COMPILER" value="Javac" />
++    <option name="DEPLOY_AFTER_MAKE" value="0" />
++    <resourceExtensions>
++      <entry name=".+\.(properties|xml|html|dtd|tld)" />
++      <entry name=".+\.(gif|png|jpeg|jpg)" />
++    </resourceExtensions>
++    <wildcardResourcePatterns>
++      <entry name="?*.properties" />
++      <entry name="?*.xml" />
++      <entry name="?*.gif" />
++      <entry name="?*.png" />
++      <entry name="?*.jpeg" />
++      <entry name="?*.jpg" />
++      <entry name="?*.html" />
++      <entry name="?*.dtd" />
++      <entry name="?*.tld" />
++    </wildcardResourcePatterns>
++  </component>
++  <component name="DependenciesAnalyzeManager">
++    <option name="myForwardDirection" value="false" />
++  </component>
++  <component name="DependencyValidationManager">
++    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
++  </component>
++  <component name="EclipseCompilerSettings">
++    <option name="DEBUGGING_INFO" value="true" />
++    <option name="GENERATE_NO_WARNINGS" value="true" />
++    <option name="DEPRECATION" value="false" />
++    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
++    <option name="MAXIMUM_HEAP_SIZE" value="128" />
++  </component>
++  <component name="EclipseEmbeddedCompilerSettings">
++    <option name="DEBUGGING_INFO" value="true" />
++    <option name="GENERATE_NO_WARNINGS" value="true" />
++    <option name="DEPRECATION" value="false" />
++    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
++    <option name="MAXIMUM_HEAP_SIZE" value="128" />
++  </component>
++  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
++  <component name="EntryPointsManager">
++    <entry_points version="2.0" />
++  </component>
++  <component name="ErrorTreeViewConfiguration">
++    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
++    <option name="HIDE_WARNINGS" value="false" />
++  </component>
++  <component name="HierarchyBrowserManager">
++    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
++    <option name="SORT_ALPHABETICALLY" value="false" />
++    <option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" />
++  </component>
++  <component name="IdProvider" IDEtalkID="C6A49ECD75ED7164A26CE3371D004C3B" />
++  <component name="InspectionProjectProfileManager">
++    <option name="PROJECT_PROFILE" value="Project Default" />
++    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
++    <scopes />
++    <profiles>
++      <profile version="1.0" is_locked="false">
++        <option name="myName" value="Project Default" />
++        <option name="myLocal" value="false" />
++      </profile>
++    </profiles>
++    <list size="0" />
++  </component>
++  <component name="JavacSettings">
++    <option name="DEBUGGING_INFO" value="true" />
++    <option name="GENERATE_NO_WARNINGS" value="false" />
++    <option name="DEPRECATION" value="true" />
++    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
++    <option name="MAXIMUM_HEAP_SIZE" value="128" />
++  </component>
++  <component name="JavadocGenerationManager">
++    <option name="OUTPUT_DIRECTORY" />
++    <option name="OPTION_SCOPE" value="protected" />
++    <option name="OPTION_HIERARCHY" value="true" />
++    <option name="OPTION_NAVIGATOR" value="true" />
++    <option name="OPTION_INDEX" value="true" />
++    <option name="OPTION_SEPARATE_INDEX" value="true" />
++    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
++    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
++    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
++    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
++    <option name="OPTION_DEPRECATED_LIST" value="true" />
++    <option name="OTHER_OPTIONS" value="" />
++    <option name="HEAP_SIZE" />
++    <option name="LOCALE" />
++    <option name="OPEN_IN_BROWSER" value="true" />
++  </component>
++  <component name="JikesSettings">
++    <option name="JIKES_PATH" value="" />
++    <option name="DEBUGGING_INFO" value="true" />
++    <option name="DEPRECATION" value="true" />
++    <option name="GENERATE_NO_WARNINGS" value="false" />
++    <option name="IS_EMACS_ERRORS_MODE" value="true" />
++    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
++  </component>
++  <component name="Palette2">
++    <group name="Swing">
++      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
++        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
++      </item>
++      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
++        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
++      </item>
++      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
++        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
++      </item>
++      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
++        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
++      </item>
++      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
++        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
++        <initial-values>
++          <property name="text" value="Button" />
++        </initial-values>
++      </item>
++      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
++        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
++        <initial-values>
++          <property name="text" value="RadioButton" />
++        </initial-values>
++      </item>
++      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
++        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
++        <initial-values>
++          <property name="text" value="CheckBox" />
++        </initial-values>
++      </item>
++      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
++        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
++        <initial-values>
++          <property name="text" value="Label" />
++        </initial-values>
++      </item>
++      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
++        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
++          <preferred-size width="150" height="-1" />
++        </default-constraints>
++      </item>
++      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
++        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
++          <preferred-size width="150" height="-1" />
++        </default-constraints>
++      </item>
++      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
++        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
++          <preferred-size width="150" height="-1" />
++        </default-constraints>
++      </item>
++      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
++        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
++          <preferred-size width="150" height="50" />
++        </default-constraints>
++      </item>
++      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
++        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
++          <preferred-size width="150" height="50" />
++        </default-constraints>
++      </item>
++      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
++        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
++          <preferred-size width="150" height="50" />
++        </default-constraints>
++      </item>
++      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
++        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
++      </item>
++      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
++        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
++          <preferred-size width="150" height="50" />
++        </default-constraints>
++      </item>
++      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
++        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
++          <preferred-size width="150" height="50" />
++        </default-constraints>
++      </item>
++      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
++        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
++          <preferred-size width="150" height="50" />
++        </default-constraints>
++      </item>
++      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
++        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
++          <preferred-size width="200" height="200" />
++        </default-constraints>
++      </item>
++      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
++        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
++          <preferred-size width="200" height="200" />
++        </default-constraints>
++      </item>
++      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
++        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
++      </item>
++      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
++        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
++      </item>
++      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
++        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
++      </item>
++      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
++        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
++      </item>
++      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
++        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
++          <preferred-size width="-1" height="20" />
++        </default-constraints>
++      </item>
++      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
++        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
++      </item>
++      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
++        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
++      </item>
++    </group>
++  </component>
++  <component name="ProjectDetails">
++    <option name="projectName" value="commons-dbcp-1.2.1" />
++  </component>
++  <component name="ProjectFileVersion" converted="true" />
++  <component name="ProjectModuleManager">
++    <modules>
++      <module fileurl="file://$PROJECT_DIR$/commons-dbcp-1.2.1.iml" filepath="$PROJECT_DIR$/commons-dbcp-1.2.1.iml" />
++    </modules>
++  </component>
++  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6 (1)" project-jdk-type="JavaSDK">
++    <output url="file://$PROJECT_DIR$/out" />
++  </component>
++  <component name="ResourceManagerContainer">
++    <option name="myResourceBundles">
++      <value>
++        <list size="0" />
++      </value>
++    </option>
++  </component>
++  <component name="RmicSettings">
++    <option name="IS_EANABLED" value="false" />
++    <option name="DEBUGGING_INFO" value="true" />
++    <option name="GENERATE_NO_WARNINGS" value="false" />
++    <option name="GENERATE_IIOP_STUBS" value="false" />
++    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
++  </component>
++  <component name="StarteamConfiguration">
++    <option name="SERVER" value="" />
++    <option name="PORT" value="49201" />
++    <option name="USER" value="" />
++    <option name="PASSWORD" value="" />
++    <option name="PROJECT" value="" />
++    <option name="VIEW" value="" />
++    <option name="ALTERNATIVE_WORKING_PATH" value="" />
++    <option name="LOCK_ON_CHECKOUT" value="false" />
++    <option name="UNLOCK_ON_CHECKIN" value="false" />
++  </component>
++  <component name="SvnBranchConfigurationManager">
++    <option name="myVersion" value="124" />
++  </component>
++  <component name="VcsDirectoryMappings">
++    <mapping directory="" vcs="" />
++  </component>
++  <component name="VssConfiguration">
++    <option name="CLIENT_PATH" value="" />
++    <option name="SRCSAFEINI_PATH" value="" />
++    <option name="USER_NAME" value="" />
++    <option name="PWD" value="" />
++    <CheckoutOptions>
++      <option name="COMMENT" value="" />
++      <option name="DO_NOT_GET_LATEST_VERSION" value="false" />
++      <option name="REPLACE_WRITABLE" value="false" />
++      <option name="RECURSIVE" value="false" />
++    </CheckoutOptions>
++    <CheckinOptions>
++      <option name="COMMENT" value="" />
++      <option name="KEEP_CHECKED_OUT" value="false" />
++      <option name="RECURSIVE" value="false" />
++    </CheckinOptions>
++    <AddOptions>
++      <option name="STORE_ONLY_LATEST_VERSION" value="false" />
++      <option name="CHECK_OUT_IMMEDIATELY" value="false" />
++    </AddOptions>
++    <UndocheckoutOptions>
++      <option name="MAKE_WRITABLE" value="false" />
++      <option name="REPLACE_LOCAL_COPY" value="2" />
++      <option name="RECURSIVE" value="false" />
++    </UndocheckoutOptions>
++    <GetOptions>
++      <option name="REPLACE_WRITABLE" value="0" />
++      <option name="MAKE_WRITABLE" value="false" />
++      <option name="ANSWER_NEGATIVELY" value="false" />
++      <option name="ANSWER_POSITIVELY" value="false" />
++      <option name="RECURSIVE" value="false" />
++      <option name="VERSION" />
++    </GetOptions>
++  </component>
++  <component name="WebServicesPlugin" addRequiredLibraries="true" />
++</project>
++
+diff -uNr ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1.iws ./commons-dbcp-1.2.1.iws
+--- ../commons-dbcp-1.2.1.orig/commons-dbcp-1.2.1.iws	1970-01-01 08:00:00.000000000 +0800
++++ ./commons-dbcp-1.2.1.iws	2009-01-14 17:54:25.000000000 +0800
+@@ -0,0 +1,684 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<project relativePaths="false" version="4">
++  <component name="ChangeListManager">
++    <list default="true" name="Default" comment="" />
++    <ignored path="commons-dbcp-1.2.1.iws" />
++    <ignored path=".idea/workspace.xml" />
++  </component>
++  <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
++  <component name="Commander">
++    <leftPanel />
++    <rightPanel />
++    <splitter proportion="0.5" />
++  </component>
++  <component name="CreatePatchCommitExecutor">
++    <option name="PATCH_PATH" value="" />
++    <option name="REVERSE_PATCH" value="false" />
++  </component>
++  <component name="DaemonCodeAnalyzer">
++    <disable_hints />
++  </component>
++  <component name="DebuggerManager">
++    <breakpoint_any>
++      <breakpoint>
++        <option name="NOTIFY_CAUGHT" value="true" />
++        <option name="NOTIFY_UNCAUGHT" value="true" />
++        <option name="ENABLED" value="false" />
++        <option name="LOG_ENABLED" value="false" />
++        <option name="LOG_EXPRESSION_ENABLED" value="false" />
++        <option name="SUSPEND_POLICY" value="SuspendAll" />
++        <option name="COUNT_FILTER_ENABLED" value="false" />
++        <option name="COUNT_FILTER" value="0" />
++        <option name="CONDITION_ENABLED" value="false" />
++        <option name="CLASS_FILTERS_ENABLED" value="false" />
++        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
++        <option name="CONDITION" value="" />
++        <option name="LOG_MESSAGE" value="" />
++      </breakpoint>
++      <breakpoint>
++        <option name="NOTIFY_CAUGHT" value="true" />
++        <option name="NOTIFY_UNCAUGHT" value="true" />
++        <option name="ENABLED" value="false" />
++        <option name="LOG_ENABLED" value="false" />
++        <option name="LOG_EXPRESSION_ENABLED" value="false" />
++        <option name="SUSPEND_POLICY" value="SuspendAll" />
++        <option name="COUNT_FILTER_ENABLED" value="false" />
++        <option name="COUNT_FILTER" value="0" />
++        <option name="CONDITION_ENABLED" value="false" />
++        <option name="CLASS_FILTERS_ENABLED" value="false" />
++        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
++        <option name="CONDITION" value="" />
++        <option name="LOG_MESSAGE" value="" />
++      </breakpoint>
++    </breakpoint_any>
++    <breakpoint_rules />
++    <ui_properties />
++  </component>
++  <component name="FavoritesManager">
++    <favorites_list name="commons-dbcp-1.2.1" />
++  </component>
++  <component name="FileEditorManager">
++    <leaf>
++      <file leaf-file-name="SharedPoolDataSource.java" pinned="false" current="false" current-in-tab="false">
++        <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java">
++          <provider selected="true" editor-type-id="text-editor">
++            <state line="42" column="13" selection-start="1545" selection-end="1545" vertical-scroll-proportion="0.0">
++              <folding />
++            </state>
++          </provider>
++        </entry>
++      </file>
++      <file leaf-file-name="PerUserPoolDataSource.java" pinned="false" current="false" current-in-tab="false">
++        <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java">
++          <provider selected="true" editor-type-id="text-editor">
++            <state line="101" column="35" selection-start="3545" selection-end="3545" vertical-scroll-proportion="0.0">
++              <folding />
++            </state>
++          </provider>
++        </entry>
++      </file>
++      <file leaf-file-name="TesterConnection.java" pinned="false" current="false" current-in-tab="false">
++        <entry file="file://$PROJECT_DIR$/src/test/org/apache/commons/dbcp/TesterConnection.java">
++          <provider selected="true" editor-type-id="text-editor">
++            <state line="286" column="0" selection-start="8497" selection-end="8497" vertical-scroll-proportion="0.0">
++              <folding />
++            </state>
++          </provider>
++        </entry>
++      </file>
++      <file leaf-file-name="TesterPreparedStatement.java" pinned="false" current="false" current-in-tab="false">
++        <entry file="file://$PROJECT_DIR$/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java">
++          <provider selected="true" editor-type-id="text-editor">
++            <state line="298" column="8" selection-start="8558" selection-end="8635" vertical-scroll-proportion="0.0">
++              <folding />
++            </state>
++          </provider>
++        </entry>
++      </file>
++      <file leaf-file-name="TesterResultSet.java" pinned="false" current="true" current-in-tab="true">
++        <entry file="file://$PROJECT_DIR$/src/test/org/apache/commons/dbcp/TesterResultSet.java">
++          <provider selected="true" editor-type-id="text-editor">
++            <state line="766" column="0" selection-start="19605" selection-end="19605" vertical-scroll-proportion="0.30186722">
++              <folding />
++            </state>
++          </provider>
++        </entry>
++      </file>
++      <file leaf-file-name="TesterStatement.java" pinned="false" current="false" current-in-tab="false">
++        <entry file="file://$PROJECT_DIR$/src/test/org/apache/commons/dbcp/TesterStatement.java">
++          <provider selected="true" editor-type-id="text-editor">
++            <state line="66" column="32" selection-start="2312" selection-end="2312" vertical-scroll-proportion="0.0">
++              <folding />
++            </state>
++          </provider>
++        </entry>
++      </file>
++      <file leaf-file-name="InstanceKeyDataSource.java" pinned="false" current="false" current-in-tab="false">
++        <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java">
++          <provider selected="true" editor-type-id="text-editor">
++            <state line="755" column="8" selection-start="26162" selection-end="26253" vertical-scroll-proportion="0.0">
++              <folding />
++            </state>
++          </provider>
++        </entry>
++      </file>
++      <file leaf-file-name="ConnectionImpl.java" pinned="false" current="false" current-in-tab="false">
++        <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java">
++          <provider selected="true" editor-type-id="text-editor">
++            <state line="463" column="0" selection-start="15666" selection-end="15666" vertical-scroll-proportion="0.0">
++              <folding />
++            </state>
++          </provider>
++        </entry>
++      </file>
++      <file leaf-file-name="DelegatingPreparedStatement.java" pinned="false" current="false" current-in-tab="false">
++        <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java">
++          <provider selected="true" editor-type-id="text-editor">
++            <state line="67" column="11" selection-start="2278" selection-end="2278" vertical-scroll-proportion="0.0">
++              <folding />
++            </state>
++          </provider>
++        </entry>
++      </file>
++      <file leaf-file-name="DelegatingCallableStatement.java" pinned="false" current="false" current-in-tab="false">
++        <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java">
++          <provider selected="true" editor-type-id="text-editor">
++            <state line="338" column="0" selection-start="18964" selection-end="18964" vertical-scroll-proportion="0.0">
++              <folding />
++            </state>
++          </provider>
++        </entry>
++      </file>
++    </leaf>
++  </component>
++  <component name="FindManager">
++    <FindUsagesManager>
++      <setting name="OPEN_NEW_TAB" value="false" />
++    </FindUsagesManager>
++  </component>
++  <component name="ModuleEditorState">
++    <option name="LAST_EDITED_MODULE_NAME" />
++    <option name="LAST_EDITED_TAB_NAME" />
++  </component>
++  <component name="ProjectLevelVcsManager">
++    <OptionsSetting value="true" id="Add" />
++    <OptionsSetting value="true" id="Remove" />
++    <OptionsSetting value="true" id="Checkout" />
++    <OptionsSetting value="true" id="Update" />
++    <OptionsSetting value="true" id="Status" />
++    <OptionsSetting value="true" id="Edit" />
++    <ConfirmationsSetting value="0" id="Add" />
++    <ConfirmationsSetting value="0" id="Remove" />
++  </component>
++  <component name="ProjectPane">
++    <subPane>
++      <PATH>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="commons-dbcp-1.2.1" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="commons-dbcp-1.2.1" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
++        </PATH_ELEMENT>
++      </PATH>
++      <PATH>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="commons-dbcp-1.2.1" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="commons-dbcp-1.2.1" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="commons-dbcp-1.2.1" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
++        </PATH_ELEMENT>
++      </PATH>
++      <PATH>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="commons-dbcp-1.2.1" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="commons-dbcp-1.2.1" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="commons-dbcp-1.2.1" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="src" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="test" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
++        </PATH_ELEMENT>
++      </PATH>
++      <PATH>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="commons-dbcp-1.2.1" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="commons-dbcp-1.2.1" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="commons-dbcp-1.2.1" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="src" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="test" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="commons" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
++        </PATH_ELEMENT>
++      </PATH>
++      <PATH>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="commons-dbcp-1.2.1" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="commons-dbcp-1.2.1" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="commons-dbcp-1.2.1" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="src" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="test" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="commons" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="dbcp" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
++        </PATH_ELEMENT>
++      </PATH>
++      <PATH>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="commons-dbcp-1.2.1" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="commons-dbcp-1.2.1" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="commons-dbcp-1.2.1" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
++        </PATH_ELEMENT>
++        <PATH_ELEMENT>
++          <option name="myItemId" value="src" />
++          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
++        </PATH_ELEMENT>
++      </PATH>
++    </subPane>
++  </component>
++  <component name="ProjectReloadState">
++    <option name="STATE" value="0" />
++  </component>
++  <component name="ProjectView">
++    <navigator currentView="ProjectPane" proportions="0.5" version="1" splitterProportion="0.5">
++      <flattenPackages />
++      <showMembers />
++      <showModules />
++      <showLibraryContents />
++      <hideEmptyPackages />
++      <abbreviatePackageNames />
++      <showStructure ProjectPane="false" />
++      <autoscrollToSource />
++      <autoscrollFromSource />
++      <sortByType />
++    </navigator>
++  </component>
++  <component name="PropertiesComponent">
++    <property name="GoToFile.includeJavaFiles" value="false" />
++    <property name="project.structure.last.edited" value="Modules" />
++    <property name="project.structure.proportion" value="0.0" />
++    <property name="options.splitter.main.proportions" value="0.3" />
++    <property name="MemberChooser.sorted" value="false" />
++    <property name="options.lastSelected" value="MavenSettings" />
++    <property name="project.structure.side.proportion" value="0.2" />
++    <property name="MemberChooser.copyJavadoc" value="false" />
++    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
++    <property name="MemberChooser.showClasses" value="true" />
++    <property name="GoToClass.includeLibraries" value="false" />
++    <property name="options.splitter.details.proportions" value="0.2" />
++    <property name="options.searchVisible" value="true" />
++  </component>
++  <component name="RunManager">
++    <configuration default="true" type="Remote" factoryName="Remote">
++      <option name="USE_SOCKET_TRANSPORT" value="true" />
++      <option name="SERVER_MODE" value="false" />
++      <option name="SHMEM_ADDRESS" value="javadebug" />
++      <option name="HOST" value="localhost" />
++      <option name="PORT" value="5005" />
++    </configuration>
++    <configuration default="true" type="Applet" factoryName="Applet">
++      <module name="" />
++      <option name="MAIN_CLASS_NAME" />
++      <option name="HTML_FILE_NAME" />
++      <option name="HTML_USED" value="false" />
++      <option name="WIDTH" value="400" />
++      <option name="HEIGHT" value="300" />
++      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
++      <option name="VM_PARAMETERS" />
++      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
++      <option name="ALTERNATIVE_JRE_PATH" />
++    </configuration>
++    <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false" runner="emma">
++      <option name="MAIN_CLASS_NAME" />
++      <option name="VM_PARAMETERS" />
++      <option name="PROGRAM_PARAMETERS" />
++      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
++      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
++      <option name="ALTERNATIVE_JRE_PATH" />
++      <option name="ENABLE_SWING_INSPECTOR" value="false" />
++      <option name="ENV_VARIABLES" />
++      <option name="PASS_PARENT_ENVS" value="true" />
++      <module name="" />
++      <envs />
++    </configuration>
++    <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false" runner="emma">
++      <module name="" />
++      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
++      <option name="ALTERNATIVE_JRE_PATH" />
++      <option name="PACKAGE_NAME" />
++      <option name="MAIN_CLASS_NAME" />
++      <option name="METHOD_NAME" />
++      <option name="TEST_OBJECT" value="class" />
++      <option name="VM_PARAMETERS" />
++      <option name="PARAMETERS" />
++      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
++      <option name="ENV_VARIABLES" />
++      <option name="PASS_PARENT_ENVS" value="true" />
++      <option name="ADDITIONAL_CLASS_PATH" />
++      <option name="TEST_SEARCH_SCOPE">
++        <value defaultName="wholeProject" />
++      </option>
++      <envs />
++    </configuration>
++    <list size="0" />
++    <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
++      <Host>localhost</Host>
++      <Port>5050</Port>
++    </configuration>
++  </component>
++  <component name="ShelveChangesManager" show_recycled="false" />
++  <component name="StructureViewFactory">
++    <option name="AUTOSCROLL_MODE" value="true" />
++    <option name="AUTOSCROLL_FROM_SOURCE" value="false" />
++    <option name="ACTIVE_ACTIONS" value="" />
++  </component>
++  <component name="SvnConfiguration">
++    <option name="USER" value="" />
++    <option name="PASSWORD" value="" />
++    <option name="LAST_MERGED_REVISION" />
++    <option name="UPDATE_RUN_STATUS" value="false" />
++    <option name="MERGE_DRY_RUN" value="false" />
++    <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
++    <option name="UPDATE_LOCK_ON_DEMAND" value="false" />
++    <configuration useDefault="true">/home/yyang/.subversion</configuration>
++    <myIsUseDefaultProxy>true</myIsUseDefaultProxy>
++  </component>
++  <component name="TodoView" selected-index="0">
++    <todo-panel id="selected-file">
++      <are-packages-shown value="false" />
++      <are-modules-shown value="false" />
++      <flatten-packages value="false" />
++      <is-autoscroll-to-source value="true" />
++    </todo-panel>
++    <todo-panel id="all">
++      <are-packages-shown value="true" />
++      <are-modules-shown value="false" />
++      <flatten-packages value="false" />
++      <is-autoscroll-to-source value="true" />
++    </todo-panel>
++    <todo-panel id="default-changelist">
++      <are-packages-shown value="false" />
++      <are-modules-shown value="false" />
++      <flatten-packages value="false" />
++      <is-autoscroll-to-source value="false" />
++    </todo-panel>
++  </component>
++  <component name="ToolWindowManager">
++    <frame x="0" y="0" width="1920" height="1135" extended-state="0" />
++    <editor active="true" />
++    <layout>
++      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" />
++      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" />
++      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
++      <window_info id="Ant Build" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="6" side_tool="false" />
++      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" />
++      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="9" side_tool="false" />
++      <window_info id="Dataflow to this" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" />
++      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" />
++      <window_info id="IDEtalk" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="14" side_tool="false" />
++      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" />
++      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
++      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="13" side_tool="false" />
++      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" />
++      <window_info id="Commander" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" />
++      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" />
++      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32975295" sideWeight="0.0" order="1" side_tool="false" />
++      <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" />
++      <window_info id="Web Preview" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" />
++      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="12" side_tool="false" />
++      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" />
++      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" />
++      <window_info id="Maven projects" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" />
++      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" />
++      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="11" side_tool="false" />
++      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" />
++      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" />
++      <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="10" side_tool="false" />
++      <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" />
++      <window_info id="Duplicates" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" />
++    </layout>
++  </component>
++  <component name="VcsManagerConfiguration">
++    <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
++    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
++    <option name="PERFORM_UPDATE_IN_BACKGROUND" value="false" />
++    <option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" />
++    <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
++    <option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
++    <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
++    <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
++    <option name="LAST_COMMIT_MESSAGE" />
++    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
++    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
++    <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
++    <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
++    <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
++    <option name="ACTIVE_VCS_NAME" />
++    <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
++    <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
++    <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
++    <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
++  </component>
++  <component name="XDebuggerManager">
++    <breakpoint-manager />
++  </component>
++  <component name="XPathView.XPathProjectComponent">
++    <history />
++    <find-history />
++  </component>
++  <component name="antWorkspaceConfiguration">
++    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
++    <option name="FILTER_TARGETS" value="false" />
++  </component>
++  <component name="editorHistoryManager">
++    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/PoolableConnection.java">
++      <provider selected="true" editor-type-id="text-editor">
++        <state line="97" column="1" selection-start="2990" selection-end="2990" vertical-scroll-proportion="0.0">
++          <folding />
++        </state>
++      </provider>
++    </entry>
++    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/DelegatingStatement.java">
++      <provider selected="true" editor-type-id="text-editor">
++        <state line="133" column="19" selection-start="4147" selection-end="4147" vertical-scroll-proportion="0.0">
++          <folding />
++        </state>
++      </provider>
++    </entry>
++    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/DelegatingConnection.java">
++      <provider selected="true" editor-type-id="text-editor">
++        <state line="420" column="5" selection-start="15077" selection-end="15077" vertical-scroll-proportion="0.0">
++          <folding />
++        </state>
++      </provider>
++    </entry>
++    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/PoolingDataSource.java">
++      <provider selected="true" editor-type-id="text-editor">
++        <state line="396" column="28" selection-start="12745" selection-end="12745" vertical-scroll-proportion="0.0">
++          <folding />
++        </state>
++      </provider>
++    </entry>
++    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/cpdsadapter/PoolablePreparedStatementStub.java">
++      <provider selected="true" editor-type-id="text-editor">
++        <state line="54" column="0" selection-start="1844" selection-end="1844" vertical-scroll-proportion="0.0">
++          <folding />
++        </state>
++      </provider>
++    </entry>
++    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java">
++      <provider selected="true" editor-type-id="text-editor">
++        <state line="364" column="152" selection-start="12259" selection-end="12259" vertical-scroll-proportion="0.0">
++          <folding />
++        </state>
++      </provider>
++    </entry>
++    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java">
++      <provider selected="true" editor-type-id="text-editor">
++        <state line="42" column="13" selection-start="1545" selection-end="1545" vertical-scroll-proportion="0.0">
++          <folding />
++        </state>
++      </provider>
++    </entry>
++    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java">
++      <provider selected="true" editor-type-id="text-editor">
++        <state line="755" column="8" selection-start="26162" selection-end="26253" vertical-scroll-proportion="0.0">
++          <folding />
++        </state>
++      </provider>
++    </entry>
++    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java">
++      <provider selected="true" editor-type-id="text-editor">
++        <state line="463" column="0" selection-start="15666" selection-end="15666" vertical-scroll-proportion="0.0">
++          <folding />
++        </state>
++      </provider>
++    </entry>
++    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java">
++      <provider selected="true" editor-type-id="text-editor">
++        <state line="67" column="11" selection-start="2278" selection-end="2278" vertical-scroll-proportion="0.0">
++          <folding />
++        </state>
++      </provider>
++    </entry>
++    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java">
++      <provider selected="true" editor-type-id="text-editor">
++        <state line="338" column="0" selection-start="18964" selection-end="18964" vertical-scroll-proportion="0.0">
++          <folding />
++        </state>
++      </provider>
++    </entry>
++    <entry file="file://$PROJECT_DIR$/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java">
++      <provider selected="true" editor-type-id="text-editor">
++        <state line="101" column="35" selection-start="3545" selection-end="3545" vertical-scroll-proportion="0.0">
++          <folding />
++        </state>
++      </provider>
++    </entry>
++    <entry file="file://$PROJECT_DIR$/src/test/org/apache/commons/dbcp/TesterConnection.java">
++      <provider selected="true" editor-type-id="text-editor">
++        <state line="286" column="0" selection-start="8497" selection-end="8497" vertical-scroll-proportion="0.0">
++          <folding />
++        </state>
++      </provider>
++    </entry>
++    <entry file="file://$PROJECT_DIR$/src/test/org/apache/commons/dbcp/TesterStatement.java">
++      <provider selected="true" editor-type-id="text-editor">
++        <state line="66" column="32" selection-start="2312" selection-end="2312" vertical-scroll-proportion="0.0">
++          <folding />
++        </state>
++      </provider>
++    </entry>
++    <entry file="file://$PROJECT_DIR$/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java">
++      <provider selected="true" editor-type-id="text-editor">
++        <state line="298" column="8" selection-start="8558" selection-end="8635" vertical-scroll-proportion="0.0">
++          <folding />
++        </state>
++      </provider>
++    </entry>
++    <entry file="file://$PROJECT_DIR$/src/test/org/apache/commons/dbcp/TesterResultSet.java">
++      <provider selected="true" editor-type-id="text-editor">
++        <state line="766" column="0" selection-start="19605" selection-end="19605" vertical-scroll-proportion="0.30186722">
++          <folding />
++        </state>
++      </provider>
++    </entry>
++  </component>
++  <component name="masterDetails">
++    <option name="states">
++      <map>
++        <entry key="Errors.UI">
++          <value>
++            <UIState>
++              <option name="proportions">
++                <SplitterProportionsDataImpl />
++              </option>
++            </UIState>
++          </value>
++        </entry>
++        <entry key="ProjectJDKs.UI">
++          <value>
++            <UIState>
++              <option name="proportions">
++                <SplitterProportionsDataImpl>
++                  <option name="proportions">
++                    <list>
++                      <option value="0.2" />
++                    </list>
++                  </option>
++                </SplitterProportionsDataImpl>
++              </option>
++              <option name="lastEditedConfigurable" value="1.6" />
++            </UIState>
++          </value>
++        </entry>
++        <entry key="ScopeChooserConfigurable.UI">
++          <value>
++            <UIState>
++              <option name="proportions">
++                <SplitterProportionsDataImpl />
++              </option>
++            </UIState>
++          </value>
++        </entry>
++      </map>
++    </option>
++    <option name="myStates">
++      <map>
++        <entry key="Errors.UI">
++          <value>
++            <UIState>
++              <option name="proportions">
++                <SplitterProportionsDataImpl />
++              </option>
++            </UIState>
++          </value>
++        </entry>
++        <entry key="ProjectJDKs.UI">
++          <value>
++            <UIState>
++              <option name="proportions">
++                <SplitterProportionsDataImpl>
++                  <option name="proportions">
++                    <list>
++                      <option value="0.2" />
++                    </list>
++                  </option>
++                </SplitterProportionsDataImpl>
++              </option>
++              <option name="lastEditedConfigurable" value="1.6" />
++            </UIState>
++          </value>
++        </entry>
++        <entry key="ScopeChooserConfigurable.UI">
++          <value>
++            <UIState>
++              <option name="proportions">
++                <SplitterProportionsDataImpl />
++              </option>
++            </UIState>
++          </value>
++        </entry>
++      </map>
++    </option>
++  </component>
++</project>
++
diff -uNr ../commons-dbcp-1.2.1.orig/src/java/org/apache/commons/dbcp/BasicDataSource.java ./src/java/org/apache/commons/dbcp/BasicDataSource.java
--- ../commons-dbcp-1.2.1.orig/src/java/org/apache/commons/dbcp/BasicDataSource.java	2004-06-12 21:42:21.000000000 +0800
+++ ./src/java/org/apache/commons/dbcp/BasicDataSource.java	2009-01-09 22:12:44.000000000 +0800
@@ -897,4 +897,12 @@
             logWriter.println(message);
         }
     }
+
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
 }
diff -uNr ../commons-dbcp-1.2.1.orig/src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java ./src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java
--- ../commons-dbcp-1.2.1.orig/src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java	2004-06-12 21:42:21.000000000 +0800
+++ ./src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java	2009-01-09 22:46:07.000000000 +0800
@@ -17,6 +17,7 @@
 package org.apache.commons.dbcp.cpdsadapter;
 
 import java.util.Map;
+import java.util.Properties;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
@@ -24,6 +25,13 @@
 import java.sql.Statement;
 import java.sql.SQLWarning;
 import java.sql.SQLException;
+import java.sql.Clob;
+import java.sql.Blob;
+import java.sql.NClob;
+import java.sql.SQLXML;
+import java.sql.SQLClientInfoException;
+import java.sql.Array;
+import java.sql.Struct;
 
 /**
  * This class is the <code>Connection</code> that will be returned
@@ -453,4 +461,56 @@
     }
 
 /* JDBC_3_ANT_KEY_END */
+
+    public Clob createClob() throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Blob createBlob() throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public NClob createNClob() throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public SQLXML createSQLXML() throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isValid(int timeout) throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setClientInfo(String name, String value) throws SQLClientInfoException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setClientInfo(Properties properties) throws SQLClientInfoException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getClientInfo(String name) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Properties getClientInfo() throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
 }
diff -uNr ../commons-dbcp-1.2.1.orig/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java ./src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java
--- ../commons-dbcp-1.2.1.orig/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java	2004-06-12 21:42:21.000000000 +0800
+++ ./src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java	2009-01-09 22:46:07.000000000 +0800
@@ -25,6 +25,7 @@
 import javax.sql.ConnectionEvent;
 import javax.sql.ConnectionEventListener;
 import javax.sql.PooledConnection;
+import javax.sql.StatementEventListener;
 
 import org.apache.commons.dbcp.DelegatingConnection;
 import org.apache.commons.dbcp.DelegatingPreparedStatement;
@@ -385,4 +386,12 @@
             return buf.toString();
         }
     }
+
+    public void addStatementEventListener(StatementEventListener listener) {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void removeStatementEventListener(StatementEventListener listener) {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
 }
diff -uNr ../commons-dbcp-1.2.1.orig/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java ./src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
--- ../commons-dbcp-1.2.1.orig/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java	2004-06-12 21:42:21.000000000 +0800
+++ ./src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java	2009-01-09 22:47:03.000000000 +0800
@@ -751,4 +751,12 @@
         ref.add(new StringRefAddr("instanceKey", instanceKey));
         return ref;
     }
+
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
 }
diff -uNr ../commons-dbcp-1.2.1.orig/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java ./src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
--- ../commons-dbcp-1.2.1.orig/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java	2004-06-12 21:42:21.000000000 +0800
+++ ./src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java	2009-01-09 22:19:17.000000000 +0800
@@ -31,6 +31,9 @@
 import java.io.InputStream;
 import java.io.Reader;
 import java.sql.SQLException;
+import java.sql.RowId;
+import java.sql.NClob;
+import java.sql.SQLXML;
 
 /**
  * A base delegating implementation of {@link CallableStatement}.
@@ -332,4 +335,133 @@
     { checkOpen(); try { return _stmt.getURL(parameterName); } catch (SQLException e) { handleException(e); return null; } }
 
 /* JDBC_3_ANT_KEY_END */
+
+
+    public RowId getRowId(int parameterIndex) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public RowId getRowId(String parameterName) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setRowId(String parameterName, RowId x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setNString(String parameterName, String value) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setNCharacterStream(String parameterName, Reader value, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setNClob(String parameterName, NClob value) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setClob(String parameterName, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setNClob(String parameterName, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public NClob getNClob(int parameterIndex) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public NClob getNClob(String parameterName) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public SQLXML getSQLXML(int parameterIndex) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public SQLXML getSQLXML(String parameterName) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getNString(int parameterIndex) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getNString(String parameterName) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Reader getNCharacterStream(int parameterIndex) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Reader getNCharacterStream(String parameterName) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Reader getCharacterStream(int parameterIndex) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Reader getCharacterStream(String parameterName) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setBlob(String parameterName, Blob x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setClob(String parameterName, Clob x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setAsciiStream(String parameterName, InputStream x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setBinaryStream(String parameterName, InputStream x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setCharacterStream(String parameterName, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setAsciiStream(String parameterName, InputStream x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setBinaryStream(String parameterName, InputStream x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setCharacterStream(String parameterName, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setNCharacterStream(String parameterName, Reader value) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setClob(String parameterName, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setBlob(String parameterName, InputStream inputStream) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setNClob(String parameterName, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
 }
\ No newline at end of file
diff -uNr ../commons-dbcp-1.2.1.orig/src/java/org/apache/commons/dbcp/DelegatingConnection.java ./src/java/org/apache/commons/dbcp/DelegatingConnection.java
--- ../commons-dbcp-1.2.1.orig/src/java/org/apache/commons/dbcp/DelegatingConnection.java	2004-06-12 21:42:21.000000000 +0800
+++ ./src/java/org/apache/commons/dbcp/DelegatingConnection.java	2009-01-09 22:27:45.000000000 +0800
@@ -23,8 +23,16 @@
 import java.sql.SQLException;
 import java.sql.SQLWarning;
 import java.sql.Statement;
+import java.sql.Clob;
+import java.sql.Blob;
+import java.sql.NClob;
+import java.sql.SQLXML;
+import java.sql.SQLClientInfoException;
+import java.sql.Array;
+import java.sql.Struct;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 
 /**
  * A base delegating implementation of {@link Connection}.
@@ -424,4 +432,56 @@
         }
     }
 /* JDBC_3_ANT_KEY_END */
+
+    public Clob createClob() throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Blob createBlob() throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public NClob createNClob() throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public SQLXML createSQLXML() throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isValid(int timeout) throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setClientInfo(String name, String value) throws SQLClientInfoException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setClientInfo(Properties properties) throws SQLClientInfoException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getClientInfo(String name) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Properties getClientInfo() throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
 }
diff -uNr ../commons-dbcp-1.2.1.orig/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java ./src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
--- ../commons-dbcp-1.2.1.orig/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java	2004-06-12 21:42:21.000000000 +0800
+++ ./src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java	2009-01-09 22:19:17.000000000 +0800
@@ -25,7 +25,12 @@
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
+import java.sql.RowId;
+import java.sql.NClob;
+import java.sql.SQLXML;
 import java.util.Calendar;
+import java.io.Reader;
+import java.io.InputStream;
 
 /**
  * A base delegating implementation of {@link PreparedStatement}.
@@ -212,4 +217,76 @@
     { checkOpen(); try { return _stmt.getParameterMetaData(); } catch (SQLException e) { handleException(e); return null; } }
 
 /* JDBC_3_ANT_KEY_END */
+
+    public void setRowId(int parameterIndex, RowId x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setNString(int parameterIndex, String value) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setNClob(int parameterIndex, NClob value) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setClob(int parameterIndex, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setNClob(int parameterIndex, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
 }
diff -uNr ../commons-dbcp-1.2.1.orig/src/java/org/apache/commons/dbcp/DelegatingResultSet.java ./src/java/org/apache/commons/dbcp/DelegatingResultSet.java
--- ../commons-dbcp-1.2.1.orig/src/java/org/apache/commons/dbcp/DelegatingResultSet.java	2004-06-12 21:42:21.000000000 +0800
+++ ./src/java/org/apache/commons/dbcp/DelegatingResultSet.java	2009-01-09 22:23:14.000000000 +0800
@@ -32,6 +32,9 @@
 import java.sql.Blob;
 import java.sql.Clob;
 import java.sql.Array;
+import java.sql.RowId;
+import java.sql.NClob;
+import java.sql.SQLXML;
 import java.util.Calendar;
 
 /**
@@ -586,4 +589,204 @@
     { try { _res.updateArray(columnName, x); } catch (SQLException e) { handleException(e); } }
 
 /* JDBC_3_ANT_KEY_END */
+
+    public RowId getRowId(int columnIndex) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public RowId getRowId(String columnLabel) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateRowId(int columnIndex, RowId x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateRowId(String columnLabel, RowId x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public int getHoldability() throws SQLException {
+        return 0;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isClosed() throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNString(int columnIndex, String nString) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNString(String columnLabel, String nString) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNClob(int columnIndex, NClob nClob) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNClob(String columnLabel, NClob nClob) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public NClob getNClob(int columnIndex) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public NClob getNClob(String columnLabel) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public SQLXML getSQLXML(int columnIndex) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public SQLXML getSQLXML(String columnLabel) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getNString(int columnIndex) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getNString(String columnLabel) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Reader getNCharacterStream(int columnIndex) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Reader getNCharacterStream(String columnLabel) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateCharacterStream(int columnIndex, Reader x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateClob(int columnIndex, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateClob(String columnLabel, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNClob(int columnIndex, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNClob(String columnLabel, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
 }
diff -uNr ../commons-dbcp-1.2.1.orig/src/java/org/apache/commons/dbcp/DelegatingStatement.java ./src/java/org/apache/commons/dbcp/DelegatingStatement.java
--- ../commons-dbcp-1.2.1.orig/src/java/org/apache/commons/dbcp/DelegatingStatement.java	2004-06-12 21:42:21.000000000 +0800
+++ ./src/java/org/apache/commons/dbcp/DelegatingStatement.java	2009-01-09 22:15:58.000000000 +0800
@@ -127,7 +127,7 @@
 
     protected boolean _closed = false;
 
-    protected boolean isClosed() {
+    public boolean isClosed() {
         return _closed;
     }
 
@@ -326,4 +326,20 @@
     { checkOpen(); try { return _stmt.getResultSetHoldability(); } catch (SQLException e) { handleException(e); return 0; } }
 
 /* JDBC_3_ANT_KEY_END */
+
+    public void setPoolable(boolean poolable) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isPoolable() throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
 }
diff -uNr ../commons-dbcp-1.2.1.orig/src/java/org/apache/commons/dbcp/PoolingDataSource.java ./src/java/org/apache/commons/dbcp/PoolingDataSource.java
--- ../commons-dbcp-1.2.1.orig/src/java/org/apache/commons/dbcp/PoolingDataSource.java	2004-06-12 21:42:21.000000000 +0800
+++ ./src/java/org/apache/commons/dbcp/PoolingDataSource.java	2009-01-09 22:44:37.000000000 +0800
@@ -409,4 +409,12 @@
             }
         }
     }
+
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
 }
diff -uNr ../commons-dbcp-1.2.1.orig/src/test/org/apache/commons/dbcp/TesterConnection.java ./src/test/org/apache/commons/dbcp/TesterConnection.java
--- ../commons-dbcp-1.2.1.orig/src/test/org/apache/commons/dbcp/TesterConnection.java	2004-06-12 21:42:21.000000000 +0800
+++ ./src/test/org/apache/commons/dbcp/TesterConnection.java	2009-01-14 17:44:37.000000000 +0800
@@ -23,7 +23,15 @@
 import java.sql.SQLException;
 import java.sql.SQLWarning;
 import java.sql.Statement;
+import java.sql.Clob;
+import java.sql.Blob;
+import java.sql.NClob;
+import java.sql.SQLXML;
+import java.sql.SQLClientInfoException;
+import java.sql.Array;
+import java.sql.Struct;
 import java.util.Map;
+import java.util.Properties;
 
 /**
  * A dummy {@link Connection}, for testing purposes.
@@ -275,4 +283,57 @@
     }
 
 /* JDBC_3_ANT_KEY_END */
+
+
+    public Clob createClob() throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Blob createBlob() throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public NClob createNClob() throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public SQLXML createSQLXML() throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isValid(int timeout) throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setClientInfo(String name, String value) throws SQLClientInfoException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setClientInfo(Properties properties) throws SQLClientInfoException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getClientInfo(String name) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Properties getClientInfo() throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
 }
diff -uNr ../commons-dbcp-1.2.1.orig/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java ./src/test/org/apache/commons/dbcp/TesterPreparedStatement.java
--- ../commons-dbcp-1.2.1.orig/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java	2004-06-12 21:42:21.000000000 +0800
+++ ./src/test/org/apache/commons/dbcp/TesterPreparedStatement.java	2009-01-14 17:44:38.000000000 +0800
@@ -26,7 +26,12 @@
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
+import java.sql.RowId;
+import java.sql.NClob;
+import java.sql.SQLXML;
 import java.util.Calendar;
+import java.io.Reader;
+import java.io.InputStream;
 
 /**
  * A dummy {@link PreparedStatement}, for testing purposes.
@@ -290,4 +295,75 @@
 
 /* JDBC_3_ANT_KEY_END */
 
+    public void setRowId(int parameterIndex, RowId x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setNString(int parameterIndex, String value) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setNClob(int parameterIndex, NClob value) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setClob(int parameterIndex, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setNClob(int parameterIndex, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
 }
diff -uNr ../commons-dbcp-1.2.1.orig/src/test/org/apache/commons/dbcp/TesterResultSet.java ./src/test/org/apache/commons/dbcp/TesterResultSet.java
--- ../commons-dbcp-1.2.1.orig/src/test/org/apache/commons/dbcp/TesterResultSet.java	2004-06-12 21:42:21.000000000 +0800
+++ ./src/test/org/apache/commons/dbcp/TesterResultSet.java	2009-01-14 17:54:24.000000000 +0800
@@ -26,7 +26,13 @@
 import java.sql.SQLException;
 import java.sql.SQLWarning;
 import java.sql.Statement;
+import java.sql.RowId;
+import java.sql.NClob;
+import java.sql.SQLXML;
 import java.util.Calendar;
+import java.util.Map;
+import java.io.Reader;
+import java.io.InputStream;
 
 /**
  * A dummy {@link ResultSet}, for testing purposes.
@@ -759,4 +765,203 @@
 
 /* JDBC_3_ANT_KEY_END */
 
+    public RowId getRowId(int columnIndex) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public RowId getRowId(String columnLabel) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateRowId(int columnIndex, RowId x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateRowId(String columnLabel, RowId x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public int getHoldability() throws SQLException {
+        return 0;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isClosed() throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNString(int columnIndex, String nString) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNString(String columnLabel, String nString) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNClob(int columnIndex, NClob nClob) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNClob(String columnLabel, NClob nClob) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public NClob getNClob(int columnIndex) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public NClob getNClob(String columnLabel) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public SQLXML getSQLXML(int columnIndex) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public SQLXML getSQLXML(String columnLabel) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getNString(int columnIndex) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public String getNString(String columnLabel) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Reader getNCharacterStream(int columnIndex) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Reader getNCharacterStream(String columnLabel) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateCharacterStream(int columnIndex, Reader x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateClob(int columnIndex, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateClob(String columnLabel, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNClob(int columnIndex, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void updateNClob(String columnLabel, Reader reader) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
 }
diff -uNr ../commons-dbcp-1.2.1.orig/src/test/org/apache/commons/dbcp/TesterStatement.java ./src/test/org/apache/commons/dbcp/TesterStatement.java
--- ../commons-dbcp-1.2.1.orig/src/test/org/apache/commons/dbcp/TesterStatement.java	2004-06-12 21:42:21.000000000 +0800
+++ ./src/test/org/apache/commons/dbcp/TesterStatement.java	2009-01-14 17:44:37.000000000 +0800
@@ -264,4 +264,23 @@
     }
 /* JDBC_3_ANT_KEY_END */
 
+    public boolean isClosed() throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public void setPoolable(boolean poolable) throws SQLException {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isPoolable() throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    }
 }