Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Anett Jakab
titan.EclipsePlug-ins
Commits
e7759e0d
Commit
e7759e0d
authored
Mar 29, 2021
by
Lenard Nagy
Committed by
Gerrit Code Review
Mar 29, 2021
Browse files
Merge "tpd import bugfix and version update (Bug 572399)"
parents
b11bdc5f
b517e788
Changes
31
Hide whitespace changes
Inline
Side-by-side
automatic_build/build_config.xml
View file @
e7759e0d
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
<property
environment=
"env"
/>
<property
environment=
"env"
/>
<!-- The qualifier of the features -->
<!-- The qualifier of the features -->
<property
name=
"version"
value=
"7.2.
1
."
/>
<property
name=
"version"
value=
"7.2.
2
."
/>
<tstamp/>
<tstamp/>
<property
name=
"timestamp"
value=
"${DSTAMP}-${TSTAMP}"
/>
<property
name=
"timestamp"
value=
"${DSTAMP}-${TSTAMP}"
/>
<property
name=
"version.qualifier"
value=
"${version}_${timestamp}"
/>
<property
name=
"version.qualifier"
value=
"${version}_${timestamp}"
/>
...
...
org.eclipse.titan.common/META-INF/MANIFEST.MF
View file @
e7759e0d
...
@@ -4,7 +4,7 @@ Created-By: 23.6-b04 (Oracle Corporation)
...
@@ -4,7 +4,7 @@ Created-By: 23.6-b04 (Oracle Corporation)
Bundle-ManifestVersion: 2
Bundle-ManifestVersion: 2
Bundle-Name: Common TITAN on Eclipse Plug-in
Bundle-Name: Common TITAN on Eclipse Plug-in
Bundle-SymbolicName: org.eclipse.titan.common;singleton:=true
Bundle-SymbolicName: org.eclipse.titan.common;singleton:=true
Bundle-Version: 7.2.
1
._2021032
5
-1000
Bundle-Version: 7.2.
2
._2021032
9
-1000
Bundle-Activator: org.eclipse.titan.common.Activator
Bundle-Activator: org.eclipse.titan.common.Activator
Bundle-Vendor: Eclipse Titan Project
Bundle-Vendor: Eclipse Titan Project
Require-Bundle: org.eclipse.ui,
Require-Bundle: org.eclipse.ui,
...
...
org.eclipse.titan.common/src/org/eclipse/titan/common/path/TITANPathUtilities.java
View file @
e7759e0d
...
@@ -67,9 +67,7 @@ public final class TITANPathUtilities {
...
@@ -67,9 +67,7 @@ public final class TITANPathUtilities {
* @return the resolved uri or null on error.
* @return the resolved uri or null on error.
*/
*/
public
static
URI
resolvePath
(
final
String
pathToBeResolved
,
final
URI
basePath
)
{
public
static
URI
resolvePath
(
final
String
pathToBeResolved
,
final
URI
basePath
)
{
final
String
basePathString
=
URIUtil
.
toPath
(
basePath
).
toOSString
();
return
resolvePathURI
(
pathToBeResolved
,
basePath
==
null
?
null
:
URIUtil
.
toPath
(
basePath
).
toOSString
());
return
resolvePathURI
(
pathToBeResolved
,
basePathString
);
}
}
/**
/**
...
...
org.eclipse.titan.common/src/org/eclipse/titan/common/product/ProductIdentity.java
View file @
e7759e0d
...
@@ -20,7 +20,7 @@ public final class ProductIdentity implements Comparable<ProductIdentity> {
...
@@ -20,7 +20,7 @@ public final class ProductIdentity implements Comparable<ProductIdentity> {
public
static
final
String
TITAN_PRODUCT_NUMBER_CNL
=
"CNL 113 200"
;
public
static
final
String
TITAN_PRODUCT_NUMBER_CNL
=
"CNL 113 200"
;
public
static
final
int
TITAN_VERSION_MAJOR
=
7
;
public
static
final
int
TITAN_VERSION_MAJOR
=
7
;
public
static
final
int
TITAN_VERSION_MINOR
=
2
;
public
static
final
int
TITAN_VERSION_MINOR
=
2
;
public
static
final
int
TITAN_VERSION_PATCHLEVEL
=
1
;
public
static
final
int
TITAN_VERSION_PATCHLEVEL
=
2
;
private
String
productNumber
=
null
;
private
String
productNumber
=
null
;
private
int
productNumberSuffix
=
1
;
private
int
productNumberSuffix
=
1
;
...
...
org.eclipse.titan.debug/META-INF/MANIFEST.MF
View file @
e7759e0d
...
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
...
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-ManifestVersion: 2
Bundle-Name: Titan_Debug
Bundle-Name: Titan_Debug
Bundle-SymbolicName: org.eclipse.titan.debug;singleton:=true
Bundle-SymbolicName: org.eclipse.titan.debug;singleton:=true
Bundle-Version: 7.2.
1
._2021032
5
-1000
Bundle-Version: 7.2.
2
._2021032
9
-1000
Bundle-Activator: org.eclipse.titan.debug.Activator
Bundle-Activator: org.eclipse.titan.debug.Activator
Bundle-Vendor: Eclipse Titan Project
Bundle-Vendor: Eclipse Titan Project
Require-Bundle: org.eclipse.ui,
Require-Bundle: org.eclipse.ui,
...
@@ -10,8 +10,8 @@ Require-Bundle: org.eclipse.ui,
...
@@ -10,8 +10,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.resources,
org.eclipse.core.resources,
org.eclipse.ui.console,
org.eclipse.ui.console,
org.eclipse.debug.core,
org.eclipse.debug.core,
org.eclipse.titan.common;bundle-version="7.2.
1
",
org.eclipse.titan.common;bundle-version="7.2.
2
",
org.eclipse.titan.designer;bundle-version="7.2.
1
"
org.eclipse.titan.designer;bundle-version="7.2.
2
"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true
Eclipse-LazyStart: true
...
...
org.eclipse.titan.debug/about.mappings
View file @
e7759e0d
...
@@ -3,4 +3,4 @@
...
@@ -3,4 +3,4 @@
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file does not need to be translated.
# This file does not need to be translated.
0=7.2.
1
0=7.2.
2
org.eclipse.titan.designer/META-INF/MANIFEST.MF
View file @
e7759e0d
...
@@ -4,7 +4,7 @@ Created-By: 23.6-b04 (Oracle Corporation)
...
@@ -4,7 +4,7 @@ Created-By: 23.6-b04 (Oracle Corporation)
Bundle-ManifestVersion: 2
Bundle-ManifestVersion: 2
Bundle-Name: TITAN_Designer Plug-in
Bundle-Name: TITAN_Designer Plug-in
Bundle-SymbolicName: org.eclipse.titan.designer;singleton:=true
Bundle-SymbolicName: org.eclipse.titan.designer;singleton:=true
Bundle-Version: 7.2.
1
._2021032
5
-1000
Bundle-Version: 7.2.
2
._2021032
9
-1000
Bundle-Activator: org.eclipse.titan.designer.Activator
Bundle-Activator: org.eclipse.titan.designer.Activator
Bundle-Vendor: Eclipse Titan Project
Bundle-Vendor: Eclipse Titan Project
Require-Bundle: org.eclipse.ui,
Require-Bundle: org.eclipse.ui,
...
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.ui,
...
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui.navigator.resources,
org.eclipse.ui.navigator.resources,
org.eclipse.core.filesystem,
org.eclipse.core.filesystem,
org.eclipse.debug.core,
org.eclipse.debug.core,
org.eclipse.titan.common;bundle-version="7.2.
1
",
org.eclipse.titan.common;bundle-version="7.2.
2
",
org.antlr.runtime;bundle-version="4.3.0",
org.antlr.runtime;bundle-version="4.3.0",
org.eclipse.jdt.core;bundle-version="3.10.2",
org.eclipse.jdt.core;bundle-version="3.10.2",
org.eclipse.core.expressions;bundle-version="3.4.600",
org.eclipse.core.expressions;bundle-version="3.4.600",
...
...
org.eclipse.titan.designer/about.mappings
View file @
e7759e0d
...
@@ -3,4 +3,4 @@
...
@@ -3,4 +3,4 @@
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file does not need to be translated.
# This file does not need to be translated.
0=7.2.
1
0=7.2.
2
org.eclipse.titan.designer/docs/Eclipse_Designer_userguide/DesignerUserGuide.adoc
View file @
e7759e0d
---
---
Author: Jenő Balaskó, Ádám Knapp
Author: Jenő Balaskó, Ádám Knapp
Version: 7.2.
1
Version: 7.2.
2
Date: 2021-03-2
5
Date: 2021-03-2
9
---
---
= User Guide for the TITAN Designer for the Eclipse IDE
= User Guide for the TITAN Designer for the Eclipse IDE
:author: Jenő Balaskó, Ádám Knapp
:author: Jenő Balaskó, Ádám Knapp
:revnumber: 7.2.
1
:revnumber: 7.2.
2
:revdate: 2021-03-2
5
:revdate: 2021-03-2
9
:title-logo-image: images/titan_logo.png
:title-logo-image: images/titan_logo.png
:sectnums:
:sectnums:
:doctype: book
:doctype: book
...
...
org.eclipse.titan.executor/META-INF/MANIFEST.MF
View file @
e7759e0d
...
@@ -4,7 +4,7 @@ Created-By: 23.6-b04 (Oracle Corporation)
...
@@ -4,7 +4,7 @@ Created-By: 23.6-b04 (Oracle Corporation)
Bundle-ManifestVersion: 2
Bundle-ManifestVersion: 2
Bundle-Name: TITAN_Executor Plug-in
Bundle-Name: TITAN_Executor Plug-in
Bundle-SymbolicName: org.eclipse.titan.executor;singleton:=true
Bundle-SymbolicName: org.eclipse.titan.executor;singleton:=true
Bundle-Version: 7.2.
1
._2021032
5
-1000
Bundle-Version: 7.2.
2
._2021032
9
-1000
Bundle-Activator: org.eclipse.titan.executor.Activator
Bundle-Activator: org.eclipse.titan.executor.Activator
Require-Bundle: org.eclipse.ui,
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime;bundle-version="3.5.0",
org.eclipse.core.runtime;bundle-version="3.5.0",
...
@@ -17,9 +17,9 @@ Require-Bundle: org.eclipse.ui,
...
@@ -17,9 +17,9 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.expressions,
org.eclipse.core.expressions,
org.eclipse.jdt.core;bundle-version="3.10.2",
org.eclipse.jdt.core;bundle-version="3.10.2",
org.eclipse.jdt.launching;bundle-version="2.0.0",
org.eclipse.jdt.launching;bundle-version="2.0.0",
org.eclipse.titan.common;bundle-version="7.2.
1
",
org.eclipse.titan.common;bundle-version="7.2.
2
",
org.eclipse.titan.designer;bundle-version="7.2.
1
",
org.eclipse.titan.designer;bundle-version="7.2.
2
",
org.eclipse.titan.runtime;bundle-version="7.2.
1
"
org.eclipse.titan.runtime;bundle-version="7.2.
2
"
Bundle-ActivationPolicy: lazy
Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true
Eclipse-LazyStart: true
Bundle-Vendor: Eclipse Titan Project
Bundle-Vendor: Eclipse Titan Project
...
...
org.eclipse.titan.executor/about.mappings
View file @
e7759e0d
...
@@ -3,4 +3,4 @@
...
@@ -3,4 +3,4 @@
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file does not need to be translated.
# This file does not need to be translated.
0=7.2.
1
0=7.2.
2
org.eclipse.titan.executor/docs/Eclipse_Executor_userguide/ExecutorUserGuide.adoc
View file @
e7759e0d
---
---
Author: Jenő Balaskó, Ádám Knapp
Author: Jenő Balaskó, Ádám Knapp
Version: 7.2.
1
Version: 7.2.
2
Date: 2021-03-2
5
Date: 2021-03-2
9
---
---
= User Guide of the TITAN Executor for the Eclipse IDE plug-in
= User Guide of the TITAN Executor for the Eclipse IDE plug-in
:author: Jenő Balaskó, Ádám Knapp
:author: Jenő Balaskó, Ádám Knapp
:revnumber: 7.2.
1
:revnumber: 7.2.
2
:revdate: 2021-03-2
5
:revdate: 2021-03-2
9
:title-logo-image: images/titan_logo.png
:title-logo-image: images/titan_logo.png
:sectnums:
:sectnums:
:doctype: book
:doctype: book
...
...
org.eclipse.titan.help/META-INF/MANIFEST.MF
View file @
e7759e0d
...
@@ -4,6 +4,6 @@ Created-By: 23.6-b04 (Oracle Corporation)
...
@@ -4,6 +4,6 @@ Created-By: 23.6-b04 (Oracle Corporation)
Bundle-ManifestVersion: 2
Bundle-ManifestVersion: 2
Bundle-Name: TITAN_Help Plug-in
Bundle-Name: TITAN_Help Plug-in
Bundle-SymbolicName: org.eclipse.titan.help;singleton:=true
Bundle-SymbolicName: org.eclipse.titan.help;singleton:=true
Bundle-Version: 7.2.
1
._2021032
5
-1000
Bundle-Version: 7.2.
2
._2021032
9
-1000
Bundle-Vendor: Eclipse Titan Project
Bundle-Vendor: Eclipse Titan Project
org.eclipse.titan.help/about.mappings
View file @
e7759e0d
...
@@ -3,4 +3,4 @@
...
@@ -3,4 +3,4 @@
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file does not need to be translated.
# This file does not need to be translated.
0=7.2.
1
0=7.2.
2
org.eclipse.titan.help/docs/Eclipse_installationguide/Eclipse_installationguide.adoc
View file @
e7759e0d
---
---
Author: Jenő Balaskó
Author: Jenő Balaskó
Version: 7.2.
1
Version: 7.2.
2
Date: 2021-03-2
5
Date: 2021-03-2
9
---
---
= Installation Guide for the TITAN Designer and TITAN Executor for the Eclipse IDE
= Installation Guide for the TITAN Designer and TITAN Executor for the Eclipse IDE
:author: Jenő Balaskó
:author: Jenő Balaskó
:revnumber: 7.2.
1
:revnumber: 7.2.
2
:revdate: 2021-03-2
5
:revdate: 2021-03-2
9
:title-logo-image: images/titan_logo.png
:title-logo-image: images/titan_logo.png
:sectnums:
:sectnums:
:doctype: book
:doctype: book
...
...
org.eclipse.titan.log.viewer/META-INF/MANIFEST.MF
View file @
e7759e0d
...
@@ -4,7 +4,7 @@ Created-By: 23.6-b04 (Oracle Corporation)
...
@@ -4,7 +4,7 @@ Created-By: 23.6-b04 (Oracle Corporation)
Bundle-ManifestVersion: 2
Bundle-ManifestVersion: 2
Bundle-Name: TITAN Log Viewer
Bundle-Name: TITAN Log Viewer
Bundle-SymbolicName: org.eclipse.titan.log.viewer;singleton:=true
Bundle-SymbolicName: org.eclipse.titan.log.viewer;singleton:=true
Bundle-Version: 7.2.
1
._2021032
5
-1000
Bundle-Version: 7.2.
2
._2021032
9
-1000
Bundle-Activator: org.eclipse.titan.log.viewer.Activator
Bundle-Activator: org.eclipse.titan.log.viewer.Activator
Bundle-Vendor: Eclipse Titan Project
Bundle-Vendor: Eclipse Titan Project
Require-Bundle: org.eclipse.core.resources,
Require-Bundle: org.eclipse.core.resources,
...
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.resources,
...
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.resources,
org.eclipse.jface.text,
org.eclipse.jface.text,
org.eclipse.ui.editors,
org.eclipse.ui.editors,
org.eclipse.ui.workbench.texteditor,
org.eclipse.ui.workbench.texteditor,
org.eclipse.titan.common;bundle-version="7.2.
1
"
org.eclipse.titan.common;bundle-version="7.2.
2
"
Bundle-ActivationPolicy: lazy
Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true
Eclipse-LazyStart: true
Bundle-ClassPath: .
Bundle-ClassPath: .
...
...
org.eclipse.titan.log.viewer/about.mappings
View file @
e7759e0d
...
@@ -3,4 +3,4 @@
...
@@ -3,4 +3,4 @@
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file does not need to be translated.
# This file does not need to be translated.
0=7.2.
1
0=7.2.
2
org.eclipse.titan.regressiontests/META-INF/MANIFEST.MF
View file @
e7759e0d
...
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
...
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-ManifestVersion: 2
Bundle-Name: Eclipse Titan Regression Test
Bundle-Name: Eclipse Titan Regression Test
Bundle-SymbolicName: org.eclipse.titan.regressiontests;singleton:=true
Bundle-SymbolicName: org.eclipse.titan.regressiontests;singleton:=true
Bundle-Version: 7.2.
1
._2021032
5
-1000
Bundle-Version: 7.2.
2
._2021032
9
-1000
Fragment-Host: org.eclipse.titan.designer;bundle-version="7.2.
1
._2021032
5
-1000"
Fragment-Host: org.eclipse.titan.designer;bundle-version="7.2.
2
._2021032
9
-1000"
Require-Bundle: org.eclipse.ui,
Require-Bundle: org.eclipse.ui,
org.eclipse.core.resources,
org.eclipse.core.resources,
org.junit
org.junit
...
...
org.eclipse.titan.regressiontests/about.mappings
View file @
e7759e0d
...
@@ -3,4 +3,4 @@
...
@@ -3,4 +3,4 @@
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file does not need to be translated.
# This file does not need to be translated.
0=7.2.
1
0=7.2.
2
org.eclipse.titan.regressiontests/build.xml
View file @
e7759e0d
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<project
basedir=
"."
default=
"build"
name=
"org.eclipse.titan.regressiontests"
>
<project
basedir=
"."
default=
"build"
name=
"org.eclipse.titan.regressiontests"
>
<property
environment=
"env"
/>
<property
environment=
"env"
/>
<!-- The qualifier of the features -->
<!-- The qualifier of the features -->
<property
name=
"version"
value=
"7.2.
1
."
/>
<property
name=
"version"
value=
"7.2.
2
."
/>
<tstamp/>
<tstamp/>
<property
name=
"timestamp"
value=
"${DSTAMP}-${TSTAMP}"
/>
<property
name=
"timestamp"
value=
"${DSTAMP}-${TSTAMP}"
/>
<property
name=
"version.qualifier"
value=
"${version}_${timestamp}"
/>
<property
name=
"version.qualifier"
value=
"${version}_${timestamp}"
/>
...
...
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment