Skip to content

Commit

Permalink
Restrict the preview import vdb functionality to teiid 8+ servers
Browse files Browse the repository at this point in the history
* Restores the merge method to Teiid 7 ExecutionAdmin, only allowing the
  import vdb functionality to 8+ servers.

* Merge should remain deprecated since it is only for backward compatibility
  • Loading branch information
Paul Richardson committed Feb 14, 2013
1 parent 7be2d48 commit 33aa0e6
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -645,4 +645,12 @@ public void update(ITeiidServer otherServer) {
getTeiidAdminInfo().setAll(otherServer.getTeiidAdminInfo());
getTeiidJdbcInfo().setAll(otherServer.getTeiidJdbcInfo());
}

@Deprecated
@Override
public void mergeVdbs( String sourceVdbName, int sourceVdbVersion,
String targetVdbName, int targetVdbVersion ) throws Exception {
connect();
admin.mergeVdbs(sourceVdbName, sourceVdbVersion, targetVdbName, targetVdbVersion);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -224,4 +224,19 @@ ITeiidDataSource getOrCreateDataSource(String displayName,
* @throws Exception
*/
Driver getTeiidDriver(String driverClass) throws Exception;

/**
* @param sourceVdbName (excluding .vdb extension) the name of the VDB being merged into the target VDB
* @param sourceVdbVersion the version of the source VDB
* @param targetVdbName (excluding .vdb extension) the name of the VDB being merged into
* @param targetVdbVersion the version of the target VDB
*
* @throws Exception if there is a problem with the merge
*
* @deprecated This is only provided for backward compatibility with teiid 7.7.1 and should not
* be used for new code.
*/
@Deprecated
void mergeVdbs( String sourceVdbName, int sourceVdbVersion,
String targetVdbName, int targetVdbVersion ) throws Exception;
}
2 changes: 1 addition & 1 deletion plugins/teiid/org.teiid.7.7.x
Submodule org.teiid.7.7.x updated 1 files
+7 −0 designer/org/teiid772/runtime/ExecutionAdmin.java

0 comments on commit 33aa0e6

Please sign in to comment.