v4.9.4

archi-contribs · Apr 26, 2023 · d8b56e5 · d8b56e5
1 parent 4f256ff
commit d8b56e5
Show file tree

Hide file tree

Showing 54 changed files with 1,048 additions and 848 deletions.
diff --git a/sources/.classpath b/sources/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.17.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/orai18n.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.48.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/mssql-jdbc-8.2.2.jre11.jar"/>
@@ -15,7 +16,6 @@
 	<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="lib/json-simple-1.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.17.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/lombok.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/sources/META-INF/MANIFEST.MF b/sources/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Database export / import plugin for Archimate Tool
 Bundle-SymbolicName: org.archicontribs.database;singleton:=true
-Bundle-Version: 4.9.3
+Bundle-Version: 4.9.4
 Bundle-Vendor: Herve Jouin
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ClassPath: .,
  lib/json-simple-1.1.1.jar,
  lib/log4j-1.2.17.jar,
  lib/lombok.jar,
+ lib/mssql-jdbc-8.2.2.jre11.jar,
+ lib/mysql-connector-java-5.1.48.jar,
  lib/neo4j-jdbc-driver-4.0.0.jar,
  lib/ojdbc10.jar,
+ lib/orai18n.jar,
  lib/postgresql-42.2.12.jar,
- lib/sqlite-jdbc-3.30.1.jar,
- lib/mssql-jdbc-8.2.2.jre11.jar,
- lib/mysql-connector-java-5.1.48.jar,
- lib/orai18n.jar
+ lib/sqlite-jdbc-3.30.1.jar
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.archicontribs.database.DBPlugin
 Require-Bundle: org.eclipse.core.runtime,

diff --git a/sources/build.properties b/sources/build.properties
@@ -6,8 +6,8 @@ bin.includes = META-INF/,\
                plugin.xml,\
                help/,\
                img/,\
-               lib/,\
                build.properties,\
                help_contexts.xml,\
-               bin/
+               bin/,\
+               lib/log4j-1.2.17.jar
 src.includes = src/
diff --git a/sources/help/html/configurePlugin.html b/sources/help/html/configurePlugin.html
diff --git a/sources/help/html/exportModel.html b/sources/help/html/exportModel.html
diff --git a/sources/help/html/index.html b/sources/help/html/index.html
@@ -1,29 +1,37 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-	<title>Table of Contents</title>
-	<link rel="stylesheet" href="style.css">
-</head>
-
-<body>
-<h1>Database plugin</h1>
-This plugin is written by Hervé Jouin ([email protected]) and extends the Archi capabilities.
-<br>
-It allows to persist models in a database.
-<br><br>
-<h2>Table of Contents</h2>
-<ul>
-<li><a href="help/html/pluginObjectives.html">Plugin objectives</a>
-<li><a href="help/html/installPlugin.html">Install the plugin</a>
-<li><a href="help/html/configurePlugin.html">Configure the plugin</a>
-<li><a href="help/html/databaseStructure.html">Database structure</a>
-<li><a href="help/html/exportModel.html">Export a model</a>
-<li><a href="help/html/importModel.html">Import a model</a>
-<li><a href="help/html/importComponent.html">Import a single component</a>
-<li><a href="help/html/componentHistory.html">Get a component's history</a>
-<li><a href="help/html/releaseNotes.html">Release notes</a>
-</ul>
-</body>
-</html>
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+    <title>Table of Contents</title>
+    <link rel="stylesheet" href="style.css">
+  </head>
+  <body>
+    <h1>Database plugin</h1>
+    This plugin is written by Hervé Jouin ([email protected]) and extends the Archi capabilities.
+    <br>
+    It allows to persist models in a database.
+    <br>
+    <br>
+    <h2>Table of Contents</h2>
+    <ul>
+      <li><a href="help/html/pluginObjectives.html" title="Plugin objectives">Plugin objectives</a>
+      </li>
+      <li><a href="help/html/installPlugin.html" title="Install the plugin">Install the plugin</a>
+      </li>
+      <li><a href="help/html/configurePlugin.html" title="Configure the plugin">Configure the plugin</a>
+      </li>
+      <li><a href="help/html/databaseStructure.html" title="Database structure">Database structure</a>
+      </li>
+      <li><a href="help/html/exportModel.html" title="Export a model">Export a model</a>
+      </li>
+      <li><a href="help/html/importModel.html" title="Import a model">Import a model</a>
+      </li>
+      <li><a href="help/html/importComponent.html" title="Import a single component">Import a single component</a>
+      </li>
+      <li><a href="help/html/componentHistory.html" title="Get a component's history">Get a component's history</a>
+      </li>
+      <li><a href="help/html/releaseNotes.html" title="Realease notes">Release notes</a>
+      </li>
+    </ul>
+  </body>
+</html>
diff --git a/sources/help/html/installPlugin.html b/sources/help/html/installPlugin.html
@@ -1,34 +1,42 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-	<title>Preference page</title>
-	<link rel="stylesheet" href="style.css">
-</head>
-
-<body>
-<h1>Install the plugin</h1>
-The plugin consists of a single <b><i>org.archicontribs.database_xxx.jar</i></b> file. There are several ways to install it.
-<h2>First installation</h2>
-<h3>Method 1 (semi-automatic installation)</h3>
-Download the <b><i>org.archicontribs.database_xxx.zip</i></b> ZIP file from GitHub, then open the Help/Install Archi plugin-in menu in Archi and select the downloaded zip file.<br>
-<br>
-Once the plugin in installed, Archi will require to restart itself.
-<h3>Method 2 (manual installation)</h3>
-Download the <b><i>org.archicontribs.database_xxx.jar</i></b> JAR file from GitHub and manually copy it to Archi's plugin folder.<br>
-<br>
-Usually, this folder is _C:\Program Files\Archi\plugins_ or _C:\Program Files (x86)\Archi\plugins_ on Windows.<br>
-<br>
-Once the jar file is copied, start (or restart) Archi.
-<h2>Update the plugin to a newer release</h2>
-<h3>Method 1 (automatic update)</h3>
-Once installed, the plugin is able to update itself, provided you've got an Internet connection (please check the <a href="configurePlugin.html">Configure the plugin</a> page should you require to configure a proxy).<br>
-<br>
-Please go to the plugin's <a href="configurePlugin.html">preference page</a> and click on the <b><i>Check for update</i></b> button.<br>
-<br>
-The plugin will indicate if a new version is available. You'll then be able to print the release note and automatically download and install the new release.<br>
-<h3>Method 2 (manual update)</h3>
-Alternatively, you may delete the JAR file from Archi's plugin folder and use the new plugin installation procedure.
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+    <title>Install the plugin</title>
+    <link rel="stylesheet" href="style.css">
+  </head>
+  <body>
+    <h1>Install the plugin</h1>
+    <h2>Download the plugin from Github</h2>
+    <p>The plugin is available on <a href="https://github.com/archi-contribs/database-plugin/tree/master/v2">Github</a> at the following address: <a
+        href="https://github.com/archi-contribs/database-plugin/tree/master/v2">https://github.com/archi-contribs/database-plugin/tree/master/v2</a></p>
+    <p>Please download the <strong><em>org.archicontribs.database_4.9.4.archiplugin</em></strong> file.</p>
+    <h2>Install the plugin</h2>
+    <p>The easiest way to install the plugin is to use Archi's integrated mechanism which is accessible through the <i><b>Help </b></i>/ <i><b>Manage Plug-ins...</b></i> menu:</p>
+    <img src="../img/manage-plugins-menu.png" alt="Manage plug-ins menu"
+      title="Manage plug-ins menu">
+    <p><br>
+    </p>
+    <p>The <i><b>Manage Archi Plug-ins </b></i>window displays all the plugins installed in Archi. The procedure works the same to install a new plugin or update an existing plugin. Please click on the <i><b>Install New ...</b></i> button:</p>
+    <p><img src="../img/manage-plugins-window.png" alt="Manage plugins window"
+        title="Manage plugins window"></p>
+    <p><br>
+    </p>
+    <p>Please select the <em><strong>archiplugin </strong></em>file you've downloaded previously.</p>
+    <p>To complete the plugin installation, Archi needs to be restarted. Please click on the <i><b>Yes </b></i>button to restart Archi immediately, or press <i><b>No </b></i>if you prefer to restart later on.</p>
+    <p><img src="../img/manage-plugins-restart.png" alt="Archi requires to restart"
+        title="Archi requires to restart"><br>
+    </p>
+    <p>Once Archi restarts, a welcome message indicates if the plugin has been correctly installed:</p>
+    <img src="../img/welcome-database-plugin.png" alt="Welcome database plugin"
+      title="Welcome database plugin">
+    <p>Or upgraded:</p>
+    <p> <img src="../img/upgrade-database-plugin.png" alt="Database plugin upgraded"
+        title="Database plugin upgraded"> </p>
+    <h2>Update the plugin</h2>
+    <p>To update the plugin to a newer version, you may follow the same procedure used to install the plugin (ie download a new version of the <i><b>archiplugin </b></i>file and install it through Archi's <i><b>Manage plugin-ins </b></i>mechanism.</p>
+    <p>Alternatively, if your computer has got a direct access to the Internet, the plugin is able to automatically download updates from Github and install them. To activate this mechanism, please refer to the <a
+        href="file:///C:/Users/herve/git/archicontribs/database-plugin/v2/sources/help/html/configurePlugin.html#version"
+        title="Version">Version section of the preferences help page</a>.</p>
+  </body>
+</html>