You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/07/16 08:03:19 UTC
svn commit: r1752907 - in /openmeetings/application:
branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/
branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/
trunk/openmeetings-install/src/main/java/...
Author: solomax
Date: Sat Jul 16 08:03:18 2016
New Revision: 1752907
URL: http://svn.apache.org/viewvc?rev=1752907&view=rev
Log:
[OPENMEETINGS-1419] Oracle DB with Service Name should work as expected
Modified:
openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java?rev=1752907&r1=1752906&r2=1752907&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java Sat Jul 16 08:03:18 2016
@@ -23,6 +23,10 @@ public class OraclePatcher extends Conne
protected String getUrl(String _url, String host, String _port, String _db) {
String port = (_port == null) ? "1521" : _port;
String db = (_db == null) ? "openmeetings" : _db;
- return "jdbc:oracle:thin:@" + host + ":" + port + ":" + db;
+ String delim = ":";
+ if (db.startsWith("/")) {
+ delim = "";
+ }
+ return String.format("jdbc:oracle:thin:@%s:%s%s%s", host, port, delim, db);
}
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java?rev=1752907&r1=1752906&r2=1752907&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java Sat Jul 16 08:03:18 2016
@@ -23,6 +23,10 @@ public class OraclePatcher extends Conne
protected String getUrl(String _url, String host, String _port, String _db) {
String port = (_port == null) ? "1521" : _port;
String db = (_db == null) ? "openmeetings" : _db;
- return "jdbc:oracle:thin:@" + host + ":" + port + ":" + db;
+ String delim = ":";
+ if (db.startsWith("/")) {
+ delim = "";
+ }
+ return String.format("jdbc:oracle:thin:@%s:%s%s%s", host, port, delim, db);
}
}
Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java?rev=1752907&r1=1752906&r2=1752907&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java (original)
+++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OraclePatcher.java Sat Jul 16 08:03:18 2016
@@ -23,6 +23,10 @@ public class OraclePatcher extends Conne
protected String getUrl(String _url, String host, String _port, String _db) {
String port = (_port == null) ? "1521" : _port;
String db = (_db == null) ? "openmeetings" : _db;
- return "jdbc:oracle:thin:@" + host + ":" + port + ":" + db;
+ String delim = ":";
+ if (db.startsWith("/")) {
+ delim = "";
+ }
+ return String.format("jdbc:oracle:thin:@%s:%s%s%s", host, port, delim, db);
}
}