Merge branch 'devonfw:main' into devonfw#734-improve-process-result

alfeilex · Nov 20, 2024 · 292aa5b · 292aa5b
2 parents 05879d1 + 7704dbf
commit 292aa5b
Show file tree

Hide file tree

Showing 44 changed files with 35 additions and 35 deletions.
diff --git a/cli/src/test/java/com/devonfw/tools/ide/repo/ToolRepositoryMock.java b/cli/src/test/java/com/devonfw/tools/ide/repo/ToolRepositoryMock.java
@@ -6,7 +6,6 @@
 import java.util.Iterator;
 import java.util.stream.Stream;
 
-import com.devonfw.tools.ide.cli.CliException;
 import com.devonfw.tools.ide.context.IdeContext;
 import com.devonfw.tools.ide.version.GenericVersionRange;
 import com.devonfw.tools.ide.version.VersionIdentifier;
@@ -33,12 +32,8 @@ public ToolRepositoryMock(IdeContext context, Path repositoryFolder) {
   @Override
   public VersionIdentifier resolveVersion(String tool, String edition, GenericVersionRange version) {
 
-    try {
-      return super.resolveVersion(tool, edition, version);
-    } catch (CliException e) {
-      this.context.error(e, "Invalid test project using version {} that cannot be resolved in urls folder", version);
-      return version.getMax();
-    }
+    return super.resolveVersion(tool, edition, version);
+
   }
 
   @Override

diff --git a/...urces/ide-projects/android-studio/_ide/urls/android-studio/android-studio/2024.1.1.1/urls b/...urces/ide-projects/android-studio/_ide/urls/android-studio/android-studio/2024.1.1.1/urls
@@ -1 +1 @@
-https://adoptium.net/download/dummytest
+${testbaseurl}/download/android-studio/android-studio/2024.1.1.1/android-studio-2024.1.1.1.tgz
diff --git a/cli/src/test/resources/ide-projects/build/_ide/urls/gradle/gradle/8.7/urls b/cli/src/test/resources/ide-projects/build/_ide/urls/gradle/gradle/8.7/urls
@@ -0,0 +1 @@
+${testbaseurl}/download/gradle/gradle/8.7/gradle-8.7.tgz
diff --git a/cli/src/test/resources/ide-projects/build/_ide/urls/java/java/17.0.10_7/urls b/cli/src/test/resources/ide-projects/build/_ide/urls/java/java/17.0.10_7/urls
@@ -0,0 +1 @@
+${testbaseurl}/download/java/java/17.0.10_7/java-17.0.10_7.tgz
diff --git a/cli/src/test/resources/ide-projects/build/_ide/urls/mvn/mvn/3.9.6/urls b/cli/src/test/resources/ide-projects/build/_ide/urls/mvn/mvn/3.9.6/urls
@@ -0,0 +1 @@
+${testbaseurl}/download/mvn/mvn/3.9.6/mvn-3.9.6.tgz
diff --git a/cli/src/test/resources/ide-projects/build/_ide/urls/node/node/v18.19.1/urls b/cli/src/test/resources/ide-projects/build/_ide/urls/node/node/v18.19.1/urls
@@ -0,0 +1 @@
+${testbaseurl}/download/node/node/v18.19.1/node-v18.19.1.tgz
diff --git a/cli/src/test/resources/ide-projects/build/_ide/urls/npm/npm/9.9.2/urls b/cli/src/test/resources/ide-projects/build/_ide/urls/npm/npm/9.9.2/urls
@@ -0,0 +1 @@
+${testbaseurl}/download/npm/npm/9.9.2/npm-9.9.2.tgz
diff --git a/cli/src/test/resources/ide-projects/dotnet/_ide/urls/dotnet/dotnet/6.0.419/urls b/cli/src/test/resources/ide-projects/dotnet/_ide/urls/dotnet/dotnet/6.0.419/urls
@@ -0,0 +1 @@
+${testbaseurl}/download/dotnet/dotnet/6.0.419/dotnet-6.0.419.tgz
diff --git a/cli/src/test/resources/ide-projects/dotnet/_ide/urls/dotnet/dotnet/6.0.419/urls.txt b/cli/src/test/resources/ide-projects/dotnet/_ide/urls/dotnet/dotnet/6.0.419/urls.txt
diff --git a/cli/src/test/resources/ide-projects/eclipse/_ide/urls/eclipse/eclipse/2024-09/urls b/cli/src/test/resources/ide-projects/eclipse/_ide/urls/eclipse/eclipse/2024-09/urls
@@ -1 +1 @@
-https://downloads.eclipse.org/dummytest
+${testbaseurl}/download/eclipse/eclipse/2024-09/eclipse-2024-09.tgz
diff --git a/cli/src/test/resources/ide-projects/eclipse/_ide/urls/java/java/17.0.10_7/urls b/cli/src/test/resources/ide-projects/eclipse/_ide/urls/java/java/17.0.10_7/urls
@@ -1 +1 @@
-https://adoptium.net/download/dummytest
+${testbaseurl}/download/java/java/17.0.10_7/java-17.0.10_7.tgz
diff --git a/cli/src/test/resources/ide-projects/graalvm/_ide/urls/graalvm/graalvm/22.3.3/urls b/cli/src/test/resources/ide-projects/graalvm/_ide/urls/graalvm/graalvm/22.3.3/urls
@@ -0,0 +1 @@
+${testbaseurl}/download/graalvm/graalvm/22.3.3/graalvm-22.3.3.tgz
diff --git a/cli/src/test/resources/ide-projects/graalvm/_ide/urls/graalvm/graalvm/22.3.3/urls.txt b/cli/src/test/resources/ide-projects/graalvm/_ide/urls/graalvm/graalvm/22.3.3/urls.txt
diff --git a/cli/src/test/resources/ide-projects/intellij/_ide/urls/intellij/intellij/2023.3.3/urls b/cli/src/test/resources/ide-projects/intellij/_ide/urls/intellij/intellij/2023.3.3/urls
@@ -1 +1 @@
-https://download.jetbrains.com/idea/ideaC-2023.3.3.win.zip
+${testbaseurl}/download/intellij/intellij/2023.3.3/intellij-2023.3.3.tgz
diff --git a/cli/src/test/resources/ide-projects/intellij/_ide/urls/intellij/intellij/2023.3.3/urls.txt b/cli/src/test/resources/ide-projects/intellij/_ide/urls/intellij/intellij/2023.3.3/urls.txt
diff --git a/cli/src/test/resources/ide-projects/intellij/_ide/urls/java/java/17.0.10_7/urls b/cli/src/test/resources/ide-projects/intellij/_ide/urls/java/java/17.0.10_7/urls
@@ -1 +1 @@
-https://adoptium.net/download/dummytest
+${testbaseurl}/download/java/java/17.0.10_7/java-17.0.10_7.tgz
diff --git a/cli/src/test/resources/ide-projects/intellij/_ide/urls/java/java/17.0.10_7/urls.txt b/cli/src/test/resources/ide-projects/intellij/_ide/urls/java/java/17.0.10_7/urls.txt
diff --git a/cli/src/test/resources/ide-projects/jasypt/_ide/urls/jasypt/jasypt/1.9.3/urls b/cli/src/test/resources/ide-projects/jasypt/_ide/urls/jasypt/jasypt/1.9.3/urls
@@ -0,0 +1 @@
+${testbaseurl}/download/jasypt/jasypt/1.9.3/jasypt-1.9.3.tgz
diff --git a/cli/src/test/resources/ide-projects/jasypt/_ide/urls/jasypt/jasypt/1.9.3/urls.txt b/cli/src/test/resources/ide-projects/jasypt/_ide/urls/jasypt/jasypt/1.9.3/urls.txt
diff --git a/cli/src/test/resources/ide-projects/jasypt/_ide/urls/java/java/17.0.10_7/urls b/cli/src/test/resources/ide-projects/jasypt/_ide/urls/java/java/17.0.10_7/urls
@@ -0,0 +1 @@
+${testbaseurl}/download/java/java/17.0.10_7/java-17.0.10_7.tgz
diff --git a/cli/src/test/resources/ide-projects/jasypt/_ide/urls/java/java/17.0.10_7/urls.txt b/cli/src/test/resources/ide-projects/jasypt/_ide/urls/java/java/17.0.10_7/urls.txt
diff --git a/cli/src/test/resources/ide-projects/jmc/_ide/urls/java/java/17.0.10_7/urls b/cli/src/test/resources/ide-projects/jmc/_ide/urls/java/java/17.0.10_7/urls
@@ -0,0 +1 @@
+${testbaseurl}/download/java/java/17.0.10_7/java-17.0.10_7.tgz
diff --git a/cli/src/test/resources/ide-projects/jmc/_ide/urls/java/java/17.0.10_7/urls.txt b/cli/src/test/resources/ide-projects/jmc/_ide/urls/java/java/17.0.10_7/urls.txt
diff --git a/cli/src/test/resources/ide-projects/jmc/_ide/urls/jmc/jmc/8.3.0/urls b/cli/src/test/resources/ide-projects/jmc/_ide/urls/jmc/jmc/8.3.0/urls
@@ -0,0 +1 @@
+${testbaseurl}/download/jmc/jmc/8.3.0/jmc-8.3.0.tgz
diff --git a/cli/src/test/resources/ide-projects/jmc/_ide/urls/jmc/jmc/8.3.0/urls.txt b/cli/src/test/resources/ide-projects/jmc/_ide/urls/jmc/jmc/8.3.0/urls.txt
diff --git a/cli/src/test/resources/ide-projects/mvn/_ide/urls/java/java/17.0.10_7/urls b/cli/src/test/resources/ide-projects/mvn/_ide/urls/java/java/17.0.10_7/urls
@@ -0,0 +1 @@
+${testbaseurl}/download/java/java/17.0.10_7/java-17.0.10_7.tgz
diff --git a/cli/src/test/resources/ide-projects/mvn/_ide/urls/java/java/17.0.10_7/urls.txt b/cli/src/test/resources/ide-projects/mvn/_ide/urls/java/java/17.0.10_7/urls.txt
diff --git a/cli/src/test/resources/ide-projects/mvn/_ide/urls/mvn/mvn/3.9.7/urls b/cli/src/test/resources/ide-projects/mvn/_ide/urls/mvn/mvn/3.9.7/urls
@@ -0,0 +1 @@
+${testbaseurl}/download/mvn/mvn/3.9.7/mvn-3.9.7.tgz
diff --git a/cli/src/test/resources/ide-projects/mvn/_ide/urls/mvn/mvn/3.9.7/urls.txt b/cli/src/test/resources/ide-projects/mvn/_ide/urls/mvn/mvn/3.9.7/urls.txt
diff --git a/cli/src/test/resources/ide-projects/npm/_ide/urls/node/node/v18.19.1/urls b/cli/src/test/resources/ide-projects/npm/_ide/urls/node/node/v18.19.1/urls
@@ -0,0 +1 @@
+${testbaseurl}/download/node/node/v18.19.1/node-v18.19.1.tgz
diff --git a/cli/src/test/resources/ide-projects/npm/_ide/urls/node/node/v18.19.1/urls.txt b/cli/src/test/resources/ide-projects/npm/_ide/urls/node/node/v18.19.1/urls.txt
diff --git a/cli/src/test/resources/ide-projects/npm/_ide/urls/npm/npm/9.9.2/urls b/cli/src/test/resources/ide-projects/npm/_ide/urls/npm/npm/9.9.2/urls
@@ -0,0 +1 @@
+${testbaseurl}/download/npm/npm/9.9.2/npm-9.9.2.tgz
diff --git a/cli/src/test/resources/ide-projects/npm/_ide/urls/npm/npm/9.9.2/urls.txt b/cli/src/test/resources/ide-projects/npm/_ide/urls/npm/npm/9.9.2/urls.txt
diff --git a/cli/src/test/resources/ide-projects/tomcat/_ide/urls/java/java/17.0.10_7/urls b/cli/src/test/resources/ide-projects/tomcat/_ide/urls/java/java/17.0.10_7/urls
@@ -1 +1 @@
-https://adoptium.net/download/dummytest
+${testbaseurl}/download/java/java/17.0.10_7/java-17.0.10_7.tgz
diff --git a/cli/src/test/resources/ide-projects/tomcat/_ide/urls/java/java/21_35/urls b/cli/src/test/resources/ide-projects/tomcat/_ide/urls/java/java/21_35/urls
@@ -1 +1 @@
-https://adoptium.net/download/dummytest
+${testbaseurl}/download/java/java/21_35/java-21_35.tgz
diff --git a/cli/src/test/resources/ide-projects/tomcat/_ide/urls/java/java/8u402b06/urls b/cli/src/test/resources/ide-projects/tomcat/_ide/urls/java/java/8u402b06/urls
@@ -1 +1 @@
-https://adoptium.net/download/dummytest
+${testbaseurl}/download/java/java/8u402b06/java-8u402b06.tgz
diff --git a/cli/src/test/resources/ide-projects/tomcat/_ide/urls/tomcat/tomcat/10.1.14/urls b/cli/src/test/resources/ide-projects/tomcat/_ide/urls/tomcat/tomcat/10.1.14/urls
@@ -1 +1 @@
-https://dlcdn.apache.org/tomcat/tomcat-10/v10.1.14/bin/apache-tomcat-10.1.14.zip
+${testbaseurl}/download/tomcat/tomcat/10.1.14/tomcat-10.1.14.tgz
diff --git a/cli/src/test/resources/ide-projects/update/_ide/urls/java/java/17.0.6/readme b/cli/src/test/resources/ide-projects/update/_ide/urls/java/java/17.0.6/readme
diff --git a/cli/src/test/resources/ide-projects/update/_ide/urls/java/java/17.0.6/urls b/cli/src/test/resources/ide-projects/update/_ide/urls/java/java/17.0.6/urls
@@ -0,0 +1 @@
+${testbaseurl}/download/java/java/17.0.6/java-17.0.6.tgz
diff --git a/cli/src/test/resources/ide-projects/update/_ide/urls/mvn/mvn/3.2.1/readme b/cli/src/test/resources/ide-projects/update/_ide/urls/mvn/mvn/3.2.1/readme
diff --git a/cli/src/test/resources/ide-projects/update/_ide/urls/mvn/mvn/3.2.1/urls b/cli/src/test/resources/ide-projects/update/_ide/urls/mvn/mvn/3.2.1/urls
@@ -0,0 +1 @@
+${testbaseurl}/download/mvn/mvn/3.2.1/mvn-3.2.1.tgz
diff --git a/cli/src/test/resources/ide-projects/vscode/_ide/urls/vscode/vscode/1.92.1/urls b/cli/src/test/resources/ide-projects/vscode/_ide/urls/vscode/vscode/1.92.1/urls
@@ -0,0 +1 @@
+${testbaseurl}/download/vscode/vscode/1.92.1/vscode-1.92.1.tgz
diff --git a/cli/src/test/resources/ide-projects/vscode/_ide/urls/vscode/vscode/1.92.1/urls.txt b/cli/src/test/resources/ide-projects/vscode/_ide/urls/vscode/vscode/1.92.1/urls.txt
diff --git a/documentation/setup.adoc b/documentation/setup.adoc
@@ -26,6 +26,8 @@ Create a central folder `projects` folder (on Windows use `C:\projects` or `D:\p
 Inside this folder, create a sub-folder named `_ide` and extract the contents of the downloaded archive (`ide-cli-*.tar.gz`) to this new folder (e.g. `C:\projects\_ide`).
 Run the command `setup` in this folder (on windows double clicking on `setup.bat`).
 To get started read the link:usage.adoc[usage].
+After the installation process, you can create a new project by typing: `ide create <project>`, replace `<project>` with your project name.
+Switch to the project folder e.g. `cd <project>` and install or configure tools for your project as needed.
 
 NOTE: We are planning to create a installer that will guide users through the installation process but this is not yet released.
 
@@ -45,10 +47,10 @@ Instead you just create a folder and extract the xref:download[downloaded] archi
 All the other softwares remain locally in your IDEasy folder.
 However, there are the following excuses (what is reverted by `ide uninstall`):
 
-* The `ide` command is copied to your home directory (`~/.ide/scripts/ide`)
-* The `ide` alias is added to your shell config (`~/.bashrc` and `~/.zshrc`, search for `alias ide="source ~/.ide/scripts/ide"`).
-* On Windows the `ide.bat` command is copied to your home directory (`%USERPROFILE%\.ide\scripts\ide.bat`)
-* On Windows this `%USERPROFILE%\.ide\scripts` directory is added to the `PATH` of your user.
+* The `ide` alias is added to your shell config (`~/.bashrc` and `~/.zshrc`, search for: `alias ide=`).
+* The `completion` is added to your shell config (`~/.bashrc` and `~/.zshrc`, search for: `_ide/completion`).
+* The `IDE_ROOT` environment variable is added to your environment variables.
+* The `$IDE_ROOT/_ide/bin` folder is added to your `PATH` environment variable.
 * `IDEasy` will download all third party software to your `~/Downloads/ide` folder to reduce redundant storage.
 You have to delete this folder manually as we do not want to be responsible for data-loss in case users manually put files here.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		https://adoptium.net/download/dummytest
		${testbaseurl}/download/android-studio/android-studio/2024.1.1.1/android-studio-2024.1.1.1.tgz
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		${testbaseurl}/download/gradle/gradle/8.7/gradle-8.7.tgz
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		${testbaseurl}/download/java/java/17.0.10_7/java-17.0.10_7.tgz
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		${testbaseurl}/download/mvn/mvn/3.9.6/mvn-3.9.6.tgz
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		${testbaseurl}/download/node/node/v18.19.1/node-v18.19.1.tgz
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		${testbaseurl}/download/npm/npm/9.9.2/npm-9.9.2.tgz
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		${testbaseurl}/download/dotnet/dotnet/6.0.419/dotnet-6.0.419.tgz
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		https://downloads.eclipse.org/dummytest
		${testbaseurl}/download/eclipse/eclipse/2024-09/eclipse-2024-09.tgz
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		${testbaseurl}/download/graalvm/graalvm/22.3.3/graalvm-22.3.3.tgz
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		https://download.jetbrains.com/idea/ideaC-2023.3.3.win.zip
		${testbaseurl}/download/intellij/intellij/2023.3.3/intellij-2023.3.3.tgz