Skip to content

Commit

Permalink
Further followup for Fix https://issues.apache.org/bugzilla/show_bug.…
Browse files Browse the repository at this point in the history 
…cgi?id=54899

Correct product names

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1484463 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Konstantin Kolinko committed May 20, 2013
1 parent 3548b60 commit 15824e7
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 46 deletions.
18 changes: 9 additions & 9 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2722,42 +2722,42 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
Read the Building page on the Apache Tomcat documentation site for details on how to configure your Eclipse workplace.</echo>
</target>

<!-- ============================ Netbeans =============================== -->
<!-- ============================ NetBeans =============================== -->

<target name="ide-netbeans"
depends="-ide-netbeans-protect,-ide-netbeans-create"
description="Create netbeans project files only if none exist">
description="Create NetBeans project files only if none exist">
</target>

<target name="-ide-netbeans-protect"
if="tomcat-nb.home.exists"
depends="-ide-netbeans-check">
<!-- Protect existing netbeans project files -->
<echo>Netbeans project files already exist and have been protected!
<!-- Protect existing NetBeans project files -->
<echo>NetBeans project files already exist and have been protected!
Use the "ide-netbeans-replace" target if you wish to overwrite them.</echo>
</target>

<target name="-ide-netbeans-check">
<!-- protect existing files if the netbeans project directory exists -->
<!-- protect existing files if the NetBeans project directory exists -->
<condition property="tomcat-nb.home.exists">
<available file="${tomcat-nb.home}" type="dir"/>
</condition>
</target>

<target name="ide-netbeans-replace" depends="-ide-netbeans-create">
<!-- Bypass protection of any existing netbeans project files -->
<!-- Bypass protection of any existing NetBeans project files -->
</target>

<target name="-ide-netbeans-create"
unless="tomcat-nb.home.exists">
<!-- Unconditionally create or ovverwrite default netbeans project files -->
<!-- Unconditionally create or ovverwrite default NetBeans project files -->
<property name="tomcat-nb.dist" value="${tomcat.home}/res/ide-support/netbeans" />
<mkdir dir="${tomcat-nb.home}/"/>
<copy todir="${tomcat-nb.home}" overwrite="true">
<fileset dir="${tomcat-nb.dist}"/>
</copy>
<echo>Netbeans project files created.
Read the Building page on the Apache Tomcat documentation site for details on how to customise your Netbeans project.</echo>
<echo>NetBeans project files created.
Read the Building page on the Apache Tomcat documentation site for details on how to customise your NetBeans project.</echo>
</target>


Expand Down
16 changes: 8 additions & 8 deletions res/ide-support/netbeans/nb-tomcat-build.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
# limitations under the License.
#================================================================================

# netbeans will automatically set the project basedir "." correctly to
# NetBeans will automatically set the project basedir "." correctly to
# the parent directory of the nbproject subdirectory
#
# the tomcat build.properties file defines the confusingly-named "base.path"
# property, which is where the tomcat dependencies are downloaded
# the Tomcat build.properties file defines the confusingly-named "base.path"
# property, which is where the Tomcat dependencies are downloaded


# the following properties will be generated by build.xml, but are also needed
# by the netbeans targets which do not have access to those properties
# as-yet not created by the main ant build.
# by the NetBeans targets which do not have access to those properties
# as-yet not created by the main Ant build.

tomcat.output=./output
tomcat.classes=${tomcat.output}/classes
Expand All @@ -35,13 +35,13 @@ test.temp=${tomcat.output}/test-tmp
nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol

# it is not possible to retrieve the classpaths from the build to
# use in the netbeans targets, so they must be explicitly declared
# use in the NetBeans targets, so they must be explicitly declared

nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit4.8.2/junit-4.8.2.jar:${base.path}/ecj-4.2.2/ecj-4.2.2.jar:${tomcat.classes}

# Extra properties used by the tomcat project additional netbeans targets.
# Extra properties used by the Tomcat project additional NetBeans targets.

# configure junit test results so that netbeans can intercept and display them
# configure JUnit test results so that NetBeans can intercept and display them
#
nb-junit.formatter=-Dorg.apache.juli.formatter=java.util.logging.SimpleFormatter
nb-junit.formatter.type=plain
Expand Down
16 changes: 8 additions & 8 deletions res/ide-support/netbeans/nb-tomcat-project.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
# limitations under the License.
#================================================================================

# netbeans will automatically set the project basedir "." correctly to
# NetBeans will automatically set the project basedir "." correctly to
# the parent directory of the nbproject subdirectory
#
# The tomcat build.properties file defines the confusingly-named "base.path"
# property, which is where the tomcat dependencies are downloaded.
# If you have followed the tomcat recommendation and explicitly coded
# a path, it will be used by netbeans. However, if you have left it to
# The Tomcat build.properties file defines the confusingly-named "base.path"
# property, which is where the Tomcat dependencies are downloaded.
# If you have followed the Tomcat recommendation and explicitly coded
# a path, it will be used by NetBeans. However, if you have left it to
# default you MUST explicitly code it here, e.g.
#base.path=/home/yourname/sandboxApache/tomcat8-dependencies

# netbeans syntax checking and code completion of the main source files
# needs all the ant libraries to be on the classpath. This is achieved
# by the standard build.xml, but needs to be duplicated for netbeans.
# NetBeans syntax checking and code completion of the main source files
# needs all the Ant libraries to be on the classpath. This is achieved
# by the standard build.xml, but needs to be duplicated for NetBeans.
#
ant.includes=${ant.home}/lib/ant.jar:${ant.home}/lib/ant-apache-bcel.jar:${ant.home}/lib/ant-launcher.jar:${ant.home}/lib/ant-apache-oro.jar:${ant.home}/lib/ant-apache-regexp.jar:${ant.home}/lib/ant-jmf.jar:${ant.home}/lib/ant-jsch.jar:${ant.home}/lib/ant-apache-bsf.jar:${ant.home}/lib/ant-apache-log4j.jar:${ant.home}/lib/ant-apache-resolver.jar:${ant.home}/lib/ant-apache-xalan2.jar:${ant.home}/lib/ant-commons-net.jar:${ant.home}/lib/ant-javamail.jar:${ant.home}/lib/ant-junit.jar:${ant.home}/lib/ant-swing.jar:${ant.home}/lib/ant-testutil.jar:${ant.home}/lib/junit.jar:${ant.home}/lib/ant-commons-logging.jar

22 changes: 11 additions & 11 deletions res/ide-support/netbeans/nb-tomcat.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,26 @@
-->

<!--
Supplementary build targets for the tomcat project under netbeans.
Supplementary build targets for the Tomcat project under NetBeans.
Use the project root as basedir to be consistent with standard build.
-->

<project basedir=".." name="Tomcat_8.0">

<!--
load the standard and user tomcat build properties now,
so they can be used in the netbeans-specific targets below.
load the standard and user Tomcat build properties now,
so they can be used in the NetBeans-specific targets below.
Note: inheritall==false will still pass all of these user
properties to the tomcat ant build targets.
properties to the Ant build targets of Tomcat.
-->
<property file="./build.properties"/>
<property file="./build.properties.default"/>

<!-- load the extra tomcat netbeans build properties, which can -->
<!-- use the standard properties symbolic variables. -->
<!-- Note: inheritall==false will still pass all of these user -->
<!-- properties to the tomcat ant build targets. -->
<!-- load the extra NetBeans build properties for Tomcat, which can -->
<!-- use the standard properties symbolic variables. -->
<!-- Note: inheritall==false will still pass all of these user -->
<!-- properties to the Ant build targets of Tomcat -->
<property file="./nbproject/nb-tomcat-build.properties"/>

<target name="deploy">
Expand All @@ -65,7 +65,7 @@
</target>

<target name="-package-project"
description="ensure tomcat is ready to use">
description="ensure Tomcat is ready to use">
<ant target="deploy" inheritall="false"/>
</target>

Expand Down Expand Up @@ -147,14 +147,14 @@
<sysproperty key="tomcat.test.protocol" value="${nb-test.io-method}"/>
<sysproperty key="tomcat.test.accesslog" value="${test.accesslog}" />

<!-- define a non-file junit formatter for netbeans to capture and display -->
<!-- define a non-file JUnit formatter for NetBeans to capture and display -->
<formatter usefile="false" type="brief" />
<!-- and also a file formatter for checking later -->
<formatter type="${nb-junit.formatter.type}"
usefile="${nb-junit.formatter.usefile}"
extension="@NB-DBG${nb-junit.formatter.extension}"/>

<!-- run the chosen junit test class under the debugger -->
<!-- run the chosen JUnit test class under the debugger -->
<test todir="${tomcat.build}/logs" name="${test.entry}"/>
</junit>
</target>
Expand Down
20 changes: 10 additions & 10 deletions res/ide-support/netbeans/project.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@
http://www.netbeans.org/
-->
<!--
Free-Form project definition for tomcat under netbeans.
Free-Form project definition for Tomcat under NetBeans.
Paths are all relative to the project root.
Warning: Do NOT use the NetBeans GUI Project Properties customizer
for this project, otherwise you might trigger unwanted
changes to this critical file, which must be maintained
by the tomcat developers!
by the Tomcat developers!
Note: As specified in the tomcat BUILDING.txt, the code completion
Note: As specified in the BUILDING.txt file of Tomcat, the code completion
classpaths below depend on the ANT_HOME environment
variable being properly defined.
-->
Expand All @@ -44,10 +44,10 @@
<!-- Do not use Project Properties customizer when editing this file manually. -->
<name>Tomcat 8.0</name>
<properties>
<!-- load the local tomcat build.properties, especially base.path. -->
<!-- load the local Tomcat build.properties, especially base.path. -->
<property-file>./build.properties</property-file>
<!-- prime some tomcat netbeans build properties, which will -->
<!-- also be defined in the standard properties. -->
<!-- prime some NetBeans build properties for Tomcat, which will -->
<!-- also be defined in the standard properties. -->
<property-file>./nbproject/nb-tomcat-project.properties</property-file>
</properties>
<folders>
Expand All @@ -74,9 +74,9 @@
</folders>
<ide-actions>
<!--
Note: all netbeans actions are delegated to an external
Note: all NetBeans actions are delegated to an external
script, so that Properties can be used consistently
with the standard tomcat build.
with the standard Tomcat build.
-->
<action name="build">
<script>nbproject/nb-tomcat.xml</script>
Expand Down Expand Up @@ -174,12 +174,12 @@
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
<!--
Warning: the classpath elements used below CANNOT include any
Properties because netbeans will not expand them! Sadly,
Properties because NetBeans will not expand them! Sadly,
this means (with nb 7.2.1, at least) every path MUST be
coded explicitly - with the potential for errors. These
errors will be flagged in the project navigation and
editors windows, although they will not affect the build
or any special netbeans targets, e.g. debugging.
or any special NetBeans targets, e.g. debugging.
Note: the classpath elements used below CAN include environment
variables as Properties, e.g. ANT_HOME becomes ${ant.home}!
Expand Down

0 comments on commit 15824e7

Please sign in to comment.