Author: kkolinko Date: Wed Sep 24 07:06:50 2014 New Revision: 1627236 URL: http://svn.apache.org/r1627236 Log: For https://issues.apache.org/bugzilla/show_bug.cgi?id=56990 Configure Eclipse to use Java 6 compliance settings for tomcat-7.0.x project instead of workspace-wide defaults
The issue was noted via documentation comment on building.html page. Added: tomcat/tc7.0.x/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties (with props) Modified: tomcat/tc7.0.x/trunk/build.xml tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1627236&r1=1627235&r2=1627236&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/build.xml (original) +++ tomcat/tc7.0.x/trunk/build.xml Wed Sep 24 07:06:50 2014 @@ -2932,6 +2932,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=".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> Added: tomcat/tc7.0.x/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties?rev=1627236&view=auto ============================================================================== --- tomcat/tc7.0.x/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties (added) +++ tomcat/tc7.0.x/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties Wed Sep 24 07:06:50 2014 @@ -0,0 +1,20 @@ +# ----------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ----------------------------------------------------------------------------- +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.source=1.6 Propchange: tomcat/tc7.0.x/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties ------------------------------------------------------------------------------ svn:eol-style = native Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1627236&r1=1627235&r2=1627236&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Sep 24 07:06:50 2014 @@ -309,7 +309,8 @@ <fix> <bug>56990</bug>: Ensure that the <code>ide-eclipse</code> build target downloads all the libraries required by the default Eclipse - configuration files. (kkolinko) + configuration files and configures Eclipse to use Java 6 for the + project. (kkolinko) </fix> </changelog> </subsection> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org