svn commit: r438865 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java

2006-08-31 Thread rwinston
Author: rwinston
Date: Thu Aug 31 04:26:45 2006
New Revision: 438865

URL: http://svn.apache.org/viewvc?rev=438865view=rev
Log:
Removed redundant IMAGE_TYPE flag

Modified:

jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java

Modified: 
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java?rev=438865r1=438864r2=438865view=diff
==
--- 
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
 (original)
+++ 
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTP.java
 Thu Aug 31 04:26:45 2006
@@ -113,14 +113,7 @@
  ***/
 public static final int EBCDIC_FILE_TYPE = 1;
 
-/***
- * A constant used to indicate the file(s) being transfered should
- * be treated as a binary image, i.e., no translations should be
- * performed.  All constants ending in codeFILE_TYPE/code are used to
- * indicate file types.
- ***/
-public static final int IMAGE_FILE_TYPE = 2;
-
+   
 /***
  * A constant used to indicate the file(s) being transfered should
  * be treated as a binary image, i.e., no translations should be



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



[EMAIL PROTECTED]: Project commons-jelly-tags-jsl-test (in module commons-jelly) failed

2006-08-31 Thread commons-jelly-tags-jsl development
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at [EMAIL PROTECTED]

Project commons-jelly-tags-jsl-test has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 7 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- commons-jelly-tags-jsl-test :  Commons Jelly


Full details are available at:

http://vmgump.apache.org/gump/public/commons-jelly/commons-jelly-tags-jsl-test/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on ant exists, no need to add for property 
maven.jar.ant-optional.
 -DEBUG- Dependency on xml-xerces exists, no need to add for property 
maven.jar.xerces.
 -DEBUG- (Gump generated) Maven Properties in: 
/usr/local/gump/public/workspace/commons-jelly/jelly-tags/jsl/build.properties
 -INFO- Failed with reason build failed
 -DEBUG- Maven POM in: 
/usr/local/gump/public/workspace/commons-jelly/jelly-tags/jsl/project.xml
 -DEBUG- Maven project properties in: 
/usr/local/gump/public/workspace/commons-jelly/jelly-tags/jsl/project.properties
 -INFO- Project Reports in: 
/usr/local/gump/public/workspace/commons-jelly/jelly-tags/jsl/target/test-reports



The following work was performed:
http://vmgump.apache.org/gump/public/commons-jelly/commons-jelly-tags-jsl-test/gump_work/build_commons-jelly_commons-jelly-tags-jsl-test.html
Work Name: build_commons-jelly_commons-jelly-tags-jsl-test (Type: Build)
Work ended in a state of : Failed
Elapsed: 20 secs
Command Line: maven --offline jar 
[Working Directory: 
/usr/local/gump/public/workspace/commons-jelly/jelly-tags/jsl]
CLASSPATH: 
/opt/jdk1.5/lib/tools.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-swing.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-trax.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-junit.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant.jar:/usr/local/gump/public/workspace/jakarta-commons/beanutils/dist/commons-beanutils-core.jar:/usr/local/gump/public/workspace/commons-cli-1.0.x/target/commons-cli-31082006.jar:/usr/local/gump/public/workspace/jakarta-commons/collections/build/commons-collections-31082006.jar:/usr/local/gump/public/workspace/commons-jelly/target/commons-jelly-31082006.jar:/usr/local/gump/public/workspace/commons-jelly/jelly-tags/ant/target/commons-jelly-tags-ant-31082006.jar:/usr/local/gump/public/workspace/commons-jelly/jelly-tags/junit/target/commons-jelly-tags-junit-31082006.jar:/usr/local/gump/public/workspace/commons-jelly/jelly-tags/log/target/commons-jelly-tags-log-31082006.jar:/usr/local/gump/public/workspace/commons-jelly/jelly-tags/xml/target/commons-jelly-tags-xml-31082006.jar:/usr/local/gump/public/workspace/jakarta-commons/jexl/dist/commons-jexl-31082006.jar:/usr/local/gump/public/workspace/jakarta-commons/logging/target/commons-logging-31082006.jar:/usr/local/gump/public/workspace/jakarta-commons/logging/target/commons-logging-api-31082006.jar:/usr/local/gump/public/workspace/dom4j/build/dom4j.jar:/usr/local/gump/public/workspace/jaxen/target/jaxen-31082006.jar
-
[junit] at 
org.apache.commons.jelly.tags.junit.AssertTagSupport.fail(AssertTagSupport.java:63)
[junit] at 
org.apache.commons.jelly.tags.junit.AssertTag.doTag(AssertTag.java:58)
[junit] at 
org.apache.commons.jelly.impl.TagScript.run(TagScript.java:262)
[junit] at 
org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:95)
[junit] at 
org.apache.commons.jelly.TagSupport.invokeBody(TagSupport.java:186)
[junit] at 
org.apache.commons.jelly.impl.StaticTag.doTag(StaticTag.java:65)
[junit] at 
org.apache.commons.jelly.impl.StaticTagScript.run(StaticTagScript.java:112)
[junit] at 
org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:95)
[junit] at 
org.apache.commons.jelly.TagSupport.invokeBody(TagSupport.java:186)
[junit] at 
org.apache.commons.jelly.tags.jsl.TemplateTag$1.run(TemplateTag.java:160)
[junit] at org.dom4j.rule.Mode.fireRule(Mode.java:59)
[junit] at org.dom4j.rule.Mode.applyTemplates(Mode.java:80)
[junit] at org.dom4j.rule.RuleManager$1.run(RuleManager.java:171)
[junit] at org.dom4j.rule.Mode.fireRule(Mode.java:59)
[junit] at org.dom4j.rule.Stylesheet.run(Stylesheet.java:102)
[junit] at org.dom4j.rule.Stylesheet.run(Stylesheet.java:91)
[junit] at 

[EMAIL PROTECTED]: Project commons-jelly-tags-jsl-test (in module commons-jelly) failed

2006-08-31 Thread commons-jelly-tags-jsl development
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at [EMAIL PROTECTED]

Project commons-jelly-tags-jsl-test has an issue affecting its community 
integration.
This issue affects 1 projects,
 and has been outstanding for 7 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- commons-jelly-tags-jsl-test :  Commons Jelly


Full details are available at:

http://vmgump.apache.org/gump/public/commons-jelly/commons-jelly-tags-jsl-test/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on ant exists, no need to add for property 
maven.jar.ant-optional.
 -DEBUG- Dependency on xml-xerces exists, no need to add for property 
maven.jar.xerces.
 -DEBUG- (Gump generated) Maven Properties in: 
/usr/local/gump/public/workspace/commons-jelly/jelly-tags/jsl/build.properties
 -INFO- Failed with reason build failed
 -DEBUG- Maven POM in: 
/usr/local/gump/public/workspace/commons-jelly/jelly-tags/jsl/project.xml
 -DEBUG- Maven project properties in: 
/usr/local/gump/public/workspace/commons-jelly/jelly-tags/jsl/project.properties
 -INFO- Project Reports in: 
/usr/local/gump/public/workspace/commons-jelly/jelly-tags/jsl/target/test-reports



The following work was performed:
http://vmgump.apache.org/gump/public/commons-jelly/commons-jelly-tags-jsl-test/gump_work/build_commons-jelly_commons-jelly-tags-jsl-test.html
Work Name: build_commons-jelly_commons-jelly-tags-jsl-test (Type: Build)
Work ended in a state of : Failed
Elapsed: 20 secs
Command Line: maven --offline jar 
[Working Directory: 
/usr/local/gump/public/workspace/commons-jelly/jelly-tags/jsl]
CLASSPATH: 
/opt/jdk1.5/lib/tools.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-swing.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-trax.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-junit.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant.jar:/usr/local/gump/public/workspace/jakarta-commons/beanutils/dist/commons-beanutils-core.jar:/usr/local/gump/public/workspace/commons-cli-1.0.x/target/commons-cli-31082006.jar:/usr/local/gump/public/workspace/jakarta-commons/collections/build/commons-collections-31082006.jar:/usr/local/gump/public/workspace/commons-jelly/target/commons-jelly-31082006.jar:/usr/local/gump/public/workspace/commons-jelly/jelly-tags/ant/target/commons-jelly-tags-ant-31082006.jar:/usr/local/gump/public/workspace/commons-jelly/jelly-tags/junit/target/commons-jelly-tags-junit-31082006.jar:/usr/local/gump/public/workspace/commons-jelly/jelly-tags/log/target/commons-jelly-tags-log-31082006.jar:/usr/local/gump/public/workspace/commons-jelly/jelly-tags/xml/target/commons-jelly-tags-xml-31082006.jar:/usr/local/gump/public/workspace/jakarta-commons/jexl/dist/commons-jexl-31082006.jar:/usr/local/gump/public/workspace/jakarta-commons/logging/target/commons-logging-31082006.jar:/usr/local/gump/public/workspace/jakarta-commons/logging/target/commons-logging-api-31082006.jar:/usr/local/gump/public/workspace/dom4j/build/dom4j.jar:/usr/local/gump/public/workspace/jaxen/target/jaxen-31082006.jar
-
[junit] at 
org.apache.commons.jelly.tags.junit.AssertTagSupport.fail(AssertTagSupport.java:63)
[junit] at 
org.apache.commons.jelly.tags.junit.AssertTag.doTag(AssertTag.java:58)
[junit] at 
org.apache.commons.jelly.impl.TagScript.run(TagScript.java:262)
[junit] at 
org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:95)
[junit] at 
org.apache.commons.jelly.TagSupport.invokeBody(TagSupport.java:186)
[junit] at 
org.apache.commons.jelly.impl.StaticTag.doTag(StaticTag.java:65)
[junit] at 
org.apache.commons.jelly.impl.StaticTagScript.run(StaticTagScript.java:112)
[junit] at 
org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:95)
[junit] at 
org.apache.commons.jelly.TagSupport.invokeBody(TagSupport.java:186)
[junit] at 
org.apache.commons.jelly.tags.jsl.TemplateTag$1.run(TemplateTag.java:160)
[junit] at org.dom4j.rule.Mode.fireRule(Mode.java:59)
[junit] at org.dom4j.rule.Mode.applyTemplates(Mode.java:80)
[junit] at org.dom4j.rule.RuleManager$1.run(RuleManager.java:171)
[junit] at org.dom4j.rule.Mode.fireRule(Mode.java:59)
[junit] at org.dom4j.rule.Stylesheet.run(Stylesheet.java:102)
[junit] at org.dom4j.rule.Stylesheet.run(Stylesheet.java:91)
[junit] at 

[nightly build] pipeline failed.

2006-08-31 Thread psteitz
Failed build logs:
http://people.apache.org/~psteitz/commons-nightlies/20060831/pipeline.log

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [nightly build] pipeline failed.

2006-08-31 Thread Rahul Akolkar

On 31 Aug 2006 13:31:36 -, [EMAIL PROTECTED] [EMAIL PROTECTED] wrote:

Failed build logs:
http://people.apache.org/~psteitz/commons-nightlies/20060831/pipeline.log


snip/

Looks like the chmod changes didn't work as planned.

BTW, many thanks for your continued efforts towards setting up the new
Commons nightly builds. This has become a very good setup, IMO (ant,
m1, m2 support) !

-Rahul

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: pipeline failed.

2006-08-31 Thread Phil Steitz

Thanks, Rahul. Actually,the problem we are seeing - or more accurately
*not* seeing - here is likely remaining fallout from the nuclear
chmod that I inadvertently kicked off against myself two nights ago. I
will get it fixed shortly.

Thanks for the encouraguing words ;-)

-Phil

On 8/31/06, Rahul Akolkar [EMAIL PROTECTED] wrote:

On 31 Aug 2006 13:31:36 -, [EMAIL PROTECTED] [EMAIL PROTECTED]
wrote:
 Failed build logs:
 http://people.apache.org/~psteitz/commons-nightlies/20060831/pipeline.log

snip/

Looks like the chmod changes didn't work as planned.

BTW, many thanks for your continued efforts towards setting up the new
Commons nightly builds. This has become a very good setup, IMO (ant,
m1, m2 support) !

-Rahul

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]




-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r438982 - /jakarta/commons/proper/commons-build/trunk/commons_nightly.sh

2006-08-31 Thread psteitz
Author: psteitz
Date: Thu Aug 31 09:49:38 2006
New Revision: 438982

URL: http://svn.apache.org/viewvc?rev=438982view=rev
Log:
Added log messages on m1, m2 jar deployment
Fixed bad path spec in m2 zip, tar deployment
Fixed bad conditional test for successful m2 build
Added src assembly and jar deploy logs to m2 build log

Modified:
jakarta/commons/proper/commons-build/trunk/commons_nightly.sh

Modified: jakarta/commons/proper/commons-build/trunk/commons_nightly.sh
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/commons-build/trunk/commons_nightly.sh?rev=438982r1=438981r2=438982view=diff
==
--- jakarta/commons/proper/commons-build/trunk/commons_nightly.sh (original)
+++ jakarta/commons/proper/commons-build/trunk/commons_nightly.sh Thu Aug 31 
09:49:38 2006
@@ -92,6 +92,7 @@
 # Deploy dated jar manually to maven 1 snapshot repo
 if [ -e target/commons-$component-$time_stamp.jar ] # build succeeded
 then 
+  echo Deploying commons-$component SNAPSHOT jar to m1 snapshot repo
   # Create component directory in the repo if it does not exist
   ssh $maven_snapshot_host mkdir -p 
${maven_snapshot_directory}/commons-$component/jars
   
@@ -141,7 +142,7 @@
 # Create source and binary distributions
 mvn clean
 mvn assembly:assembly -DdescriptorId=bin  $log_location/$component.log 
21 
-mvn assembly:assembly -DdescriptorId=src 
+mvn assembly:assembly -DdescriptorId=src  $log_location/$component.log 
21 
 # Rename files
 mv target/commons-$component*bin.tar.gz 
target/commons-$component-$time_stamp.tar.gz
 mv target/commons-$component*src.tar.gz 
target/commons-$component-$time_stamp-src.tar.gz
@@ -150,17 +151,18 @@
 
 # Deploy source and binary distro to commons nightly location
 ssh $deploy_host mkdir -p $deploy_location/commons-$component
-scp target/distributions/commons-$component*.gz \
+scp target/commons-$component*.gz \
 [EMAIL PROTECTED]:$deploy_location/commons-$component
-scp target/distributions/commons-$component*.zip \
+scp target/commons-$component*.zip \
 [EMAIL PROTECTED]:$deploy_location/commons-$component
-scp target/distributions/commons-$component*.md5 \
+scp target/commons-$component*.md5 \
 [EMAIL PROTECTED]:$deploy_location/commons-$component
 
 # Deploy dated jar to maven 2 snapshot repo (configured in apache pom)
-if [ -e target/commons-$component*.jar ] # build succeeded
+if [ `ls target/commons-$component*.jar` ] # build succeeded
 then 
-   mvn deploy
+   echo Deploying commons-$component SNAPSHOT jar to m2 snapshot repo
+   mvn deploy  $log_location/$component.log 21 
 else # build failed - add to failure list and capture unit test logs
   [EMAIL PROTECTED]
   echo Test Reports  $log_location/$component.log



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r439030 - /jakarta/commons/proper/configuration/trunk/project.xml

2006-08-31 Thread oheger
Author: oheger
Date: Thu Aug 31 12:37:42 2006
New Revision: 439030

URL: http://svn.apache.org/viewvc?rev=439030view=rev
Log:
Added Gabriele Garuglieri as contributor

Modified:
jakarta/commons/proper/configuration/trunk/project.xml

Modified: jakarta/commons/proper/configuration/trunk/project.xml
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/configuration/trunk/project.xml?rev=439030r1=439029r2=439030view=diff
==
--- jakarta/commons/proper/configuration/trunk/project.xml (original)
+++ jakarta/commons/proper/configuration/trunk/project.xml Thu Aug 31 12:37:42 
2006
@@ -200,6 +200,12 @@
   organization/organization
 /contributor
 
+contributor
+  nameGabriele Garuglieri/name
+  email[EMAIL PROTECTED]/email
+  organizationInfoblu S.p.A/organization
+/contributor
+
   /contributors
 
   dependencies



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [all][maven 2 configuration]

2006-08-31 Thread Phil Steitz

Looks like something like this will actually work (so inline profiles
can override distributionManagement):

distributionManagement
   !-- Null out inherited apache distribution repo by default --
   repository
 iddummy/id
 nameDummy to avoid accidental deploys/name
 url/url
   /repository
 /distributionManagement
 profiles
   profile
 idrelease/id
 distributionManagement
   repository
 !-- Activate apache distribution repo --
 idapache.releases/id
 nameApache Release Distribution Repository/name
 urlscp://people.apache.org...m2-ibiblio-rsync-repository/url
   /repository
 /distributionManagement
   /profile
 /profiles

I checked this locally and using mvn help:effective-pom.  If I add the
above to the commons-parent, then mvn -Prelease deploy will work to
deploy and mvn deploy will fail if the version is not a snap and it
is trying to deploy to the rsynched repo.  This is a little awkward
and it requires that we maintain the rsynch url in the commons POM,
but it does protect against accidental deploys.  Any better ideas?

I have thought about adding a check to the nightly script to grep out
the version and fail the deploy if it is not a snapshot, but that does
not protect us from other accidents.  So unless someone has a better
idea, I am inclined to make the change above to the commons-parent
POM.

Phil

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [all][maven 2 configuration]

2006-08-31 Thread Wendy Smoak

On 8/29/06, Phil Steitz [EMAIL PROTECTED] wrote:


I have one more question / concern with the current setup.

Should we override the distributionManagement section to
null out the releases section ...


We've talked about this some on [EMAIL PROTECTED]  IMO, we need to use a
staging repository for releases and have an easy way to promote a
build from staging to ibiblio-rsync.  (Right now it's hard to move or
copy artifacts between repos, at least if you want the repository
metadata to be somewhat correct.)

Struts and Shale currently have distributionManagement/repository
pointed at apache.snapshots, while MyFaces uses a staging repo on
their zone.

--
Wendy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [all][maven 2 configuration]

2006-08-31 Thread Wendy Smoak

On 8/31/06, Phil Steitz [EMAIL PROTECTED] wrote:


Looks like something like this will actually work (so inline profiles
can override distributionManagement):


That looks great. A component can always override
distributionManagement if necessary, so this is still flexible.

How and where will you deploy release candidates?  This is something
that doesn't seem to happen now, but I'd like to see Commons RCs
available in a Maven 2 repository.

What about a rc profile that points
distributionManagement/repository to apache.snapshots?  That would
allow a release manager to go through the same process for a release
candidate, except for using -Prc instead of -Prelease.

--
Wendy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [all][maven 2 configuration]

2006-08-31 Thread Phil Steitz

On 8/31/06, Wendy Smoak [EMAIL PROTECTED] wrote:

On 8/31/06, Phil Steitz [EMAIL PROTECTED] wrote:

 Looks like something like this will actually work (so inline profiles
 can override distributionManagement):

That looks great. A component can always override
distributionManagement if necessary, so this is still flexible.

How and where will you deploy release candidates?  This is something
that doesn't seem to happen now, but I'd like to see Commons RCs
available in a Maven 2 repository.

What about a rc profile that points
distributionManagement/repository to apache.snapshots?  That would
allow a release manager to go through the same process for a release
candidate, except for using -Prc instead of -Prelease.


Great idea. I will add that too if no one objects / proposes a better
setup than using profiles like this.

Phil

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r439061 - in /jakarta/commons/proper/fileupload/trunk: .classpath pom.xml src/main/ src/main/assembly/ src/main/assembly/bin.xml src/main/assembly/src.xml

2006-08-31 Thread jochen
Author: jochen
Date: Thu Aug 31 14:56:44 2006
New Revision: 439061

URL: http://svn.apache.org/viewvc?rev=439061view=rev
Log:
Preparing assembly with Maven 2.

Added:
jakarta/commons/proper/fileupload/trunk/src/main/
jakarta/commons/proper/fileupload/trunk/src/main/assembly/
jakarta/commons/proper/fileupload/trunk/src/main/assembly/bin.xml
jakarta/commons/proper/fileupload/trunk/src/main/assembly/src.xml   (with 
props)
Modified:
jakarta/commons/proper/fileupload/trunk/.classpath
jakarta/commons/proper/fileupload/trunk/pom.xml

Modified: jakarta/commons/proper/fileupload/trunk/.classpath
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/.classpath?rev=439061r1=439060r2=439061view=diff
==
--- jakarta/commons/proper/fileupload/trunk/.classpath (original)
+++ jakarta/commons/proper/fileupload/trunk/.classpath Thu Aug 31 14:56:44 2006
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=UTF-8?
 classpath
classpathentry path=src/java kind=src/
-   classpathentry path=src/test output=target/test-classes 
kind=src/
+   classpathentry path=src/test kind=src/
classpathentry path=org.eclipse.jdt.launching.JRE_CONTAINER 
kind=con/
classpathentry path=org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER 
kind=con/
classpathentry path=target/classes kind=output/

Modified: jakarta/commons/proper/fileupload/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/pom.xml?rev=439061r1=439060r2=439061view=diff
==
--- jakarta/commons/proper/fileupload/trunk/pom.xml (original)
+++ jakarta/commons/proper/fileupload/trunk/pom.xml Thu Aug 31 14:56:44 2006
@@ -3,20 +3,26 @@
 xmlns=http://maven.apache.org/POM/4.0.0;
 xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
 xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
+  parent
+groupIdorg.apache/groupId
+artifactIdapache/artifactId
+version3/version
+  /parent
   modelVersion4.0.0/modelVersion
   groupIdorg.apache.commons/groupId
   artifactIdcommons-fileupload/artifactId
   version1.2-SNAPSHOT/version
   nameFileUpload/name
-  !-- The description must currently be a single line. See MJAR-4. --
-  descriptionThe FileUpload component provides a simple yet flexible means 
of adding support for multipart file upload functionality to servlets and web 
applications. /description
+  description
+The FileUpload component provides a simple yet flexible means of adding 
support for multipart
+file upload functionality to servlets and web applications.
+  /description
   urlhttp://jakarta.apache.org/commons/fileupload//url
   issueManagement
 systemjira/system
-urlhttp://issues.apache.org/jira/BrowseProject.jspa?pid=10465/url
+urlhttp://issues.apache.org/jira/browse/FILEUPLOAD/url
   /issueManagement
   inceptionYear2002/inceptionYear
-
   mailingLists
 mailingList
   nameCommons Dev List/name
@@ -98,25 +104,12 @@
 /contributor
   /contributors
 
-  licenses
-license
-  nameThe Apache Software License, Version 2.0/name
-  urlhttp://www.apache.org/licenses/LICENSE-2.0.txt/url
-  distributionrepo/distribution
-/license
-  /licenses
-
   scm
 
connectionscm:svn:scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/fileupload/trunk/connection
 
developerConnectionscm:svn:scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/proper/fileupload/trunk/developerConnection
 
urlscm:svn:https://svn.apache.org/repos/asf/webservices/xmlrpc/tags/XMLRPC_3_0rc1/url
   /scm
 
-  organization
-nameApache Software Foundation/name
-urlhttp://www.apache.org//url
-  /organization
-
   build
 sourceDirectorysrc/java/sourceDirectory
 testSourceDirectorysrc/test/testSourceDirectory
@@ -141,6 +134,16 @@
   /archive
 /configuration
   /plugin
+  plugin
+artifactIdmaven-assembly-plugin/artifactId
+configuration
+  descriptors
+descriptorsrc/main/assembly/bin.xml/descriptor
+descriptorsrc/main/assembly/src.xml/descriptor
+  /descriptors
+  tarLongFileModegnu/tarLongFileMode
+/configuration
+  /plugin
 /plugins
   /build
 
@@ -167,6 +170,7 @@
   groupIdcommons-io/groupId
   artifactIdcommons-io/artifactId
   version1.1/version
+  optionaltrue/optional
 /dependency
   /dependencies
 /project

Added: jakarta/commons/proper/fileupload/trunk/src/main/assembly/bin.xml
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/src/main/assembly/bin.xml?rev=439061view=auto
==
--- jakarta/commons/proper/fileupload/trunk/src/main/assembly/bin.xml (added)
+++ 

Re: [VOTE] Release Commons JEXL 1.1

2006-08-31 Thread Rahul Akolkar

Ran the usual gamut of checks, looks good to me.

snip/

---
[X] +1  I support this release
[ ] +0
[ ] -0
[ ] -1  I oppose this release because...



snap/

-Rahul

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



svn commit: r439102 - in /jakarta/commons/proper/io/trunk: ./ src/java/org/apache/commons/io/ src/test/org/apache/commons/io/

2006-08-31 Thread scolebourne
Author: scolebourne
Date: Thu Aug 31 16:34:31 2006
New Revision: 439102

URL: http://svn.apache.org/viewvc?rev=439102view=rev
Log:
IO-56,IO-70 - FileDeleteStrategy / FileCleaner
- FileDeleteStrategy is a strategy for handling file deletion and can be used 
as a calback in FileCleaner
- Together these allow FileCleaner to do a forceDelete to kill directories and 
provide hooks for secure delete

Added:

jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileDeleteStrategy.java
   (with props)
Modified:
jakarta/commons/proper/io/trunk/RELEASE-NOTES.txt

jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileCleaner.java

jakarta/commons/proper/io/trunk/src/test/org/apache/commons/io/FileCleanerTestCase.java

jakarta/commons/proper/io/trunk/src/test/org/apache/commons/io/PackageTestSuite.java

Modified: jakarta/commons/proper/io/trunk/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/io/trunk/RELEASE-NOTES.txt?rev=439102r1=439101r2=439102view=diff
==
--- jakarta/commons/proper/io/trunk/RELEASE-NOTES.txt (original)
+++ jakarta/commons/proper/io/trunk/RELEASE-NOTES.txt Thu Aug 31 16:34:31 2006
@@ -51,6 +51,9 @@
 - FileSystemUtils.freeSpace [IO-91]
   - This is now documented not to work on SunOS 5
 
+- FileCleaner
+  - This now handles the situation where an error occurs when deleting the file
+
 
 Enhancements from 1.2
 -
@@ -62,6 +65,19 @@
   - wildcardMatch - new method that has IOCase as a parameter
   - equals - new method that has IOCase as a parameter
 
+- FileUtils.isFileOlder
+  - add methods to check if a file is older (i.e. isFileOlder()) - counterparts
+to the existing isFileNewer() methods.
+
+- FileUtils.checksum, FileUtils.checksumCRC32
+  - add methods to create a checksum of a file
+
+- FileDeleteStrategy
+- FileCleaner[IO-56,IO-70]
+  - FileDeleteStrategy is a strategy for handling file deletion
+  - This can be used as a calback in FileCleaner
+  - Together these allow FileCleaner to do a forceDelete to kill directories
+
 - WildcardFileFilter
   - Replacement for WildcardFilter
   - Accepts both files and directories
@@ -105,13 +121,6 @@
 - FileFilterUtils
   - new sizeRangeFileFilter(long minimumSize, long maximumSize) method which 
 creates a filter that accepts files within the specified size range.
-
-- FileUtils
-  - add methods to check if a file is older (i.e. isFileOlder()) - counterparts
-to the existing isFileNewer() methods.
-
-- FileUtils.checksum, FileUtils.checksumCRC32
-  - add methods to create a checksum of a file
 
 
 Feedback

Modified: 
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileCleaner.java
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileCleaner.java?rev=439102r1=439101r2=439102view=diff
==
--- 
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileCleaner.java 
(original)
+++ 
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileCleaner.java 
Thu Aug 31 16:34:31 2006
@@ -81,69 +81,104 @@
 reaper.start();
 }
 
+//---
 /**
  * Track the specified file, using the provided marker, deleting the file
  * when the marker instance is garbage collected.
+ * The [EMAIL PROTECTED] FileDeleteStrategy#NORMAL normal} deletion 
strategy will be used.
  *
- * @param file   The file to be tracked.
- * @param marker The marker object used to track the file.
+ * @param file  the file to be tracked, not null
+ * @param marker  the marker object used to track the file, not null
+ * @throws NullPointerException if the file is null
  */
 public static void track(File file, Object marker) {
-trackers.add(new Tracker(file, marker, q));
+track(file, marker, (FileDeleteStrategy) null);
 }
 
 /**
  * Track the specified file, using the provided marker, deleting the file
  * when the marker instance is garbage collected.
+ * The speified deletion strategy is used.
  *
- * @param path   The full path to the file to be tracked.
- * @param marker The marker object used to track the file.
+ * @param file  the file to be tracked, not null
+ * @param marker  the marker object used to track the file, not null
+ * @param deleteStrategy  the strategy to delete the file, null means 
normal
+ * @throws NullPointerException if the file is null
+ */
+public static void track(File file, Object marker, FileDeleteStrategy 
deleteStrategy) {
+if (file == null) {
+throw new NullPointerException(The file must not be null);
+}
+trackers.add(new Tracker(file.getPath(), deleteStrategy, marker, q));
+}
+
+/**
+ * 

[io] FileDeleteStrategy

2006-08-31 Thread Stephen Colebourne
I've checked in a new class FileDeleteStrategy. This should handle IO-56 
and IO-70 requests for alternate deletion strategies in FileCleaner.


Ideally FileDeleteStrategy needs a test case, but I'm going on holiday, 
so I thought I'd get it checked in for review now. If anyones got the 
urge, feel free to add the tests.


Stephen

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



[jira] Commented: (IO-70) [io] Add a secureDelete method to FileUtils.java

2006-08-31 Thread Stephen Colebourne (JIRA)
[ http://issues.apache.org/jira/browse/IO-70?page=comments#action_12432007 
] 

Stephen Colebourne commented on IO-70:
--

Checked in FileDeleteStrategy, awaiting feedback

 [io] Add a secureDelete method to FileUtils.java
 

 Key: IO-70
 URL: http://issues.apache.org/jira/browse/IO-70
 Project: Commons IO
  Issue Type: Improvement
  Components: Utilities
 Environment: Operating System: other
 Platform: All
Reporter: Ralf Hauser
Priority: Minor
 Fix For: 1.3


 in org.apache.commons.io.FileUtils
 Commons Fileupload uses at least the io's FileCleaner.track() method.
 Unfortunately, they just use the plain java File.delete() method and not a 
 more
 sophisticated delete as offered in this package.
 Especially, if servers running the FileUpload are sitting in DMZs and forward
 all personal/private uploaded information in another (DB-)server behind 
 another
 firewall, one would not want that if the DMZ machine gets hacked, all previous
 uploads that are supposedly deleted still can easily be found on the disk by a
 not even that skilled attacker.
 Therefore, it would be great to have a pgp-wipe alike secure delete method 
 here!
 it would overwrite the file multiple times and probably, it this should be
 spawned as a separte thread since that may take longer than a state-of-the-art
 GUI would want to wait for such an action to complete.

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: 
http://issues.apache.org/jira/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



[jira] Commented: (IO-56) [io] FileCleaner - delete non empty directories

2006-08-31 Thread Stephen Colebourne (JIRA)
[ http://issues.apache.org/jira/browse/IO-56?page=comments#action_12432008 
] 

Stephen Colebourne commented on IO-56:
--

Checked in FileDeleteStrategy, awaiting feedback

 [io] FileCleaner - delete non empty directories
 ---

 Key: IO-56
 URL: http://issues.apache.org/jira/browse/IO-56
 Project: Commons IO
  Issue Type: Improvement
  Components: Utilities
 Environment: Operating System: Linux
 Platform: PC
Reporter: Kazimierz Pogoda
Priority: Minor
 Fix For: 1.3


 It is a feature request. FileCleaner is using java.io.File#delete() method in
 the inner class Tracker. I suggest to use FileUtils#forceDelete(File) method.
 This way also non-empty directories can be deleted.

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: 
http://issues.apache.org/jira/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: [VOTE] Release Commons JEXL 1.1

2006-08-31 Thread Dion Gillard

+1.

On 9/1/06, Rahul Akolkar [EMAIL PROTECTED] wrote:

Ran the usual gamut of checks, looks good to me.

snip/
 ---
 [X] +1  I support this release
 [ ] +0
 [ ] -0
 [ ] -1  I oppose this release because...
 

snap/

-Rahul

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]





--
http://www.multitask.com.au/people/dion/
If you even dream of beating me you'd better wake up and apologize -
Muhammad Ali

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]