You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/02/10 20:03:10 UTC
svn commit: r505747 - in /incubator/tuscany/java/das/rdb/src:
main/java/org/apache/tuscany/das/rdb/config/wrapper/
main/java/org/apache/tuscany/das/rdb/impl/ main/resources/
test/java/org/apache/tuscany/das/rdb/test/
Author: lresende
Date: Sat Feb 10 11:03:09 2007
New Revision: 505747
URL: http://svn.apache.org/viewvc?view=rev&rev=505747
Log:
Fixing a typo on the xsd definition
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java
incubator/tuscany/java/das/rdb/src/main/resources/config.xsd
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java?view=diff&rev=505747&r1=505746&r2=505747
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java Sat Feb 10 11:03:09 2007
@@ -466,7 +466,7 @@
ConnectionInfo info = ConfigFactory.INSTANCE.createConnectionInfo();
info.setDataSource(dataSourceName);
info.setManagedtx(managedtx);
- info.setUseDriveManager(useDriverManager);
+ info.setUseDriverManager(useDriverManager);
ConnectionProperties connectionProperties = ConfigFactory.INSTANCE.createConnectionProperties();
connectionProperties.setDriverClass(driverClass);
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java?view=diff&rev=505747&r1=505746&r2=505747
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java Sat Feb 10 11:03:09 2007
@@ -152,8 +152,8 @@
}
ConnectionInfo connectionInfo = configWrapper.getConfig().getConnectionInfo();
- if(connectionInfo.isUseDriveManager()){
- initializeDriveManagerConnection(connectionInfo);
+ if(connectionInfo.isUseDriverManager()){
+ initializeDriverManagerConnection(connectionInfo);
}else{
initializeDatasourceConnection(connectionInfo);
}
@@ -193,7 +193,7 @@
* Initialize a DB connection on a J2SE environment
* For more info, see http://java.sun.com/j2se/1.3/docs/guide/jdbc/getstart/drivermanager.html
*/
- private void initializeDriveManagerConnection(ConnectionInfo connectionInfo) {
+ private void initializeDriverManagerConnection(ConnectionInfo connectionInfo) {
Connection connection = null;
Modified: incubator/tuscany/java/das/rdb/src/main/resources/config.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/resources/config.xsd?view=diff&rev=505747&r1=505746&r2=505747
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/resources/config.xsd (original)
+++ incubator/tuscany/java/das/rdb/src/main/resources/config.xsd Sat Feb 10 11:03:09 2007
@@ -52,7 +52,7 @@
</xsd:sequence>
<xsd:attribute name="dataSource" type="xsd:string"/>
<xsd:attribute name="managedtx" type="xsd:boolean" default="true"/>
- <xsd:attribute name="useDriveManager" type="xsd:boolean" default="false"/>
+ <xsd:attribute name="useDriverManager" type="xsd:boolean" default="false"/>
</xsd:complexType>
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java?view=diff&rev=505747&r1=505746&r2=505747
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java Sat Feb 10 11:03:09 2007
@@ -245,13 +245,13 @@
*/
public void testConnectionInfoDriverManager() throws Exception {
ConfigHelper helper = new ConfigHelper();
- helper.addConnectionInfo("jdbc/adatasource", false, true);
+ helper.addConnectionInfo("jdbc/adatasource", false, false);
Config config = helper.getConfig();
ConnectionInfo info = config.getConnectionInfo();
assertEquals(info.getDataSource(), "jdbc/adatasource");
assertEquals(info.isManagedtx(), false);
- assertEquals(info.isUseDriveManager(), true);
+ assertEquals(info.isUseDriverManager(), false);
}
/**
@@ -266,6 +266,7 @@
ConnectionInfo info = config.getConnectionInfo();
assertEquals(info.getDataSource(), "jdbc/adatasource");
assertEquals(info.isManagedtx(), false);
+ assertEquals(info.isUseDriverManager(), true);
assertEquals(info.getConnectionProperties().getDriverClass(), "jdbc:derby:target/dastest");
assertEquals(info.getConnectionProperties().getUserName(), "user");
assertEquals(info.getConnectionProperties().getPassword(), "password");
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org