From d6572f3045125aa0ca2a8fcd8c8c57db2b403da8 Mon Sep 17 00:00:00 2001
From: Simon Leischnig <simon-jena@gmx.net>
Date: Mon, 6 Dec 2021 12:30:27 +0100
Subject: [PATCH] introduce update site location markers in xml, inf files

---
 notes_updatesitelocations.txt                      | 14 ++++++++++++++
 .../feature.xml                                    |  2 +-
 .../feature.xml                                    |  2 +-
 org.jcryptool.core.feature/feature.xml             |  2 +-
 org.jcryptool.crypto.feature/feature.xml           |  2 +-
 .../feature.xml                                    |  2 +-
 org.jcryptool.editors.feature/feature.xml          |  2 +-
 org.jcryptool.product/jcryptool.p2.inf             |  1 +
 org.jcryptool.providers.feature/feature.xml        |  2 +-
 org.jcryptool.views.feature/feature.xml            |  2 +-
 10 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 notes_updatesitelocations.txt

diff --git a/notes_updatesitelocations.txt b/notes_updatesitelocations.txt
new file mode 100644
index 0000000000..7086c0badc
--- /dev/null
+++ b/notes_updatesitelocations.txt
@@ -0,0 +1,14 @@
+org.jcryptool.product/jcryptool.p2.inf|7| org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//www.cryptool.org/jct/update,name:JCrypTool);\
+
+    org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//www.cryptool.org/jct/update,name:JCrypTool);\
+    org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//www.cryptool.org/jct/update,name:JCrypTool);
+    -> replace encoded (${#<charnum>}) in "addRepository(type:\d*,location:<location>,name:<name>)"
+    ?  what does type mean?
+
+in feature.xmls:
+  <update label="JCrypTool.org" url="https://www.cryptool.org/jct/update"/> <!-- url_update:plugins --> <!-- do not remove comment -->
+  -> replace url attribute
+
+
+TODO: ssh transport to update site does not work yet; "repository" inside
+
diff --git a/org.jcryptool.core.dependencies.feature/feature.xml b/org.jcryptool.core.dependencies.feature/feature.xml
index 690ae4a8e7..9940e2df94 100644
--- a/org.jcryptool.core.dependencies.feature/feature.xml
+++ b/org.jcryptool.core.dependencies.feature/feature.xml
@@ -214,7 +214,7 @@ litigation.
    </license>
 
    <url>
-      <update label="JCrypTool.org" url="https://www.cryptool.org/jct/update"/>
+      <update label="JCrypTool.org" url="https://www.cryptool.org/jct/update"/> <!-- url_update:plugins --> <!-- do not remove comment -->
    </url>
 
    <includes
diff --git a/org.jcryptool.core.dependencies.nl_de.feature/feature.xml b/org.jcryptool.core.dependencies.nl_de.feature/feature.xml
index 12705ce6f0..6dcdea976c 100644
--- a/org.jcryptool.core.dependencies.nl_de.feature/feature.xml
+++ b/org.jcryptool.core.dependencies.nl_de.feature/feature.xml
@@ -214,7 +214,7 @@ litigation.
    </license>
 
    <url>
-      <update label="JCrypTool.org" url="https://www.cryptool.org/jct/update"/>
+      <update label="JCrypTool.org" url="https://www.cryptool.org/jct/update"/> <!-- url_update:plugins --> <!-- do not remove comment -->
    </url>
 
    <requires>
diff --git a/org.jcryptool.core.feature/feature.xml b/org.jcryptool.core.feature/feature.xml
index 71e652dcfa..b68fc13991 100644
--- a/org.jcryptool.core.feature/feature.xml
+++ b/org.jcryptool.core.feature/feature.xml
@@ -216,7 +216,7 @@ litigation.
    </license>
 
    <url>
-      <update label="JCrypTool.org" url="https://www.cryptool.org/jct/update"/>
+       <update label="JCrypTool.org" url="https://www.cryptool.org/jct/update"/> <!-- url_update:plugins --> <!-- do not remove comment -->
    </url>
 
    <plugin
diff --git a/org.jcryptool.crypto.feature/feature.xml b/org.jcryptool.crypto.feature/feature.xml
index 8694025068..b00bf266c4 100644
--- a/org.jcryptool.crypto.feature/feature.xml
+++ b/org.jcryptool.crypto.feature/feature.xml
@@ -213,7 +213,7 @@ litigation.
    </license>
 
    <url>
-      <update label="JCrypTool.org" url="https://www.cryptool.org/jct/update"/>
+      <update label="JCrypTool.org" url="https://www.cryptool.org/jct/update"/> <!-- url_update:plugins --> <!-- do not remove comment -->
    </url>
 
    <plugin
diff --git a/org.jcryptool.crypto.flexiprovider.feature/feature.xml b/org.jcryptool.crypto.flexiprovider.feature/feature.xml
index e9812ed7a9..182bf59b32 100644
--- a/org.jcryptool.crypto.flexiprovider.feature/feature.xml
+++ b/org.jcryptool.crypto.flexiprovider.feature/feature.xml
@@ -213,7 +213,7 @@ litigation.
    </license>
 
    <url>
-      <update label="JCrypTool.org" url="https://www.cryptool.org/jct/update"/>
+      <update label="JCrypTool.org" url="https://www.cryptool.org/jct/update"/> <!-- url_update:plugins --> <!-- do not remove comment -->
    </url>
 
    <plugin
diff --git a/org.jcryptool.editors.feature/feature.xml b/org.jcryptool.editors.feature/feature.xml
index 31bb2daf8c..47903b69d9 100644
--- a/org.jcryptool.editors.feature/feature.xml
+++ b/org.jcryptool.editors.feature/feature.xml
@@ -213,7 +213,7 @@ litigation.
    </license>
 
    <url>
-      <update label="JCrypTool.org" url="https://www.cryptool.org/jct/update"/>
+      <update label="JCrypTool.org" url="https://www.cryptool.org/jct/update"/> <!-- url_update:plugins --> <!-- do not remove comment -->
    </url>
 
    <plugin
diff --git a/org.jcryptool.product/jcryptool.p2.inf b/org.jcryptool.product/jcryptool.p2.inf
index 95e9726011..9137879f9c 100644
--- a/org.jcryptool.product/jcryptool.p2.inf
+++ b/org.jcryptool.product/jcryptool.p2.inf
@@ -7,6 +7,7 @@ instructions.configure=\
     org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//www.cryptool.org/jct/update,name:JCrypTool);\
     org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//www.cryptool.org/jct/update,name:JCrypTool);
 
+
 instructions.install=mkdir(path:${installFolder}/dropins);
 
 requires.0.namespace=org.eclipse.equinox.p2.iu
diff --git a/org.jcryptool.providers.feature/feature.xml b/org.jcryptool.providers.feature/feature.xml
index 61bc45c221..34c9817884 100644
--- a/org.jcryptool.providers.feature/feature.xml
+++ b/org.jcryptool.providers.feature/feature.xml
@@ -213,7 +213,7 @@ litigation.
    </license>
 
    <url>
-      <update label="JCrypTool.org" url="https://www.cryptool.org/jct/update"/>
+      <update label="JCrypTool.org" url="https://www.cryptool.org/jct/update"/> <!-- url_update:plugins --> <!-- do not remove comment -->
    </url>
 
    <plugin
diff --git a/org.jcryptool.views.feature/feature.xml b/org.jcryptool.views.feature/feature.xml
index 4664ab1c46..965dbc966d 100644
--- a/org.jcryptool.views.feature/feature.xml
+++ b/org.jcryptool.views.feature/feature.xml
@@ -214,7 +214,7 @@ litigation.
    </license>
 
    <url>
-      <update label="JCrypTool.org" url="https://www.cryptool.org/jct/update"/>
+      <update label="JCrypTool.org" url="https://www.cryptool.org/jct/update"/> <!-- url_update:plugins --> <!-- do not remove comment -->
    </url>
 
    <plugin