Hi Devs,
Please review and commit, Please find the attached svn diff for the JIRA
issue https://wso2.org/jira/browse/CARBON-15239
Thanks,
Madhawa
--
*Madhawa Gunasekara*
Software Engineer
WSO2 Inc.; http://wso2.com
lean.enterprise.middleware
mobile: +94 719411002 <+94+719411002>
blog: *http://madhawa-gunasekara.blogspot.com
<http://madhawa-gunasekara.blogspot.com>*
linkedin: *http://lk.linkedin.com/in/mgunasekara
<http://lk.linkedin.com/in/mgunasekara>*
Index: kernel/branches/4.2.0/patches/patch0003/core/org.wso2.carbon.ndatasource.rdbms/4.2.0/src/main/java/org/wso2/carbon/ndatasource/rdbms/utils/RDBMSDataSourceUtils.java
===================================================================
--- kernel/branches/4.2.0/patches/patch0003/core/org.wso2.carbon.ndatasource.rdbms/4.2.0/src/main/java/org/wso2/carbon/ndatasource/rdbms/utils/RDBMSDataSourceUtils.java (revision 212341)
+++ kernel/branches/4.2.0/patches/patch0003/core/org.wso2.carbon.ndatasource.rdbms/4.2.0/src/main/java/org/wso2/carbon/ndatasource/rdbms/utils/RDBMSDataSourceUtils.java (working copy)
@@ -202,8 +202,14 @@
}
props.setDefaultCatalog(config.getDefaultCatalog());
props.setDriverClassName(config.getDriverClassName());
- props.setUsername(config.getUsername());
- props.setPassword(config.getPassword());
+ String username = config.getUsername();
+ if (username != null && !username.equals("")) {
+ props.setUsername(username);
+ }
+ String password = config.getPassword();
+ if (password != null && !password.equals("")) {
+ props.setPassword(password);
+ }
if (config.getMaxActive() != null) {
props.setMaxActive(config.getMaxActive());
}
Index: kernel/branches/4.2.0/patches/patch0010/core/org.wso2.carbon.ndatasource.rdbms/4.2.0/pom.xml
===================================================================
--- kernel/branches/4.2.0/patches/patch0010/core/org.wso2.carbon.ndatasource.rdbms/4.2.0/pom.xml (revision 212341)
+++ kernel/branches/4.2.0/patches/patch0010/core/org.wso2.carbon.ndatasource.rdbms/4.2.0/pom.xml (working copy)
@@ -51,6 +51,17 @@
<artifactId>org.wso2.carbon.utils</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database.wso2</groupId>
+ <artifactId>h2-database-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Index: kernel/branches/4.2.0/patches/patch0010/core/org.wso2.carbon.ndatasource.rdbms/4.2.0/src/main/java/org/wso2/carbon/ndatasource/rdbms/utils/RDBMSDataSourceUtils.java
===================================================================
--- kernel/branches/4.2.0/patches/patch0010/core/org.wso2.carbon.ndatasource.rdbms/4.2.0/src/main/java/org/wso2/carbon/ndatasource/rdbms/utils/RDBMSDataSourceUtils.java (revision 212341)
+++ kernel/branches/4.2.0/patches/patch0010/core/org.wso2.carbon.ndatasource.rdbms/4.2.0/src/main/java/org/wso2/carbon/ndatasource/rdbms/utils/RDBMSDataSourceUtils.java (working copy)
@@ -202,8 +202,14 @@
}
props.setDefaultCatalog(config.getDefaultCatalog());
props.setDriverClassName(config.getDriverClassName());
- props.setUsername(config.getUsername());
- props.setPassword(config.getPassword());
+ String username = config.getUsername();
+ if (null != username && !("").equals(username)) {
+ props.setUsername(username);
+ String password = config.getPassword();
+ if (null != password && !("").equals(password)) {
+ props.setPassword(password);
+ }
+ }
if (config.getMaxActive() != null) {
props.setMaxActive(config.getMaxActive());
}
Index: platform/branches/turing/components/data-services/org.wso2.carbon.dataservices.core/4.2.1/src/main/java/org/wso2/carbon/dataservices/core/admin/DataServiceAdmin.java
===================================================================
--- platform/branches/turing/components/data-services/org.wso2.carbon.dataservices.core/4.2.1/src/main/java/org/wso2/carbon/dataservices/core/admin/DataServiceAdmin.java (revision 212341)
+++ platform/branches/turing/components/data-services/org.wso2.carbon.dataservices.core/4.2.1/src/main/java/org/wso2/carbon/dataservices/core/admin/DataServiceAdmin.java (working copy)
@@ -221,9 +221,16 @@
}
Class.forName(driverClass.trim());
- connection = DriverManager.getConnection(jdbcURL, username, resolvePwd);
- String message = "Database connection is successfull with driver class " + driverClass
- + " , jdbc url " + jdbcURL + " and user name " + username;
+ String message;
+ if (username != null && !username.equals("")) {
+ connection = DriverManager.getConnection(jdbcURL, username, resolvePwd);
+ message = "Database connection is successful with driver class " + driverClass +
+ " , jdbc url " + jdbcURL + " and user name " + username;
+ } else {
+ connection = DriverManager.getConnection(jdbcURL);
+ message = "Database connection is successful with driver class " + driverClass +
+ " , jdbc url " + jdbcURL;
+ }
log.debug(message);
return message;
} catch (SQLException e) {
Index: platform/branches/turing/components/data-services/org.wso2.carbon.dataservices.core/4.2.1/src/main/java/org/wso2/carbon/dataservices/core/script/DSGenerator.java
===================================================================
--- platform/branches/turing/components/data-services/org.wso2.carbon.dataservices.core/4.2.1/src/main/java/org/wso2/carbon/dataservices/core/script/DSGenerator.java (revision 212341)
+++ platform/branches/turing/components/data-services/org.wso2.carbon.dataservices.core/4.2.1/src/main/java/org/wso2/carbon/dataservices/core/script/DSGenerator.java (working copy)
@@ -302,8 +302,12 @@
if ((url != null) && (driver != null) && (userName != null)
&& (password != null)) {
Class.forName(driver);
- Connection connection = DriverManager.getConnection(url, userName,
- password);
+ Connection connection;
+ if (!userName.equals("")) {
+ connection = DriverManager.getConnection(url, userName, password);
+ } else {
+ connection = DriverManager.getConnection(url);
+ }
return DSGenerator.getTableList(connection, dbName, schemas);
} else {
return null;
_______________________________________________
Dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/dev
