Author: kkolinko
Date: Mon Nov 24 00:19:32 2014
New Revision: 1641301
URL: http://svn.apache.org/r1641301
Log:
Update "ide-eclipse" target to configure Eclipse to use Java 7 compliance
settings for tomcat-8.0.x project instead of workspace-wide defaults.
Forward-port of r1627236, r1641299 from Tomcat 7.
Merged revision 1641300 from tomcat/trunk.
Added:
tomcat/tc8.0.x/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties
- copied, changed from r1641300,
tomcat/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/build.xml
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1641300
Modified: tomcat/tc8.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/build.xml?rev=1641301&r1=1641300&r2=1641301&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/build.xml (original)
+++ tomcat/tc8.0.x/trunk/build.xml Mon Nov 24 00:19:32 2014
@@ -2978,6 +2978,10 @@ Apache Tomcat ${version} native binaries
<copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project"
tofile="${tomcat.home}/.project"/>
<copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.classpath"
tofile="${tomcat.home}/.classpath"/>
+ <!-- Copy compiler settings file -->
+ <mkdir dir="${tomcat.home}/.settings" />
+ <copy
file="${tomcat.home}/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties"
tofile="${tomcat.home}/.settings/org.eclipse.jdt.core.prefs"/>
+
<echo>Eclipse project files created.
Read the Building page on the Apache Tomcat documentation site for details on
how to configure your Eclipse workplace.</echo>
</target>
Copied:
tomcat/tc8.0.x/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties
(from r1641300,
tomcat/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties)
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties?p2=tomcat/tc8.0.x/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties&p1=tomcat/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties&r1=1641300&r2=1641301&rev=1641301&view=diff
==============================================================================
--- tomcat/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties
(original)
+++
tomcat/tc8.0.x/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties
Mon Nov 24 00:19:32 2014
@@ -15,6 +15,6 @@
# limitations under the License.
# -----------------------------------------------------------------------------
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.source=1.7
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1641301&r1=1641300&r2=1641301&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Nov 24 00:19:32 2014
@@ -128,6 +128,11 @@
Simplify <code>setproxy</code> task in <code>build.xml</code>.
Taskdef there is not needed since Ant 1.8.2. (kkolinko)
</update>
+ <fix>
+ Update "ide-eclipse" target in <code>build.xml</code> to create Eclipse
+ project that uses Java 7 compliance settings instead of workspace-wide
+ defaults. (kkolinko)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
