youys
/
ant
Not watched
1
0
Fork 1
Code
Releases 0 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

fix line-feeds, set svn:eol-style 

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@279394 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 20 years ago
parent
82c972c23e
commit
7b5ce7f4b4
5 changed files with 282 additions and 281 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +220
    -220
      docs/svn.html
  2. +2
    -2
      src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java
  3. +6
    -5
      src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
  4. +3
    -3
      src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
  5. +51
    -51
      xdocs/svn.xml

+ 220
- 220
docs/svn.html View File

@@ -1,220 +1,220 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html lang="en">
<!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
<head>
<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Apache Ant - SVN Repositories</title>
<link type="text/css" href="./page.css" rel="stylesheet">
<meta name="author" content="Antoine Levy-Lambert">
<meta name="email" content="">
</head>
<body>
<p class="navpath">
<script src="./breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
</p>
<div class="logobar">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="left"><img border="0" alt="Apache Ant site" src="./images/group-logo.gif"></td>
<td align="center" width="100%"><img alt="Apache Ant logo" border="0" src="./images/project-logo.gif"></td>
<td align="right">
<form target="_blank" onsubmit="q.value = query.value + ' site:ant.apache.org'" action="http://www.google.com/search" method="get">
<table summary="search" border="0" cellspacing="0" cellpadding="0" bgcolor="#4C6C8F">
<tr>
<td colspan="3"><img height="10" width="1" alt="" src="./images/spacer.gif"></td>
</tr>
<tr>
<td><img height="1" width="1" alt="" src="./images/spacer.gif"></td>
<td nowrap="nowrap" class="searchcaption">
<input name="q" type="hidden">
<input size="15" id="query" type="text">
<img height="1" width="5" alt="" src="./images/spacer.gif">
<input name="Search" value="Search" type="submit">
<br>
the Apache Ant site
</td>
<td><img height="1" width="1" alt="" src="./images/spacer.gif"></td>
</tr>
<tr>
<td><img alt="" border="0" height="10" width="9" src="./images/search-left.gif"></td>
<td><img height="1" width="1" alt="" src="./images/spacer.gif"></td>
<td><img alt="" border="0" height="10" width="9" src="./images/search-right.gif"></td>
</tr>
</table>
</form>
</td>
</tr>
</table>
</div>
<div class="tab">
<table summary="tab bar" border="0" cellpadding="0" cellspacing="0">
<tr>
<td width="8"><img alt="" height="5" width="8" src="./images/spacer.gif"></td><td valign="bottom">
<table summary="selected tab" style="height: 1.5em" border="0" cellpadding="0" cellspacing="0">
<tr>
<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="./images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b>Home</b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="./images/tabSel-right.gif"></td>
</tr>
</table>
</td>
<td width="5"><img alt="" height="8" width="8" src="./images/spacer.gif"></td><td valign="bottom">
<table summary="non selected tab" style="height: 1.4em" border="0" cellpadding="0" cellspacing="0">
<tr>
<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="./images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a href="./projects/index.html"><font size="2" face="Arial, Helvetica, Sans-serif">Projects</font></a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="./images/tab-right.gif"></td>
</tr>
</table>
</td>
</tr>
</table>
</div>
<div class="bluebar"></div>
<div class="menucontainer">
<div align="center">
<a href="http://ApacheCon.Com/"><img width="135" height="50"
border="0" style="background-color: white"
src="http://apache.org/images/ac2005eu_135x50.gif"
alt="ApacheCon!" title="Come to ApacheCon!"/></a>
</div>
<div class="menu">
<ul>
<li class="menuheader">Apache Ant
<ul>
<li>
<a href="./index.html">Welcome</a>
</li>
<li>
<a href="./license.html">License</a>
</li>
<li>
<a href="./antnews.html">News</a>
</li>
</ul>
</li>
<li class="menuheader">Documentation
<ul>
<li>
<a href="./manual/index.html">Manual</a>
</li>
<li>
<a href="./projects.html">Related Projects</a>
</li>
<li>
<a href="./external.html">External Tools and Tasks</a>
</li>
<li>
<a href="./resources.html">Resources</a>
</li>
<li>
<a href="./faq.html">Frequently Asked Questions</a>
</li>
<li>
<a href="http://wiki.apache.org/ant/FrontPage">Wiki</a>
</li>
<li>
<a href="./problems.html">Having Problems?</a>
</li>
</ul>
</li>
<li class="menuheader">Download
<ul>
<li>
<a href="http://ant.apache.org/bindownload.cgi">Binary Distributions</a>
</li>
<li>
<a href="http://ant.apache.org/srcdownload.cgi">Source Distributions</a>
</li>
</ul>
</li>
<li class="menuheader">Contributing
<ul>
<li>
<a href="./mail.html">Mailing Lists</a>
</li>
<li>
<a href="./svn.html">Subversion Repositories</a>
</li>
<li>
<a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Ant">Bug Database</a>
</li>
<li>
<a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Ant&amp;bug_severity=enhancement">Enhancement Requests</a>
</li>
<li>
<a href="http://www.apache.org/foundation/contributing.html">Donations</a>
</li>
</ul>
</li>
<li class="menuheader">Project Management
<ul>
<li>
<a href="./contributors.html">Contributors</a>
</li>
<li>
<a href="./mission.html">Apache Ant Mission</a>
</li>
<li>
<a href="./bylaws.html">Project Bylaws</a>
</li>
<li>
<a href="./legal.html">Legal</a>
</li>
</ul>
</li>
</ul>
</div>
<img style="float: left" height="10" width="10" border="0" alt="" src="./images/menu-left.gif">
<img style="float: right" height="10" width="10" border="0" alt="" src="./images/menu-right.gif">
</div>
<div class="lightbluebar">&nbsp;</div>
<div class="main">
<div class="content">
<h1 class="title">SVN Repositories</h1>
<h3 class="section">
<a name="Access the Source Tree (Subversion)"></a>
Access the Source Tree (Subversion)
</h3>
<p>Anyone can checkout source code from our public Subversion repository. To do so,
simply use the following command (if you are using a GUI client, configure it
appropriately):</p>
<pre class="code">
svn co http://svn.apache.org/repos/asf/ant/[project]/trunk/ ant-[project]</pre>
<p>Modules available for access are:</p>
<ul>
<li><a href="http://svn.apache.org/repos/asf/ant/core/trunk/">ant</a> - The "main" Ant module.</li>
<li><a href="http://svn.apache.org/repos/asf/ant/antlibs/">antlibs</a> - Libraries developed as antlib.</li>
<li><a href="http://svn.apache.org/repos/asf/ant/sandbox/">sandbox</a> - New developments.</li>
</ul>
<p>If you are not familiar with Subversion, <a href="http://jakarta.apache.org/site/cvsindex.html">Jakarta's
source repositories page</a> may hold many helpful hints.</p>
<p>Nightly snapshots of the CVS tree are available at
<a href="http://cvs.apache.org/snapshots/ant/">http://cvs.apache.org/snapshots/ant/</a>.</p>
</div>
</div>
<p class="copyright">
Copyright &copy; 2000-2005&nbsp;The Apache Software Foundation. All rights reserved.
<script type="text/javascript" language="JavaScript"><!--
document.write(" - "+"Last Published: " + document.lastModified);
// -->
</script>
</p>
</body>
</html>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html lang="en">
<!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
<head>
<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Apache Ant - SVN Repositories</title>
<link type="text/css" href="./page.css" rel="stylesheet">
<meta name="author" content="Antoine Levy-Lambert">
<meta name="email" content="">
</head>
<body>
<p class="navpath">
<script src="./breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
</p>
<div class="logobar">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="left"><img border="0" alt="Apache Ant site" src="./images/group-logo.gif"></td>
<td align="center" width="100%"><img alt="Apache Ant logo" border="0" src="./images/project-logo.gif"></td>
<td align="right">
<form target="_blank" onsubmit="q.value = query.value + ' site:ant.apache.org'" action="http://www.google.com/search" method="get">
<table summary="search" border="0" cellspacing="0" cellpadding="0" bgcolor="#4C6C8F">
<tr>
<td colspan="3"><img height="10" width="1" alt="" src="./images/spacer.gif"></td>
</tr>
<tr>
<td><img height="1" width="1" alt="" src="./images/spacer.gif"></td>
<td nowrap="nowrap" class="searchcaption">
<input name="q" type="hidden">
<input size="15" id="query" type="text">
<img height="1" width="5" alt="" src="./images/spacer.gif">
<input name="Search" value="Search" type="submit">
<br>
the Apache Ant site
</td>
<td><img height="1" width="1" alt="" src="./images/spacer.gif"></td>
</tr>
<tr>
<td><img alt="" border="0" height="10" width="9" src="./images/search-left.gif"></td>
<td><img height="1" width="1" alt="" src="./images/spacer.gif"></td>
<td><img alt="" border="0" height="10" width="9" src="./images/search-right.gif"></td>
</tr>
</table>
</form>
</td>
</tr>
</table>
</div>
<div class="tab">
<table summary="tab bar" border="0" cellpadding="0" cellspacing="0">
<tr>
<td width="8"><img alt="" height="5" width="8" src="./images/spacer.gif"></td><td valign="bottom">
<table summary="selected tab" style="height: 1.5em" border="0" cellpadding="0" cellspacing="0">
<tr>
<td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="./images/tabSel-left.gif"></td><td valign="middle" bgcolor="#4C6C8F"><font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b>Home</b></font></td><td valign="top" width="5" bgcolor="#4C6C8F"><img height="5" width="5" alt="" src="./images/tabSel-right.gif"></td>
</tr>
</table>
</td>
<td width="5"><img alt="" height="8" width="8" src="./images/spacer.gif"></td><td valign="bottom">
<table summary="non selected tab" style="height: 1.4em" border="0" cellpadding="0" cellspacing="0">
<tr>
<td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="./images/tab-left.gif"></td><td valign="middle" bgcolor="#B2C4E0"><a href="./projects/index.html"><font size="2" face="Arial, Helvetica, Sans-serif">Projects</font></a></td><td valign="top" width="5" bgcolor="#B2C4E0"><img height="5" width="5" alt="" src="./images/tab-right.gif"></td>
</tr>
</table>
</td>
</tr>
</table>
</div>
<div class="bluebar"></div>
<div class="menucontainer">
<div align="center">
<a href="http://ApacheCon.Com/"><img width="135" height="50"
border="0" style="background-color: white"
src="http://apache.org/images/ac2005eu_135x50.gif"
alt="ApacheCon!" title="Come to ApacheCon!"/></a>
</div>
<div class="menu">
<ul>
<li class="menuheader">Apache Ant
<ul>
<li>
<a href="./index.html">Welcome</a>
</li>
<li>
<a href="./license.html">License</a>
</li>
<li>
<a href="./antnews.html">News</a>
</li>
</ul>
</li>
<li class="menuheader">Documentation
<ul>
<li>
<a href="./manual/index.html">Manual</a>
</li>
<li>
<a href="./projects.html">Related Projects</a>
</li>
<li>
<a href="./external.html">External Tools and Tasks</a>
</li>
<li>
<a href="./resources.html">Resources</a>
</li>
<li>
<a href="./faq.html">Frequently Asked Questions</a>
</li>
<li>
<a href="http://wiki.apache.org/ant/FrontPage">Wiki</a>
</li>
<li>
<a href="./problems.html">Having Problems?</a>
</li>
</ul>
</li>
<li class="menuheader">Download
<ul>
<li>
<a href="http://ant.apache.org/bindownload.cgi">Binary Distributions</a>
</li>
<li>
<a href="http://ant.apache.org/srcdownload.cgi">Source Distributions</a>
</li>
</ul>
</li>
<li class="menuheader">Contributing
<ul>
<li>
<a href="./mail.html">Mailing Lists</a>
</li>
<li>
<a href="./svn.html">Subversion Repositories</a>
</li>
<li>
<a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Ant">Bug Database</a>
</li>
<li>
<a href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Ant&amp;bug_severity=enhancement">Enhancement Requests</a>
</li>
<li>
<a href="http://www.apache.org/foundation/contributing.html">Donations</a>
</li>
</ul>
</li>
<li class="menuheader">Project Management
<ul>
<li>
<a href="./contributors.html">Contributors</a>
</li>
<li>
<a href="./mission.html">Apache Ant Mission</a>
</li>
<li>
<a href="./bylaws.html">Project Bylaws</a>
</li>
<li>
<a href="./legal.html">Legal</a>
</li>
</ul>
</li>
</ul>
</div>
<img style="float: left" height="10" width="10" border="0" alt="" src="./images/menu-left.gif">
<img style="float: right" height="10" width="10" border="0" alt="" src="./images/menu-right.gif">
</div>
<div class="lightbluebar">&nbsp;</div>
<div class="main">
<div class="content">
<h1 class="title">SVN Repositories</h1>
<h3 class="section">
<a name="Access the Source Tree (Subversion)"></a>
Access the Source Tree (Subversion)
</h3>
<p>Anyone can checkout source code from our public Subversion repository. To do so,
simply use the following command (if you are using a GUI client, configure it
appropriately):</p>
<pre class="code">
svn co http://svn.apache.org/repos/asf/ant/[project]/trunk/ ant-[project]</pre>
<p>Modules available for access are:</p>
<ul>
<li><a href="http://svn.apache.org/repos/asf/ant/core/trunk/">ant</a> - The "main" Ant module.</li>
<li><a href="http://svn.apache.org/repos/asf/ant/antlibs/">antlibs</a> - Libraries developed as antlib.</li>
<li><a href="http://svn.apache.org/repos/asf/ant/sandbox/">sandbox</a> - New developments.</li>
</ul>
<p>If you are not familiar with Subversion, <a href="http://jakarta.apache.org/site/cvsindex.html">Jakarta's
source repositories page</a> may hold many helpful hints.</p>
<p>Nightly snapshots of the CVS tree are available at
<a href="http://cvs.apache.org/snapshots/ant/">http://cvs.apache.org/snapshots/ant/</a>.</p>
</div>
</div>
<p class="copyright">
Copyright &copy; 2000-2005&nbsp;The Apache Software Foundation. All rights reserved.
<script type="text/javascript" language="JavaScript"><!--
document.write(" - "+"Last Published: " + document.lastModified);
// -->
</script>
</p>
</body>
</html>

+ 2
- 2
src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java View File

@@ -157,7 +157,7 @@ public abstract class AbstractSshMessage {
*/
protected void logStats(long timeStarted,
long timeEnded,
int totalLength) {
long totalLength) {
double duration = (timeEnded - timeStarted) / 1000.0;
NumberFormat format = NumberFormat.getNumberInstance();
format.setMaximumFractionDigits(2);
@@ -184,7 +184,7 @@ public abstract class AbstractSshMessage {
* @param percentTransmitted the current percent transmitted
* @return the percent that the file is of the total
*/
protected final int trackProgress(int filesize, int totalLength,
protected final int trackProgress(long filesize, long totalLength,
int percentTransmitted) {

int percent = (int) Math.round(Math.floor((totalLength


+ 6
- 5
src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java View File

@@ -163,7 +163,7 @@ public class ScpFromMessage extends AbstractSshMessage {
int end = serverResponse.indexOf(" ", start + 1);
start = end + 1;
end = serverResponse.indexOf(" ", start + 1);
int filesize = Integer.parseInt(serverResponse.substring(start, end));
long filesize = Long.parseLong(serverResponse.substring(start, end));
String filename = serverResponse.substring(end + 1);
log("Receiving: " + filename + " : " + filesize);
File transferFile = (localFile.isDirectory())
@@ -175,7 +175,7 @@ public class ScpFromMessage extends AbstractSshMessage {
}

private void fetchFile(File localFile,
int filesize,
long filesize,
OutputStream out,
InputStream in) throws IOException {
byte[] buf = new byte[BUFFER_SIZE];
@@ -184,20 +184,21 @@ public class ScpFromMessage extends AbstractSshMessage {
// read a content of lfile
FileOutputStream fos = new FileOutputStream(localFile);
int length;
int totalLength = 0;
long totalLength = 0;
long startTime = System.currentTimeMillis();

// only track progress for files larger than 100kb in verbose mode
boolean trackProgress = getVerbose() && filesize > 102400;
// since filesize keeps on decreasing we have to store the
// initial filesize
int initFilesize = filesize;
long initFilesize = filesize;
int percentTransmitted = 0;

try {
while (true) {
length = in.read(buf, 0,
(buf.length < filesize) ? buf.length : filesize);
(BUFFER_SIZE < filesize) ? BUFFER_SIZE
: (int) filesize);
if (length < 0) {
throw new EOFException("Unexpected end of stream.");
}


+ 3
- 3
src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java View File

@@ -197,7 +197,7 @@ public class ScpToMessage extends AbstractSshMessage {
InputStream in,
OutputStream out) throws IOException {
// send "C0644 filesize filename", where filename should not include '/'
int filesize = (int) localFile.length();
long filesize = localFile.length();
String command = "C0644 " + filesize + " ";
command += localFile.getName();
command += "\n";
@@ -211,13 +211,13 @@ public class ScpToMessage extends AbstractSshMessage {
FileInputStream fis = new FileInputStream(localFile);
byte[] buf = new byte[BUFFER_SIZE];
long startTime = System.currentTimeMillis();
int totalLength = 0;
long totalLength = 0;

// only track progress for files larger than 100kb in verbose mode
boolean trackProgress = getVerbose() && filesize > 102400;
// since filesize keeps on decreasing we have to store the
// initial filesize
int initFilesize = filesize;
long initFilesize = filesize;
int percentTransmitted = 0;

try {


+ 51
- 51
xdocs/svn.xml View File

@@ -1,52 +1,52 @@
<?xml version="1.0"?>
<!--
Copyright 2005 The Apache Software Foundation
Licensed 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.
-->
<document>
<properties>
<title>SVN Repositories</title>
<author email="">Antoine Levy-Lambert</author>
</properties>
<body>
<section name="Access the Source Tree (Subversion)">
<p>Anyone can checkout source code from our public Subversion repository. To do so,
simply use the following command (if you are using a GUI client, configure it
appropriately):</p>
<source>
svn co http://svn.apache.org/repos/asf/ant/[project]/trunk/ ant-[project]</source>
<p>Modules available for access are:</p>
<ul>
<li><a href="http://svn.apache.org/repos/asf/ant/core/trunk/">ant</a> - The &quot;main&quot; Ant module.</li>
<li><a href="http://svn.apache.org/repos/asf/ant/antlibs/">antlibs</a> - Libraries developed as antlib.</li>
<li><a href="http://svn.apache.org/repos/asf/ant/sandbox/">sandbox</a> - New developments.</li>
</ul>
<p>If you are not familiar with Subversion, <a
href="http://jakarta.apache.org/site/cvsindex.html">Jakarta's
source repositories page</a> may hold many helpful hints.</p>
<p>Nightly snapshots of the CVS tree are available at
<a href="http://cvs.apache.org/snapshots/ant/">http://cvs.apache.org/snapshots/ant/</a>.</p>
</section>
</body>
<?xml version="1.0"?>
<!--
Copyright 2005 The Apache Software Foundation
Licensed 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.
-->
<document>
<properties>
<title>SVN Repositories</title>
<author email="">Antoine Levy-Lambert</author>
</properties>
<body>
<section name="Access the Source Tree (Subversion)">
<p>Anyone can checkout source code from our public Subversion repository. To do so,
simply use the following command (if you are using a GUI client, configure it
appropriately):</p>
<source>
svn co http://svn.apache.org/repos/asf/ant/[project]/trunk/ ant-[project]</source>
<p>Modules available for access are:</p>
<ul>
<li><a href="http://svn.apache.org/repos/asf/ant/core/trunk/">ant</a> - The &quot;main&quot; Ant module.</li>
<li><a href="http://svn.apache.org/repos/asf/ant/antlibs/">antlibs</a> - Libraries developed as antlib.</li>
<li><a href="http://svn.apache.org/repos/asf/ant/sandbox/">sandbox</a> - New developments.</li>
</ul>
<p>If you are not familiar with Subversion, <a
href="http://jakarta.apache.org/site/cvsindex.html">Jakarta's
source repositories page</a> may hold many helpful hints.</p>
<p>Nightly snapshots of the CVS tree are available at
<a href="http://cvs.apache.org/snapshots/ant/">http://cvs.apache.org/snapshots/ant/</a>.</p>
</section>
</body>
</document>

Write Preview
Loading…
Cancel
Save
Please read the following content carefully:

Dear OpenI User

Thank you for your continuous support to the Openl Qizhi Community AI Collaboration Platform. In order to protect your usage rights and ensure network security, we updated the Openl Qizhi Community AI Collaboration Platform Usage Agreement in January 2024. The updated agreement specifies that users are prohibited from using intranet penetration tools. After you click "Agree and continue", you can continue to use our services. Thank you for your cooperation and understanding.

For more agreement content, please refer to the《Openl Qizhi Community AI Collaboration Platform Usage Agreement》

Agree and continue
Disagree, exit