Revision 2219

tmp/org.txm.searchengine.core/META-INF/MANIFEST.MF (revision 2219)
9 9
Bundle-ManifestVersion: 2
10 10
Bundle-SymbolicName: org.txm.searchengine.core;singleton:=true
11 11
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
12
Bundle-Vendor: Textometrie.org
12 13

  
tmp/org.txm.libs.msoffice/META-INF/MANIFEST.MF (revision 2219)
20 20
 lib/xmlbeans-2.6.0.jar,
21 21
 .
22 22
Export-Package: org.txm.libs.msoffice
23
Bundle-Vendor: Textometrie.org
tmp/org.txm.treetagger.feature/feature.xml (revision 2219)
15 15
   </copyright>
16 16

  
17 17
   <license url="http://www.cis.uni-muenchen.de/~schmid/tools/TreeTagger/Tagger-Licence">
18
      ** TreeTagger License **
18
      TreeTagger License
19 19

  
20 20
1. The Institut fuer maschinelle Sprachverarbeitung, Universitaet
21 21
   Stuttgart, subsequently called ``the licenser&apos;&apos;, grants you (the
tmp/org.txm.libs.groovy-all/META-INF/MANIFEST.MF (revision 2219)
182 182
 org.codehaus.groovy.vmplugin.v6,
183 183
 org.codehaus.groovy.vmplugin.v7,
184 184
 org.codehaus.groovy.vmplugin.v8
185
Bundle-Vendor: Textometrie.org
tmp/org.txm.referencer.core/META-INF/MANIFEST.MF (revision 2219)
10 10
Bundle-ManifestVersion: 2
11 11
Bundle-SymbolicName: org.txm.referencer.core;singleton:=true
12 12
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
13
Bundle-Vendor: Textometrie.org
13 14

  
tmp/org.txm.treetagger.binaries.feature/feature.xml (revision 2219)
14 14
   </copyright>
15 15

  
16 16
   <license url="http://www.cis.uni-muenchen.de/~schmid/tools/TreeTagger/Tagger-Licence">
17
      ** TreeTagger License **
17
      TreeTagger License
18 18

  
19 19
1. The Institut fuer maschinelle Sprachverarbeitung, Universitaet
20 20
   Stuttgart, subsequently called ``the licenser&apos;&apos;, grants you (the
tmp/org.txm.translate.rcp/META-INF/MANIFEST.MF (revision 2219)
7 7
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
8 8
Require-Bundle: org.txm.rcp;bundle-version="0.8.0";visibility:=reexport,
9 9
 org.eclipse.search;bundle-version="3.11.100";visibility:=reexport
10
Bundle-Vendor: Textometrie.org
tmp/org.txm.rcp.p2.ui/META-INF/MANIFEST.MF (revision 2219)
10 10
 .
11 11
Export-Package: org.eclipse.equinox.internal.p2.ui,
12 12
 org.eclipse.equinox.internal.p2.ui.dialogs
13
Bundle-Vendor: Textometrie.org
tmp/org.txm.tests.rcp/META-INF/MANIFEST.MF (revision 2219)
7 7
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
8 8
Require-Bundle: org.txm.rcp;bundle-version="0.8.0";visibility:=reexport,
9 9
 org.txm.tests.core;bundle-version="1.0.0";visibility:=reexport
10
Bundle-Vendor: Textometrie.org
tmp/org.txm.internalview.core/META-INF/MANIFEST.MF (revision 2219)
8 8
Bundle-ManifestVersion: 2
9 9
Bundle-SymbolicName: org.txm.internalview.core;singleton:=true
10 10
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
11
Bundle-Vendor: Textometrie.org
11 12

  
tmp/org.txm.statsengine.r.core.win32/META-INF/MANIFEST.MF (revision 2219)
6 6
Fragment-Host: org.txm.statsengine.r.core;bundle-version="1.0.0"
7 7
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
8 8
Eclipse-PlatformFilter: (osgi.os=win32)
9
Bundle-Vendor: Textometrie.org
tmp/org.txm.connlu.core/META-INF/MANIFEST.MF (revision 2219)
8 8
Require-Bundle: org.txm.core;bundle-version="0.8.0";visibility:=reexport,
9 9
 org.txm.groovy.core;bundle-version="1.0.0";visibility:=reexport
10 10
Export-Package: org.txm.connlu.core
11
Bundle-Vendor: Textometrie.org
tmp/org.txm.rcp.about.fragment/META-INF/MANIFEST.MF (revision 2219)
9 9
Bundle-ClassPath: library.jar,
10 10
 .
11 11
Export-Package: org.eclipse.ui.internal.about
12
Bundle-Vendor: Textometrie.org
tmp/org.txm.para.core/META-INF/MANIFEST.MF (revision 2219)
7 7
Bundle-ManifestVersion: 2
8 8
Bundle-SymbolicName: org.txm.para.core;singleton:=true
9 9
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
10
Bundle-Vendor: Textometrie.org
10 11

  
tmp/org.txm.rcp.feature/feature.xml (revision 2219)
33 33
   </copyright>
34 34

  
35 35
   <license url="">
36
      &lt;TXM Software User Agreement&gt;
36
      TXM Software User Agreement
37 37

  
38 38
TXM 0.8.0 Copyright © 2010-2019 ENS de Lyon, University of Franche-Comté, CNRS
39 39

  
tmp/org.txm.tokenizer.core/META-INF/MANIFEST.MF (revision 2219)
9 9
Require-Bundle: org.txm.libs.groovy-all;bundle-version="2.3.7";visibility:=reexport,
10 10
 org.txm.utils.core;bundle-version="1.0.0";visibility:=reexport,
11 11
 org.eclipse.core.resources;visibility:=reexport
12
Bundle-Vendor: Textometrie.org
tmp/org.txm.statsengine.r.core.macosx/META-INF/MANIFEST.MF (revision 2219)
6 6
Fragment-Host: org.txm.statsengine.r.core;bundle-version="1.0.0"
7 7
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
8 8
Eclipse-PlatformFilter: (osgi.os=macosx)
9
Bundle-Vendor: Textometrie.org
tmp/org.txm.para.rcp/META-INF/MANIFEST.MF (revision 2219)
10 10
Bundle-ManifestVersion: 2
11 11
Bundle-SymbolicName: org.txm.para.rcp;singleton:=true
12 12
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
13
Bundle-Vendor: Textometrie.org
13 14

  
14 15

  
tmp/org.txm.statsengine.r.core.linux/META-INF/MANIFEST.MF (revision 2219)
6 6
Fragment-Host: org.txm.statsengine.r.core;bundle-version="1.0.0"
7 7
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
8 8
Eclipse-PlatformFilter: (osgi.os=linux)
9
Bundle-Vendor: Textometrie.org
tmp/org.txm.treetagger.files.feature/feature.xml (revision 2219)
14 14
   </copyright>
15 15

  
16 16
   <license url="http://www.cis.uni-muenchen.de/~schmid/tools/TreeTagger/Tagger-Licence">
17
      ** TreeTagger License **
17
      TreeTagger License
18 18

  
19 19
1. The Institut fuer maschinelle Sprachverarbeitung, Universitaet
20 20
   Stuttgart, subsequently called ``the licenser&apos;&apos;, grants you (the
tmp/org.txm.core.tests/META-INF/MANIFEST.MF (revision 2219)
33 33
Export-Package: org.txm.core.tests.junit,
34 34
 org.txm.core.tests.manual,
35 35
 org.txm.rcp.commands.tests
36
Bundle-Vendor: Textometrie.org
tmp/org.txm.referencer.rcp/META-INF/MANIFEST.MF (revision 2219)
13 13
Bundle-ManifestVersion: 2
14 14
Bundle-SymbolicName: org.txm.referencer.rcp;singleton:=true
15 15
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
16
Bundle-Vendor: Textometrie.org
16 17

  
17 18

  
tmp/org.txm.groovy.core/src/groovy/org/txm/macro/prototypes/txt/AdvancedSearchInDirectoryMacro.groovy (revision 2219)
1
package org.txm.macro.txt
2

  
3
import org.kohsuke.args4j.*
4

  
5
import groovy.transform.Field
6

  
7
import java.nio.charset.Charset
8

  
9
import org.txm.rcp.swt.widget.parameters.*
10
import org.txm.utils.*
11

  
12
import javax.xml.stream.*
13

  
14
import java.net.URL
15
import java.util.regex.Matcher;
16
import java.util.regex.Pattern;
17

  
18
@Field @Option(name="inputDirectory", usage="TXT directory", widget="Folder", required=false, def="txt")
19
File inputDirectory;
20
@Field @Option(name="regexp", usage="Regular expression to match", widget="String", required=false, def="p")
21
String regexp;
22
@Field @Option(name="encoding", usage="File encoding", widget="String", required=false, def="UTF-8")
23
String encoding;
24
@Field @Option(name="reverse", usage="Show the files not matching", widget="Boolean", required=false, def="false")
25
def reverse;
26
@Field @Option(name="recursive", usage="recurse in directories", widget="Boolean", required=false, def="false")
27
def recursive;
28
@Field @Option(name="filePathFilterRegExp", usage="Show the files not matching", widget="String", required=false, def=".*/MANIFEST.MF")
29
def filePathFilterRegExp;
30
@Field @Option(name="directoryPathFilterRegExp", usage="Show the files not matching", widget="String", required=false, def="")
31
def directoryPathFilterRegExp;
32

  
33
if (!ParametersDialog.open(this)) return;
34

  
35
p = /$regexp/
36

  
37
println "processing: "+inputDirectory
38

  
39
def processDir(def directory) {
40
	
41
for (File inputfile : directory.listFiles()) {
42

  
43
	if (inputfile.isDirectory()) {
44
		if (recursive) {
45
			if (directoryPathFilterRegExp != null && directoryPathFilterRegExp.length() > 0) {
46
				if (!inputfile.getAbsolutePath().matches(directoryPathFilterRegExp)) {
47
					continue // ignore since does not match
48
				}
49
			}
50
		
51
			processDir(inputfile)
52
		}
53
		continue // ignore
54
	}
55
	
56
	if (filePathFilterRegExp != null && filePathFilterRegExp.length() > 0) {
57
		if (!inputfile.getAbsolutePath().matches(filePathFilterRegExp)) {
58
			continue // ignore since does not match
59
		}
60
	}
61
	
62
	def lines = []
63
	inputfile.eachLine("UTF-8") { line, n ->
64
		def m = line =~ p
65
		if ( m.size() > 0) {
66
			lines << "  line $n: $line"
67
		}
68
	}
69
	
70
	if (reverse) {
71
		if (lines.size() == 0) {
72
			println inputfile.getAbsolutePath()
73
		}
74
	} else {
75
		if (lines.size() > 0) {
76
			println inputfile.getAbsolutePath() + " "+lines.size() + " match" +((lines.size() > 1)?"s":"")
77
			for (String s : lines ) println s
78
		}
79
	}
80
}
81
}
82

  
83
processDir(inputDirectory)
tmp/org.txm.groovy.core/META-INF/MANIFEST.MF (revision 2219)
4 4
Bundle-ClassPath: .,bin/
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-Name: Macro
7
Bundle-Vendor: Textometrie.org
7 8
Bundle-ManifestVersion: 2
8 9
Bundle-SymbolicName: org.txm.groovy.core;singleton:=true
9 10
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
tmp/org.txm.libs.args4j/META-INF/MANIFEST.MF (revision 2219)
8 8
Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0"
9 9
Export-Package: org.kohsuke.args4j,
10 10
 org.kohsuke.args4j.spi
11
Bundle-Vendor: Textometrie.org
tmp/org.txm.searchengine.cqp.rcp/META-INF/MANIFEST.MF (revision 2219)
9 9
Bundle-ManifestVersion: 2
10 10
Bundle-SymbolicName: org.txm.searchengine.cqp.rcp;singleton:=true
11 11
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
12
Bundle-Vendor: Textometrie.org
12 13

  
tmp/org.txm.libs.hsqldb/META-INF/MANIFEST.MF (revision 2219)
30 30
 org.hsqldb.server,
31 31
 org.hsqldb.types,
32 32
 org.hsqldb.util
33
Bundle-Vendor: hsqldb.org
tmp/org.txm.treetagger.core/META-INF/MANIFEST.MF (revision 2219)
8 8
Bundle-ManifestVersion: 2
9 9
Bundle-SymbolicName: org.txm.treetagger.core;singleton:=true
10 10
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
11
Bundle-Vendor: Textometrie.org
11 12

  
tmp/org.txm.ocaml.core/META-INF/MANIFEST.MF (revision 2219)
38 38
Bundle-ClassPath: .,
39 39
 lib/ocamlrun-scripting.jar,
40 40
 lib/ocaml-lib-files.jar
41
Bundle-Vendor: Textometrie.org
tmp/org.txm.tmp.rcp/META-INF/MANIFEST.MF (revision 2219)
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Require-Bundle: org.eclipse.ui;visibility:=reexport
7 7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
8
Bundle-Vendor: Textometrie.org
tmp/org.txm.internalview.rcp/META-INF/MANIFEST.MF (revision 2219)
10 10
Bundle-ManifestVersion: 2
11 11
Bundle-SymbolicName: org.txm.internalview.rcp;singleton:=true
12 12
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
13
Bundle-Vendor: Textometrie.org
13 14

  
tmp/org.txm.imports.metopes/META-INF/MANIFEST.MF (revision 2219)
14 14
 org.txm.importer.metopes.preferences,
15 15
 org.txm.imports.metopes,
16 16
 org.txm.macro.metopes
17
Bundle-Vendor: Textometrie.org
tmp/org.txm.treetagger.core.win32/META-INF/MANIFEST.MF (revision 2219)
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Fragment-Host: org.txm.treetagger.core;bundle-version="1.0.0"
7 7
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
8
Bundle-Vendor: Textometrie.org
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties (revision 2219)
879 879
startJobColonLoadInstallPreferences = Startup: loading installation preferences
880 880

  
881 881
startingTxm=Starting TXM
882
startingUpP0 = Starting TXM {0}
882
startingUpP0 = Starting TXM {0} ({1})
883 883

  
884 884
startingUpdateFetch = Starting updates retrieval
885 885

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties (revision 2219)
861 861

  
862 862
startJobColonLoadInstallPreferences = Démarrage : chargement des préférences d'installation
863 863

  
864
startingUpP0 = Démarrage de TXM {0}
864
startingUpP0 = Démarrage de TXM {0} ({1})
865 865

  
866 866
startingUpdateFetch = Démarrage de la récupération des mises à jour
867 867

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/p2/plugins/TXMUpdateHandler.java (revision 2219)
81 81
		// Hacking p2 profile to be able to update installation directory even if -configuration is set
82 82
		try {
83 83
			ProvisioningUI pui = ProvisioningUI.getDefaultUI();
84

  
84
		
85 85
			String profileId = pui.getProfileId();
86 86
			IProvisioningAgent agent = pui.getSession().getProvisioningAgent();
87 87

  
......
96 96
					IProfile iprofile = profileRegistry.getProfile(profileId);
97 97
					if (iprofile != null && iprofile instanceof Profile) {
98 98
						Profile profile = (Profile)iprofile;
99

  
99
						
100 100
						spr.lockProfile(profile);
101 101

  
102 102
						//System.out.println("Profile: "+profile.getClass()+" = "+profile);
......
104 104
						boolean changed = false;
105 105
						while(everything.hasNext()) {
106 106
							IInstallableUnit iu = everything.next();
107

  
108 107
							String locked = profile.getInstallableUnitProperty(iu, IProfile.PROP_PROFILE_LOCKED_IU);
109 108

  
110 109
							if (locked != null && !("0".equals(locked))) {
tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java (revision 2219)
28 28
package org.txm.rcp;
29 29

  
30 30
import java.io.File;
31
import java.io.IOException;
32 31
import java.io.InputStream;
33 32
import java.io.PrintStream;
34 33
import java.lang.reflect.InvocationTargetException;
35 34
import java.net.URL;
36 35
import java.text.DateFormat;
37
import java.text.SimpleDateFormat;
38 36
import java.util.ArrayList;
39 37
import java.util.Arrays;
40 38
import java.util.Date;
41 39
import java.util.HashMap;
40
import java.util.Iterator;
42 41
import java.util.List;
43
import java.util.Locale;
44 42
import java.util.logging.Handler;
45 43
import java.util.logging.Level;
46 44
import java.util.logging.LogRecord;
47 45

  
48
import org.apache.commons.lang.StringUtils;
49 46
import org.eclipse.core.resources.ResourcesPlugin;
50 47
import org.eclipse.core.runtime.IAdaptable;
51 48
import org.eclipse.core.runtime.IProgressMonitor;
......
55 52
import org.eclipse.core.runtime.preferences.DefaultScope;
56 53
import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
57 54
import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
58
import org.eclipse.jface.action.IMenuManager;
59
import org.eclipse.jface.action.MenuManager;
55
import org.eclipse.equinox.internal.p2.engine.Profile;
56
import org.eclipse.equinox.p2.core.IProvisioningAgent;
57
import org.eclipse.equinox.p2.engine.IProfile;
58
import org.eclipse.equinox.p2.engine.IProfileRegistry;
59
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
60
import org.eclipse.equinox.p2.ui.ProvisioningUI;
60 61
import org.eclipse.jface.dialogs.MessageDialog;
61 62
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
62 63
import org.eclipse.jface.operation.IRunnableWithProgress;
63 64
import org.eclipse.jface.preference.IPreferenceNode;
64 65
import org.eclipse.jface.preference.PreferenceManager;
65
import org.eclipse.jface.preference.PreferenceStore;
66 66
import org.eclipse.jface.util.Util;
67 67
import org.eclipse.jface.viewers.ArrayContentProvider;
68 68
import org.eclipse.jface.viewers.LabelProvider;
......
100 100
import org.txm.Toolbox;
101 101
import org.txm.core.messages.TXMCoreMessages;
102 102
import org.txm.core.preferences.TBXPreferences;
103
import org.txm.core.preferences.TXMPreferences;
104 103
import org.txm.core.results.TXMResult;
105 104
import org.txm.objects.Project;
106 105
import org.txm.rcp.commands.OpenWelcomePage;
107 106
import org.txm.rcp.commands.RestartTXM;
108 107
import org.txm.rcp.commands.workspace.LoadBinaryCorporaDirectory;
109
import org.txm.rcp.commands.workspace.LoadBinaryCorpus;
110 108
import org.txm.rcp.handlers.results.DeleteObject;
111 109
import org.txm.rcp.handlers.scripts.ExecuteGroovyScript;
112 110
import org.txm.rcp.messages.TXMUIMessages;
113 111
import org.txm.rcp.p2.plugins.TXMUpdateHandler;
114 112
import org.txm.rcp.perspective.TXMPerspective;
115 113
import org.txm.rcp.preferences.RCPPreferences;
116
import org.txm.rcp.swt.dialog.CGUMessageDialog;
117 114
import org.txm.rcp.utils.JobHandler;
118
import org.txm.rcp.views.corpora.CorporaView;
119
import org.txm.searchengine.core.SearchEnginesManager;
120
import org.txm.utils.BundleUtils;
121 115
import org.txm.utils.DeleteDir;
122
import org.txm.utils.io.FileCopy;
123 116
import org.txm.utils.io.IOUtils;
124 117
import org.txm.utils.logger.Log;
125
import org.txm.utils.zip.Zip;
126 118

  
127 119
// TODO: Auto-generated Javadoc
128 120
/**
......
291 283

  
292 284
	public static void printTXMVersion() {
293 285
		// build the properties given to the Toolbox
294
		String version =  Activator.getDefault().getBundle().getVersion().toString(); // "0.7.7.201412160925";
295
		version = version.replaceAll("(.\\..\\..)\\.(....)(..)(..)(..)(..)", "$1 ($2-$3-$4 $5h$6)"); //$NON-NLS-1$ //$NON-NLS-2$
286
//		String version =  Activator.getDefault().getBundle().getVersion().toString(); // "0.7.7.201412160925";
287
//		System.out.println(BundleUtils.getBundle("org.txm.rcp.app"));
288
//		for (IBundleGroupProvider bg : Platform.getBundleGroupProviders()) {
289
//			System.out.println(bg);
290
//			for (IBundleGroup f : bg.getBundleGroups()) {
291
//				System.out.println(f);
292
//				if (f.getIdentifier().equals("org.txm.rcp.app")) {
293
//					version = f.getVersion();
294
//					System.out.println(version);
295
//				}
296
//			}
297
//		}
298
//		org.eclipse.core.internal.runtime.Product product = (Product) Platform.getProduct();
299
//		product.getDefiningBundle()
300
//		version = version.replaceAll("(.\\..\\..)\\.(....)(..)(..)(..)(..)", "$1 ($2-$3-$4 $5h$6)"); //$NON-NLS-1$ //$NON-NLS-2$
301
		
302
		
303
		ProvisioningUI pui = ProvisioningUI.getDefaultUI();
304
		
305
		String profileId = pui.getProfileId();
306
		IProvisioningAgent agent = pui.getSession().getProvisioningAgent();
307
		IProfileRegistry profileRegistry = (IProfileRegistry) agent.getService(IProfileRegistry.SERVICE_NAME);
308
		IProfile iprofile = profileRegistry.getProfile(profileId);
309
		if (iprofile == null) {
310
			System.out.println("TXM dev version...");
311
			return;
312
		}
313
		Profile profile = (Profile)iprofile;
314
		Iterator<IInstallableUnit> everything = profile.everything();
315

  
316
		String version = null;
317
		while (everything.hasNext()) {
318
			IInstallableUnit iu = everything.next();
319
			String id = iu.getId();
320
			if ("org.txm.rcp.app".equals(id)) {
321
				version =  iu.getVersion().toString();
322
			}
323
		}
324

  
325
		if (version == null) {
326
			version =  Activator.getDefault().getBundle().getVersion().toString();
327
		}
328
		
296 329
		DateFormat formatter = TXMResult.PRETTY_LOCALIZED_TIME_FORMAT;
297

  
298
		System.out.println(NLS.bind(TXMUIMessages.startingUpP0, version, formatter.format(new Date(Activator.getDefault().getBundle().getLastModified()))));
330
		System.out.println(NLS.bind(TXMUIMessages.startingUpP0, Activator.getDefault().getBundle().getVersion().toString(), formatter.format(new Date(Activator.getDefault().getBundle().getLastModified()))));
299 331
	}
300 332

  
301 333
	private void setPreferencesConfiguration() {

Also available in: Unified diff