This is an automated email from the ASF dual-hosted git repository.
isapir pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 2d9f42aea5 Add Run Configuration for IntelliJ IDEA
2d9f42aea5 is described below
commit 2d9f42aea59e734225e13cf17b46ab52a63744ac
Author: Igal Sapir <[email protected]>
AuthorDate: Sun Jan 7 23:02:12 2024 -0800
Add Run Configuration for IntelliJ IDEA
---
build.xml | 9 +++++++--
res/ide-support/idea/compiler.xml | 14 ++++++++++++++
res/ide-support/idea/tomcat.iml | 10 ++++++++++
res/ide-support/idea/workspace.xml | 18 ++++++++++++++++++
4 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index 806c47d4b9..2daf02fe1c 100644
--- a/build.xml
+++ b/build.xml
@@ -264,6 +264,7 @@
<filter token="MIGRATION_JAR" value="${migration-lib.jar}"/>
<filter token="UNBOUNDID_JAR" value="${unboundid.jar}"/>
<filter token="JUNIT_JAR" value="${junit.jar}"/>
+ <filter token="OUTPUT_DIR" value="${tomcat.output}"/>
</filterset>
<!-- Version info filter set -->
@@ -3818,7 +3819,7 @@ Read the Building page on the Apache Tomcat documentation
site for details on ho
<!-- ============================ IntelliJ IDEA===========================
-->
<target name="ide-intellij"
- depends="download-compile, download-test-compile"
+ depends="download-compile, download-test-compile, deploy"
description="Creates project directory .idea for IntelliJ IDEA">
<copy todir="${tomcat.home}/.idea" overwrite="true">
@@ -3827,7 +3828,11 @@ Read the Building page on the Apache Tomcat
documentation site for details on ho
<filterset refid="version.filters"/>
</copy>
- <echo>IntelliJ IDEA project directory created.</echo>
+ <mkdir dir="${tomcat.home}/lib"/>
+
+ <echo>IntelliJ IDEA project directory created.
+The SDK was set to "${build.java.version}" so make sure that your
IDE has an SDK with that name,
+or update the Project Settings accordingly.</echo>
</target>
<!-- ============================ NetBeans ===============================
-->
diff --git a/res/ide-support/idea/compiler.xml
b/res/ide-support/idea/compiler.xml
new file mode 100644
index 0000000000..dc73b5a101
--- /dev/null
+++ b/res/ide-support/idea/compiler.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="CompilerConfiguration">
+ <excludeFromCompile>
+ <!--
+ <directory
url="file://$PROJECT_DIR$/java/org/apache/tomcat/util/openssl"
includeSubdirectories="true" />
+ <directory
url="file://$PROJECT_DIR$/java/org/apache/tomcat/util/net/openssl/panama"
includeSubdirectories="true" />
+ -->
+ </excludeFromCompile>
+ <annotationProcessing>
+ <profile default="true" name="Default" enabled="true" />
+ </annotationProcessing>
+ </component>
+</project>
\ No newline at end of file
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 08e6c05f7a..b4bc5870fd 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -120,5 +120,15 @@
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="file://$MODULE_DIR$/lib" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ <jarDirectory url="file://$MODULE_DIR$/lib" recursive="true" />
+ </library>
+ </orderEntry>
</component>
</module>
diff --git a/res/ide-support/idea/workspace.xml
b/res/ide-support/idea/workspace.xml
new file mode 100644
index 0000000000..761caf13ad
--- /dev/null
+++ b/res/ide-support/idea/workspace.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Git.Settings">
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+ </component>
+ <component name="RunManager">
+ <configuration name="Tomcat" type="Application" factoryName="Application">
+ <option name="ALTERNATIVE_JRE_PATH" value="@BUILD_JAVA_VERSION@" />
+ <option name="MAIN_CLASS_NAME"
value="org.apache.catalina.startup.Bootstrap" />
+ <module name="tomcat" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="WORKING_DIRECTORY" value="@OUTPUT_DIR@/build" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+ </component>
+</project>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
