Skip to content
Snippets Groups Projects
Commit 09dfd6c0 authored by dgelessus's avatar dgelessus
Browse files

Merge tag 'v1.5.5'

1.5.5 release
parents c39c8ea0 fafcc249
No related branches found
No related tags found
No related merge requests found
Showing
with 110 additions and 34 deletions
......@@ -46,7 +46,11 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.jar.Attributes;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
import java.util.jar.Pack200;
import java.util.jar.Pack200.Packer;
import java.util.zip.GZIPOutputStream;
import org.apache.commons.io.IOUtils;
import org.eclipse.core.runtime.IProgressMonitor;
......@@ -133,22 +137,53 @@ public class PayloadHelper {
final Path to = fs.getPath("/model/generated.properties");
Files.copy(f.toPath(), to, StandardCopyOption.REPLACE_EXISTING);
} catch (final IOException e1) {
throw new RuntimeException("No model directory found to deploy");
throw new RuntimeException("No model directory found to deploy", e1);
}
/*
* Convert the customized tla2tools.jar into a jClouds payload object. This
* is the format it will be transfered on the wire. This is handled by
* jClouds though.
* Compress archive with pack200 to achieve a much higher compression rate. We
* are going to send the file on the wire after all:
*
* effort: take more time choosing codings for better compression segment: use
* largest-possible archive segments (>10% better compression) mod time: smear
* modification times to a single value deflate: ignore all JAR deflation hints
* in original archive
*/
final Packer packer = Pack200.newPacker();
final Map<String, String> p = packer.properties();
p.put(Packer.EFFORT, "9");
p.put(Packer.SEGMENT_LIMIT, "-1");
p.put(Packer.MODIFICATION_TIME, Packer.LATEST);
p.put(Packer.DEFLATE_HINT, Packer.FALSE);
// Do not reorder which changes package names. Pkg name changes e.g. break
// SimpleFilenameToStream.
p.put(Packer.KEEP_FILE_ORDER, Packer.TRUE);
// Throw an error if any of the above attributes is unrecognized.
p.put(Packer.UNKNOWN_ATTRIBUTE, Packer.ERROR);
final File packTempFile = File.createTempFile("tla2tools", ".pack.gz");
try (final JarFile jarFile = new JarFile(tempFile);
final GZIPOutputStream fos = new GZIPOutputStream(new FileOutputStream(packTempFile));) {
packer.pack(jarFile, fos);
} catch (IOException ioe) {
throw new RuntimeException("Failed to pack200 the tla2tools.jar file", ioe);
}
/*
* Convert the customized tla2tools.jar into a jClouds payload object. This is
* the format it will be transfered on the wire. This is handled by jClouds
* though.
*/
Payload jarPayLoad = null;
try {
final InputStream openStream = new FileInputStream(tempFile);
final InputStream openStream = new FileInputStream(packTempFile);
jarPayLoad = Payloads.newInputStreamPayload(openStream);
// manually set length of content to prevent a NPE bug
jarPayLoad.getContentMetadata().setContentLength(Long.valueOf(openStream.available()));
} catch (final IOException e1) {
throw new RuntimeException("No tlatools.jar to deploy");
throw new RuntimeException("No tlatools.jar to deploy", e1);
} finally {
monitor.worked(5);
}
......
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/org.lamport.tla.toolbox.feature.uitest_1.0.0.qualifier.jar" id="org.lamport.tla.toolbox.feature.uitest" version="1.0.0.qualifier">
<category name="tychotest.category"/>
</feature>
<feature url="features/org.lamport.tla.toolbox.feature.standalone_1.0.0.qualifier.jar" id="org.lamport.tla.toolbox.feature.standalone" version="1.0.0.qualifier">
<category name="tychodemo.category"/>
</feature>
......@@ -11,4 +14,9 @@
TLA+ Toolbox Category
</description>
</category-def>
<category-def name="tychotest.category" label="Test Category - please ignore">
<description>
Please ignore this category which is only relevant for Toolbox testing!
</description>
</category-def>
</site>
......@@ -45,7 +45,7 @@
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.13.0.v20170531-1133"/>
<unit id="org.eclipse.core.runtime.feature.feature.group" version="1.2.0.v20170518-1049"/>
<unit id="org.eclipse.sdk.ide" version="4.7.0.I20170612-0950"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.7/"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.7/" id="eclipse"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="de.vonloesch.pdf4eclipse.feature.feature.group" version="0.0.0"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product name="TLA+ Toolbox" uid="org.lamport.tla.toolbox.product.product" id="org.lamport.tla.toolbox.product.standalone.product" application="org.lamport.tla.toolbox.application" version="1.5.4" useFeatures="true" includeLaunchers="true">
<product name="TLA+ Toolbox" uid="org.lamport.tla.toolbox.product.product" id="org.lamport.tla.toolbox.product.standalone.product" application="org.lamport.tla.toolbox.application" version="1.5.5.qualifier" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="/org.lamport.tla.toolbox.product.standalone/images/splash_small.png"/>
<text>
TLA+ Toolbox provides a user interface for TLA+ Tools.
This is Version 1.5.4 of 06 October 2017 and includes:
This is Version 1.5.5 of 05 January 2018 and includes:
- SANY Version 2.1 of 23 July 2017
- TLC Version 2.10 of 28 September 2017
- TLC Version 2.11 of 05 January 2018
- PlusCal Version 1.8 of 07 December 2015
- TLATeX Version 1.0 of 20 September 2017
......@@ -80,12 +80,16 @@ openFile
<plugin id="org.eclipse.equinox.http.registry" autoStart="true" startLevel="3" />
<plugin id="org.lamport.tla.toolbox.jclouds" autoStart="true" startLevel="4" />
<plugin id="sts" autoStart="true" startLevel="4" />
<property name="eclipse.buildId" value="1.5.4" />
<property name="eclipse.buildId" value="1.5.5" />
</configurations>
<repositories>
<repository location="http://lamport.org/tlatoolbox/toolboxUpdate/" enabled="true" />
<repository location="http://lamport.org/tlatoolbox/ci/toolboxUpdate/" enabled="false" />
<repository location="http://lamport.org/tlatoolbox/toolboxUpdate/" enabled="true" />
<repository location="http://lamport.org/tlatoolbox/ci/toolboxUpdate/" enabled="false" />
<repository location="http://lamport.org/tlatoolbox/toolboxUpdate/" enabled="true" />
<repository location="http://lamport.org/tlatoolbox/ci/toolboxUpdate/" enabled="false" />
</repositories>
<preferencesInfo>
......
......@@ -19,7 +19,7 @@
<!-- Align product.version with the version in
org.lamport.tla.toolbox.product.product.product
product.version. -->
<product.version>1.5.4</product.version>
<product.version>1.5.5</product.version>
<!-- Format build timestamp to adhere to the Debian package guidelines -->
<maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
<product.build>${maven.build.timestamp}</product.build>
......
......@@ -30,7 +30,7 @@
</property>
<property
name="aboutText"
value="TLA+ Toolbox provides a user interface for TLA+ Tools. &#x0A;&#x0A;This is Version 1.5.4 of 06 October 2017 and includes:&#x0A; - SANY Version 2.1 of 23 July 2017&#x0A; - TLC Version 2.10 of 28 September 2017&#x0A; - PlusCal Version 1.8 of 07 December 2015&#x0A; - TLATeX Version 1.0 of 20 September 2017&#x0A;&#x0A;Don&apos;t forget to click on help. You can learn about features that you never knew about or have forgotten.&#x0A;&#x0A;Please send us reports of problems or suggestions; see https://groups.google.com/d/forum/tlaplus .">
value="TLA+ Toolbox provides a user interface for TLA+ Tools. &#x0A;&#x0A;This is Version 1.5.5 of 05 January 2018 and includes:&#x0A; - SANY Version 2.1 of 23 July 2017&#x0A; - TLC Version 2.11 of 05 January 2018&#x0A; - PlusCal Version 1.8 of 07 December 2015&#x0A; - TLATeX Version 1.0 of 20 September 2017&#x0A;&#x0A;Don&apos;t forget to click on help. You can learn about features that you never knew about or have forgotten.&#x0A;&#x0A;Please send us reports of problems or suggestions; see https://groups.google.com/d/forum/tlaplus .">
</property>
<property
name="aboutImage"
......
......@@ -67,7 +67,6 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor
filters.add("de.vonloesch.pdf4Eclipse");
// Filter out GraphViz
//TODO Move its configuration (path to dot) into Toolbox specific preference page.
filters.add("com.abstratt.graphviz.ui");
// Clean the preferences
......
......@@ -175,7 +175,7 @@ public class ToolboxIntroPart extends IntroPart implements IIntroPart {
final Label lblVersion = new Label(outerContainer, SWT.WRAP);
lblVersion.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 2, 1));
lblVersion.setText("Version 1.5.4 of 06 October 2017");
lblVersion.setText("Version 1.5.5 of 05 January 2018");
lblVersion.setBackground(backgroundColor);
}
......
......@@ -101,7 +101,7 @@
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.eclipse.equinox.weaving.hook</artifactId>
<version>1.1.100.v20140821-1915</version>
<version>1.2.0.v20160929-1449</version>
</dependency>
<dependency>
<type>p2-installable-unit</type>
......@@ -115,7 +115,7 @@
<frameworkExtension>
<groupId>p2.osgi.bundle</groupId>
<artifactId>org.eclipse.equinox.weaving.hook</artifactId>
<version>1.1.100.v20140821-1915</version>
<version>1.2.0.v20160929-1449</version>
</frameworkExtension>
</frameworkExtensions>
......
......@@ -2,8 +2,6 @@ package org.lamport.tla.toolbox.tool.tla2tex;
import java.io.File;
import junit.framework.Assert;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
......@@ -16,15 +14,18 @@ import org.lamport.tla.toolbox.test.RCPTestSetupHelper;
import org.lamport.tla.toolbox.test.threading.MonitorAdaptor;
import org.lamport.tla.toolbox.ui.handler.OpenSpecHandler;
import org.junit.Assert;
@RunWith(SWTBotJunit4ClassRunner.class)
public class PDFHandlerThreadingTest {
private static SWTWorkbenchBot bot;
private static final String specA = System
.getProperty("org.lamport.tla.toolbox.tool.tlc.ui.test.PathToSpecA");
private static final String specB = System
.getProperty("org.lamport.tla.toolbox.tool.tlc.ui.test.PathToSpecB");
private static final String specA = System.getProperty("org.lamport.tla.toolbox.tool.tlc.ui.test.PathToSpecA",
RCPTestSetupHelper.getAbsolutePath("org.lamport.tla.toolbox.uitest",
"farsite/DistributedSystemModule.tla"));
private static final String specB = System.getProperty("org.lamport.tla.toolbox.tool.tlc.ui.test.PathToSpecB",
RCPTestSetupHelper.getAbsolutePath("org.lamport.tla.toolbox.uitest", "DieHard/DieHard.tla"));
@BeforeClass
public static void beforeClass() throws Exception {
......
......@@ -102,7 +102,7 @@
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.eclipse.equinox.weaving.hook</artifactId>
<version>1.1.100.v20140821-1915</version>
<version>1.2.0.v20160929-1449</version>
</dependency>
<dependency>
<type>p2-installable-unit</type>
......@@ -116,7 +116,7 @@
<frameworkExtension>
<groupId>p2.osgi.bundle</groupId>
<artifactId>org.eclipse.equinox.weaving.hook</artifactId>
<version>1.1.100.v20140821-1915</version>
<version>1.2.0.v20160929-1449</version>
</frameworkExtension>
</frameworkExtensions>
......
package org.lamport.tla.toolbox;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
import org.lamport.tla.toolbox.tool.tlc.ui.test.ModelCheckerTest;
import org.lamport.tla.toolbox.ui.handler.CloneModelTest;
import org.lamport.tla.toolbox.ui.handler.RenameSpecHandlerTest;
@RunWith(Suite.class)
@SuiteClasses({
ModelCheckerTest.class,
CloneModelTest.class,
RenameSpecHandlerTest.class
})
public class SmokeTests {}
......@@ -32,8 +32,9 @@ public abstract class AbstractTest {
/**
* Full qualified spec name
*/
protected static final String specA = System
.getProperty("org.lamport.tla.toolbox.tool.tlc.ui.test.PathToSpecA");
protected static String specA = System.getProperty("org.lamport.tla.toolbox.tool.tlc.ui.test.PathToSpecA",
RCPTestSetupHelper.getAbsolutePath("org.lamport.tla.toolbox.uitest",
"DieHard/DieHard.tla"));
/**
* Pre flight checks (run once for each test _class_)
......
......@@ -15,6 +15,7 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.lamport.tla.toolbox.test.RCPTestSetupHelper;
import org.lamport.tla.toolbox.test.threading.MonitorAdaptor;
import org.lamport.tla.toolbox.tool.tlc.ui.test.AbstractTest;
......@@ -28,7 +29,8 @@ import org.lamport.tla.toolbox.tool.tlc.ui.test.AbstractTest;
@RunWith(SWTBotJunit4ClassRunner.class)
public class HandlerThreadingTest extends AbstractTest {
private static final String specB = System.getProperty("org.lamport.tla.toolbox.tool.tlc.ui.test.PathToSpecB");
private static final String specB = System.getProperty("org.lamport.tla.toolbox.tool.tlc.ui.test.PathToSpecB",
RCPTestSetupHelper.getAbsolutePath("org.lamport.tla.toolbox.uitest", "farsite/DistributedSystemModule.tla"));
@BeforeClass
public static void beforeClass() {
......
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="class"/>
......
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
......@@ -70,4 +70,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.source=1.8
......@@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.core.runtime,
javax.mail;bundle-version="1.4.0",
com.abstratt.graphviz;bundle-version="2.1.201501",
com.abstratt.graphviz.ui;bundle-version="2.1.201501"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: org.lamport.tla.toolbox.editor.basic
Export-Package: org.lamport.tla.toolbox.tool.tlc.output;x-friends:="org.lamport.tla.toolbox.tool.tlc.ui.test",
......
org.lamport.tla.toolbox.tool.tlc.ui/icons/full/lockedstate.gif

255 B

org.lamport.tla.toolbox.tool.tlc.ui/icons/full/owned_monitor_obj.gif

324 B

......@@ -445,6 +445,15 @@
name="TLC Models"
priority="normal"
providesSaveables="false">
<commonSorter
id="toolbox.content.ModelSnapshotSorter"
class="org.lamport.tla.toolbox.tool.tlc.ui.modelexplorer.ModelSnapshotSorter">
<parentExpression>
<or>
<instanceof value="org.lamport.tla.toolbox.tool.tlc.model.Model" />
</or>
</parentExpression>
</commonSorter>
<possibleChildren>
<or>
<instanceof
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment