Révision 906

tmp/org.txm.rcp.feature/feature.xml (revision 906)
220 220
      <import plugin="org.txm.libs.args4j" version="1.0.0" match="greaterOrEqual"/>
221 221
      <import plugin="org.txm.tokenizer.core" version="1.0.0" match="greaterOrEqual"/>
222 222
      <import plugin="org.txm.searchengine.cqp.core" version="1.1.0" match="greaterOrEqual"/>
223
      <import plugin="org.eclipse.equinox.p2.director"/>
224 223
      <import plugin="org.eclipse.osgi.util" version="3.3.0" match="greaterOrEqual"/>
225 224
      <import plugin="org.eclipse.core.net" version="1.2.200" match="greaterOrEqual"/>
226 225
      <import plugin="org.eclipse.core.runtime" version="3.6.0" match="compatible"/>
......
256 255
      <import plugin="org.txm.chartsengine.rcp" version="1.0.0" match="greaterOrEqual"/>
257 256
      <import plugin="org.txm.lexicaltable.rcp" version="1.0.0" match="greaterOrEqual"/>
258 257
      <import plugin="org.txm.ahc.core" version="1.0.0" match="greaterOrEqual"/>
259
      <import plugin="org.txm.utils"/>
260
      <import plugin="org.txm.concordance.rcp" version="1.0.0" match="greaterOrEqual"/>
261
      <import plugin="org.txm.progression.rcp" version="1.0.0" match="greaterOrEqual"/>
262
      <import plugin="org.txm.chartsengine.core" version="1.0.0" match="greaterOrEqual"/>
263
      <import plugin="org.txm.chartsengine.jfreechart.rcp" version="1.0.0" match="greaterOrEqual"/>
264
      <import plugin="org.txm.chartsengine.r.rcp" version="1.0.0" match="greaterOrEqual"/>
265
      <import plugin="org.txm.edition.rcp" version="1.0.0" match="greaterOrEqual"/>
266 258
      <import plugin="javax.persistence" version="2.1.0" match="greaterOrEqual"/>
267 259
      <import plugin="org.eclipse.persistence.jpa" version="2.6.0" match="greaterOrEqual"/>
268 260
      <import plugin="org.eclipse.persistence.jpa.jpql" version="2.6.0" match="greaterOrEqual"/>
269 261
      <import plugin="org.txm.annotation.kr.core" version="1.0.0" match="greaterOrEqual"/>
270 262
      <import plugin="org.txm.annotation.rcp" version="1.0.0" match="greaterOrEqual"/>
271 263
      <import plugin="org.txm.annotation.core" version="1.0.0" match="greaterOrEqual"/>
272
      <import plugin="org.eclipse.core.expressions" version="3.4.500" match="greaterOrEqual"/>
273
      <import plugin="org.txm.concordance.core" version="1.0.0" match="greaterOrEqual"/>
264
      <import plugin="org.txm.concordance.rcp" version="1.0.0" match="greaterOrEqual"/>
274 265
      <import plugin="org.txm.chartsengine.r.core" version="1.0.0" match="greaterOrEqual"/>
275 266
      <import plugin="org.txm.chartsengine.jfreechart.core" version="1.0.0" match="greaterOrEqual"/>
276
      <import plugin="org.txm.libs.graphstream" version="1.3.0" match="greaterOrEqual"/>
277
      <import plugin="org.txm.chartsengine.graphstream.core" version="1.0.0" match="greaterOrEqual"/>
278
      <import plugin="org.txm.cooccurrence.core" version="1.0.0" match="greaterOrEqual"/>
267
      <import plugin="org.txm.chartsengine.core" version="1.0.0" match="greaterOrEqual"/>
279 268
      <import plugin="org.txm.libs.itext"/>
280 269
      <import plugin="org.txm.statsengine.r.core" version="1.0.0" match="greaterOrEqual"/>
281
      <import plugin="org.txm.cooccurrence.rcp" version="1.0.0" match="greaterOrEqual"/>
270
      <import plugin="org.txm.concordance.core" version="1.0.0" match="greaterOrEqual"/>
282 271
      <import plugin="org.txm.specificities.core" version="1.0.0" match="greaterOrEqual"/>
283 272
      <import plugin="org.txm.statsengine.r.rcp" version="1.0.0" match="greaterOrEqual"/>
284 273
      <import plugin="org.txm.links.rcp" version="1.0.0" match="greaterOrEqual"/>
274
      <import plugin="org.txm.cooccurrence.core" version="1.0.0" match="greaterOrEqual"/>
285 275
      <import plugin="org.txm.index.core" version="1.0.0" match="greaterOrEqual"/>
276
      <import plugin="org.txm.internalview.core" version="1.0.0" match="greaterOrEqual"/>
286 277
      <import plugin="org.txm.lexicaltable.core" version="1.0.0" match="greaterOrEqual"/>
287 278
      <import plugin="org.txm.partition.core" version="1.0.0" match="greaterOrEqual"/>
288 279
      <import plugin="org.txm.progression.core" version="1.0.0" match="greaterOrEqual"/>
280
      <import plugin="org.txm.edition.rcp" version="1.0.0" match="greaterOrEqual"/>
281
      <import plugin="org.txm.properties.core" version="1.0.0" match="greaterOrEqual"/>
289 282
      <import plugin="org.txm.referencer.core" version="1.0.0" match="greaterOrEqual"/>
290
      <import plugin="org.txm.textsbalance.core" version="1.0.0" match="greaterOrEqual"/>
291
      <import plugin="org.txm.wordcloud.core" version="1.0.0" match="greaterOrEqual"/>
292
      <import plugin="org.eclipse.ui.editors" version="3.8.100" match="greaterOrEqual"/>
293
      <import plugin="org.txm.index.rcp" version="1.0.0" match="greaterOrEqual"/>
294
      <import plugin="org.txm.groovy.core" version="1.0.0" match="greaterOrEqual"/>
295
      <import plugin="org.codehaus.groovy.eclipse.ui" version="2.9.1" match="greaterOrEqual"/>
296
      <import plugin="org.txm.internalview.core" version="1.0.0" match="greaterOrEqual"/>
297 283
      <import plugin="org.txm.searchengine.core" version="1.0.0" match="greaterOrEqual"/>
298
      <import plugin="org.eclipse.ui.workbench.texteditor"/>
299
      <import plugin="org.txm.properties.core" version="1.0.0" match="greaterOrEqual"/>
300
      <import plugin="org.txm.queryindex.rcp" version="1.0.0" match="greaterOrEqual"/>
301
      <import plugin="org.eclipse.ui.workbench" version="3.105.0" match="greaterOrEqual"/>
302 284
      <import plugin="org.txm.libs.cqp" version="1.0.0" match="greaterOrEqual"/>
303 285
      <import plugin="org.txm.statsengine.core" version="1.0.0" match="greaterOrEqual"/>
304 286
      <import plugin="org.txm.libs.rserve"/>
305
      <import plugin="org.eclipse.team.svn" version="1.1.0" match="greaterOrEqual"/>
306
      <import plugin="org.eclipse.team.svn.core" version="1.1.0" match="greaterOrEqual"/>
307
      <import plugin="org.eclipse.team.svn.help" version="1.1.0" match="greaterOrEqual"/>
308
      <import plugin="org.eclipse.team.svn.ui" version="1.1.0" match="greaterOrEqual"/>
309
      <import plugin="org.polarion.eclipse.team.svn.connector" version="3.0.1" match="greaterOrEqual"/>
310
      <import plugin="org.eclipse.team.ui" version="3.7.0" match="greaterOrEqual"/>
311
      <import plugin="org.eclipse.team.core" version="3.7.0" match="greaterOrEqual"/>
312
      <import plugin="org.polarion.eclipse.team.svn.connector.svnkit18" version="4.1.0" match="greaterOrEqual"/>
313
      <import plugin="org.eclipse.ui.editors" version="3.8.200" match="greaterOrEqual"/>
314
      <import plugin="org.txm.treetagger.core" version="1.0.0" match="greaterOrEqual"/>
315
      <import plugin="org.eclipse.core.runtime" version="3.0.0" match="greaterOrEqual"/>
316
      <import plugin="org.eclipse.jface" version="3.10.2" match="greaterOrEqual"/>
317
      <import plugin="org.eclipse.wst.xml.ui" version="1.1.401" match="greaterOrEqual"/>
318
      <import plugin="org.eclipse.core.filesystem" version="1.4.0" match="greaterOrEqual"/>
319
      <import plugin="org.eclipse.ui.ide" version="3.9.0" match="greaterOrEqual"/>
320
      <import plugin="org.eclipse.wst.sse.ui" version="1.3.200" match="greaterOrEqual"/>
321
      <import plugin="org.eclipse.wst.sse.core" version="1.1.801" match="greaterOrEqual"/>
322
      <import plugin="org.eclipse.wst.xml.core" version="1.1.801" match="greaterOrEqual"/>
323
      <import plugin="org.eclipse.wst.common.uriresolver" version="1.2.100" match="greaterOrEqual"/>
324
      <import plugin="org.eclipse.wst.common.core" version="1.2.0" match="greaterOrEqual"/>
325
      <import plugin="org.eclipse.wst.validation" version="1.2.500" match="greaterOrEqual"/>
326
      <import plugin="org.eclipse.wst.validation.ui" version="1.2.400" match="greaterOrEqual"/>
327
      <import plugin="org.eclipse.search" version="3.9.0" match="greaterOrEqual"/>
328
      <import plugin="org.eclipse.wst.common.project.facet.core" version="1.4.300" match="greaterOrEqual"/>
329
      <import plugin="org.eclipse.wst.common.ui" version="1.1.500" match="greaterOrEqual"/>
330
      <import plugin="org.eclipse.debug.core" version="3.8.0" match="greaterOrEqual"/>
331
      <import plugin="org.eclipse.debug.ui" version="3.9.0" match="greaterOrEqual"/>
332
      <import plugin="org.eclipse.wst.common.frameworks" version="1.2.200" match="greaterOrEqual"/>
333
      <import plugin="org.eclipse.wst.common.frameworks.ui" version="1.2.201" match="greaterOrEqual"/>
334
      <import plugin="org.apache.xml.serializer" version="2.7.1" match="greaterOrEqual"/>
335
      <import plugin="org.eclipse.ui.views" version="3.7.0" match="greaterOrEqual"/>
336
      <import plugin="org.eclipse.jface.text" version="3.9.2" match="greaterOrEqual"/>
337 287
   </requires>
338 288

  
339 289
   <plugin
......
494 444
         unpack="false"/>
495 445

  
496 446
   <plugin
497
         id="org.txm.chartsengine.graphstream.core"
498
         download-size="0"
499
         install-size="0"
500
         version="0.0.0"
501
         unpack="false"/>
502

  
503
   <plugin
504
         id="org.txm.chartsengine.graphstream.rcp"
505
         download-size="0"
506
         install-size="0"
507
         version="0.0.0"
508
         unpack="false"/>
509

  
510
   <plugin
511 447
         id="org.txm.chartsengine.jfreechart.core"
512 448
         download-size="0"
513 449
         install-size="0"
......
571 507
         unpack="false"/>
572 508

  
573 509
   <plugin
574
         id="org.txm.cooccurrence.chartsengine"
575
         download-size="0"
576
         install-size="0"
577
         version="0.0.0"
578
         unpack="false"/>
579

  
580
   <plugin
581 510
         id="org.txm.cooccurrence.core"
582 511
         download-size="0"
583 512
         install-size="0"
......
711 640
         unpack="false"/>
712 641

  
713 642
   <plugin
714
         id="org.txm.rcp.about.fragment"
715
         download-size="0"
716
         install-size="0"
717
         version="0.0.0"
718
         fragment="true"
719
         unpack="false"/>
720

  
721
   <plugin
722
         id="org.txm.rcp.p2.ui"
723
         download-size="0"
724
         install-size="0"
725
         version="0.0.0"
726
         fragment="true"
727
         unpack="false"/>
728

  
729
   <plugin
730 643
         id="org.txm.referencer.core"
731 644
         download-size="0"
732 645
         install-size="0"
tmp/org.txm.groovy.core/src/groovy/org/txm/setup/SetSVNQualifier.groovy (revision 906)
1
import java.util.jar.Manifest
2

  
3
File workspace = new File(System.getProperty("user.home"), "workspace047")
4

  
5
for (File dir : workspace.listFiles()) {
6
	if (!dir.isDirectory()) continue
7
	
8
	File manifestFile = new File(dir, "META-INF/MANIFEST.MF")
9
	if (!manifestFile.exists()) continue;
10
	
11
	Manifest manifest = new Manifest();
12
	def inputStream = manifestFile.toURI().toURL().openStream()
13
	manifest.read(inputStream)
14
	inputStream.close();
15
	
16
	def id = manifest.getMainAttributes().getValue("Bundle-SymbolicName")
17
	def version = manifest.getMainAttributes().getValue("Bundle-Version")
18
	
19
	String xml = "svn info --xml".execute().getText()
20
	String revision = new XmlSlurper().parseText(xml).info.entry["@revision"]
21
	println "id=$id"
22
	println "version=$version"
23
	println "revision=$revision"
24
	
25
	
26
//	if (id.startsWith("org.txm")) {
27
//		println "$id ..."
28
//		if (version.endsWith(".qualifier")) {
29
//			println "	fix .qualifier"
30
//			version = version.replaceAll(".qualifier", revision)
31
//		} else if (version.matches("^.+\.r[0-9]+\$")) {
32
//			version.replaceAll(("^.+\.(r[0-9]+)\$", revision)
33
//		} else {
34
//			println "	ERROR with version format: $version"
35
//		}
36
//	}
37
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/p2/plugins/TXMUpdateHandler.java (revision 906)
447 447

  
448 448
	@Override
449 449
	protected void doExecute(LoadMetadataRepositoryJob job) {
450
		//System.out.println("TXMUpdateHandler: doExecute(...)");
451
		if (hasNoRepos) {
452
			if (getProvisioningUI().getPolicy().getRepositoriesVisible()) {
453
				System.out.println(ProvSDKMessages.UpdateHandler_NoSitesMessage);
454
			}
455
			return;
456
		}
457
		// Report any missing repositories.
458
		job.reportAccumulatedStatus();
459
		if (continueWorkingWithOperation(operation, getShell())) {
460
			if (operation.getResolutionResult() == Status.OK_STATUS) {
461
				getProvisioningUI().openUpdateWizard(false, operation, job);
462
			} else {
463

  
464
				final RemediationOperation remediationOperation = new RemediationOperation(getProvisioningUI().getSession(), operation.getProfileChangeRequest(), RemedyConfig.getCheckForUpdateRemedyConfigs());
465
				ProvisioningJob job2 = new ProvisioningJob(ProvSDKMessages.RemediationOperation_ResolveJobName, getProvisioningUI().getSession()) {
466
					@Override
467
					public IStatus runModal(IProgressMonitor monitor) {
468
						monitor.beginTask(ProvSDKMessages.RemediationOperation_ResolveJobTask, RemedyConfig.getAllRemedyConfigs().length);
469
						return remediationOperation.resolveModal(monitor);
470
					}
471
				};
472
				job2.addJobChangeListener(new JobChangeAdapter() {
473
					public void done(IJobChangeEvent event) {
474
						if (PlatformUI.isWorkbenchRunning()) {
475
							PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
476
								public void run() {
477
									getProvisioningUI().openUpdateWizard(true, operation, remediationOperation, null);
478
								}
479
							});
480
						}
481
					}
482

  
483
				});
484
				getProvisioningUI().schedule(job2, StatusManager.SHOW | StatusManager.LOG);
485
			}
486
		}
450
		super.doExecute(job);
451
//		//System.out.println("TXMUpdateHandler: doExecute(...)");
452
//		if (hasNoRepos) {
453
//			if (getProvisioningUI().getPolicy().getRepositoriesVisible()) {
454
//				System.out.println(ProvSDKMessages.UpdateHandler_NoSitesMessage);
455
//			}
456
//			return;
457
//		}
458
//		// Report any missing repositories.
459
//		job.reportAccumulatedStatus();
460
//		if (continueWorkingWithOperation(operation, getShell())) {
461
//			if (operation.getResolutionResult() == Status.OK_STATUS) {
462
//				getProvisioningUI().openUpdateWizard(false, operation, job);
463
//			} else {
464
//
465
//				final RemediationOperation remediationOperation = new RemediationOperation(getProvisioningUI().getSession(), operation.getProfileChangeRequest(), RemedyConfig.getCheckForUpdateRemedyConfigs());
466
//				ProvisioningJob job2 = new ProvisioningJob(ProvSDKMessages.RemediationOperation_ResolveJobName, getProvisioningUI().getSession()) {
467
//					@Override
468
//					public IStatus runModal(IProgressMonitor monitor) {
469
//						monitor.beginTask(ProvSDKMessages.RemediationOperation_ResolveJobTask, RemedyConfig.getAllRemedyConfigs().length);
470
//						return remediationOperation.resolveModal(monitor);
471
//					}
472
//				};
473
//				job2.addJobChangeListener(new JobChangeAdapter() {
474
//					public void done(IJobChangeEvent event) {
475
//						if (PlatformUI.isWorkbenchRunning()) {
476
//							PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
477
//								public void run() {
478
//									getProvisioningUI().openUpdateWizard(true, operation, remediationOperation, null);
479
//								}
480
//							});
481
//						}
482
//					}
483
//
484
//				});
485
//				getProvisioningUI().schedule(job2, StatusManager.SHOW | StatusManager.LOG);
486
//			}
487
//		}
487 488
	}
488 489

  
489 490
	/**
tmp/org.txm.rcp/rcpapplication.product (revision 906)
45 45
   </configIni>
46 46

  
47 47
   <launcherArgs>
48
      <vmArgs>-Xms512m -Xmx1536m
48
      <vmArgs>-Xms512m -Xmx2048m
49 49
-Dfile.encoding=UTF-8
50 50
-Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4
51 51
-Dorg.eclipse.ecf.provider.filetransfer.retrieve.connectTimeout=6000
......
78 78
      </win>
79 79
   </launcher>
80 80

  
81

  
82 81
   <vm>
83 82
      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</linux>
84 83
      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</macos>
tmp/org.txm.rcp/META-INF/MANIFEST.MF (revision 906)
142 142
Bundle-Activator: org.txm.rcp.Activator
143 143
Bundle-SymbolicName: org.txm.rcp;singleton:=true
144 144
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
145
Import-Package: org.eclipse.equinox.p2.planner;version="2.0.0"
146 145

  

Formats disponibles : Unified diff