Author: kkolinko
Date: Wed Sep 24 07:44:09 2014
New Revision: 1627245
URL: http://svn.apache.org/r1627245
Log:
For https://issues.apache.org/bugzilla/show_bug.cgi?id=56990
Add build target ide-eclipse-websocket.
This creates second Eclipse project at ../tomcat-7.0.x-java7 and configures to
to build Websocket classes and tests with Java 7.
Note that created project does the following
1. It depends on the main project ("tomcat-7.0.x") as build path dependency.
2. It imports "java" and "test" directories as linked resources from
"../trunk/java" and "../trunk/test".
Added:
tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse-websocket.classpath
(with props)
tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse-websocket.project
(with props)
tomcat/tc7.0.x/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs-websocket.properties
- copied, changed from r1627236,
tomcat/tc7.0.x/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties
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=1627245&r1=1627244&r2=1627245&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Wed Sep 24 07:44:09 2014
@@ -2940,6 +2940,23 @@ Apache Tomcat ${version} native binaries
Read the Building page on the Apache Tomcat documentation site for details on
how to configure your Eclipse workplace.</echo>
</target>
+ <target name="ide-eclipse-websocket"
+ depends="download-compile, extras-webservices-prepare,
download-test-compile"
+ description="Prepares the source tree to be built in Eclipse -
separate project to build classes that require Java 7">
+
+ <!-- Create directory "../tomcat-7.0.x-java7" and configure Eclipse
project there -->
+ <property name="projectLocation"
location="${tomcat.home}/../tomcat-7.0.x-java7" />
+ <mkdir dir="${projectLocation}" />
+ <mkdir dir="${projectLocation}/.settings" />
+
+ <copy
file="${tomcat.home}/res/ide-support/eclipse/eclipse-websocket.project"
tofile="${projectLocation}/.project"/>
+ <copy
file="${tomcat.home}/res/ide-support/eclipse/eclipse-websocket.classpath"
tofile="${projectLocation}/.classpath"/>
+ <copy
file="${tomcat.home}/res/ide-support/eclipse/org.eclipse.jdt.core.prefs-websocket.properties"
tofile="${projectLocation}/.settings/org.eclipse.jdt.core.prefs"/>
+
+ <echo>Eclipse project files created at "${projectLocation}".
+Read the Building page on the Apache Tomcat documentation site for details on
how to configure your Eclipse workplace.</echo>
+ </target>
+
<!-- ======================= Macros, Taskdefs etc ========================
-->
<macrodef name="jarIt" description="utility macro for standard JAR
packaging">
Added: tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse-websocket.classpath
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse-websocket.classpath?rev=1627245&view=auto
==============================================================================
--- tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse-websocket.classpath
(added)
+++ tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse-websocket.classpath
Wed Sep 24 07:44:09 2014
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<classpath>
+ <classpathentry including="org/apache/tomcat/websocket/" kind="src"
path="java"/>
+ <classpathentry
including="org/apache/catalina/websocket/|org/apache/tomcat/websocket/"
kind="src" path="test"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+ <classpathentry combineaccessrules="false" kind="src"
path="/tomcat-7.0.x"/>
+ <classpathentry kind="output" path=".settings/output"/>
+</classpath>
Propchange:
tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse-websocket.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse-websocket.project
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse-websocket.project?rev=1627245&view=auto
==============================================================================
--- tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse-websocket.project
(added)
+++ tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse-websocket.project Wed
Sep 24 07:44:09 2014
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<projectDescription>
+ <name>tomcat-7.0.x-java7</name>
+ <comment></comment>
+ <projects>
+ <project>tomcat-7.0.x</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+ <linkedResources>
+ <link>
+ <name>java</name>
+ <type>2</type>
+ <locationURI>PARENT-1-PROJECT_LOC/trunk/java</locationURI>
+ </link>
+ <link>
+ <name>test</name>
+ <type>2</type>
+ <locationURI>PARENT-1-PROJECT_LOC/trunk/test</locationURI>
+ </link>
+ </linkedResources>
+</projectDescription>
Propchange:
tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse-websocket.project
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
tomcat/tc7.0.x/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs-websocket.properties
(from r1627236,
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-websocket.properties?p2=tomcat/tc7.0.x/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs-websocket.properties&p1=tomcat/tc7.0.x/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties&r1=1627236&r2=1627245&rev=1627245&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs.properties
(original)
+++
tomcat/tc7.0.x/trunk/res/ide-support/eclipse/org.eclipse.jdt.core.prefs-websocket.properties
Wed Sep 24 07:44:09 2014
@@ -15,6 +15,6 @@
# 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
+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/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1627245&r1=1627244&r2=1627245&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:44:09 2014
@@ -310,7 +310,9 @@
<bug>56990</bug>: Ensure that the <code>ide-eclipse</code> build target
downloads all the libraries required by the default Eclipse
configuration files and configures Eclipse to use Java 6 for the
- project. (kkolinko)
+ project. Add build target <code>ide-eclipse-websocket</code> that
+ creates a separate linked project that compiles websocket classes
+ of Tomcat 7 with Java 7 compiler. (kkolinko)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
