[Mulgara-svn] r680 - in branches/mgr-73: . src/jar/resolver/java/org/mulgara/resolver

[andrae at mulgara.org]

Author: andrae
Date: 2008-03-17 01:12:10 -0700 (Mon, 17 Mar 2008)
New Revision: 680

Modified:
   branches/mgr-73/common.xml
   branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/AdvDatabaseSessionUnitTest.java
Log:
refs #73
refs #85

Fixes up some incompatibilities with updated jar-files in trunk/

Specifically trouble with the jotm upgrade, and the wsdl upgrade.



Modified: branches/mgr-73/common.xml
===================================================================
--- branches/mgr-73/common.xml	2008-03-17 04:18:25 UTC (rev 679)
+++ branches/mgr-73/common.xml	2008-03-17 08:12:10 UTC (rev 680)
@@ -152,7 +152,7 @@
                        jotm*.jar, commons-logging-*.jar, Quick4rt.jar,
                        commons-discovery-*.jar, commons-httpclient-*.jar,
                        commons-codec-*.jar, connector-*.jar, jaxrpc-*.jar,
-                       ${date-utils.jar}"
+                       carol*.jar, howl-logger*.jar, ${date-utils.jar}"
              excludes="jboss-j2ee.jar"/>
   </path>
 

Modified: branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/AdvDatabaseSessionUnitTest.java
===================================================================
--- branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/AdvDatabaseSessionUnitTest.java	2008-03-17 04:18:25 UTC (rev 679)
+++ branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/AdvDatabaseSessionUnitTest.java	2008-03-17 08:12:10 UTC (rev 680)
@@ -63,6 +63,7 @@
 import org.mulgara.query.Order;
 import org.mulgara.query.Query;
 import org.mulgara.query.QueryException;
+import org.mulgara.query.SelectElement;
 import org.mulgara.query.Subquery;
 import org.mulgara.query.TuplesException;
 import org.mulgara.query.UnconstrainedAnswer;
@@ -1158,7 +1159,7 @@
         Variable predicateVariable = new Variable("predicate");
         Variable objectVariable    = new Variable("object");
 
-        List<Object> selectList = new ArrayList<Object>(3);
+        List<SelectElement> selectList = new ArrayList<SelectElement>(3);
         selectList.add(subjectVariable);
         selectList.add(predicateVariable);
         selectList.add(objectVariable);