Attachment 595366 Details for Bug 836664 – Patch to fix issue

[patch] Patch to fix issue

patch.diff (text/plain), 3.05 KB, created by Richard Hensman on 2012-06-29 20:59:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Richard Hensman

Created: 2012-06-29 20:59:23 UTC

Size: 3.05 KB

patch

obsolete

>diff --git a/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleServerComponent.java b/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleServerComponent.java
>index 3d70eef..4e5e240 100644
>--- a/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleServerComponent.java
>+++ b/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleServerComponent.java
>@@ -128,7 +128,12 @@ public class OracleServerComponent implements DatabaseComponent, MeasurementFace
>     }
> 
>     private static String buildUrl(Configuration configuration) {
>-        return "jdbc:oracle:thin:@" + configuration.getSimpleValue("host", "localhost") + ":"
>-            + configuration.getSimpleValue("port", "1521") + ":" + configuration.getSimpleValue("sid", "XE");
>+        if ( configuration.getSimpleValue("connectionMethod", "SID").equals("SID")) {
>+            return "jdbc:oracle:thin:@" + configuration.getSimpleValue("host", "localhost") + ":"
>+                + configuration.getSimpleValue("port", "1521") + ":" + configuration.getSimpleValue("sid", "XE");
>+        } else {
>+            return "jdbc:oracle:thin:@" + configuration.getSimpleValue("host", "localhost") + ":"
>+                + configuration.getSimpleValue("port", "1521") + "/" + configuration.getSimpleValue("sid", "XE");
>+        }
>     }
> }
>\ No newline at end of file
>diff --git a/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml
>index 27c9033..9a32f47 100644
>--- a/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml
>+++ b/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml
>@@ -21,7 +21,17 @@
>       <plugin-configuration>
>          <c:simple-property name="host" default="localhost" displayName="Listen host" description="the hostname or IP address that the database is listening on"/>
>          <c:simple-property name="port" default="1521" displayName="Listen port" description="the TCP port that the database is listening on"/>
>-         <c:simple-property name="sid" default="XE" displayName="Database SID" description="the name of the database to connect to"/>
>+            
>+         <c:simple-property name="connectionMethod" displayName="Connection Method" type="string" required="true" default="SID"
>+                            description="The method used to connect to Oracle;
>+                                         defaults to 'SID'.">
>+                <c:property-options>
>+                   <c:option value="SID"    name="SID"/>
>+                   <c:option value="SERVICENAME" name="Service name"/>
>+                </c:property-options>
>+         </c:simple-property>
>+            
>+         <c:simple-property name="sid" default="XE" displayName="Database SID/Service name" description="SID or service name of the database to connect to"/>
> 
>          <c:simple-property name="driverClass" default="oracle.jdbc.driver.OracleDriver" displayName="JDBC driver class"
>                             description="the fully-qualified classname of the JDBC driver class" required="false"/>

Actions: View | Diff

Attachments on bug 836664: 595366