[teiid-commits] teiid SVN: r1982 - in trunk: adminshell/src/main/java/org/teiid/script and 5 other directories.

[teiid-commits at lists.jboss.org]

Author: rareddy
Date: 2010-03-20 17:03:03 -0400 (Sat, 20 Mar 2010)
New Revision: 1982

Added:
   trunk/adminshell/src/main/java/org/teiid/script/
   trunk/adminshell/src/main/java/org/teiid/script/io/
   trunk/test-integration/db/src/main/java/org/teiid/jdbc/
   trunk/test-integration/db/src/main/java/org/teiid/jdbc/api/
Removed:
   trunk/client-jdbc/src/test/java/org/teiid/jdbc/api/
   trunk/client-jdbc/src/test/java/org/teiid/script/io/
Modified:
   trunk/adminshell/src/main/resources/scripts/jdbc.bsh
   trunk/adminshell/src/main/resources/scripts/server.bsh
Log:
TEIID-918: changing the package names based on teiid client code

Copied: trunk/adminshell/src/main/java/org/teiid/script/io (from rev 1981, trunk/client-jdbc/src/test/java/org/teiid/script/io)

Modified: trunk/adminshell/src/main/resources/scripts/jdbc.bsh
===================================================================
--- trunk/adminshell/src/main/resources/scripts/jdbc.bsh	2010-03-20 03:06:44 UTC (rev 1981)
+++ trunk/adminshell/src/main/resources/scripts/jdbc.bsh	2010-03-20 21:03:03 UTC (rev 1982)
@@ -10,9 +10,8 @@
  */
 
 import java.sql.*;
-import com.metamatrix.script.io.*;
-import com.metamatrix.jdbc.api.*;
-import com.metamatrix.jdbc.*;
+import org.teiid.script.io.*;
+import org.teiid.jdbc.*;
 
 protected Connection getConnection() {
     if (currentContext().internalConnection != void && currentContext().internalConnection != null) {
@@ -264,7 +263,7 @@
     	print("Statement is null - execute then issue showPlan");
         return;  
     }
-	PlanNode queryPlan = ((MMResultSet)currentContext().internalStatement).getPlanDescription();
+	PlanNode queryPlan = ((ResultSetImpl)currentContext().internalStatement).getPlanDescription();
 	if (queryPlan != null) {
 	    if (xml != null && xml) {
 			print(XMLOutputVisitor.convertToXML(queryPlan));

Modified: trunk/adminshell/src/main/resources/scripts/server.bsh
===================================================================
--- trunk/adminshell/src/main/resources/scripts/server.bsh	2010-03-20 03:06:44 UTC (rev 1981)
+++ trunk/adminshell/src/main/resources/scripts/server.bsh	2010-03-20 21:03:03 UTC (rev 1982)
@@ -7,7 +7,7 @@
 
 
 import java.sql.*;
-import com.metamatrix.common.api.MMURL;
+import org.teiid.net.*;
 import org.teiid.adminapi.*;
 
 // These values are default values, a user can supply a property file called
@@ -43,7 +43,7 @@
         newContext(contextName);        
         url = url+";ApplicationName="+contextName;
         try {
-        	com.metamatrix.jdbc.api.Connection mmConn = connectDriver(driver, url);
+        	Connection mmConn = connectDriver(driver, url);
             currentContext().internalPrompt = contextName+"["+extractVDBName(url)+"@"+extractHost(url)+"] $ ";
     		return mmConn;        	
         } catch(e) {
@@ -82,7 +82,7 @@
 */
 void connectAsAdmin(String username, String password, String url) {
 
-    if (MMURL.isValidServerURL(url)) {
+    if (TeiidURL.isValidServerURL(url)) {
         try {
             //url is in "server URL format": connect via ServerAdminFactory
             internalAdmin = createExceptionHandlingProxy(AdminFactory.getInstance().createAdmin(username, password.toCharArray(), url));
@@ -91,7 +91,7 @@
         	debug(e);
         }        
     } else {
-    	print("Wrong syntax for the URL.. connection failed. ex: \"jnp://localhost:1099\"");
+    	print("Wrong syntax for the URL.. connection failed. ex: \"mm://localhost:31443\"");
     }
 }
 

Copied: trunk/test-integration/db/src/main/java/org/teiid/jdbc/api (from rev 1981, trunk/client-jdbc/src/test/java/org/teiid/jdbc/api)