summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsb <sb@openoffice.org>2011-02-11 11:00:41 +0100
committersb <sb@openoffice.org>2011-02-11 11:00:41 +0100
commitac66cccbb324808f8497b5f71e5a63371c8b5303 (patch)
tree5b62c8d274b92c90847f53efbfe98711ac251f20
parent09b708d0ebf21e42553a4bf703d8c051c7a6dcb8 (diff)
parent2f9518709be117b62a1a5b9fbc1002340f71a2b5 (diff)
sb138: merged in re/DEV300_next towards DEV300_m100
-rw-r--r--odk/examples/DevelopersGuide/Database/CodeSamples.java42
1 files changed, 8 insertions, 34 deletions
diff --git a/odk/examples/DevelopersGuide/Database/CodeSamples.java b/odk/examples/DevelopersGuide/Database/CodeSamples.java
index 0980055a..855b816b 100644
--- a/odk/examples/DevelopersGuide/Database/CodeSamples.java
+++ b/odk/examples/DevelopersGuide/Database/CodeSamples.java
@@ -151,33 +151,6 @@ public class CodeSamples
if(xDriverManager != null)
{
// first create the needed url
- String adabasURL = "sdbc:adabas::MYDB0";
- // second create the necessary properties
- com.sun.star.beans.PropertyValue [] adabasProps = new com.sun.star.beans.PropertyValue[]
- {
- new com.sun.star.beans.PropertyValue("user",0,"test1",com.sun.star.beans.PropertyState.DIRECT_VALUE),
- new com.sun.star.beans.PropertyValue("password",0,"test1",com.sun.star.beans.PropertyState.DIRECT_VALUE)
- };
- // now create a connection to adabas
- con = xDriverManager.getConnectionWithInfo(adabasURL,adabasProps);
- }
- return con;
- }
-
- // uses the driver manager to create a new connection and dispose it.
- public static XConnection openToJDBC() throws com.sun.star.uno.Exception
- {
- XConnection con = null;
- // create the DriverManager
- Object driverManager =
- xMCF.createInstanceWithContext("com.sun.star.sdbc.DriverManager",
- xContext);
- // query for the interface
- com.sun.star.sdbc.XDriverManager xDriverManager;
- xDriverManager = (XDriverManager)UnoRuntime.queryInterface(XDriverManager.class,driverManager);
- if(xDriverManager != null)
- {
- // first create the needed url
String url = "jdbc:mysql://localhost:3306/TestTables";
// second create the necessary properties
com.sun.star.beans.PropertyValue [] props = new com.sun.star.beans.PropertyValue[]
@@ -186,7 +159,7 @@ public class CodeSamples
new com.sun.star.beans.PropertyValue("password",0,"test1",com.sun.star.beans.PropertyState.DIRECT_VALUE),
new com.sun.star.beans.PropertyValue("JavaDriverClass",0,"org.gjt.mm.mysql.Driver",com.sun.star.beans.PropertyState.DIRECT_VALUE)
};
- // now create a connection to adabas
+ // now create a connection to mysql
con = xDriverManager.getConnectionWithInfo(url,props);
}
return con;
@@ -198,7 +171,7 @@ public class CodeSamples
XConnection con = null;
// create the Driver with the implementation name
Object aDriver =
- xMCF.createInstanceWithContext("com.sun.star.comp.sdbcx.adabas.ODriver",
+ xMCF.createInstanceWithContext("org.openoffice.comp.drivers.MySQL.Driver",
xContext);
// query for the interface
com.sun.star.sdbc.XDriver xDriver;
@@ -206,15 +179,16 @@ public class CodeSamples
if(xDriver != null)
{
// first create the needed url
- String adabasURL = "sdbc:adabas::MYDB0";
+ String url = "jdbc:mysql://localhost:3306/TestTables";
// second create the necessary properties
- com.sun.star.beans.PropertyValue [] adabasProps = new com.sun.star.beans.PropertyValue[]
+ com.sun.star.beans.PropertyValue [] props = new com.sun.star.beans.PropertyValue[]
{
new com.sun.star.beans.PropertyValue("user",0,"test1",com.sun.star.beans.PropertyState.DIRECT_VALUE),
- new com.sun.star.beans.PropertyValue("password",0,"test1",com.sun.star.beans.PropertyState.DIRECT_VALUE)
+ new com.sun.star.beans.PropertyValue("password",0,"test1",com.sun.star.beans.PropertyState.DIRECT_VALUE),
+ new com.sun.star.beans.PropertyValue("JavaDriverClass",0,"org.gjt.mm.mysql.Driver",com.sun.star.beans.PropertyState.DIRECT_VALUE)
};
- // now create a connection to adabas
- con = xDriver.connect(adabasURL,adabasProps);
+ // now create a connection to mysql
+ con = xDriver.connect(url,props);
}
return con;
}