From: timw Date: Tue, 28 Sep 2010 09:36:08 +0000 (+0000) Subject: Moved all Eclipse specific files into res/ide-support/eclipse. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a0b1a28bf298a769605a8f3b333d22adc76b82ce;p=tomcat7.0 Moved all Eclipse specific files into res/ide-support/eclipse. Removed spaces from launch target filenames. Corrected launch targets to run in output/build instead of root directory (still not sure if they're a good idea) Added an Ant ide-eclipse target to prepare the working copy to be built with Eclipse and create Eclipse project files. Updated the Building docs to document new Eclipse setup method. Added descriptions of how to configure Eclipse to respect Tomcat coding conventions to the Building guide. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1002073 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/Start Tomcat.launch b/Start Tomcat.launch deleted file mode 100644 index 4f4f1eb92..000000000 --- a/Start Tomcat.launch +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/Stop Tomcat.launch b/Stop Tomcat.launch deleted file mode 100644 index 21c00f47b..000000000 --- a/Stop Tomcat.launch +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/build.xml b/build.xml index 5e5d7a26f..fdad9907c 100644 --- a/build.xml +++ b/build.xml @@ -1513,6 +1513,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + @@ -2242,6 +2243,19 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + + + + + + + + + Eclipse project files created. +Read the Building page on the Apache Tomcat documentation site for details on how to configure your Eclipse workplace. + + diff --git a/eclipse.classpath b/eclipse.classpath deleted file mode 100644 index dbc78363d..000000000 --- a/eclipse.classpath +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/eclipse.project b/eclipse.project deleted file mode 100644 index 016f07657..000000000 --- a/eclipse.project +++ /dev/null @@ -1,33 +0,0 @@ - - - - tomcat-7.0.x - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/res/ide-support/eclipse/eclipse.classpath b/res/ide-support/eclipse/eclipse.classpath new file mode 100644 index 000000000..dbc78363d --- /dev/null +++ b/res/ide-support/eclipse/eclipse.classpath @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + diff --git a/res/ide-support/eclipse/eclipse.project b/res/ide-support/eclipse/eclipse.project new file mode 100644 index 000000000..016f07657 --- /dev/null +++ b/res/ide-support/eclipse/eclipse.project @@ -0,0 +1,33 @@ + + + + tomcat-7.0.x + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/res/ide-support/eclipse/start-tomcat.launch b/res/ide-support/eclipse/start-tomcat.launch new file mode 100644 index 000000000..54c5a203a --- /dev/null +++ b/res/ide-support/eclipse/start-tomcat.launch @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/res/ide-support/eclipse/stop-tomcat.launch b/res/ide-support/eclipse/stop-tomcat.launch new file mode 100644 index 000000000..cb1e60c6a --- /dev/null +++ b/res/ide-support/eclipse/stop-tomcat.launch @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/webapps/docs/building.xml b/webapps/docs/building.xml index 55b203a49..0dbddec18 100644 --- a/webapps/docs/building.xml +++ b/webapps/docs/building.xml @@ -161,11 +161,6 @@ and the following steps have been used by some developers.

-NOTE: You must complete all the above steps to fetch -dependency libraries and build Tomcat before you can setup an Eclipse project and start -using it. -

-

NOTE: This will not let you build everything under Eclipse; the build process requires use of Ant for the many stages that aren't simple Java compilations. @@ -174,19 +169,19 @@ get warnings, reformat code, perform refactorings, run Tomcat under the IDE, and so on.

-Complete the download of all third party dependencies required to compile the Tomcat -source in Eclipse: +Sample Eclipse project files and launch targets are provided in the +res/ide-support/eclipse directory of the source tree. +The instructions below will automatically copy these into the required locations. +

+

+An Ant target is provided as a convenience to download all binary dependencies, and to create +the Eclipse project and classpath files in the root of the source tree.

cd ${tomcat.source}
- ant extras
+ ant ide-eclipse

-

-Sample Eclipse project and classpath files are provided in the root directory of the source tree. -The sample files are named eclipse.project and eclipse.classpath, and must -be copied to .project and .classpath respectively before proceeding. -

Start Eclipse and create a new Workspace. @@ -212,21 +207,30 @@ and import the Tomcat project located there.

-You may see errors in your problems tab at this point about missing build path dependencies. -If this happens you have forgotten to execute the ant extras build to download -these dependencies. -

- -

-Start Tomcat and Stop Tomcat launch configurations are provided in the -root directory of the source tree and will be available in the Run->Run Configurations -dialog. Use these to start and stop Tomcat from Eclipse. +start-tomcat and stop-tomcat launch configurations are provided in +res/ide-support/eclipse and will be available in the Run->Run Configurations +dialog. Use these to start and stop Tomcat from Eclipse.
If you want to configure these yourself (or are using a different IDE) then use org.apache.catalina.startup.Bootstrap as the main class, -start/stop as program arguments, and specify -Dcatalina.home=... +start/stop etc. as program arguments, and specify -Dcatalina.home=... (with the name of your build directory) as VM arguments.

+

+Tweaking a few formatting preferences will make it much easier to keep consistent with Tomcat +coding conventions (and have your contributions accepted): +

+

+ + + + + + + +
Java -> Code Style -> Formatter -> Edit...Tab policy: Spaces only
Tab and Indentation size: 4
General -> Editors -> Text EditorsDisplayed tab width: 2
Insert spaces for tabs
Show whitespace characters (optional)
XML -> XML Files -> EditorIndent using spaces
Indentation size: 2
Ant -> Editor -> FormatterTab size: 2
Use tab character instead of spaces: unchecked
+

+