1.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/datasource/DataSourceResolver.java Wed Sep 26 23:42:19 2007 +0000
1.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/datasource/DataSourceResolver.java Thu Sep 27 05:18:13 2007 +0000
1.3 @@ -214,17 +214,11 @@
1.4 // Update Project's datasources
1.5 try {
1.6 new DesignTimeDataSourceHelper().updateDataSource(project);
1.7 - markProject(project);
1.8 checkConnections(project);
1.9 } catch (NamingException ne) {
1.10 Logger.getLogger("copy").info("Migrating user settings failed " + ne); //NOI18N
1.11 }
1.12 - }
1.13 -
1.14 - // Mark legacy project as migrated
1.15 - private void markProject(Project project) {
1.16 - JsfProjectUtils.createProjectProperty(project, "migrated", "true");
1.17 - }
1.18 + }
1.19
1.20 // Check if any database connections needed by the project are missing
1.21 private void checkConnections(Project project) {
2.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DesignTimeDataSourceHelper.java Wed Sep 26 23:42:19 2007 +0000
2.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DesignTimeDataSourceHelper.java Thu Sep 27 05:18:13 2007 +0000
2.3 @@ -479,7 +479,8 @@
2.4 public Map updateDataSource(Project currentProj) {
2.5 // Manage the migration of legacy projects
2.6 if (ImportDataSource.isLegacyProject(currentProj) && JsfProjectUtils.getProjectProperty(currentProj, "migrated").equals("")) {//NOI18N
2.7 - DataSourceResolver.getInstance().updateSettings();
2.8 + DataSourceResolver.getInstance().updateSettings();
2.9 + JsfProjectUtils.createProjectProperty(currentProj, "migrated", "true");
2.10 }
2.11
2.12 // Get the data sources in the project then bind them to the project's context
3.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/utils/ImportDataSource.java Wed Sep 26 23:42:19 2007 +0000
3.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/utils/ImportDataSource.java Thu Sep 27 05:18:13 2007 +0000
3.3 @@ -109,7 +109,6 @@
3.4 public static void prepareCopy() throws IOException {
3.5 // Check if already migrated
3.6 if (isMigrated()) {
3.7 - System.out.println("nothing to migrated"); //NOI18N
3.8 return;
3.9 }
3.10