hammant 2003/01/02 16:25:10
Modified: db build.xml
db/src/conf db-assembly.xml
db/src/java/org/apache/avalon/db/server/lxsql
AbstractLXSQLParser.java
db/src/java/org/apache/avalon/db/transport/altrmi/client
AltrmiConnection.java
Log:
transport switched from cornerstone to altrmi.
Revision Changes Path
1.62 +9 -7 jakarta-avalon-apps/db/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/db/build.xml,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- build.xml 5 Nov 2002 22:23:02 -0000 1.61
+++ build.xml 3 Jan 2003 00:25:09 -0000 1.62
@@ -139,8 +139,9 @@
<exclude name="org/apache/avalon/db/driver/jdbc30/**"
unless="jdbc30.present" />
+
<exclude name="org/apache/avalon/db/driver/jdbc2x/**"
- if="jdbc30.present" />
+ if="jdbc30.present" />
<exclude name="org/apache/avalon/db/transport/altrmi/client/jdbc30/**"
unless="jdbc30.present" />
@@ -166,10 +167,10 @@
interfaces="org.apache.avalon.db.services.DatabaseManager"
classgendir="build/genclasses">
<classpath>
- <pathelement
location="../common/lib/excalibur-altrmi-client-interfaces-0.7.jar"/>
- <pathelement location="../common/lib/excalibur-altrmi-client-impl-0.7.jar"/>
- <pathelement location="../common/lib/excalibur-altrmi-common-0.7.jar"/>
- <pathelement location="../common/lib/excalibur-altrmi-generator-0.7.jar"/>
+ <pathelement
location="../common/lib/excalibur-altrmi-client-interfaces-0.8a.jar"/>
+ <pathelement
location="../common/lib/excalibur-altrmi-client-impl-0.8a.jar"/>
+ <pathelement location="../common/lib/excalibur-altrmi-common-0.8a.jar"/>
+ <pathelement location="../common/lib/excalibur-altrmi-generator-0.8a.jar"/>
<pathelement path="${build.classes}"/>
</classpath>
</altrmiproxies>
@@ -265,8 +266,9 @@
<lib dir="../common/lib/" >
<include name="excalibur-altrmi-server-*.jar"/>
- <include name="excalibur-altrmi-common-0.7.jar"/>
- <include name="excalibur-altrmi-generator-0.7.jar"/>
+ <include name="excalibur-altrmi-common-0.8a.jar"/>
+ <include name="excalibur-altrmi-generator-0.8a.jar"/>
+ <include name="excalibur-altrmi-blocks-0.8a.jar"/>
</lib>
<lib dir="../common/lib" >
1.20 +2 -2 jakarta-avalon-apps/db/src/conf/db-assembly.xml
Index: db-assembly.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/db/src/conf/db-assembly.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- db-assembly.xml 13 Apr 2002 10:45:18 -0000 1.19
+++ db-assembly.xml 3 Jan 2003 00:25:10 -0000 1.20
@@ -89,11 +89,11 @@
<provide name="sql-optimizer"
role="org.apache.avalon.db.services.SQLOptimizer" />
</block>
- <block
class="org.apache.avalon.cornerstone.blocks.transport.authentication.DefaultAuthenticator"
+ <block
class="org.apache.excalibur.altrmi.blocks.authentication.DefaultAuthenticator"
name="altrmi-authenticator" >
</block>
- <block
class="org.apache.avalon.cornerstone.blocks.transport.publishing.SocketStreamPublisher"
+ <block
class="org.apache.excalibur.altrmi.blocks.publishing.SocketStreamPublisher"
name="altrmi-publisher" >
<provide name="sockets"
role="org.apache.avalon.cornerstone.services.sockets.SocketManager"/>
<provide name="connections"
1.7 +1 -1
jakarta-avalon-apps/db/src/java/org/apache/avalon/db/server/lxsql/AbstractLXSQLParser.java
Index: AbstractLXSQLParser.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/server/lxsql/AbstractLXSQLParser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractLXSQLParser.java 12 May 2002 10:09:24 -0000 1.6
+++ AbstractLXSQLParser.java 3 Jan 2003 00:25:10 -0000 1.7
@@ -55,7 +55,7 @@
}
catch (ParserConfigurationException pce)
{
- throw new ServiceException("ParserConfiguration Exception in
service()",pce);
+ throw new ServiceException(DocumentBuilderFactory.class.getName(),
"ParserConfiguration Exception in service()",pce);
}
super.service(serviceManager);
}
1.7 +4 -3
jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/altrmi/client/AltrmiConnection.java
Index: AltrmiConnection.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/db/src/java/org/apache/avalon/db/transport/altrmi/client/AltrmiConnection.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AltrmiConnection.java 3 Apr 2002 12:06:00 -0000 1.6
+++ AltrmiConnection.java 3 Jan 2003 00:25:10 -0000 1.7
@@ -65,9 +65,10 @@
AltrmiFactory altrmiFactory = new ClientClassAltrmiFactory(false);
try {
altrmiFactory.setHostContext(getAltrmiHostContext(url,host,port));
- } catch (IOException ioe) {
- throw new AvalonDBSQLException("Some IO Exception during
initialization", ioe);
+ } catch (AltrmiConnectionException e) {
+ throw new AvalonDBSQLException("Some AltRMI Connection Exception during
initialization", e);
}
+
mOptions = options;
mSQLSyntax = syntax;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
