Revision 2136

tmp/org.txm.core/src/java/org/txm/PostTXMHOMEInstallationStep.java (revision 2136)
20 20
	
21 21
	/**
22 22
	 * called after the Core has created its files
23
	 * 
24
	 * the do_install method is called only if the plugin version has changed
25
	 * 
23 26
	 * @return true if success, false if installation failed
24 27
	 */
25 28
	public final boolean install(Workspace workspace) {
......
30 33
			extinstalledVersionString = "0.0.0";
31 34
		}
32 35
		Version extinstalledVersion = new Version(extinstalledVersionString);
33
		Log.fine(TXMCoreMessages.bind("{0} nstalled version: {1}.", getName(), extinstalledVersion));
36
		Log.fine(TXMCoreMessages.bind("{0} installed version: {1}.", getName(), extinstalledVersion));
34 37
		//System.out.println("Toolbox.startWorkspace(): workspace location = " + location);
35 38
		boolean extDoUpdateworkspace = extcurrentVersion.compareTo(extinstalledVersion) > 0;
36 39
		if (needsReinstall(workspace) || extDoUpdateworkspace) {
37
			return do_install(workspace);
40
			Log.finer("Installing extension "+getName()+" reasons: workspace or extDoUpdateworkspace="+extDoUpdateworkspace);
41
			if (do_install(workspace)) {
42
				Toolbox.setPreference(getName(), extcurrentVersion.toString()); // SAVE the installed version
43
			}
44
		} else {
45
			Log.finer(" no need to re-install "+getName());
38 46
		}
39 47
		return true;
40 48
	};
tmp/org.txm.core/src/java/org/txm/Toolbox.java (revision 2136)
226 226
	 */
227 227
	public static boolean initialize(Class preferencesStore, IProgressMonitor monitor) throws Exception {
228 228
		initializing = true;
229

  
230
		try {
231
			Log.fine("Initializing logger...");
232
			Log.setLevel(Level.parse(getPreference(TBXPreferences.LOG_LEVEL)));
233
			Log.setPrintInConsole(TBXPreferences.getInstance().getBoolean(TBXPreferences.ADD_TECH_LOGS));
234
			Log.log_stacktrace_boolean = TBXPreferences.getInstance().getBoolean(TBXPreferences.LOG_STACKTRACE);
235

  
236
			if (!getPreference(TBXPreferences.LOG_DIR).isEmpty()) {
237
				Log.setPrintInFile(TBXPreferences.getInstance().getBoolean(TBXPreferences.LOG_IN_FILE), new File(getPreference(TBXPreferences.LOG_DIR)));
238
			} else {
239
				Log.setPrintInFile(TBXPreferences.getInstance().getBoolean(TBXPreferences.LOG_IN_FILE));
240
			}
241
		} catch(Exception e) {
242
			System.out.println("Error while initializing logger: "+e);
243
			e.printStackTrace();
244
		}
245

  
229 246
		if (monitor != null) {
230 247
			monitor.setTaskName(TXMCoreMessages.initializingToolbox);
231 248
		}
......
246 263
			state = startWorkspace(monitor);
247 264
			if (monitor != null && monitor.isCanceled()) return false;
248 265

  
249
			Log.fine("Initializing logger...");
250
			Log.setLevel(Level.parse(getPreference(TBXPreferences.LOG_LEVEL)));
251
			Log.setPrintInConsole(TBXPreferences.getInstance().getBoolean(TBXPreferences.ADD_TECH_LOGS));
252
			Log.log_stacktrace_boolean = TBXPreferences.getInstance().getBoolean(TBXPreferences.LOG_STACKTRACE);
253 266

  
254
			if (!getPreference(TBXPreferences.LOG_DIR).isEmpty()) {
255
				Log.setPrintInFile(TBXPreferences.getInstance().getBoolean(TBXPreferences.LOG_IN_FILE), new File(getPreference(TBXPreferences.LOG_DIR)));
256
			} else {
257
				Log.setPrintInFile(TBXPreferences.getInstance().getBoolean(TBXPreferences.LOG_IN_FILE));
258
			}
259 267

  
260 268
		} catch (Exception e) {
261 269
			initializing = false;
......
277 285
		try {
278 286
			if (monitor != null) {
279 287
				monitor.subTask(TXMCoreMessages.loadingExtensionPostInstallation);
280
				
288

  
281 289
			}
282 290
			pluginsPostinstallation(monitor);
283 291
			if (monitor != null && monitor.isCanceled()) return false;
......
625 633
				// updating extension files
626 634
				IConfigurationElement[] contributions = Platform.getExtensionRegistry().getConfigurationElementsFor(PostTXMHOMEInstallationStep.EXTENSION_ID);
627 635
				//System.out.println("contributions: "+Arrays.toString(contributions));
636
				Log.fine("Installing extensions ("+contributions.length+")");
628 637
				for (int i = 0; i < contributions.length; i++) {
629 638
					try {
630
						Log.fine(TXMCoreMessages.bind("Registering engine: {0}...", contributions[i].getName()));
639
						Log.fine(TXMCoreMessages.bind("Installing extentions: {0}...", contributions[i].getName()));
631 640
						PostTXMHOMEInstallationStep extp = (PostTXMHOMEInstallationStep)contributions[i].createExecutableExtension("class"); //$NON-NLS-1$
632 641

  
633 642
						if (!extp.install(workspace)) {
tmp/org.txm.analec.rcp/src/org/txm/annotation/urs/InstallURSFiles.java (revision 2136)
26 26
	@Override
27 27
	public boolean do_install(Workspace workspace) {
28 28

  
29
		String saved = URSPreferences.getInstance().getString(URSPreferences.VERSION); //$NON-NLS-1$
30
		Version currentVersion = BundleUtils.getBundleVersion("org.txm.annotation.urs.rcp"); //$NON-NLS-1$
31
		Log.finer("Testing saved version with current version="+currentVersion+" and saved="+saved);
32
		if (saved != null && saved.length() > 0) {
33
			Version savedVersion = new Version(saved);
34
			if (currentVersion.compareTo(savedVersion) <= 0) {
35
				Log.finer(Messages.DoInstallStep_5);
36
				//System.out.println("No post-installation of URS to do");
37
				return true; // nothing to do
38
			}
39
		}
29
//		String saved = URSPreferences.getInstance().getString(URSPreferences.VERSION); //$NON-NLS-1$
30
//		Version currentVersion = BundleUtils.getBundleVersion("org.txm.annotation.urs.rcp"); //$NON-NLS-1$
31
//		Log.finer("Testing saved version with current version="+currentVersion+" and saved="+saved);
32
//		if (saved != null && saved.length() > 0) {
33
//			Version savedVersion = new Version(saved);
34
//			if (currentVersion.compareTo(savedVersion) <= 0) {
35
//				Log.finer(Messages.DoInstallStep_5);
36
//				//System.out.println("No post-installation of URS to do");
37
//				return true; // nothing to do
38
//			}
39
//		}
40 40
		
41 41
		File txmhomedir = new File(Toolbox.getTxmHomePath());
42 42

  
......
61 61
		BundleUtils.copyFiles(bundle_id, "src/", "org/txm/macro", "urs", macroDirectory);
62 62

  
63 63
		// saving current version
64
		URSPreferences.getInstance().put(URSPreferences.VERSION, currentVersion.toString());
64
//		URSPreferences.getInstance().put(URSPreferences.VERSION, currentVersion.toString());
65 65
		
66 66
		return URSMacroDirectory.exists() && URSMacroDirectory.listFiles().length > 0;
67 67
	}
tmp/org.txm.tigersearch.rcp/.classpath (revision 2136)
8 8
		</accessrules>
9 9
	</classpathentry>
10 10
	<classpathentry kind="src" path="src"/>
11
	<classpathentry kind="src" path="groovy"/>
12 11
	<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
13 12
	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.12.jar"/>
14 13
	<classpathentry exported="true" kind="lib" path="lib/TigerSearch.jar">

Also available in: Unified diff