[teiid-commits] teiid SVN: r1623 - trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2009-12-04 14:07:55 -0500 (Fri, 04 Dec 2009)
New Revision: 1623

Modified:
   trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedVDBService.java
Log:
TEIID-893 fix for bad error message when reading an invalid def file.  also ensuring that all vdb paths are based upon an abstract path name.

Modified: trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedVDBService.java
===================================================================
--- trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedVDBService.java	2009-12-04 19:07:14 UTC (rev 1622)
+++ trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedVDBService.java	2009-12-04 19:07:55 UTC (rev 1623)
@@ -22,7 +22,6 @@
 
 package com.metamatrix.dqp.embedded.services;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -163,8 +162,8 @@
     public int getFileVisibility(String vdbName, String vdbVersion, String pathInVDB) 
         throws MetaMatrixComponentException {        
 
-    	String modelName = StringUtil.getFirstToken(StringUtil.getLastToken(pathInVDB, File.separator), "."); //$NON-NLS-1$ //$NON-NLS-2$
-    	
+    	String modelName = StringUtil.getFirstToken(StringUtil.getLastToken(pathInVDB, "/"), "."); //$NON-NLS-1$ //$NON-NLS-2$
+
         // If this is any of the Public System Models, like JDBC,ODBC system models
         if(VDBArchive.isSystemModelWithSystemTableType(modelName)){
             return ModelInfo.PUBLIC;