You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/05/04 14:57:32 UTC

[tomcat] branch 8.5.x updated (c0c7990 -> 9f5ba20)

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


    from c0c7990  Fix IDE warnings
     new 5f025de  Improve IDE support for IntelliJ IDEA
     new b813cee  Add copyright configuration for IntelliJ IDEA
     new 90b2118  Add ant configuration for IntelliJ IDEA
     new 9f5ba20  Update changelog

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 res/ide-support/idea/ant.xml                                |  6 ++++++
 res/ide-support/idea/codeStyles/Project.xml                 | 13 +++++++++++++
 res/ide-support/idea/codeStyles/codeStyleConfig.xml         |  5 +++++
 res/ide-support/idea/copyright/Tomcat.xml                   |  6 ++++++
 res/ide-support/idea/copyright/profiles_settings.xml        |  3 +++
 res/ide-support/idea/externalDependencies.xml               | 12 ++++++++++++
 res/ide-support/idea/inspectionProfiles/Project_Default.xml | 11 +++++++++++
 webapps/docs/changelog.xml                                  |  4 ++++
 8 files changed, 60 insertions(+)
 create mode 100644 res/ide-support/idea/ant.xml
 create mode 100644 res/ide-support/idea/codeStyles/Project.xml
 create mode 100644 res/ide-support/idea/codeStyles/codeStyleConfig.xml
 create mode 100644 res/ide-support/idea/copyright/Tomcat.xml
 create mode 100644 res/ide-support/idea/copyright/profiles_settings.xml
 create mode 100644 res/ide-support/idea/externalDependencies.xml
 create mode 100644 res/ide-support/idea/inspectionProfiles/Project_Default.xml


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat] 03/04: Add ant configuration for IntelliJ IDEA

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 90b211854fc3a1e41eec092994a75981b7d89746
Author: Lars Grefer <gi...@larsgrefer.de>
AuthorDate: Fri Apr 24 00:23:43 2020 +0200

    Add ant configuration for IntelliJ IDEA
---
 res/ide-support/idea/ant.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/res/ide-support/idea/ant.xml b/res/ide-support/idea/ant.xml
new file mode 100644
index 0000000..a2a4769
--- /dev/null
+++ b/res/ide-support/idea/ant.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AntConfiguration">
+    <buildFile url="file://$PROJECT_DIR$/build.xml" />
+  </component>
+</project>
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat] 04/04: Update changelog

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 9f5ba20814b167fddb2259b44a86730e3756f8d5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon May 4 15:55:31 2020 +0100

    Update changelog
---
 webapps/docs/changelog.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4d153a6..0d4128d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -189,6 +189,10 @@
         Refactor to use enhanced for loops where possible. Pull request by Lars
         Grefer. (markt)
       </scode>
+      <add>
+        Improve IDE support for IntelliJ IDEA. Patch provided by Lars Grefer.
+        (markt)
+      </add>
     </changelog>
   </subsection>
 </section>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat] 01/04: Improve IDE support for IntelliJ IDEA

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 5f025de11e762f68f9aec3af9eccfc199fb86a6b
Author: Lars Grefer <la...@materna.de>
AuthorDate: Thu Apr 23 18:33:03 2020 +0200

    Improve IDE support for IntelliJ IDEA
    
    Move IntelliJ specific files to res/ide-support
---
 res/ide-support/idea/codeStyles/Project.xml                 | 13 +++++++++++++
 res/ide-support/idea/codeStyles/codeStyleConfig.xml         |  5 +++++
 res/ide-support/idea/externalDependencies.xml               | 12 ++++++++++++
 res/ide-support/idea/inspectionProfiles/Project_Default.xml | 11 +++++++++++
 4 files changed, 41 insertions(+)

diff --git a/res/ide-support/idea/codeStyles/Project.xml b/res/ide-support/idea/codeStyles/Project.xml
new file mode 100644
index 0000000..54fe072
--- /dev/null
+++ b/res/ide-support/idea/codeStyles/Project.xml
@@ -0,0 +1,13 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="JAVA">
+      <option name="RIGHT_MARGIN" value="100" />
+      <option name="WRAP_ON_TYPING" value="0" />
+    </codeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/res/ide-support/idea/codeStyles/codeStyleConfig.xml b/res/ide-support/idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/res/ide-support/idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/res/ide-support/idea/externalDependencies.xml b/res/ide-support/idea/externalDependencies.xml
new file mode 100644
index 0000000..eade272
--- /dev/null
+++ b/res/ide-support/idea/externalDependencies.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalDependencies">
+    <plugin id="AntSupport" />
+    <plugin id="Git4Idea" />
+    <plugin id="HtmlTools" />
+    <plugin id="Tomcat" />
+    <plugin id="com.intellij.java" />
+    <plugin id="com.intellij.javaee" />
+    <plugin id="com.intellij.jsp" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/res/ide-support/idea/inspectionProfiles/Project_Default.xml b/res/ide-support/idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..38495a4
--- /dev/null
+++ b/res/ide-support/idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,11 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="AutoBoxing" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoreAddedToCollection" value="false" />
+    </inspection_tool>
+    <inspection_tool class="AutoUnboxing" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="UnnecessaryBoxing" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryUnboxing" enabled="false" level="WARNING" enabled_by_default="false" />
+  </profile>
+</component>
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat] 02/04: Add copyright configuration for IntelliJ IDEA

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit b813cee001fd41b08a9205241ace3920f164a349
Author: Lars Grefer <gi...@larsgrefer.de>
AuthorDate: Fri Apr 24 00:22:38 2020 +0200

    Add copyright configuration for IntelliJ IDEA
---
 res/ide-support/idea/copyright/Tomcat.xml            | 6 ++++++
 res/ide-support/idea/copyright/profiles_settings.xml | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/res/ide-support/idea/copyright/Tomcat.xml b/res/ide-support/idea/copyright/Tomcat.xml
new file mode 100644
index 0000000..2982350
--- /dev/null
+++ b/res/ide-support/idea/copyright/Tomcat.xml
@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="Licensed to the Apache Software Foundation (ASF) under one or more&#10;contributor license agreements.  See the NOTICE file distributed with&#10;this work for additional information regarding copyright ownership.&#10;The ASF licenses this file to You under the Apache License, Version 2.0&#10;(the &quot;License&quot;); you may not use this file except in compliance with&#10;the License.  You may obtain a copy of the License at&#10;&#10;     http://www.apac [...]
+    <option name="myName" value="Tomcat" />
+  </copyright>
+</component>
\ No newline at end of file
diff --git a/res/ide-support/idea/copyright/profiles_settings.xml b/res/ide-support/idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..0970355
--- /dev/null
+++ b/res/ide-support/idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+  <settings default="Tomcat" />
+</component>
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org