[jira] Closed: (BEANUTILS-245) Problem setting nested index property or combined property (with index property)
[ http://issues.apache.org/jira/browse/BEANUTILS-245?page=all ] Simon Kitching closed BEANUTILS-245. Resolution: Invalid Closing as requested by original poster. Problem setting nested index property or combined property (with index property) Key: BEANUTILS-245 URL: http://issues.apache.org/jira/browse/BEANUTILS-245 Project: Commons BeanUtils Issue Type: Bug Affects Versions: 1.7.0 Release Environment: Windows XP Professional, Java 5 Reporter: Pawan Kumar Shrivastava This is the specific problem, when you are setting a nested index property i.e. - list1[0].value Now i have initialized list1 as = new ArrayList(). Obviously the size is 0. So PropertyUtils uses List.set(index, value) method, which throws IndexOutOfBoundsException as the size and index are same. I think it should check the index and size first and then decide whether to call add(index, value) or set(index, value). Please let me know, if my understanding is wrong. One potential misuse i can see is what if someone passes index 100. But not sure if this can be resolved by somehow shrinking the list. -- 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] Created: (LANG-276) MutableBigDecimal and MutableBigInteger
MutableBigDecimal and MutableBigInteger --- Key: LANG-276 URL: http://issues.apache.org/jira/browse/LANG-276 Project: Commons Lang Issue Type: New Feature Reporter: Simon Kitching Priority: Minor The mutable package covers most of the standard immutable data-types, but not BigDecimal or BigInteger. I actually had a need for a mutable BigDecimal today (money amount out parameter) and noticed the lack. With these two done, that would be all subclasses of java.lang.Number covered... -- 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] Updated: (CONFIGURATION-223) PropertiesConfigurationLayout broke the autoSave behaviour of PropertiesConfiguration
[ http://issues.apache.org/jira/browse/CONFIGURATION-223?page=all ] Gabriele Garuglieri updated CONFIGURATION-223: -- Attachment: 223-test.patch I guess it should work, but this would change the operations behaviour, making them more ore less atomic. Understanding all the possible side effects of this change was too far from my actual knowledge of all internal subtleties and i couldn't afford the time to develop a patch for this. Anyway i attach a patch with some testcases you can use to verify the problem. Regards, Gabriele PS: this broke all my JMX work on properties persistence... :( PropertiesConfigurationLayout broke the autoSave behaviour of PropertiesConfiguration - Key: CONFIGURATION-223 URL: http://issues.apache.org/jira/browse/CONFIGURATION-223 Project: Commons Configuration Issue Type: Bug Environment: 1.3RC1 Reporter: Gabriele Garuglieri Assigned To: Oliver Heger Priority: Critical Attachments: 223-test.patch When using PropertiesConfiguration with autoSave true the PropertiesConfigurationLayout causes invalid properties files to be saved. When using addProperty(key, value); where key does not exist yet in the configuration the EVENT_ADD_PROPERTY event that updates the PropertiesConfigurationLayout with the new key is issued only after the possiblySave() method is invoked so the new property will not be saved. When using setProperty(key, value); where key does not exist yet in the configuration the EVENT_SET_PROPERTY event that updates the PropertiesConfigurationLayout with the new key is issued only after the possiblySave() method is invoked so the new property will not be saved. The way it is implemented now makes content of the saved file depending on PropertiesConfigurationLayout content that depends on an event that will be issued only after the file was properly updated. This creates a circular dependency that cannot work. -- 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]
[EMAIL PROTECTED]: Project commons-jelly-tags-jsl-test (in module commons-jelly) failed
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. 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: 19 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-29082006.jar:/usr/local/gump/public/workspace/jakarta-commons/collections/build/commons-collections-29082006.jar:/usr/local/gump/public/workspace/commons-jelly/target/commons-jelly-29082006.jar:/usr/local/gump/public/workspace/commons-jelly/jelly-tags/ant/target/commons-jelly-tags-ant-29082006.jar:/usr/local/gump/public/workspace/commons-jelly/jelly-tags/junit/target/commons-jelly-tags-junit-29082006.jar:/usr/local/gump/public/workspace/commons-jelly/jelly-tags/log/target/commons-jelly-tags-log-29082006.jar:/usr/local/gump/public/workspace/commons-jelly/jelly-tags/xml/target/commons-jelly-tags-xml-29082006.jar:/usr/local/gump/public/workspace/jakarta-commons/jexl/dist/commons-jexl-29082006.jar:/usr/local/gump/public/workspace/jakarta-commons/logging/target/commons-logging-29082006.jar:/usr/local/gump/public/workspace/jakarta-commons/logging/target/commons-logging-api-29082006.jar:/usr/local/gump/public/workspace/dom4j/build/dom4j.jar:/usr/local/gump/public/workspace/jaxen/target/jaxen-29082006.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
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. 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: 19 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-29082006.jar:/usr/local/gump/public/workspace/jakarta-commons/collections/build/commons-collections-29082006.jar:/usr/local/gump/public/workspace/commons-jelly/target/commons-jelly-29082006.jar:/usr/local/gump/public/workspace/commons-jelly/jelly-tags/ant/target/commons-jelly-tags-ant-29082006.jar:/usr/local/gump/public/workspace/commons-jelly/jelly-tags/junit/target/commons-jelly-tags-junit-29082006.jar:/usr/local/gump/public/workspace/commons-jelly/jelly-tags/log/target/commons-jelly-tags-log-29082006.jar:/usr/local/gump/public/workspace/commons-jelly/jelly-tags/xml/target/commons-jelly-tags-xml-29082006.jar:/usr/local/gump/public/workspace/jakarta-commons/jexl/dist/commons-jexl-29082006.jar:/usr/local/gump/public/workspace/jakarta-commons/logging/target/commons-logging-29082006.jar:/usr/local/gump/public/workspace/jakarta-commons/logging/target/commons-logging-api-29082006.jar:/usr/local/gump/public/workspace/dom4j/build/dom4j.jar:/usr/local/gump/public/workspace/jaxen/target/jaxen-29082006.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
[jira] Updated: (EL-13) Boolean bean property not found due to Introspector limitation
[ http://issues.apache.org/jira/browse/EL-13?page=all ]
Joe Littlejohn updated EL-13:
-
Attachment: AdditionalIntrospection.java
I've optimised the patch and removed the nested iteration completely. I've also
got rid of the ad-hoc introspection code, so now all introspection is still
handled by core J2SE classes (importantly, java.beans.PropertyDescriptor not
java.beans.Introspector).
I can't see any reason why this shouldn't go in now. It's fast and completely
backwards compatible.
Boolean bean property not found due to Introspector limitation
--
Key: EL-13
URL: http://issues.apache.org/jira/browse/EL-13
Project: Commons EL
Issue Type: Bug
Affects Versions: 1.0 Final
Environment: Windows XP, Java 1.5.0_07-b03, Tomcat 5.5.17
Reporter: Joe Littlejohn
Attachments: AdditionalIntrospection.java,
AdditionalIntrospection.java, AdditionalIntrospection.java, el_exception.txt
There is a bug in the java.beans.Introspector which means that it cannot find
the read method for a property of Boolean type (because it looks for the get
prefix, not the is prefix). This is arguably the expected behaviour of the
Introspector, however since the java.beans.PropertyDescriptor acts differently
(it can identify the property read method), this inconsistency hints it's a
bug.
Also, with the advent of autoboxing, developers are supposed to be able to
free
themselves from primitive types.
The commons EL library is affected by this bug, so using an interface like: -
public interface Bean {
Boolean isEnabled();
}
and an expression like: -
${bean.enabled}
fails with an ELException saying that the property could not be found (see
attached log snippet).
WebLogic does not suffer from this problem, presumably because they implement
their own EL parser (don't use commons.el) which doesn't use the
Introspector. I
have written a suggested workaround for this problem which would allow the
commons.el library to continue its use of the Introspector, but deal with this
flaw (see attached). The AdditionalIntrospection could be used in the
BeanInfoManager.initialise() method, like so: -
PropertyDescriptor [] pds = mBeanInfo.getPropertyDescriptors ();
pds = AdditionalIntrospection.findMissingMethods(mBeanClass, pds); // new step
--
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] Updated: (EL-13) Boolean bean property not found due to Introspector limitation
[ http://issues.apache.org/jira/browse/EL-13?page=all ]
Joe Littlejohn updated EL-13:
-
Attachment: AdditionalIntrospection.java
Original class was throwing exceptions where read methods were not found. This
is not compatible with the existing library so this is now fixed.
Boolean bean property not found due to Introspector limitation
--
Key: EL-13
URL: http://issues.apache.org/jira/browse/EL-13
Project: Commons EL
Issue Type: Bug
Affects Versions: 1.0 Final
Environment: Windows XP, Java 1.5.0_07-b03, Tomcat 5.5.17
Reporter: Joe Littlejohn
Attachments: AdditionalIntrospection.java,
AdditionalIntrospection.java, AdditionalIntrospection.java,
AdditionalIntrospection.java, el_exception.txt
There is a bug in the java.beans.Introspector which means that it cannot find
the read method for a property of Boolean type (because it looks for the get
prefix, not the is prefix). This is arguably the expected behaviour of the
Introspector, however since the java.beans.PropertyDescriptor acts differently
(it can identify the property read method), this inconsistency hints it's a
bug.
Also, with the advent of autoboxing, developers are supposed to be able to
free
themselves from primitive types.
The commons EL library is affected by this bug, so using an interface like: -
public interface Bean {
Boolean isEnabled();
}
and an expression like: -
${bean.enabled}
fails with an ELException saying that the property could not be found (see
attached log snippet).
WebLogic does not suffer from this problem, presumably because they implement
their own EL parser (don't use commons.el) which doesn't use the
Introspector. I
have written a suggested workaround for this problem which would allow the
commons.el library to continue its use of the Introspector, but deal with this
flaw (see attached). The AdditionalIntrospection could be used in the
BeanInfoManager.initialise() method, like so: -
PropertyDescriptor [] pds = mBeanInfo.getPropertyDescriptors ();
pds = AdditionalIntrospection.findMissingMethods(mBeanClass, pds); // new step
--
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] Resolved: (SANDBOX-40) [pipeline] SimpleStageDriver does not stop the monitor
[ http://issues.apache.org/jira/browse/SANDBOX-40?page=all ] Kris Nuttycombe resolved SANDBOX-40. Fix Version/s: Nightly Builds Resolution: Fixed Assignee: Kris Nuttycombe Patch included in fixes for SANDBOX-165 [pipeline] SimpleStageDriver does not stop the monitor -- Key: SANDBOX-40 URL: http://issues.apache.org/jira/browse/SANDBOX-40 Project: Commons Sandbox Issue Type: Bug Components: Pipeline Affects Versions: Nightly Builds Environment: Operating System: other Platform: PC Reporter: Travis Stevens Assigned To: Kris Nuttycombe Fix For: Nightly Builds Attachments: SimpleStageDriver.patch, SimpleStageDriverTest.patch When a pipeline.start() is requested a stage driver should put the stage monitor in the RUNNING state and when the pipeline.finish() is requested, the stage driver should put the stage monitor in the STOPPED state. The SimpleStageDriver is not putting the monitor in the STOPPED state when pipeline.finish() is called. Attached is a patch to SimpleStageDriverTest, which when applied will cause test failures. Also attached is a patch to SimpleStageDriver which once applied, will cause the test to pass. -- 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] Resolved: (SANDBOX-165) [pipeline] [patch] Major modifications for commons-pipeline
[ http://issues.apache.org/jira/browse/SANDBOX-165?page=all ] Kris Nuttycombe resolved SANDBOX-165. - Fix Version/s: Nightly Builds Resolution: Fixed Assignee: Kris Nuttycombe Patch applied. [pipeline] [patch] Major modifications for commons-pipeline --- Key: SANDBOX-165 URL: http://issues.apache.org/jira/browse/SANDBOX-165 Project: Commons Sandbox Issue Type: Improvement Components: Pipeline Reporter: Kris Nuttycombe Assigned To: Kris Nuttycombe Fix For: Nightly Builds Attachments: commons-pipeline.patch, svn-patch.sh This patch makes significant changes to the underlying pipeline API that are intended to facilitate unit testing and reduce coupling between stages and the execution environment, switches the project to use Maven 2, and adds documentation reflecting the changes. This patch set includes a patch file and a shell script that will execute the svn commands necessary to modify the project structure to conform to the Maven 2 standard layout. The patch should not be applied directly as it depends upon some modifications to the project structure. Instead, it should be applied in the process of the execution of the shell script supplied. This patch includes and supercedes the patch provided by Travis Stevens in SANDBOX-40 (bugzilla 35983) -- 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: [all][maven 2 configuration]
I have one more question / concern with the current setup. Currently, we are inheriting the distributionManagement config from the apache POM. This seems good and reasonable, except that that parent defines both apache.snapshots and apache.releases and points to the ibiblio synched repo for releases. That is again good and natural, but what I am afraid of is what happens when someone mistakenly changes a version not to end in -SNAPSHOT and then does mvn deploy (or they check in the change and the nightlies do it). Since (I think) the releases repo lives on the same box (people.apache.org) that the snapshot one does, authentication will be the same and deployment will go to the rsynched repo. Isn't this dangerous? Should we override the distributionManagement section to null out the releases section and create a build profile for releases that has to be explicitly triggered on the command line? Will that work? (i.e., will m2 just merge it in anyway?). In m1, we handled this with build properties. What is the right m2 way to handle this? I am afraid that the poms I checked in yesterday do not handle the risk of accidental deployment correctly. Phil - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (CONFIGURATION-223) PropertiesConfigurationLayout broke the autoSave behaviour of PropertiesConfiguration
[ http://issues.apache.org/jira/browse/CONFIGURATION-223?page=comments#action_12431362 ] Oliver Heger commented on CONFIGURATION-223: Thanks for the patch, this is really helpful. I changed AbstractFileConfiguration in the way mentioned above and everything seems to work. I will do some more testing. You are right that the behavior of these methods is now slightly different, but in this case I think it is an improvement. Calling addProperty() or setProperty() is now considered a single change and will result in only one auto save operation. This is fine IMO. Sorry for your JMX work. What makes me worrying is the fact that this significant bug was not detected by our unit test suite, though we have a pretty high code coverage. Obviously there is still room for improvement. PropertiesConfigurationLayout broke the autoSave behaviour of PropertiesConfiguration - Key: CONFIGURATION-223 URL: http://issues.apache.org/jira/browse/CONFIGURATION-223 Project: Commons Configuration Issue Type: Bug Environment: 1.3RC1 Reporter: Gabriele Garuglieri Assigned To: Oliver Heger Priority: Critical Attachments: 223-test.patch When using PropertiesConfiguration with autoSave true the PropertiesConfigurationLayout causes invalid properties files to be saved. When using addProperty(key, value); where key does not exist yet in the configuration the EVENT_ADD_PROPERTY event that updates the PropertiesConfigurationLayout with the new key is issued only after the possiblySave() method is invoked so the new property will not be saved. When using setProperty(key, value); where key does not exist yet in the configuration the EVENT_SET_PROPERTY event that updates the PropertiesConfigurationLayout with the new key is issued only after the possiblySave() method is invoked so the new property will not be saved. The way it is implemented now makes content of the saved file depending on PropertiesConfigurationLayout content that depends on an event that will be issued only after the file was properly updated. This creates a circular dependency that cannot work. -- 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]
svn commit: r438203 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH: src/main/java/org/apache/commons/net/ftp/FTPSClient.java src/main/java/org/apache/commons/net/ftp/parser/RegexFTPFileEntry
Author: rwinston
Date: Tue Aug 29 13:47:29 2006
New Revision: 438203
URL: http://svn.apache.org/viewvc?rev=438203view=rev
Log:
* Clean up FTPSClient.java slightly
* Refactor changeRegex() to setRegex() in RegexFTPFileEntryParserImpl.java
* Document some more changes
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/parser/RegexFTPFileEntryParserImpl.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/xdocs/changes.xml
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java?rev=438203r1=438202r2=438203view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Tue Aug 29 13:47:29 2006
@@ -19,27 +19,15 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
-import java.net.InetAddress;
import java.net.Socket;
-import java.net.SocketException;
import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
-import java.util.Enumeration;
-import java.util.Vector;
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
/**
* FTP over SSL processing.
@@ -68,10 +56,6 @@
private String protocol = DEFAULT_PROTOCOL;
/** The AUTH Command value */
private String auth = DEFAULT_PROTOCOL;
-/** The KeyManager object. */
-private KeyManager[] keyManager = null;
-/** The TrustManager object */
-private TrustManager[] trustManager = null;
/** The context object. */
private SSLContext context;
/** The socket object. */
@@ -138,116 +122,8 @@
context = SSLContext.getInstance(protocol);
}
-/**
- * Create KeyManager[] object.
- * @param ks The KeyStore objects.
- * @param storePass The Store password.
- * @throws NoSuchAlgorithmException A requested cryptographic
- * algorithm is not available in the environment.
- * @throws NoSuchProviderException A requested cryptographic provider
- * is not available in the environment.
- * @throws UnrecoverableKeyException This exception is thrown
- * if a key in the keystore cannot be recovered.
- * @throws KeyStoreException This is the generic KeyStore exception.
- * @throws KeyManagementException It is the generic KeyManager exception.
- */
-public void createKeyManager(KeyStore ks, String storePass)
-throws NoSuchAlgorithmException, NoSuchProviderException,
-KeyStoreException,UnrecoverableKeyException,KeyManagementException{
-if (ks == null) {
-keyManager = null;
-return;
-}
-if (KEYSTORE_ALGORITHM == null)
-KEYSTORE_ALGORITHM = KeyManagerFactory.getDefaultAlgorithm();
-KeyManagerFactory kmf;
-if (PROVIDER == null) {
-kmf = KeyManagerFactory.getInstance(KEYSTORE_ALGORITHM);
-} else {
-kmf = KeyManagerFactory.getInstance(KEYSTORE_ALGORITHM, PROVIDER);
-}
-if (kmf == null) {
-keyManager = null;
-return;
-}
-kmf.init(ks, storePass.toCharArray());
-keyManager = kmf.getKeyManagers();
-context.init(keyManager, trustManager, null);
-}
-
-/**
- * Create TrustManager[] object.
- * @param ks The KeyStore object.
- * @throws NoSuchAlgorithmException A requested cryptographic algorithm
- * is not available in the environment.
- * @throws NoSuchProviderException A requested cryptographic provider
- * is not available in the environment.
- * @throws KeyStoreException This is the generic KeyStore exception.
- * @throws KeyManagementException It is the generic KeyManager exception.
- */
-public void createTrustManager(KeyStore ks)
-throws NoSuchAlgorithmException, NoSuchProviderException,
-KeyStoreException, KeyManagementException {
-if (ks == null) trustManager = null;
-if (TRUSTSTORE_ALGORITHM == null)
-
svn commit: r438206 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSReply.java
Author: rwinston
Date: Tue Aug 29 13:53:47 2006
New Revision: 438206
URL: http://svn.apache.org/viewvc?rev=438206view=rev
Log:
Clean up FTPSReply.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSReply.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSReply.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSReply.java?rev=438206r1=438205r2=438206view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSReply.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSReply.java
Tue Aug 29 13:53:47 2006
@@ -14,8 +14,12 @@
*/
package org.apache.commons.net.ftp;
+
/**
- * I confirm a response cord of a command added in FTPS.
+ * FTPS Response codes and status checking. Just delegates to [EMAIL
PROTECTED] FTPReply} for now.
+ *
+ * @version $Id$
+ * @see [EMAIL PROTECTED] FTPReply}
*/
public final class FTPSReply {
public static final int CODE_200 = 200;
@@ -67,7 +71,7 @@
* false if not.
*/
public static boolean isPositivePreliminary(int reply) {
-return (reply = 100 reply 200);
+return FTPReply.isPositivePreliminary(reply);
}
/**
@@ -81,7 +85,7 @@
* false if not.
*/
public static boolean isPositiveCompletion(int reply) {
-return (reply = 200 reply 300);
+return FTPReply.isPositiveCompletion(reply);
}
/**
@@ -98,7 +102,7 @@
* false if not.
*/
public static boolean isPositiveIntermediate(int reply) {
-return (reply = 300 reply 400);
+return FTPReply.isPositiveIntermediate(reply);
}
/**
@@ -112,7 +116,7 @@
* false if not.
*/
public static boolean isNegativeTransient(int reply) {
-return (reply = 400 reply 500);
+return FTPReply.isNegativeTransient(reply);
}
/**
@@ -126,6 +130,6 @@
* false if not.
*/
public static boolean isNegativePermanent(int reply) {
-return (reply = 500 reply 600);
+return FTPReply.isNegativePermanent(reply);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r438209 - in /jakarta/commons/proper/io/trunk: RELEASE-NOTES.txt src/java/org/apache/commons/io/FileSystemUtils.java src/test/org/apache/commons/io/FileSystemUtilsTestCase.java
Author: scolebourne
Date: Tue Aug 29 13:54:47 2006
New Revision: 438209
URL: http://svn.apache.org/viewvc?rev=438209view=rev
Log:
IO-91 - FileSystemUtils.freeSpace deprecated, replaced by freeSpaceKb
Document freeSpace not working with SunOS 5
info from Magnus Grimsell
Modified:
jakarta/commons/proper/io/trunk/RELEASE-NOTES.txt
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileSystemUtils.java
jakarta/commons/proper/io/trunk/src/test/org/apache/commons/io/FileSystemUtilsTestCase.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=438209r1=438208r2=438209view=diff
==
--- jakarta/commons/proper/io/trunk/RELEASE-NOTES.txt (original)
+++ jakarta/commons/proper/io/trunk/RELEASE-NOTES.txt Tue Aug 29 13:54:47 2006
@@ -29,6 +29,12 @@
- WildcardFilter deprecated, replaced by WildcardFileFilter
- old class only accepted files, thus had a confusing dual purpose
+- FileSystemUtils.freeSpace deprecated, replaced by freeSpaceKb
+ - freeSpace returns a result that varies by operating system and
+thus isn't that useful
+ - freeSpaceKb returns much better and more consistent results
+ - freeSpaceKb existed in v1.2, so this is a gentle cutover
+
Bug fixes from 1.2
--
@@ -41,6 +47,9 @@
- FileSystemUtils.freeSpace/freeSpaceKb [IO-90]
- Avoid infinite looping in Windows
- Catch more errors with nice messages
+
+- FileSystemUtils.freeSpace [IO-91]
+ - This is now documented not to work on SunOS 5
Enhancements from 1.2
Modified:
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileSystemUtils.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileSystemUtils.java?rev=438209r1=438208r2=438209view=diff
==
---
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileSystemUtils.java
(original)
+++
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileSystemUtils.java
Tue Aug 29 13:54:47 2006
@@ -110,11 +110,11 @@
* the command line.
* This method does not normalize the result, and typically returns
* bytes on Windows, 512 byte units on OS X and kilobytes on Unix.
+ * As this is not very useful, this method is deprecated in favour
+ * of [EMAIL PROTECTED] #freeSpaceKb(String)} which returns a result in
kilobytes.
* p
- * See also [EMAIL PROTECTED] #freeSpaceKb(String)} for a better
implementation
- * which normalizes to kilobytes.
- * p
- * Note that some OS's are NOT currently supported, including OS/390.
+ * Note that some OS's are NOT currently supported, including OS/390
+ * and SunOS 5. (SunOS is supported by codefreeSpaceKb/code.)
* pre
* FileSystemUtils.freeSpace(C:); // Windows
* FileSystemUtils.freeSpace(/volume); // *nix
@@ -127,6 +127,9 @@
* @throws IllegalArgumentException if the path is invalid
* @throws IllegalStateException if an error occurred in initialisation
* @throws IOException if an error occurs when finding the free space
+ * @since Commons IO 1.1, enhanced OS support in 1.2 and 1.3
+ * @deprecated Use freeSpaceKb(String)
+ * Deprecated from 1.3, may be removed in 2.0
*/
public static long freeSpace(String path) throws IOException {
return INSTANCE.freeSpaceOS(path, OS, false);
@@ -136,20 +139,26 @@
/**
* Returns the free space on a drive or volume in kilobytes by invoking
* the command line.
- * Note that some OS's are NOT currently supported, including OS/390.
* pre
* FileSystemUtils.freeSpaceKb(C:); // Windows
* FileSystemUtils.freeSpaceKb(/volume); // *nix
* /pre
* The free space is calculated via the command line.
* It uses 'dir /-c' on Windows, 'df -kP' on AIX/HP-UX and 'df -k' on
other Unix.
+ * p
+ * In order to work, you must be running Windows, or have a implementation
of
+ * Unix df that supports GNU format when passed -k (or -kP). If you are
going
+ * to rely on this code, please check that it works on your OS by running
+ * some simple tests to compare the command line with the output from this
class.
+ * If your operating system isn't supported, please raise a JIRA call
detailing
+ * the exact result from df -k and as much other detail as possible,
thanks.
*
* @param path the path to get free space for, not null, not empty on Unix
* @return the amount of free drive space on the drive or volume in
kilobytes
* @throws IllegalArgumentException if the path is invalid
* @throws IllegalStateException if an error occurred in initialisation
* @throws IOException if an error occurs when finding the free space
- *
svn commit: r438210 - in /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp: FTPSClient.java FTPSTrustManager.java
Author: rwinston
Date: Tue Aug 29 13:56:17 2006
New Revision: 438210
URL: http://svn.apache.org/viewvc?rev=438210view=rev
Log: (empty)
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java?rev=438210r1=438209r2=438210view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Tue Aug 29 13:56:17 2006
@@ -31,6 +31,8 @@
/**
* FTP over SSL processing.
+ *
+ * @version $Id$
*/
public class FTPSClient extends FTPClient {
@@ -122,8 +124,6 @@
context = SSLContext.getInstance(protocol);
}
-
-
/**
* Set AUTH command use value.
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java?rev=438210r1=438209r2=438210view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java
Tue Aug 29 13:56:17 2006
@@ -18,10 +18,20 @@
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
+import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
+/**
+ * Custom [EMAIL PROTECTED] TrustManager} implementation.
+ *
+ * @version $Id$
+ *
+ */
public class FTPSTrustManager implements X509TrustManager
{
+ /**
+* No-op
+*/
public void checkClientTrusted(X509Certificate[] certificates, String
authType)
{
return;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Closed: (IO-91) FileSystemUtils.freeSpace does not work on Sun Solaris
[ http://issues.apache.org/jira/browse/IO-91?page=all ] Stephen Colebourne closed IO-91. Resolution: Fixed - FileSystemUtils.freeSpace deprecated, replaced by freeSpaceKb - freeSpace returns a result that varies by operating system and thus isn't that useful - freeSpaceKb returns much better and more consistent results - freeSpaceKb existed in v1.2, so this is a gentle cutover - FileSystemUtils.freeSpace [IO-91] - This is now documented not to work on SunOS 5 FileSystemUtils.freeSpace does not work on Sun Solaris -- Key: IO-91 URL: http://issues.apache.org/jira/browse/IO-91 Project: Commons IO Issue Type: Bug Components: Utilities Affects Versions: 1.2 Environment: SunOS et 5.10 Generic_118822-25 sun4u sparc SUNW,Ultra-4 SunOS alien 5.8 Generic_111433-02 sun4u sparc SUNW,Ultra-4 Reporter: Magnus Grimsell Fix For: 1.3 The method FileSystemUtils.freeSpace does not work on Sun Solaris. [junit] Testcase: testGetFreeSpace_String took 0.216 sec [junit] Caused an ERROR [junit] Command line 'df' did not return info as expected for path '/'- response on first line was '/ (/dev/dsk/c0t0d0s0 ):41676304 block 3133314 filer' [junit] java.io.IOException: Command line 'df' did not return info as expected for path '/'- response on first line was '/ (/dev/dsk/c0t0d0s0 ):41676304 block 3133314 filer' [junit] at org.apache.commons.io.FileSystemUtils.freeSpaceUnix(FileSystemUtils.java:315) [junit] at org.apache.commons.io.FileSystemUtils.freeSpaceOS(FileSystemUtils.java:179) [junit] at org.apache.commons.io.FileSystemUtils.freeSpace(FileSystemUtils.java:126) [junit] at org.apache.commons.io.FileSystemUtilsTestCase.testGetFreeSpace_String(FileSystemUtilsTestCase.java:90) This is because on Solaris the df command work different if the flag -k is used or not: $ df / / (/dev/dsk/c0t1d0s0 ): 1070402 blocks 294205 files $ df -k / Filesystemkbytesused avail capacity Mounted on /dev/dsk/c0t1d0s01350955 815754 48116363%/ I haven't found any flag that makes it output GNU format even when -k is omitted. -- 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]
svn commit: r438215 - /jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Author: rwinston
Date: Tue Aug 29 14:11:12 2006
New Revision: 438215
URL: http://svn.apache.org/viewvc?rev=438215view=rev
Log:
Props change
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
(contents, props changed)
Modified:
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java?rev=438215r1=438214r2=438215view=diff
==
---
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
(original)
+++
jakarta/commons/proper/net/branches/JDK_1_5_BRANCH/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
Tue Aug 29 14:11:12 2006
@@ -1,455 +1,456 @@
-/**
- *
- * 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.
- */
-package org.apache.commons.net.ftp;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.Socket;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-
-/**
- * FTP over SSL processing.
- *
- * @version $Id$
- */
-public class FTPSClient extends FTPClient {
-
-/** keystore algorithm name. */
-public static String KEYSTORE_ALGORITHM;
-/** truststore algorithm name. */
-public static String TRUSTSTORE_ALGORITHM;
-/** provider name. */
-public static String PROVIDER;
-/** truststore type. */
-public static String STORE_TYPE;
-
-/** The value that I can set in PROT command */
-private static final String[] PROT_COMMAND_VALUE = {C,E,S,P};
-/** Default PROT Command */
-private static final String DEFAULT_PROT = C;
-/** Default protocol name */
-private static final String DEFAULT_PROTOCOL = TLS;
-
-/** The security mode. (True - Implicit Mode / False - Explicit Mode) */
-private boolean isImplicit;
-/** The use SSL/TLS protocol. */
-private String protocol = DEFAULT_PROTOCOL;
-/** The AUTH Command value */
-private String auth = DEFAULT_PROTOCOL;
-/** The context object. */
-private SSLContext context;
-/** The socket object. */
-private Socket planeSocket;
-/** The established socket flag. */
-private boolean isCreation = true;
-/** The use client mode flag. */
-private boolean isClientMode = true;
-/** The need client auth flag. */
-private boolean isNeedClientAuth = false;
-/** The want client auth flag. */
-private boolean isWantClientAuth = false;
-/** The cipher suites */
-private String[] suites = null;
-/** The protocol versions */
-private String[] protocols = null;
-
-/**
- * Constructor for FTPSClient.
- * @throws NoSuchAlgorithmException A requested cryptographic algorithm
- * is not available in the environment.
- */
-public FTPSClient() throws NoSuchAlgorithmException {
-this.protocol = DEFAULT_PROTOCOL;
-this.isImplicit = false;
-context = SSLContext.getInstance(protocol);
-}
-
-/**
- * Constructor for FTPSClient.
- * @param isImplicit The secutiry mode(Implicit/Explicit).
- * @throws NoSuchAlgorithmException A requested cryptographic algorithm
- * is not available in the environment.
- */
-public FTPSClient(boolean isImplicit) throws NoSuchAlgorithmException {
-this.protocol = DEFAULT_PROTOCOL;
-this.isImplicit = isImplicit;
-context = SSLContext.getInstance(protocol);
-}
-
-/**
- * Constructor for FTPSClient.
- * @param conType The context type
- * @throws NoSuchAlgorithmException A requested cryptographic algorithm
- * is not available in the environment.
- */
-public FTPSClient(String protocol) throws NoSuchAlgorithmException {
-this.protocol = protocol;
-this.isImplicit = false;
-context = SSLContext.getInstance(protocol);
-}
-
-/**
- * Constructor for FTPSClient.
- * @param conType The context type
- * @param
svn commit: r438218 - in /jakarta/commons/proper/io/trunk/src: java/org/apache/commons/io/DirectoryWalker.java test/org/apache/commons/io/DirectoryWalkerTestCase.java
Author: scolebourne
Date: Tue Aug 29 14:15:11 2006
New Revision: 438218
URL: http://svn.apache.org/viewvc?rev=438218view=rev
Log:
Separate handleDirectory from handleDirectoryStart
Modified:
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/DirectoryWalker.java
jakarta/commons/proper/io/trunk/src/test/org/apache/commons/io/DirectoryWalkerTestCase.java
Modified:
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/DirectoryWalker.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/DirectoryWalker.java?rev=438218r1=438217r2=438218view=diff
==
---
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/DirectoryWalker.java
(original)
+++
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/DirectoryWalker.java
Tue Aug 29 14:15:11 2006
@@ -91,7 +91,7 @@
//---
/**
- * Internal method that walks the directory hierarchy.
+ * Internal method that walks the directory hierarchy in a depth-first
manner.
* p
* Most users of this class do not need to call this method. This method
will
* be called automatically by another (public) method on the specific
subclass.
@@ -117,13 +117,13 @@
* @param results the collection of result objects, may be updated
*/
private void walk(File directory, int depth, Collection results) {
-boolean process = handleDirectoryStart(directory, depth, results);
-if (process) {
+if (handleDirectory(directory, depth, results)) {
+handleDirectoryStart(directory, depth, results);
int childDepth = depth + 1;
if (depthLimit 0 || childDepth = depthLimit) {
File[] files = (filter == null ? directory.listFiles() :
directory.listFiles(filter));
if (files == null) {
-handleRestricted(directory);
+handleRestricted(directory, results);
} else {
for (int i = 0; i files.length; i++) {
if (files[i].isDirectory()) {
@@ -152,12 +152,11 @@
}
/**
- * Overridable callback method invoked at the start of processing each
directory.
+ * Overridable callback method invoked to determine if a directory should
be processed.
* p
- * This method returns a boolean to indicate if the directory should be
examined
- * or not. If you return false, the next event received will be the
- * [EMAIL PROTECTED] #handleDirectoryEnd} for that directory. Note that
this functionality
- * is in addition to the filtering by file filter.
+ * This method returns a boolean to indicate if the directory should be
examined or not.
+ * If you return false, the entire directory and any subdirectories will
be skipped.
+ * Note that this functionality is in addition to the filtering by file
filter.
* p
* This implementation does nothing and returns true.
*
@@ -166,12 +165,25 @@
* @param results the collection of result objects, may be updated
* @return true to process this directory, false to skip this directory
*/
-protected boolean handleDirectoryStart(File directory, int depth,
Collection results) {
+protected boolean handleDirectory(File directory, int depth, Collection
results) {
// do nothing - overridable by subclass
return true;
}
/**
+ * Overridable callback method invoked at the start of processing each
directory.
+ * p
+ * This implementation does nothing.
+ *
+ * @param directory the current directory being processed
+ * @param depth the current directory level (starting directory = 0)
+ * @param results the collection of result objects, may be updated
+ */
+protected void handleDirectoryStart(File directory, int depth, Collection
results) {
+// do nothing - overridable by subclass
+}
+
+/**
* Overridable callback method invoked for each (non-directory) file.
* p
* This implementation does nothing.
@@ -186,10 +198,13 @@
/**
* Overridable callback method invoked for each restricted directory.
+ * p
+ * This implementation does nothing.
*
* @param directory the restricted directory
+ * @param results the collection of result objects, may be updated
*/
-protected void handleRestricted(File directory) {
+protected void handleRestricted(File directory, Collection results) {
// do nothing - overridable by subclass
}
@@ -198,9 +213,9 @@
* p
* This implementation does nothing.
*
- * @param directory The directory being processed
- * @param depth The directory level (starting directory = 0)
- * @param results The collection of files found.
[jira] Commented: (CODEC-8) REQ: Streaming codecs
[
http://issues.apache.org/jira/browse/CODEC-8?page=comments#action_12431380 ]
Jochen Wiedmann commented on CODEC-8:
-
Remi Arntzen wrote:
As far as I can tell the ws-common-utils Base64 streams are only output
streams for encoding and decoding.
Please note the Encoder and Decoder classes. All other objects and methods (for
example the EncoderOutputStream or the SAXEncoder) are derived via subclassing
or composition from these objects.
REQ: Streaming codecs
-
Key: CODEC-8
URL: http://issues.apache.org/jira/browse/CODEC-8
Project: Commons Codec
Issue Type: Bug
Affects Versions: 1.2
Environment: Operating System: All
Platform: All
Reporter: Sergei S. Ivanov
Attachments: Base64.diff
I would really appreciate if, for example, Base64 encoder could operate on
streams. One reason is that it's much easier to attach ByteArrayInputStream to
an array of bytes that to copy a byte array into a stream. The other reason is
greater flexibility, given by the streams.
I'd suggest creating a pair of new interfaces:
public interface StreamingDecoder implements Decoder {
public void decode(InputStream in, OutputStream out) throws
DecoderException;
}
public interface StreamingEncoder implements Encoder {
public void encode(InputStream in, OutputStream out) throws
EncoderException;
}
Base64 and Hex will then be able to implement these interfaces.
--
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]
svn commit: r438239 - /jakarta/commons/proper/commons-build/trunk/commons_nightly.sh
Author: psteitz
Date: Tue Aug 29 14:47:13 2006
New Revision: 438239
URL: http://svn.apache.org/viewvc?rev=438239view=rev
Log:
Added maven 2 support.
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=438239r1=438238r2=438239view=diff
==
--- jakarta/commons/proper/commons-build/trunk/commons_nightly.sh (original)
+++ jakarta/commons/proper/commons-build/trunk/commons_nightly.sh Tue Aug 29
14:47:13 2006
@@ -3,19 +3,23 @@
# Jakarta Commons Nightly Build
#
# Executes svn up and then ant clean dist for all of the
-# components in $nightly_list_location/nightly_proper_ant_list.txt
-# and maven clean dist for those in
-# $nightly_list_location/nightly_proper_maven_list.txt.
+# components in $nightly_list_location/nightly_proper_ant_list.txt,
+# maven clean dist for those in
+# $nightly_list_location/nightly_proper_maven_list.txt and
+# mvn assembly:assembly -DdescriptorId=bin (then src) for components in
+# $nightly_list_location/nightly_proper_maven2_list.txt
# Similarly for sandbox components from the *_sandbox_* lists.
#
# Uses scp to upload resulting .zip and .tar.gz files to
# [EMAIL PROTECTED]:$deploy_location/commons-$component
#
-# Deploys dated snapshot jars for the maven components to
-# $maven_snapshot_host:$maven_snapshot_directory
+# Deploys dated snapshot jars for the maven 1 components to
+# $maven_snapshot_host:$maven_snapshot_directory and uses
+# mvn deploy to deploy maven 2 jars to the snapshot repo configured
+# in the pom.
#
# Names of distro files take the form
-# commons-$component-src-$time_stamp (source)
+# commons-$component-$time_stamp-src (source)
# commons-$component-$time_stamp (binaries)
#
# (Over-)writes a log for each component build to $log_location/$component.log
@@ -45,22 +49,31 @@
log_url=http://people.apache.org/~psteitz/commons-nightlies
[EMAIL PROTECTED]
#==
+# Function definitions
+#==
+# Check to make sure current component checkout exists locally and if it is
+# missing, execute svn up from the current root
+#==
+verify_checkout() {
+ if [ ! -e ${current_root}/${component} ] # Check if checkout exists.
+ then
+echo $component checkout is missing.
+echo Updating top level checkout...
+cd $current_root
+svn up
+ fi
+}
+#==
# Process maven components in $components list.
# Assumes $components are checked out with common root, $current_root
#==
process_maven_components() {
for component in $components
do
-if [ ! -e ${current_root}/${component} ] # Check if checkout exists.
-then
- echo $component checkout is missing.
- echo Updating top level checkout...
- cd $current_root
- svn up
-fi
+verify_checkout
cd ${current_root}/${component}
echo
-echo Using Maven to build $component
+echo Using Maven 1 to build $component
svn up
# Create distro, overriding version name with timestamp
@@ -113,19 +126,61 @@
done
}
#==
+# Process maven 2 components in $components list.
+# Assumes $components are checked out with common root, $current_root
+#==
+process_maven2_components() {
+ for component in $components
+ do
+verify_checkout
+cd ${current_root}/${component}
+echo
+echo Using Maven 2 to build $component
+svn up
+
+# Create source and binary distributions
+mvn clean
+mvn assembly:assembly -DdescriptorId=bin $log_location/$component.log
21
+mvn assembly:assembly -DdescriptorId=src
+# 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
+mv target/commons-$component*bin.zip
target/commons-$component-$time_stamp.zip
+mv target/commons-$component*src.zip
target/commons-$component-$time_stamp-src.zip
+
+# Deploy source and binary distro to commons nightly location
+ssh $deploy_host mkdir -p $deploy_location/commons-$component
+scp target/distributions/commons-$component*.gz \
+[EMAIL PROTECTED]:$deploy_location/commons-$component
+scp target/distributions/commons-$component*.zip \
+[EMAIL PROTECTED]:$deploy_location/commons-$component
+
svn commit: r438281 - in /jakarta/commons/proper/io/trunk: RELEASE-NOTES.txt project.xml src/java/org/apache/commons/io/FileUtils.java src/test/org/apache/commons/io/FileUtilsTestCase.java
Author: scolebourne
Date: Tue Aug 29 16:05:22 2006
New Revision: 438281
URL: http://svn.apache.org/viewvc?rev=438281view=rev
Log:
IO-54 - Add FileUtils.checksum / FileUtils.checksumCRC32 to simplify
calculating checksums
from Emmanuel Bourg
Modified:
jakarta/commons/proper/io/trunk/RELEASE-NOTES.txt
jakarta/commons/proper/io/trunk/project.xml
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileUtils.java
jakarta/commons/proper/io/trunk/src/test/org/apache/commons/io/FileUtilsTestCase.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=438281r1=438280r2=438281view=diff
==
--- jakarta/commons/proper/io/trunk/RELEASE-NOTES.txt (original)
+++ jakarta/commons/proper/io/trunk/RELEASE-NOTES.txt Tue Aug 29 16:05:22 2006
@@ -110,6 +110,8 @@
- 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/project.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/io/trunk/project.xml?rev=438281r1=438280r2=438281view=diff
==
--- jakarta/commons/proper/io/trunk/project.xml (original)
+++ jakarta/commons/proper/io/trunk/project.xml Tue Aug 29 16:05:22 2006
@@ -187,6 +187,9 @@
nameNathan Beyer/name
/contributor
contributor
+ nameEmmanuel Bourg/name
+/contributor
+contributor
nameChris Eldredge/name
/contributor
contributor
Modified:
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileUtils.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileUtils.java?rev=438281r1=438280r2=438281view=diff
==
---
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileUtils.java
(original)
+++
jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/FileUtils.java
Tue Aug 29 16:05:22 2006
@@ -30,6 +30,9 @@
import java.util.Date;
import java.util.Iterator;
import java.util.List;
+import java.util.zip.CRC32;
+import java.util.zip.CheckedInputStream;
+import java.util.zip.Checksum;
import org.apache.commons.io.filefilter.DirectoryFileFilter;
import org.apache.commons.io.filefilter.FalseFileFilter;
@@ -37,6 +40,7 @@
import org.apache.commons.io.filefilter.IOFileFilter;
import org.apache.commons.io.filefilter.SuffixFileFilter;
import org.apache.commons.io.filefilter.TrueFileFilter;
+import org.apache.commons.io.output.NullOutputStream;
/**
* General file manipulation utilities.
@@ -52,6 +56,7 @@
* lilisting files and directories by filter and extension
* licomparing file content
* lifile last changed date
+ * licalculating a checksum
* /ul
* p
* Origin of code: Excalibur, Alexandria, Commons-Utils
@@ -1358,4 +1363,53 @@
}
return file.lastModified() timeMillis;
}
+
+//---
+/**
+ * Computes the checksum of a file using the CRC32 checksum routine.
+ * The value of the checksum is returned.
+ *
+ * @param file the file to checksum, not null
+ * @param checksum the checksum object to be used, not null
+ * @return the checksum value
+ * @throws NullPointerException if the file or checksum is null
+ * @throws IllegalArgumentException if the file is a directory
+ * @since Commons IO 1.3
+ */
+public static long checksumCRC32(File file) throws IOException {
+CRC32 crc = new CRC32();
+checksum(file, crc);
+return crc.getValue();
+}
+
+/**
+ * Computes the checksum of a file using the specified checksum object.
+ * Multiple files may be checked using one codeChecksum/code instance
+ * if desired simply by reusing the same checksum object.
+ * For example:
+ * pre
+ * long csum = FileUtils.checksum(file, new CRC32()).getValue();
+ * /pre
+ *
+ * @param file the file to checksum, not null
+ * @param checksum the checksum object to be used, not null
+ * @return the checksum specified, updated with the content of the file
+ * @throws NullPointerException if the file or checksum is null
+ * @throws IllegalArgumentException if the file is a directory
+ * @since Commons IO 1.3
+ */
+public static Checksum checksum(File file, Checksum checksum) throws
IOException {
+if (file.isDirectory()) {
+throw new IllegalArgumentException(Checksums can't be computed on
directories);
+}
+InputStream in = null;
+try {
+in = new
[jira] Closed: (IO-54) [io] File checksum
[ http://issues.apache.org/jira/browse/IO-54?page=all ] Stephen Colebourne closed IO-54. Resolution: Fixed Assignee: Stephen Colebourne Add FileUtils.checksum / FileUtils.checksumCRC32 to simplify calculating checksums [io] File checksum -- Key: IO-54 URL: http://issues.apache.org/jira/browse/IO-54 Project: Commons IO Issue Type: Improvement Components: Utilities Environment: Operating System: other Platform: Other Reporter: Emmanuel Bourg Assigned To: Stephen Colebourne Priority: Minor Fix For: 1.3 Attachments: checksum.patch, checksum.patch This is a RFE to add a method to compute checksums in FileUtils. -- 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]
[VOTE] Release Commons JEXL 1.1
This is a vote for releasing Commons JEXL 1.1 based on RC1. RC1 has been available for more than two weeks. It (with release notes, code signing keys, site etc.) is here: http://people.apache.org/~rahul/commons/jexl/ --- [ ] +1 I support this release [ ] +0 [ ] -0 [ ] -1 I oppose this release because... Vote will close no sooner than Wednesday September 6th, 5 PM EST (i.e. New York time) -- a little longer, since I'm away this Friday through Tuesday. -Rahul - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [all][maven 2 configuration]
It's a valid point. Unfortunately, build profiles can't be used for the distributionManagement section at the moment. I believe the solution to this really needs to be server side controls on the repository which we are definitely working on. I'm not sure what we can do on the client side other than education at the moment. - Brett On 30/08/2006, at 4:44 AM, Phil Steitz wrote: I have one more question / concern with the current setup. Currently, we are inheriting the distributionManagement config from the apache POM. This seems good and reasonable, except that that parent defines both apache.snapshots and apache.releases and points to the ibiblio synched repo for releases. That is again good and natural, but what I am afraid of is what happens when someone mistakenly changes a version not to end in -SNAPSHOT and then does mvn deploy (or they check in the change and the nightlies do it). Since (I think) the releases repo lives on the same box (people.apache.org) that the snapshot one does, authentication will be the same and deployment will go to the rsynched repo. Isn't this dangerous? Should we override the distributionManagement section to null out the releases section and create a build profile for releases that has to be explicitly triggered on the command line? Will that work? (i.e., will m2 just merge it in anyway?). In m1, we handled this with build properties. What is the right m2 way to handle this? I am afraid that the poms I checked in yesterday do not handle the risk of accidental deployment correctly. Phil - 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]
Re: [all][maven 2 configuration]
On 8/29/06, Brett Porter [EMAIL PROTECTED] wrote: It's a valid point. Unfortunately, build profiles can't be used for the distributionManagement section at the moment. Hmm...the introduction-to-profiles.html doc seems to suggest that if you do it inline (in the POM), you can specify distributionManagement in a profile. Is this an error in the docs, or am I misunderstanding something? Phil I believe the solution to this really needs to be server side controls on the repository which we are definitely working on. I'm not sure what we can do on the client side other than education at the moment. - Brett On 30/08/2006, at 4:44 AM, Phil Steitz wrote: I have one more question / concern with the current setup. Currently, we are inheriting the distributionManagement config from the apache POM. This seems good and reasonable, except that that parent defines both apache.snapshots and apache.releases and points to the ibiblio synched repo for releases. That is again good and natural, but what I am afraid of is what happens when someone mistakenly changes a version not to end in -SNAPSHOT and then does mvn deploy (or they check in the change and the nightlies do it). Since (I think) the releases repo lives on the same box (people.apache.org) that the snapshot one does, authentication will be the same and deployment will go to the rsynched repo. Isn't this dangerous? Should we override the distributionManagement section to null out the releases section and create a build profile for releases that has to be explicitly triggered on the command line? Will that work? (i.e., will m2 just merge it in anyway?). In m1, we handled this with build properties. What is the right m2 way to handle this? I am afraid that the poms I checked in yesterday do not handle the risk of accidental deployment correctly. Phil - 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] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [all][maven 2 configuration]
It's either an error in the docs, or my memory is failing me :) On 30/08/2006, at 1:40 PM, Phil Steitz wrote: On 8/29/06, Brett Porter [EMAIL PROTECTED] wrote: It's a valid point. Unfortunately, build profiles can't be used for the distributionManagement section at the moment. Hmm...the introduction-to-profiles.html doc seems to suggest that if you do it inline (in the POM), you can specify distributionManagement in a profile. Is this an error in the docs, or am I misunderstanding something? Phil I believe the solution to this really needs to be server side controls on the repository which we are definitely working on. I'm not sure what we can do on the client side other than education at the moment. - Brett On 30/08/2006, at 4:44 AM, Phil Steitz wrote: I have one more question / concern with the current setup. Currently, we are inheriting the distributionManagement config from the apache POM. This seems good and reasonable, except that that parent defines both apache.snapshots and apache.releases and points to the ibiblio synched repo for releases. That is again good and natural, but what I am afraid of is what happens when someone mistakenly changes a version not to end in -SNAPSHOT and then does mvn deploy (or they check in the change and the nightlies do it). Since (I think) the releases repo lives on the same box (people.apache.org) that the snapshot one does, authentication will be the same and deployment will go to the rsynched repo. Isn't this dangerous? Should we override the distributionManagement section to null out the releases section and create a build profile for releases that has to be explicitly triggered on the command line? Will that work? (i.e., will m2 just merge it in anyway?). In m1, we handled this with build properties. What is the right m2 way to handle this? I am afraid that the poms I checked in yesterday do not handle the risk of accidental deployment correctly. Phil - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: commons-dev- [EMAIL PROTECTED] - 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] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: License rework svn commit: r437567 [1/2] - in /jakarta/commons/proper/io/trunk: ./ src/java/org/apache/commons/io/ src/java/org/apache/commons/io/filefilter/ src/java/org/apache/commons/io/input/
On 8/28/06, Stephen Colebourne [EMAIL PROTECTED] wrote: I think it happened where the copyright dates were in the format 2002,2004-2006 rather than just 2004-2006 Does the script need tweaking? Probably, it missed a bunch of files in each project for some reason. I was short-term lazy and just fixed them by hand. Thanks for catching those. Hen - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r438353 - /jakarta/commons/proper/attributes/trunk/api/src/java/org/apache/commons/attributes/SealedAttributeException.java
Author: bayard
Date: Tue Aug 29 21:32:35 2006
New Revision: 438353
URL: http://svn.apache.org/viewvc?rev=438353view=rev
Log:
Fixed indentation
Modified:
jakarta/commons/proper/attributes/trunk/api/src/java/org/apache/commons/attributes/SealedAttributeException.java
Modified:
jakarta/commons/proper/attributes/trunk/api/src/java/org/apache/commons/attributes/SealedAttributeException.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/attributes/trunk/api/src/java/org/apache/commons/attributes/SealedAttributeException.java?rev=438353r1=438352r2=438353view=diff
==
---
jakarta/commons/proper/attributes/trunk/api/src/java/org/apache/commons/attributes/SealedAttributeException.java
(original)
+++
jakarta/commons/proper/attributes/trunk/api/src/java/org/apache/commons/attributes/SealedAttributeException.java
Tue Aug 29 21:32:35 2006
@@ -1,19 +1,19 @@
-/*
- * Copyright 2003-2004 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.
- */
-package org.apache.commons.attributes;
+/*
+ * Copyright 2003-2004 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.
+ */
+package org.apache.commons.attributes;
import java.util.Iterator;
import java.util.List;
@@ -30,4 +30,4 @@
public SealedAttributeException () {
super (sealed);
}
-}
\ No newline at end of file
+}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r438354 [2/2] - in /jakarta/commons/proper/attributes/trunk: ./ api/src/java/org/apache/commons/attributes/ compiler/src/java/org/apache/commons/attributes/ compiler/src/java/org/apache/co
Modified: jakarta/commons/proper/attributes/trunk/unittest/src/test/org/apache/commons/attributes/test/samples/SuperSample.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/attributes/trunk/unittest/src/test/org/apache/commons/attributes/test/samples/SuperSample.java?rev=438354r1=438353r2=438354view=diff == --- jakarta/commons/proper/attributes/trunk/unittest/src/test/org/apache/commons/attributes/test/samples/SuperSample.java (original) +++ jakarta/commons/proper/attributes/trunk/unittest/src/test/org/apache/commons/attributes/test/samples/SuperSample.java Tue Aug 29 21:35:06 2006 @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004 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 + * 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 * Modified: jakarta/commons/proper/attributes/trunk/unittest/src/test/org/apache/commons/attributes/test/samples/ThreadSafe.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/attributes/trunk/unittest/src/test/org/apache/commons/attributes/test/samples/ThreadSafe.java?rev=438354r1=438353r2=438354view=diff == --- jakarta/commons/proper/attributes/trunk/unittest/src/test/org/apache/commons/attributes/test/samples/ThreadSafe.java (original) +++ jakarta/commons/proper/attributes/trunk/unittest/src/test/org/apache/commons/attributes/test/samples/ThreadSafe.java Tue Aug 29 21:35:06 2006 @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004 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 + * 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 * - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r438360 - in /jakarta/commons/proper/attributes/trunk: project.properties site/etc/maven_demo/project.properties site/project.xml unittest/project.properties
Author: bayard Date: Tue Aug 29 21:43:40 2006 New Revision: 438360 URL: http://svn.apache.org/viewvc?rev=438360view=rev Log: Removed ASF copyright, now found in NOTICE.txt Modified: jakarta/commons/proper/attributes/trunk/project.properties jakarta/commons/proper/attributes/trunk/site/etc/maven_demo/project.properties jakarta/commons/proper/attributes/trunk/site/project.xml jakarta/commons/proper/attributes/trunk/unittest/project.properties Modified: jakarta/commons/proper/attributes/trunk/project.properties URL: http://svn.apache.org/viewvc/jakarta/commons/proper/attributes/trunk/project.properties?rev=438360r1=438359r2=438360view=diff == --- jakarta/commons/proper/attributes/trunk/project.properties (original) +++ jakarta/commons/proper/attributes/trunk/project.properties Tue Aug 29 21:43:40 2006 @@ -1,16 +1,17 @@ -# Copyright 2003-2004 The Apache Software Foundation +# 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 # -# 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 # -# 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. +# 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. ## # Properties that override Maven build defaults Modified: jakarta/commons/proper/attributes/trunk/site/etc/maven_demo/project.properties URL: http://svn.apache.org/viewvc/jakarta/commons/proper/attributes/trunk/site/etc/maven_demo/project.properties?rev=438360r1=438359r2=438360view=diff == --- jakarta/commons/proper/attributes/trunk/site/etc/maven_demo/project.properties (original) +++ jakarta/commons/proper/attributes/trunk/site/etc/maven_demo/project.properties Tue Aug 29 21:43:40 2006 @@ -1,16 +1,17 @@ -# Copyright 2003-2004 The Apache Software Foundation +# 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 # -# 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 # -# 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. +# 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. ## # Properties that override Maven build defaults Modified: jakarta/commons/proper/attributes/trunk/site/project.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/attributes/trunk/site/project.xml?rev=438360r1=438359r2=438360view=diff == --- jakarta/commons/proper/attributes/trunk/site/project.xml (original) +++ jakarta/commons/proper/attributes/trunk/site/project.xml Tue Aug 29 21:43:40
svn commit: r438363 [4/4] - in /jakarta/commons/proper/beanutils/trunk: ./ optional/bean-collections/ optional/bean-collections/src/java/org/apache/commons/beanutils/ optional/bean-collections/src/tes
Modified: jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/converters/URLConverterTestCase.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/converters/URLConverterTestCase.java?rev=438363r1=438362r2=438363view=diff == --- jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/converters/URLConverterTestCase.java (original) +++ jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/converters/URLConverterTestCase.java Tue Aug 29 21:48:00 2006 @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004 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 + * 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 * Modified: jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java?rev=438363r1=438362r2=438363view=diff == --- jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java (original) +++ jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java Tue Aug 29 21:48:00 2006 @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004 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 + * 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 * Modified: jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/LocaleConvertTestSuite.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/LocaleConvertTestSuite.java?rev=438363r1=438362r2=438363view=diff == --- jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/LocaleConvertTestSuite.java (original) +++ jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/LocaleConvertTestSuite.java Tue Aug 29 21:48:00 2006 @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004 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 + * 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 * Modified: jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/LocaleConvertUtilsTestCase.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/LocaleConvertUtilsTestCase.java?rev=438363r1=438362r2=438363view=diff == --- jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/LocaleConvertUtilsTestCase.java (original) +++ jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/locale/LocaleConvertUtilsTestCase.java Tue Aug 29 21:48:00 2006 @@ -1,9 +1,10 @@ /* - * Copyright 2001-2004 The Apache Software Foundation. - *
Re: License rework svn commit: r437567 [1/2] - in /jakarta/commons/proper/io/trunk: ./ src/java/org/apache/commons/io/ src/java/org/apache/commons/io/filefilter/ src/java/org/apache/commons/io/input/
I think the script fails to hit ones of that form. It also fails to hit when there are an unexpected number of spaces in the header. I was fixing it by hand, so I bet the non-standard width is because I took my header from the html on the legal page and not from the script. Now I'm getting around things by fixing the format in the source so the copy2license.pl script works, so it shouldn't happen with new ones, but might exist in csv, finder, compress, lang and io. I'll go grepping. Hen On 8/28/06, Stephen Colebourne [EMAIL PROTECTED] wrote: I think it happened where the copyright dates were in the format 2002,2004-2006 rather than just 2004-2006 Does the script need tweaking? Stephen Stephen Colebourne wrote: Just a few files seem to have ended up with a different header. CopyUtils and HexDump in [io] for example. (The second half of the license has been reformatted onto shorter lines, making it less readable). Any idea whats going on? Stephen [EMAIL PROTECTED] wrote: jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/CopyUtils.java jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/HexDump.java ... Modified: jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/CopyUtils.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/CopyUtils.java?rev=437567r1=437566r2=437567view=diff == --- jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/CopyUtils.java (original) +++ jakarta/commons/proper/io/trunk/src/java/org/apache/commons/io/CopyUtils.java Sun Aug 27 23:39:07 2006 @@ -1,17 +1,20 @@ /* - * Copyright 2001-2004,2006 The Apache Software Foundation. + * 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 * - * 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 * - * 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. + * 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. */ package org.apache.commons.io; - 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] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r438366 - /jakarta/commons/proper/io/trunk/project.properties
Author: bayard Date: Tue Aug 29 21:54:57 2006 New Revision: 438366 URL: http://svn.apache.org/viewvc?rev=438366view=rev Log: Fixing the format of the license header Modified: jakarta/commons/proper/io/trunk/project.properties Modified: jakarta/commons/proper/io/trunk/project.properties URL: http://svn.apache.org/viewvc/jakarta/commons/proper/io/trunk/project.properties?rev=438366r1=438365r2=438366view=diff == --- jakarta/commons/proper/io/trunk/project.properties (original) +++ jakarta/commons/proper/io/trunk/project.properties Tue Aug 29 21:54:57 2006 @@ -1,19 +1,17 @@ -# 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 +# 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 +# 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. +# 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. maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r438367 - /jakarta/commons/sandbox/finder/trunk/project.properties
Author: bayard Date: Tue Aug 29 21:56:46 2006 New Revision: 438367 URL: http://svn.apache.org/viewvc?rev=438367view=rev Log: Fixing the format of the license header Modified: jakarta/commons/sandbox/finder/trunk/project.properties Modified: jakarta/commons/sandbox/finder/trunk/project.properties URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/finder/trunk/project.properties?rev=438367r1=438366r2=438367view=diff == --- jakarta/commons/sandbox/finder/trunk/project.properties (original) +++ jakarta/commons/sandbox/finder/trunk/project.properties Tue Aug 29 21:56:46 2006 @@ -1,19 +1,17 @@ -# 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 +# 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 +# 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. +# 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. maven.compile.source=1.2 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r438368 - /jakarta/commons/sandbox/csv/trunk/project.properties
Author: bayard Date: Tue Aug 29 21:58:16 2006 New Revision: 438368 URL: http://svn.apache.org/viewvc?rev=438368view=rev Log: Fixing the format of the license header Modified: jakarta/commons/sandbox/csv/trunk/project.properties Modified: jakarta/commons/sandbox/csv/trunk/project.properties URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/csv/trunk/project.properties?rev=438368r1=438367r2=438368view=diff == --- jakarta/commons/sandbox/csv/trunk/project.properties (original) +++ jakarta/commons/sandbox/csv/trunk/project.properties Tue Aug 29 21:58:16 2006 @@ -1,19 +1,17 @@ -# 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 +# 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 +# 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. +# 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. maven.compile.source=1.2 maven.compile.target=1.2 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r438369 - /jakarta/commons/sandbox/compress/trunk/project.properties
Author: bayard Date: Tue Aug 29 21:58:45 2006 New Revision: 438369 URL: http://svn.apache.org/viewvc?rev=438369view=rev Log: Fixing the format of the license header Modified: jakarta/commons/sandbox/compress/trunk/project.properties Modified: jakarta/commons/sandbox/compress/trunk/project.properties URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/compress/trunk/project.properties?rev=438369r1=438368r2=438369view=diff == --- jakarta/commons/sandbox/compress/trunk/project.properties (original) +++ jakarta/commons/sandbox/compress/trunk/project.properties Tue Aug 29 21:58:45 2006 @@ -1,19 +1,17 @@ -# 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 +# 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 +# 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. +# 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. maven.xdoc.jsl=../commons-build/commons-site.jsl maven.xdoc.date=bottom - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r438373 [9/9] - in /jakarta/commons/proper/betwixt/trunk: ./ src/java/org/apache/commons/betwixt/ src/java/org/apache/commons/betwixt/digester/ src/java/org/apache/commons/betwixt/expressi
Modified:
jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/VersioningTestData.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/VersioningTestData.java?rev=438373r1=438372r2=438373view=diff
==
---
jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/VersioningTestData.java
(original)
+++
jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/versioning/VersioningTestData.java
Tue Aug 29 22:17:21 2006
@@ -1,64 +1,65 @@
-/*
- * Copyright 2006 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.
- */
-package org.apache.commons.betwixt.versioning;
-
-/**
- * Holder for versioned test data.
- */
-public class VersioningTestData {
-private String attribute1;
-
-public String getAttribute1() {
-return attribute1;
-}
-
-public void setAttribute1(String attribute1) {
-this.attribute1 = attribute1;
-}
-
-
-private String attribute2;
-
-public String getAttribute2() {
-return attribute2;
-}
-
-public void setAttribute2(String attribute2) {
-this.attribute2 = attribute2;
-}
-
-
-private String element1;
-
-public String getElement1() {
-return element1;
-}
-
-public void setElement1(String element1) {
-this.element1 = element1;
-}
-
-
-private String element2;
-
-public String getElement2() {
-return element2;
-}
-
-public void setElement2(String element2) {
-this.element2 = element2;
-}
-}
+/*
+ * 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.
+ */
+package org.apache.commons.betwixt.versioning;
+
+/**
+ * Holder for versioned test data.
+ */
+public class VersioningTestData {
+private String attribute1;
+
+public String getAttribute1() {
+return attribute1;
+}
+
+public void setAttribute1(String attribute1) {
+this.attribute1 = attribute1;
+}
+
+
+private String attribute2;
+
+public String getAttribute2() {
+return attribute2;
+}
+
+public void setAttribute2(String attribute2) {
+this.attribute2 = attribute2;
+}
+
+
+private String element1;
+
+public String getElement1() {
+return element1;
+}
+
+public void setElement1(String element1) {
+this.element1 = element1;
+}
+
+
+private String element2;
+
+public String getElement2() {
+return element2;
+}
+
+public void setElement2(String element2) {
+this.element2 = element2;
+}
+}
Modified:
jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/xmlunit/TestXmlTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/xmlunit/TestXmlTestCase.java?rev=438373r1=438372r2=438373view=diff
==
---
jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/xmlunit/TestXmlTestCase.java
(original)
+++
jakarta/commons/proper/betwixt/trunk/src/test/org/apache/commons/betwixt/xmlunit/TestXmlTestCase.java
Tue Aug 29 22:17:21 2006
@@ -1,11 +1,12 @@
package org.apache.commons.betwixt.xmlunit;
/*
- * Copyright 2001-2004 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
+ * Licensed to the Apache
