RE: Commons Multipart, anyone?
Here is another project that could take advantage of MIME data: Fulcrum MIME component: http://jakarta.apache.org/turbine/fulcrum/fulcrum-mimetype/index.html Eric -Original Message- From: Mark R. Diggory [mailto:[EMAIL PROTECTED] Sent: Friday, January 09, 2004 9:08 PM To: Jakarta Commons Developers List Subject: Re: Commons Multipart, anyone? Here are a list of projects I think would benefit from a common codec for multipart mime encodings (capable of various mime types) or some sort of consolidation of Multipart Encoding into a Common codebase. Web Services: SOAP Web Services: XML-RPC Jakarta Commons: HttpClient Jakarta Commons: Net Jakarta Commons: FileUpload Jakarta: Struts If you can think of any other please include them. I thought this might also be of benefit to the Web Services folks because I know tools like Soap and XML-RPC send messages over both HTTP and SMTP and that there is work that needs to be done in these projects concerning multipart SMTP. -Mark Mark R. Diggory wrote: Tim O'Brien wrote: On Fri, 9 Jan 2004, Mark R. Diggory wrote: Martin Cooper wrote: On Fri, 9 Jan 2004, Mark R. Diggory wrote: I really like the model for handling multipart content currently maintained in HttpClients MultipartPost method. For the most part, your going to either have content in memory or in a file on the filesystem, generically wrapping any Part including references to a file in the filesystem allows one not to have to put it into memory and still process it into the Writer/Stream without the user really needing to manage it. http://jakarta.apache.org/commons/httpclient/xref/org/apache/c ommons/httpclient/methods/MultipartPostMethod.html http://jakarta.apache.org/commons/httpclient/xref/org/apache/c ommons/httpclient/methods/multipart/FilePart.html If there is a consideration to work on the SMTP implementation. This is an excellent approach to consider. Are Mutlipart Http Posts and Multipart SMPT messages encoded the same way or is the naming just a coincidence? They are both multipart MIME, but the specific MIME types are different. I think a Commons Multipart component would be very interesting. We already have multipart creation code in Commons HttpClient, and multipart parsing code in Commons FileUpload. Breaking these out into something like a Commons Multipart that could be used by both - and potentially by Commons Net in more comprehensive mail handling - would be great. I would be +1 on creating a Commons Multipart component, meaning that I am willing to put in some time and effort, if other people are interested in collaborating on such a beast. Anyone else? -- Martin Cooper If we're talking about Encoding/Decoding mutlipart MIME, arn't we really possibly talking about a common multipart MIME Codec that would possibly be housed in the codec project? Mark, +1, and anyone who feels like committing this code to codec is encouraged. Tim Most of the HttpClient encoding is in a static getParts method in o.a.c.h.methods.multipart.Part and in the individual send methods of the Part implmentation for HttpClient. -Mark p.s. I'm about +0.5 in terms of effort I can apply to this. (Sorry for crossposting this, trying to keep it on the dev list, please respond there.) -- Mark Diggory Software Developer Harvard MIT Data Center http://osprey.hmdc.harvard.edu - 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: Commons Multipart MIME?
I don't have a direct need for a MIME type component myself, but this certainly sounds widely popular and useful. I would however suggest starting in the sandbox with a dependency on [codec]. That way you'll have more freedom of design to start with, and not block releases of [codec]. You may find that once complete you merge the mime code into codec, or you may find not. But leave that decision until later. Stephen - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 26038] New: - IteratorChain - if first iterator empty, doesn't care about next ones.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26038. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26038 IteratorChain - if first iterator empty, doesn't care about next ones. Summary: IteratorChain - if first iterator empty, doesn't care about next ones. Product: Commons Version: 2.1 Final Platform: PC OS/Version: Linux Status: NEW Severity: Major Priority: Other Component: Collections AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] If first Iterator in IteratorChain is empty, and next ones contain some elements, first call to hasNext() on IteratorChain returns false. It should return true if there are elements in other Iterators. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 26038] - IteratorChain - if first iterator empty, doesn't care about next ones.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26038. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26038 IteratorChain - if first iterator empty, doesn't care about next ones. [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2004-01-10 14:35 --- Fixed in CVS already (duplicate report). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/net/src/test/org/apache/commons/net/ftp/parser VMSFTPEntryParserTest.java
scohen 2004/01/10 07:36:41
Modified:net/src/java/org/apache/commons/net/ftp FTPClient.java
FTPFileEntryParser.java FTPFileIterator.java
FTPFileList.java FTPFileListParserImpl.java
net/src/java/org/apache/commons/net/ftp/parser
VMSFTPEntryParser.java
net/src/test/org/apache/commons/net/ftp/parser
VMSFTPEntryParserTest.java
Added: net/src/java/org/apache/commons/net/ftp/parser
VMSVersioningFTPEntryParser.java
Log:
Solve the VMSVersioning problem a different way. Created new subclass of
VMSFTPEntryParser, VMSVersioningFTPEntryParser, and rollback many other changes of the
last few days which no longer were necessary. This implementation is a much simpler
solution to this problem and will allow for the smooth removal of the deprecated
FTPFileListParser interface in 2.0.
Revision ChangesPath
1.26 +3 -3
jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPClient.java
Index: FTPClient.java
===
RCS file:
/home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPClient.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- FTPClient.java9 Jan 2004 09:07:03 - 1.25
+++ FTPClient.java10 Jan 2004 15:36:40 - 1.26
@@ -2268,7 +2268,7 @@
*FTPClient f=FTPClient();
*f.connect(server);
*f.login(username, password);
- *FTPFileList list = createFTPFileList(directory, parser);
+ *FTPFileList list = f.createFileList(directory, parser);
*FTPFileIterator iter = list.iterator();
*
*while (iter.hasNext()) {
@@ -2333,13 +2333,13 @@
return null;
}
-FTPFileList list =
-parser.createFTPFileList(socket.getInputStream());
+FTPFileList list = FTPFileList.create(socket.getInputStream(), parser);
socket.close();
completePendingCommand();
+//return parser.removeDuplicates(list);
return list;
}
1.13 +14 -13
jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPFileEntryParser.java
Index: FTPFileEntryParser.java
===
RCS file:
/home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPFileEntryParser.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FTPFileEntryParser.java 9 Jan 2004 09:07:03 - 1.12
+++ FTPFileEntryParser.java 10 Jan 2004 15:36:40 - 1.13
@@ -80,7 +80,7 @@
*FTPClient f=FTPClient();
*f.connect(server);
*f.login(username, password);
- *FTPFileList list = createFTPFileList(directory, parser);
+ *FTPFileList list = f.createFileList(directory, parser);
*FTPFileIterator iter = list.iterator();
*
*while (iter.hasNext()) {
@@ -162,20 +162,21 @@
*/
String readNextEntry(BufferedReader reader) throws IOException;
+
/**
- * Creates an codeFTPFileList/code object from a stream containing
- * a file listing.
- *
- * @param stream The input stream created by reading the socket on which
- * the output of the LIST command was returned
+ * This method is a hook for those implementers (such as
+ * VMSVersioningFTPEntryParser, and possibly others) which return
+ * multiple files with the same name to remove the duplicates.
*
- * @return the codeFTPFileList/code created.
- * Will be null if the listing cannot be read from the stream.
- * @exception IOException
- * Thrown on any failure to read from the stream.
+ * Implementations for systems that do not allow duplicates will
+ * implement a NO-OP here.
+ *
+ * @param original Original list which may contain duplicates
+ *
+ * @return Original list purged of duplicates
*/
-public FTPFileList createFTPFileList(InputStream stream)
-throws IOException;
+FTPFileList removeDuplicates(FTPFileList original);
+
}
1.8 +225 -11
jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPFileIterator.java
Index: FTPFileIterator.java
===
RCS file:
/home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPFileIterator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FTPFileIterator.java 9 Jan 2004 09:07:03 - 1.7
+++ FTPFileIterator.java 10 Jan 2004 15:36:40 - 1.8
@@ -57,7 +57,6 @@
import java.util.Vector;
/**
- *
cvs commit: jakarta-commons/net/src/java/org/apache/commons/net/ftp DefaultFTPFileIterator.java DefaultFTPFileList.java
scohen 2004/01/10 07:42:16 Removed: net/src/java/org/apache/commons/net/ftp DefaultFTPFileIterator.java DefaultFTPFileList.java Log: removal of recently added files no longer needed because of most recent simplification. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/digester build.properties.sample project.properties project.xml
rdonkin 2004/01/10 07:43:06
Modified:digester build.properties.sample project.properties
project.xml
Log:
Modified maven build to add optional support for ssh-agents. Committers who wish to
use ssh-agents need to set maven.username and digester.cvs properties in their
build.properties file.
Revision ChangesPath
1.7 +8 -1 jakarta-commons/digester/build.properties.sample
Index: build.properties.sample
===
RCS file: /home/cvs/jakarta-commons/digester/build.properties.sample,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.properties.sample 18 Oct 2003 13:40:46 - 1.6
+++ build.properties.sample 10 Jan 2004 15:43:06 - 1.7
@@ -19,4 +19,11 @@
# which can often be confusing to new developers.
# This output is suppressed by default but can be re-enabled by
#suppressLogOutputDuringTests=false
-suppressLogOutputDuringTests=true
\ No newline at end of file
+suppressLogOutputDuringTests=true
+
+# Maven Properties
+#
+# Committers using agents may need to fill in and enable the following:
+#digester.cvs=scm:cvs:lserver:[EMAIL PROTECTED]:/home/cvs:jakarta-commons/digester/
+#maven.username=rdonkin
+
1.5 +2 -0 jakarta-commons/digester/project.properties
Index: project.properties
===
RCS file: /home/cvs/jakarta-commons/digester/project.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.properties2 Sep 2003 03:19:38 - 1.4
+++ project.properties10 Jan 2004 15:43:06 - 1.5
@@ -11,3 +11,5 @@
maven.xdoc.date=left
maven.xdoc.version=${pom.currentVersion}
maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html
+
+digester.cvs=pserver:[EMAIL PROTECTED]:/home/cvspublic
1.15 +5 -0 jakarta-commons/digester/project.xml
Index: project.xml
===
RCS file: /home/cvs/jakarta-commons/digester/project.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- project.xml 28 Oct 2003 21:53:09 - 1.14
+++ project.xml 10 Jan 2004 15:43:06 - 1.15
@@ -9,6 +9,11 @@
shortDescriptionRule based XML-Java object mapping module/shortDescription
descriptionThe Digester package lets you configure an XML-Java object mapping
module which triggers certain actions called rules whenever a particular pattern of
nested XML elements is recognized./description
+ repository
+connectionscm:cvs:${digester.cvs}:jakarta-commons/digester//connection
+urlhttp://cvs.apache.org/viewcvs/jakarta-commons/digester//url
+ /repository
+
versions
version
id1.5/id
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser EnterpriseUnixFTPEntryParser.java NTFTPEntryParser.java OS2FTPEntryParser.java UnixFTPEntryParser.java VMSFTPEntryParser.java VMSVersioningFTPEntryParser.java
scohen 2004/01/10 08:01:49
Modified:net/src/java/org/apache/commons/net/ftp/parser
EnterpriseUnixFTPEntryParser.java
NTFTPEntryParser.java OS2FTPEntryParser.java
UnixFTPEntryParser.java VMSFTPEntryParser.java
VMSVersioningFTPEntryParser.java
Added: net/src/java/org/apache/commons/net/ftp
FTPFileEntryParserImpl.java
Removed: net/src/java/org/apache/commons/net/ftp
FTPFileListParserImpl.java
Log:
Refactor - renamed FTPFileListParserImpl to FTPFileEntryParserImpl to get ready
for the eventual removal of FTPFileListParser in 2.0.
Revision ChangesPath
1.1
jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java
Index: FTPFileEntryParserImpl.java
===
package org.apache.commons.net.ftp;
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution,
*if any, must include the following acknowledgment:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowledgment may appear in the software itself,
*if and wherever such third-party acknowledgments normally appear.
*
* 4. The names Apache and Apache Software Foundation and
*Apache Commons must not be used to endorse or promote products
*derived from this software without prior written permission. For
*written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache,
*nor may Apache appear in their name, without
*prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*/
import java.io.InputStream;
import java.io.BufferedReader;
import java.io.IOException;
import java.util.ListIterator;
import org.apache.oro.text.regex.Pattern;
import org.apache.oro.text.regex.MalformedPatternException;
import org.apache.oro.text.regex.PatternMatcher;
import org.apache.oro.text.regex.Perl5Matcher;
import org.apache.oro.text.regex.Perl5Compiler;
import org.apache.oro.text.regex.MatchResult;
/**
* This abstract class implements both the older FTPFileListParser and
* newer FTPFileEntryParser interfaces with default functionality.
* All the classes in the parser subpackage inherit from this.
*
* @author Steve Cohen [EMAIL PROTECTED]
*/
public abstract class FTPFileEntryParserImpl
implements FTPFileEntryParser, FTPFileListParser
{
/**
* internal pattern the matcher tries to match, representing a file
* entry
*/
private Pattern pattern = null;
/**
* internal match result used by the parser
*/
private MatchResult result = null;
/**
* Internal PatternMatcher object used by the parser. It has protected
* scope in case subclasses want to make use of it for their own purposes.
Re: [jexl] - checking for unresolved variables
On Jan 9, 2004, at 4:34 PM, Bill Horsman wrote: My first thoughts: add a method to Expression: /** * Get a list of all the variables within this expression that * aren't known by the context * @param context contains variables we do know * @return a list of unknown variables (or a null if there are none). * Defining all these unknown variables does not guarantee that a * subsequent call to this method will produce no unknown variables. */ public String[] getUnknownVariables(JexlContext context); The alternative to get the evaluate() method to throw a UnknownVariablesException or something. But to do that, we have to configure the Expression to know whether it should be lenient (the current, default behaviour) or strict. If we just want the first unknown variable, I think the implementation of that could be all in the JexlContext. Just have a JexlContext implementation that throws a runtime exception when an invalid variable is requested, as opposed to returning null. -pete - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[net] Solved VMS duplicates problem and simplified system
I have made a rather large checkin to fully solve the VMS problem. (Actually, there is one more detail, but it is minor, see below). These changes were as follows: 1. Subclass VMSFTPEntryParser with VMSVersioningFTPEntryParser. This subclass handles the duplicate removal at what I believe is the right time: After the initial list is read in, but within the process of FTPFileList creation, that is before FTPFileList.create() returns. No client of the list sees the removed dupes. 2. In order to implement one, a removeDuplicates() method was added to FTPFileEntryParser. This is a no-op in the normal case but implemented in VMSVersioningFTPEntryParser. 3. You'll note I said FTPFileList.create() in #1. I reverted to this and removed FTPFileEntryParser.createFTPFileList() that Daniel had added. He was uncomfortable with the name of this method, and it was no longer necessary with the above changes. I also removed DefaultFTPFileList and DefaultFTPFileIterator. Since these are large changes and potentially step on Daniel's toes, I created a tag NET_1_2_0_TEMP so we can revert if anyone strenuously objects. 4. I renamed FTPFileListParserImpl to FTPFileEntryParserImpl to reduce the confusion level since FTPFileListParser is now deprecated and going away in 2.0. For the time being, though, for backward compatibility it still implements FTPFileListParser. This has been a painful exercise, so I want to give my thinking. Probably FTPFileList and FTPFileListIterator are misnamed. FTPFileList IS-NOT-A List of FTPFiles. It HAS a Vector of raw input lines from the listing. FTPFileListIterator IS-NOT-A simple iterator over FTPFileList. It DOES iterate over this Vector and DOES return FTPFile objects, so it is more than a simple iterator, it is an iterator on steroids. Remember that there are two scenarios supported here: a) read the whole list at once as in FTPClient.listFiles() and b) read the list in but defer creation of more expensive FTPFile objects until needed. This scenario was broken in the VMS case. The nice thing about this fix is that both scenarios are supported, and complications are much reduced. The one thing left to do is decide which VMS scenario, versioning or non-versioning is the default, i.e. the one to be supported by autodetection. I asked for someone to chime in on this last week and no one has. I still don't know. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/digester project.xml
rdonkin 2004/01/10 08:52:46 Modified:digester project.xml Log: Changed developer reference to refer to my apache email address. Revision ChangesPath 1.16 +1 -1 jakarta-commons/digester/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/digester/project.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- project.xml 10 Jan 2004 15:43:06 - 1.15 +++ project.xml 10 Jan 2004 16:52:46 - 1.16 @@ -67,7 +67,7 @@ developer nameRobert Burrell Donkin/name idrdonkin/id - email[EMAIL PROTECTED]/email + email[EMAIL PROTECTED]/email /developer developer nameScott Sanders/name - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/digester checkstyle.xml
rdonkin 2004/01/10 08:53:40 Modified:digester checkstyle.xml Log: Improved checkstyle configuration so that it now ignores (some) lines which are expected to vary in the header. Revision ChangesPath 1.2 +1 -0 jakarta-commons/digester/checkstyle.xml Index: checkstyle.xml === RCS file: /home/cvs/jakarta-commons/digester/checkstyle.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- checkstyle.xml2 Sep 2003 03:19:38 - 1.1 +++ checkstyle.xml10 Jan 2004 16:53:40 - 1.2 @@ -13,6 +13,7 @@ !-- Verify that EVERY source file has the appropriate license -- module name=Header property name=headerFile value=LICENSE.txt/ + property name=ignoreLines value=2,3,4,9/ /module module name=OperatorWrap - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/digester LICENSE.txt
rdonkin 2004/01/10 08:54:28 Modified:digester LICENSE.txt Log: Updated copyright year on license Revision ChangesPath 1.5 +4 -4 jakarta-commons/digester/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/jakarta-commons/digester/LICENSE.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- LICENSE.txt 9 Oct 2003 21:09:45 - 1.4 +++ LICENSE.txt 10 Jan 2004 16:54:28 - 1.5 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester/plugins Declaration.java PluginCreateRule.java PluginDeclarationRule.java PluginManager.java PluginRules.java
rdonkin 2004/01/10 09:23:47
Modified:digester/src/java/org/apache/commons/digester/plugins
Declaration.java PluginCreateRule.java
PluginDeclarationRule.java PluginManager.java
PluginRules.java
Log:
Cosmetic changes to please checkstyle.
Revision ChangesPath
1.8 +11 -11
jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/Declaration.java
Index: Declaration.java
===
RCS file:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/Declaration.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Declaration.java 16 Nov 2003 22:37:35 - 1.7
+++ Declaration.java 10 Jan 2004 17:23:47 - 1.8
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -344,8 +344,8 @@
Object none = ruleMethod.invoke(null, params);
} catch (Exception e) {
throw new PluginWrappedException(
-Unable to configure class [ + pluginClass + ]
-+ using method [ + ruleMethodName + ], e);
+Unable to configure class [ + pluginClass + ] +
+ using method [ + ruleMethodName + ], e);
}
return;
}
@@ -374,8 +374,8 @@
// look for resource
{
String resourceName =
-pluginClass.getClass().getName().replace('.', '/')
-+ RuleInfo.xml;
+pluginClass.getClass().getName().replace('.', '/') +
+RuleInfo.xml;
InputStream is =
pluginClass.getClassLoader().getResourceAsStream(
resourceName);
@@ -433,9 +433,9 @@
Object none = ruleMethod.invoke(null, params);
} catch (Exception e) {
throw new PluginWrappedException(
-Unable to configure class [ + pluginClass + ]
-+ using rule class [ + ruleClass + ]
-+ method [ + ruleMethodName + ], e);
+Unable to configure class [ + pluginClass + ] +
+ using rule class [ + ruleClass + ] +
+ method [ + ruleMethodName + ], e);
}
}
1.10 +14 -14
jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginCreateRule.java
Index: PluginCreateRule.java
===
RCS file:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginCreateRule.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PluginCreateRule.java 18 Nov 2003 22:14:22 - 1.9
+++ PluginCreateRule.java 10 Jan 2004 17:23:47 - 1.10
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -444,9 +444,9 @@
Declaration currDeclaration = null;
if (debug) {
-log.debug(PluginCreateRule.begin: installing new plugin:
-+ oldrules= + oldRules.toString()
-+ , localrules= + localRules.toString());
+log.debug(PluginCreateRule.begin: installing new plugin: +
+oldrules= + oldRules.toString() +
+, localrules= + localRules.toString());
}
String pluginClassName;
@@ -499,8 +499,8 @@
}
else {
throw new PluginInvalidInputException(
-No plugin class specified for element
-+ pattern);
+No plugin class specified for element +
+pattern);
}
// now load up the custom rules into a private Rules instance
@@ -528,9 +528,9 @@
Rules oldRules = digester.getRules();
if (debug) {
-log.debug(PluginCreateRule.begin: firing nested rules:
-+ oldrules= + oldRules.toString()
-+ , localrules= + localRules.toString());
+log.debug(PluginCreateRule.begin: firing
cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester BeanPropertySetterRule.java CallMethodRule.java Digester.java FactoryCreateRule.java ParserFeatureSetterFactory.java
rdonkin 2004/01/10 09:24:10
Modified:digester/src/java/org/apache/commons/digester
BeanPropertySetterRule.java CallMethodRule.java
Digester.java FactoryCreateRule.java
ParserFeatureSetterFactory.java
Log:
Cosmetic changes to please checkstyle.
Revision ChangesPath
1.16 +6 -6
jakarta-commons/digester/src/java/org/apache/commons/digester/BeanPropertySetterRule.java
Index: BeanPropertySetterRule.java
===
RCS file:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/BeanPropertySetterRule.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- BeanPropertySetterRule.java 9 Oct 2003 21:09:46 - 1.15
+++ BeanPropertySetterRule.java 10 Jan 2004 17:24:10 - 1.16
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
- */
+ */
package org.apache.commons.digester;
1.27 +7 -7
jakarta-commons/digester/src/java/org/apache/commons/digester/CallMethodRule.java
Index: CallMethodRule.java
===
RCS file:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/CallMethodRule.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- CallMethodRule.java 9 Oct 2003 21:09:46 - 1.26
+++ CallMethodRule.java 10 Jan 2004 17:24:10 - 1.27
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -450,8 +450,8 @@
// convert nulls and convert stringy parameters
// for non-stringy param types
if(
-parameters[i] == null
-|| (parameters[i] instanceof String
+parameters[i] == null ||
+ (parameters[i] instanceof String
!String.class.isAssignableFrom(paramTypes[i]))) {
paramValues[i] =
1.89 +6 -6
jakarta-commons/digester/src/java/org/apache/commons/digester/Digester.java
Index: Digester.java
===
RCS file:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/Digester.java,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- Digester.java 6 Jan 2004 22:15:57 - 1.88
+++ Digester.java 10 Jan 2004 17:24:10 - 1.89
@@ -2679,8 +2679,8 @@
}
}
if (locator != null) {
-String error = Error at ( + locator.getLineNumber() + ,
-+ locator.getColumnNumber() + : + message;
+String error = Error at ( + locator.getLineNumber() + , +
+locator.getColumnNumber() + : + message;
if (e != null) {
return new SAXParseException(error, locator, e);
} else {
1.16 +10 -10
jakarta-commons/digester/src/java/org/apache/commons/digester/FactoryCreateRule.java
Index: FactoryCreateRule.java
===
RCS file:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/FactoryCreateRule.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- FactoryCreateRule.java9 Oct 2003 21:09:46 - 1.15
+++ FactoryCreateRule.java10 Jan 2004 17:24:10 - 1.16
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -422,8 +422,8 @@
} catch (Exception e) {
// log message and error
if (digester.log.isInfoEnabled()) {
-digester.log.info([FactoryCreateRule] Create exception
ignored:
-+ ((e.getMessage() == null) ? e.getClass().getName() :
e.getMessage()));
+
cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules DigesterRuleParser.java
rdonkin 2004/01/10 09:24:27 Modified:digester checkstyle.xml digester/src/java/org/apache/commons/digester/xmlrules DigesterRuleParser.java Log: Cosmetic changes to please checkstyle. Revision ChangesPath 1.3 +1 -1 jakarta-commons/digester/checkstyle.xml Index: checkstyle.xml === RCS file: /home/cvs/jakarta-commons/digester/checkstyle.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- checkstyle.xml10 Jan 2004 16:53:40 - 1.2 +++ checkstyle.xml10 Jan 2004 17:24:26 - 1.3 @@ -13,7 +13,7 @@ !-- Verify that EVERY source file has the appropriate license -- module name=Header property name=headerFile value=LICENSE.txt/ - property name=ignoreLines value=2,3,4,9/ + property name=ignoreLines value=2,3,4,10/ /module module name=OperatorWrap 1.22 +8 -12 jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/DigesterRuleParser.java Index: DigesterRuleParser.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/DigesterRuleParser.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- DigesterRuleParser.java 28 Oct 2003 22:31:02 - 1.21 +++ DigesterRuleParser.java 10 Jan 2004 17:24:26 - 1.22 @@ -1,4 +1,4 @@ - /* +/* * $Header$ * $Revision$ * $Date$ @@ -665,8 +665,7 @@ boolean ignoreExceptions = true.equalsIgnoreCase(attributes.getValue(ignore-exceptions)); return (attrName == null || attrName.length() == 0) ? -new FactoryCreateRule( className, ignoreExceptions) -: +new FactoryCreateRule( className, ignoreExceptions) : new FactoryCreateRule( className, attrName, ignoreExceptions); } } @@ -679,8 +678,7 @@ String className = attributes.getValue(classname); String attrName = attributes.getValue(attrname); return (attrName == null || attrName.length() == 0) ? -new ObjectCreateRule( className) -: +new ObjectCreateRule( className) : new ObjectCreateRule( className, attrName); } } @@ -713,8 +711,7 @@ String methodName = attributes.getValue(methodname); String paramType = attributes.getValue(paramtype); return (paramType == null || paramType.length() == 0) ? -new SetTopRule( methodName) -: +new SetTopRule( methodName) : new SetTopRule( methodName, paramType); } } @@ -727,8 +724,7 @@ String methodName = attributes.getValue(methodname); String paramType = attributes.getValue(paramtype); return (paramType == null || paramType.length() == 0) ? -new SetNextRule( methodName) -: +new SetNextRule( methodName) : new SetNextRule( methodName, paramType); } } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester AbstractObjectCreationFactory.java AbstractRulesImpl.java BeanPropertySetterRule.java CallMethodRule.java CallParamRule.java
rdonkin 2004/01/10 09:32:29 Modified:digester LICENSE.txt digester/src/java/org/apache/commons/digester AbstractObjectCreationFactory.java AbstractRulesImpl.java BeanPropertySetterRule.java CallMethodRule.java CallParamRule.java Log: Corrected typo in license text. Revision ChangesPath 1.6 +4 -4 jakarta-commons/digester/LICENSE.txt Index: LICENSE.txt === RCS file: /home/cvs/jakarta-commons/digester/LICENSE.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- LICENSE.txt 10 Jan 2004 16:54:28 - 1.5 +++ LICENSE.txt 10 Jan 2004 17:32:28 - 1.6 @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.9 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/AbstractObjectCreationFactory.java Index: AbstractObjectCreationFactory.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/AbstractObjectCreationFactory.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- AbstractObjectCreationFactory.java9 Oct 2003 21:09:46 - 1.8 +++ AbstractObjectCreationFactory.java10 Jan 2004 17:32:28 - 1.9 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.4 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/AbstractRulesImpl.java Index: AbstractRulesImpl.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/AbstractRulesImpl.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AbstractRulesImpl.java9 Oct 2003 21:09:46 - 1.3 +++ AbstractRulesImpl.java10 Jan 2004 17:32:28 - 1.4 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.17 +5 -5 jakarta-commons/digester/src/java/org/apache/commons/digester/BeanPropertySetterRule.java Index: BeanPropertySetterRule.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/BeanPropertySetterRule.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- BeanPropertySetterRule.java 10 Jan 2004 17:24:10 - 1.16 +++ BeanPropertySetterRule.java 10 Jan 2004 17:32:28 - 1.17 @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.28 +5 -5 jakarta-commons/digester/src/java/org/apache/commons/digester/CallMethodRule.java Index:
cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester Digester.java ExtendedBaseRules.java FactoryCreateRule.java NodeCreateRule.java ObjectCreateRule.java
rdonkin 2004/01/10 09:34:18 Modified:digester/src/java/org/apache/commons/digester Digester.java ExtendedBaseRules.java FactoryCreateRule.java NodeCreateRule.java ObjectCreateRule.java Log: Corrected typo in license text. Revision ChangesPath 1.90 +5 -5 jakarta-commons/digester/src/java/org/apache/commons/digester/Digester.java Index: Digester.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/Digester.java,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- Digester.java 10 Jan 2004 17:24:10 - 1.89 +++ Digester.java 10 Jan 2004 17:34:17 - 1.90 @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.10 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/ExtendedBaseRules.java Index: ExtendedBaseRules.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/ExtendedBaseRules.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ExtendedBaseRules.java13 Oct 2003 20:52:21 - 1.9 +++ ExtendedBaseRules.java10 Jan 2004 17:34:18 - 1.10 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.17 +5 -5 jakarta-commons/digester/src/java/org/apache/commons/digester/FactoryCreateRule.java Index: FactoryCreateRule.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/FactoryCreateRule.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- FactoryCreateRule.java10 Jan 2004 17:24:10 - 1.16 +++ FactoryCreateRule.java10 Jan 2004 17:34:18 - 1.17 @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.6 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/NodeCreateRule.java Index: NodeCreateRule.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/NodeCreateRule.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- NodeCreateRule.java 9 Oct 2003 21:09:46 - 1.5 +++ NodeCreateRule.java 10 Jan 2004 17:34:18 - 1.6 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.16 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/ObjectCreateRule.java Index: ObjectCreateRule.java === RCS file:
cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester ObjectCreationFactory.java ObjectParamRule.java ParserFeatureSetterFactory.java PathCallParamRule.java RegexMatcher.java RegexRules.java
rdonkin 2004/01/10 09:35:46 Modified:digester/src/java/org/apache/commons/digester ObjectCreationFactory.java ObjectParamRule.java ParserFeatureSetterFactory.java PathCallParamRule.java RegexMatcher.java RegexRules.java Log: Corrected typo in license text. Revision ChangesPath 1.10 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/ObjectCreationFactory.java Index: ObjectCreationFactory.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/ObjectCreationFactory.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ObjectCreationFactory.java9 Oct 2003 21:09:46 - 1.9 +++ ObjectCreationFactory.java10 Jan 2004 17:35:46 - 1.10 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.6 +5 -5 jakarta-commons/digester/src/java/org/apache/commons/digester/ObjectParamRule.java Index: ObjectParamRule.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/ObjectParamRule.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ObjectParamRule.java 9 Oct 2003 21:09:46 - 1.5 +++ ObjectParamRule.java 10 Jan 2004 17:35:46 - 1.6 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.3 +4 -4 jakarta-commons/digester/src/java/org/apache/commons/digester/ParserFeatureSetterFactory.java Index: ParserFeatureSetterFactory.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/ParserFeatureSetterFactory.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ParserFeatureSetterFactory.java 10 Jan 2004 17:24:10 - 1.2 +++ ParserFeatureSetterFactory.java 10 Jan 2004 17:35:46 - 1.3 @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.4 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/PathCallParamRule.java Index: PathCallParamRule.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/PathCallParamRule.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- PathCallParamRule.java9 Oct 2003 21:09:46 - 1.3 +++ PathCallParamRule.java10 Jan 2004 17:35:46 - 1.4 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called
cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester Rule.java RuleSet.java RuleSetBase.java Rules.java RulesBase.java
rdonkin 2004/01/10 09:37:12 Modified:digester/src/java/org/apache/commons/digester Rule.java RuleSet.java RuleSetBase.java Rules.java RulesBase.java Log: Corrected typo in license text. Revision ChangesPath 1.12 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/Rule.java Index: Rule.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/Rule.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Rule.java 9 Oct 2003 21:09:46 - 1.11 +++ Rule.java 10 Jan 2004 17:37:12 - 1.12 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.6 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/RuleSet.java Index: RuleSet.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/RuleSet.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- RuleSet.java 9 Oct 2003 21:09:46 - 1.5 +++ RuleSet.java 10 Jan 2004 17:37:12 - 1.6 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.6 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/RuleSetBase.java Index: RuleSetBase.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/RuleSetBase.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- RuleSetBase.java 9 Oct 2003 21:09:46 - 1.5 +++ RuleSetBase.java 10 Jan 2004 17:37:12 - 1.6 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.8 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/Rules.java Index: Rules.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/Rules.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Rules.java9 Oct 2003 21:09:46 - 1.7 +++ Rules.java10 Jan 2004 17:37:12 - 1.8 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names
cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester SetNestedPropertiesRule.java SetNextRule.java SetPropertiesRule.java
rdonkin 2004/01/10 09:38:19 Modified:digester/src/java/org/apache/commons/digester SetNestedPropertiesRule.java SetNextRule.java SetPropertiesRule.java Log: Corrected typo in license text. Revision ChangesPath 1.2 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/SetNestedPropertiesRule.java Index: SetNestedPropertiesRule.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetNestedPropertiesRule.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SetNestedPropertiesRule.java 19 Nov 2003 20:40:26 - 1.1 +++ SetNestedPropertiesRule.java 10 Jan 2004 17:38:19 - 1.2 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.19 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/SetNextRule.java Index: SetNextRule.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetNextRule.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- SetNextRule.java 9 Oct 2003 21:09:46 - 1.18 +++ SetNextRule.java 10 Jan 2004 17:38:19 - 1.19 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.16 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertiesRule.java Index: SetPropertiesRule.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertiesRule.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- SetPropertiesRule.java9 Oct 2003 21:09:46 - 1.15 +++ SetPropertiesRule.java10 Jan 2004 17:38:19 - 1.16 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester/plugins LogUtils.java PluginAssertionFailure.java PluginConfigurationException.java PluginCreateRule.java PluginDeclarationRule.java
rdonkin 2004/01/10 09:41:26 Modified:digester/src/java/org/apache/commons/digester/plugins LogUtils.java PluginAssertionFailure.java PluginConfigurationException.java PluginCreateRule.java PluginDeclarationRule.java Log: Corrected typo in license text. Revision ChangesPath 1.2 +5 -5 jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/LogUtils.java Index: LogUtils.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/LogUtils.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LogUtils.java 28 Oct 2003 23:31:38 - 1.1 +++ LogUtils.java 10 Jan 2004 17:41:26 - 1.2 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.2 +5 -5 jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginAssertionFailure.java Index: PluginAssertionFailure.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginAssertionFailure.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PluginAssertionFailure.java 2 Nov 2003 23:26:42 - 1.1 +++ PluginAssertionFailure.java 10 Jan 2004 17:41:26 - 1.2 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.4 +5 -5 jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginConfigurationException.java Index: PluginConfigurationException.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginConfigurationException.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- PluginConfigurationException.java 9 Oct 2003 21:09:48 - 1.3 +++ PluginConfigurationException.java 10 Jan 2004 17:41:26 - 1.4 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.11 +4 -4 jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginCreateRule.java Index: PluginCreateRule.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginCreateRule.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- PluginCreateRule.java 10 Jan 2004 17:23:47 - 1.10 +++ PluginCreateRule.java 10 Jan 2004 17:41:26 - 1.11 @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be
cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester/plugins PluginInvalidInputException.java PluginManager.java PluginRules.java PluginWrappedException.java
rdonkin 2004/01/10 09:42:09 Modified:digester/src/java/org/apache/commons/digester/plugins PluginInvalidInputException.java PluginManager.java PluginRules.java PluginWrappedException.java Log: Corrected typo in license text. Revision ChangesPath 1.4 +5 -5 jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginInvalidInputException.java Index: PluginInvalidInputException.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginInvalidInputException.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- PluginInvalidInputException.java 9 Oct 2003 21:09:48 - 1.3 +++ PluginInvalidInputException.java 10 Jan 2004 17:42:09 - 1.4 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.7 +4 -4 jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginManager.java Index: PluginManager.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginManager.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- PluginManager.java10 Jan 2004 17:23:47 - 1.6 +++ PluginManager.java10 Jan 2004 17:42:09 - 1.7 @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.9 +4 -4 jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginRules.java Index: PluginRules.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginRules.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- PluginRules.java 10 Jan 2004 17:23:47 - 1.8 +++ PluginRules.java 10 Jan 2004 17:42:09 - 1.9 @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.4 +5 -5 jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginWrappedException.java Index: PluginWrappedException.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginWrappedException.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- PluginWrappedException.java 9 Oct 2003 21:09:48 - 1.3 +++ PluginWrappedException.java 10 Jan 2004 17:42:09 - 1.4 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - To unsubscribe,
cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester/rss Channel.java Image.java Item.java RSSDigester.java TextInput.java
rdonkin 2004/01/10 09:43:05 Modified:digester/src/java/org/apache/commons/digester/rss Channel.java Image.java Item.java RSSDigester.java TextInput.java Log: Corrected typo in license text. Revision ChangesPath 1.10 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/rss/Channel.java Index: Channel.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/rss/Channel.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Channel.java 9 Oct 2003 21:09:48 - 1.9 +++ Channel.java 10 Jan 2004 17:43:05 - 1.10 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.8 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/rss/Image.java Index: Image.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/rss/Image.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Image.java9 Oct 2003 21:09:48 - 1.7 +++ Image.java10 Jan 2004 17:43:05 - 1.8 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.8 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/rss/Item.java Index: Item.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/rss/Item.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Item.java 9 Oct 2003 21:09:48 - 1.7 +++ Item.java 10 Jan 2004 17:43:05 - 1.8 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.8 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/rss/RSSDigester.java Index: RSSDigester.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/rss/RSSDigester.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- RSSDigester.java 9 Oct 2003 21:09:48 - 1.7 +++ RSSDigester.java 10 Jan 2004 17:43:05 - 1.8 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may
cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester/substitution MultiVariableExpander.java VariableAttributes.java VariableExpander.java VariableSubstitutor.java
rdonkin 2004/01/10 09:43:46 Modified:digester/src/java/org/apache/commons/digester/substitution MultiVariableExpander.java VariableAttributes.java VariableExpander.java VariableSubstitutor.java Log: Corrected typo in license text. Revision ChangesPath 1.2 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/substitution/MultiVariableExpander.java Index: MultiVariableExpander.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/substitution/MultiVariableExpander.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MultiVariableExpander.java2 Dec 2003 23:22:28 - 1.1 +++ MultiVariableExpander.java10 Jan 2004 17:43:46 - 1.2 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.2 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/substitution/VariableAttributes.java Index: VariableAttributes.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/substitution/VariableAttributes.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- VariableAttributes.java 2 Dec 2003 23:22:11 - 1.1 +++ VariableAttributes.java 10 Jan 2004 17:43:46 - 1.2 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.2 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/substitution/VariableExpander.java Index: VariableExpander.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/substitution/VariableExpander.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- VariableExpander.java 2 Dec 2003 23:21:55 - 1.1 +++ VariableExpander.java 10 Jan 2004 17:43:46 - 1.2 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.3 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/substitution/VariableSubstitutor.java Index: VariableSubstitutor.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/substitution/VariableSubstitutor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- VariableSubstitutor.java 3 Dec 2003 23:21:52 - 1.2 +++ VariableSubstitutor.java 10 Jan 2004 17:43:46 - 1.3 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All
cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules CircularIncludeException.java DigesterLoader.java DigesterLoadingException.java
rdonkin 2004/01/10 09:44:18 Modified:digester/src/java/org/apache/commons/digester/xmlrules CircularIncludeException.java DigesterLoader.java DigesterLoadingException.java Log: Corrected typo in license text. Revision ChangesPath 1.6 +5 -5 jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/CircularIncludeException.java Index: CircularIncludeException.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/CircularIncludeException.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- CircularIncludeException.java 9 Oct 2003 21:09:48 - 1.5 +++ CircularIncludeException.java 10 Jan 2004 17:44:18 - 1.6 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.11 +5 -5 jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/DigesterLoader.java Index: DigesterLoader.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/DigesterLoader.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- DigesterLoader.java 28 Oct 2003 23:01:00 - 1.10 +++ DigesterLoader.java 10 Jan 2004 17:44:18 - 1.11 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.6 +5 -5 jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/DigesterLoadingException.java Index: DigesterLoadingException.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/DigesterLoadingException.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- DigesterLoadingException.java 9 Oct 2003 21:09:48 - 1.5 +++ DigesterLoadingException.java 10 Jan 2004 17:44:18 - 1.6 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules DigesterRuleParser.java DigesterRulesSource.java FromXmlRuleSet.java XmlLoadException.java
rdonkin 2004/01/10 09:45:07 Modified:digester/src/java/org/apache/commons/digester/xmlrules DigesterRuleParser.java DigesterRulesSource.java FromXmlRuleSet.java XmlLoadException.java Log: Corrected typo in license text. Revision ChangesPath 1.23 +5 -5 jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/DigesterRuleParser.java Index: DigesterRuleParser.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/DigesterRuleParser.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- DigesterRuleParser.java 10 Jan 2004 17:24:26 - 1.22 +++ DigesterRuleParser.java 10 Jan 2004 17:45:07 - 1.23 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.6 +5 -5 jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/DigesterRulesSource.java Index: DigesterRulesSource.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/DigesterRulesSource.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- DigesterRulesSource.java 9 Oct 2003 21:09:48 - 1.5 +++ DigesterRulesSource.java 10 Jan 2004 17:45:07 - 1.6 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.11 +5 -5 jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/FromXmlRuleSet.java Index: FromXmlRuleSet.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/FromXmlRuleSet.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- FromXmlRuleSet.java 22 Oct 2003 18:28:57 - 1.10 +++ FromXmlRuleSet.java 10 Jan 2004 17:45:07 - 1.11 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,7 +35,7 @@ *permission, please contact [EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache, - *Apache nor may Apache appear in their names without prior + *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED 1.6 +5 -5 jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/XmlLoadException.java Index: XmlLoadException.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/XmlLoadException.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- XmlLoadException.java 9 Oct 2003 21:09:48 - 1.5 +++ XmlLoadException.java 10 Jan 2004 17:45:07 - 1.6 @@ -7,7 +7,7 @@ * * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation.
cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester Substitutor.java
rdonkin 2004/01/10 09:51:57 Modified:digester/src/java/org/apache/commons/digester Substitutor.java Log: Cosmetic changes to please checkstyle. Revision ChangesPath 1.4 +5 -5 jakarta-commons/digester/src/java/org/apache/commons/digester/Substitutor.java Index: Substitutor.java === RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/Substitutor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Substitutor.java 10 Jan 2004 17:39:41 - 1.3 +++ Substitutor.java 10 Jan 2004 17:51:57 - 1.4 @@ -34,7 +34,7 @@ *from this software without prior written permission. For written *permission, please contact [EMAIL PROTECTED] * - * 5. Products derived from this software may not be called Apache + * 5. Products derived from this software may not be called Apache, *nor may Apache appear in their names without prior *written permission of the Apache Software Foundation. * - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections/xdocs navigation.xml index.xml
scolebourne2004/01/10 10:08:26 Modified:collections/xdocs navigation.xml index.xml Log: Update xdocs now javadoc generation is in maven xml Revision ChangesPath 1.4 +2 -2 jakarta-commons/collections/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/jakarta-commons/collections/xdocs/navigation.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- navigation.xml6 Jan 2004 00:44:20 - 1.3 +++ navigation.xml10 Jan 2004 18:08:26 - 1.4 @@ -15,13 +15,13 @@ menu name=Commons Collections item name=Overview href=/index.html/ item name=Users guide href=/userguide.html/ - item name=Javadoc (3.0 release) href=api-30/index.html/ + item name=Javadoc (3.0 release) href=apidocs-COLLECTIONS_3_0/index.html/ item name=Mailing lists href=/mail-lists.html/ item name=Team href=/team-list.html/ item name=Tasks href=/tasks.html/ item name=CVS href=http://cvs.apache.org/viewcvs/jakarta-commons/collections// item name=Javadoc (CVS latest) href=apidocs/index.html/ - item name=Javadoc (2.1 old) href=api-21/index.html/ + item name=Javadoc (2.1 old) href=apidocs-COLLECTIONS_2_1/index.html/ /menu commons-nav; 1.9 +2 -2 jakarta-commons/collections/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-commons/collections/xdocs/index.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- index.xml 6 Jan 2004 21:24:01 - 1.8 +++ index.xml 10 Jan 2004 18:08:26 - 1.9 @@ -46,8 +46,8 @@ /p p The JavaDoc API documents are available online for the -a href=api-30/index.htmlcurrent release 3.0/a, the -a href=api-21/index.htmlprevious version 2.1/a, and the +a href=apidocs-COLLECTIONS_3_0/index.htmlcurrent release 3.0/a, the +a href=apidocs-COLLECTIONS_2_1/index.htmlprevious version 2.1/a, and the a href=apidocs/index.htmllatest CVS/a. /p p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Commons Multipart MIME?
On Sat, 10 Jan 2004, Stephen Colebourne wrote: I don't have a direct need for a MIME type component myself, but this certainly sounds widely popular and useful. I would however suggest starting in the sandbox with a dependency on [codec]. That way you'll have more freedom of design to start with, and not block releases of [codec]. You may find that once complete you merge the mime code into codec, or you may find not. But leave that decision until later. +1. I was thinking along the same lines myself. Perhaps we start out in the sandbox as [mime], and then when we have our act together, we can have a discussion about merging with [codec] or not. (I have a feeling that a full MIME library would rather swamp the rest of Codec, at least as it is today, but we can talk about that later, when we actually have code. ;) -- Martin Cooper Stephen - 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]
cvs commit: jakarta-commons/collections maven.xml project.properties
scolebourne2004/01/10 10:09:32
Modified:collections maven.xml project.properties
Log:
Add to maven build scripts for 3.0 release
Revision ChangesPath
1.7 +114 -0jakarta-commons/collections/maven.xml
Index: maven.xml
===
RCS file: /home/cvs/jakarta-commons/collections/maven.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- maven.xml 29 Dec 2003 23:56:15 - 1.6
+++ maven.xml 10 Jan 2004 18:09:32 - 1.7
@@ -77,4 +77,118 @@
tofile=${jardir__}/${testfwkName}.jar /
/postGoal
+ !-- == JAVADOC PREVIOUS VERSIONS == --
+ postGoal name=javadoc:generate
+!-- This is a postGoal because we need data from the javadoc plugin which I can't
get another way --
+!--description=Retrieves a tagged version of the source and generates the
javadoc--
+
+j:if test=${context.getVariable('collections.javadoc.tag') == null}
+ ant:echo message=The collections.javadoc.tag property must be set for
javadoc:tag /
+/j:if
+j:if test=${context.getVariable('collections.javadoc.tag') != null}
+ ant:echo message=Generate javadoc for ${collections.javadoc.tag} /
+ !-- not in javadoc plugin, so have to setup properties --
+ j:set var=maven.javadoc.destdir
value=${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.destdir')}
/
+ j:set var=maven.javadoc.stylesheet
value=${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.stylesheet')}
/
+
+ ant:property name=collections.javadoc.tag.destdir
value=${maven.javadoc.destdir}-${collections.javadoc.tag}/
+ ant:property name=collections.javadoc.tag.stylesheet
value=${maven.javadoc.stylesheet}/
+
+ ant:property name=taggedBaseDir
value=${maven.build.dir}/javadoc/${collections.javadoc.tag} /
+ ant:mkdir dir=${taggedBaseDir} /
+ maven:makeRelativePath var=relativeSrcDir basedir=${basedir}
path=${pom.build.sourceDirectory} /
+ util:replace var=relativeSrcDir oldChar=\ newChar=/
value=${relativeSrcDir} /
+ ant:property name=taggedSourceDir
+ value=${taggedBaseDir}/${pom.repository.cvsModule}/${relativeSrcDir}/
+ ant:cvs
+ cvsRoot=${pom.repository.cvsRoot}
+ package=${pom.repository.cvsModule}/${relativeSrcDir}
+ dest=${taggedBaseDir}
+ tag=${collections.javadoc.tag}
+ /
+
+ ant:mkdir dir=${collections.javadoc.tag.destdir} /
+ ant:tstamp
+ ant:format property=currentYear pattern=/
+ /ant:tstamp
+ ant:tstamp
+j:choose
+ j:when test=${pom.inceptionYear.equals(currentYear)}
+ant:format property=year pattern=/
+ /j:when
+ j:otherwise
+ant:format property=year pattern=${pom.inceptionYear}-/
+ /j:otherwise
+/j:choose
+ /ant:tstamp
+ ant:property name=copyright
+value=Copyright amp;copy; ${year} ${pom.organization.name}. All Rights
Reserved. /
+
+ ant:javadoc
+packagenames=${pom.package}.*
+destdir=${collections.javadoc.tag.destdir}
+sourcepath=${taggedSourceDir}
+author=true
+protected=true
+version=true
+use=true
+windowtitle=${collections.javadoc.tag.windowtitle}
+doctitle=${collections.javadoc.tag.windowtitle}
+bottom=${copyright}
+stylesheetfile=${maven.javadoc.stylesheet}
+
+ /ant:javadoc
+/j:if
+ /postGoal
+
+ !-- == DIST == --
+ postGoal name=dist:prepare-bin-filesystem
+j:set var=maven.dist.bin.assembly.dir
value=${pom.getPluginContext('maven-dist-plugin').getVariable('maven.dist.bin.assembly.dir')}
/
+
+!-- Copy Files --
+ant:copy todir=${maven.dist.bin.assembly.dir}
+ ant:fileset dir=.
+ant:include name=RELEASE-NOTES.html/
+ /ant:fileset
+/ant:copy
+
+!-- Copy Jars --
+ant:copy todir=${maven.dist.bin.assembly.dir}
+ ant:fileset dir=${maven.build.dir}
+ant:include name=*testframework*.jar/
+ /ant:fileset
+/ant:copy
+
+!-- Delete tagged old release documentation --
+ant:delete includeEmptyDirs=true
+ ant:fileset dir=${maven.dist.bin.assembly.dir}/docs
includes=apidocs-*/** /
+/ant:delete
+
+ /postGoal
+
+ postGoal name=dist:prepare-src-filesystem
+j:set var=maven.dist.src.assembly.dir
value=${pom.getPluginContext('maven-dist-plugin').getVariable('maven.dist.src.assembly.dir')}
/
+
+!-- Copy Files --
+ant:copy todir=${maven.dist.src.assembly.dir}
+ ant:fileset dir=.
+ant:include
cvs commit: jakarta-commons/collections README.txt
scolebourne2004/01/10 10:10:13 Modified:collections README.txt Log: Make readme more suitable for both bin and src distribution Revision ChangesPath 1.4 +18 -4 jakarta-commons/collections/README.txt Index: README.txt === RCS file: /home/cvs/jakarta-commons/collections/README.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- README.txt4 Jul 2003 03:09:59 - 1.3 +++ README.txt10 Jan 2004 18:10:13 - 1.4 @@ -1,11 +1,19 @@ Jakarta Commons Collections === -Welcome to the Collections component of the Jakarta Commons -project. +Welcome to the Collections component of the Jakarta Commons project. +This component contains many new collections and collection utilities. -This component requires the excellent Ant utility. It can -be found here : +Two jar files are produced by this component. +The first, commons-collections.jar is the main jar used by applications. +The second, commons-collections-testframework.jar is an extension to junit +for testing new collection implementations and is not normally used by applications. + + +Building from source + +This component requires the excellent Ant utility. +It can be found here : http://ant.apache.org/ @@ -38,3 +46,9 @@ To build the jar and API doc at once : $ ant dist + + +Maven +- +The component can also be built using Maven. +http://maven.apache.org - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [PATCH] Re: [jexl] - checking for unresolved variables
On Sat, 2004-01-10 at 23:43, Paul Libbrecht wrote: Do you mean the methods of the java.util.Map interface constrain the implementation ? That's not what I meant, but actually it does :) My getVar() method throws an UnknownVariableException and in order to maintain that API I would have to make the Map's get() method also throw that Exception. Only you can't do that. So if implement the Map interface (or expose it) then you run the risk of another class just calling get() instead of getVar() and bypassing my strict variable check. For completeness, my original point was that the Map interface wasn't restrictive enough. We can always add additional Map-like methods if people need them: clear() for instance. - Bill - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[jexl] - a project using jexl
Paul, On Sat, 2004-01-10 at 22:41, Paul Libbrecht wrote: Your usage of Jexl is the first usage I know of which is separate from Jelly. If you happen to have pointers, it would be nice to start a page powered-by. We're using a genetic algorithm to help analyse some financial data. We provide the variables in a JexlContext and then juggle the formula around to see if we can improve it. Checking whether that juggling results in a valid formula is one of the reasons I wanted Jexl to be a bit stricter. I'm using code from the jgap.sourceforge.net project to get ideas about how to do it. I think that the resulting code might be useful to someone else, but I'm not sure at this early stage whether it would be suitable for as a plugin to the jgap project or not. Sorry again that I'm not able to provide a powered by link. - Bill - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser VMSVersioningFTPEntryParser.java
scohen 2004/01/10 15:19:52
Modified:net/src/java/org/apache/commons/net/ftp FTPClient.java
FTPFileEntryParser.java FTPFileEntryParserImpl.java
FTPFileList.java
net/src/java/org/apache/commons/net/ftp/parser
VMSVersioningFTPEntryParser.java
Log:
Rename FTPFileEntryParser.removeDuplicates() to preParse() to allow more generic
uses.
Revision ChangesPath
1.27 +0 -2
jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPClient.java
Index: FTPClient.java
===
RCS file:
/home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPClient.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- FTPClient.java10 Jan 2004 15:36:40 - 1.26
+++ FTPClient.java10 Jan 2004 23:19:51 - 1.27
@@ -2338,8 +2338,6 @@
socket.close();
completePendingCommand();
-
-//return parser.removeDuplicates(list);
return list;
}
1.14 +8 -8
jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPFileEntryParser.java
Index: FTPFileEntryParser.java
===
RCS file:
/home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPFileEntryParser.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FTPFileEntryParser.java 10 Jan 2004 15:36:40 - 1.13
+++ FTPFileEntryParser.java 10 Jan 2004 23:19:52 - 1.14
@@ -164,18 +164,18 @@
/**
- * This method is a hook for those implementers (such as
- * VMSVersioningFTPEntryParser, and possibly others) which return
- * multiple files with the same name to remove the duplicates.
+ * This method is a hook for those implementors (such as
+ * VMSVersioningFTPEntryParser, and possibly others) which need to
+ * perform some action upon the FTPFileList after it has been created
+ * from the server stream, but before any clients see the list.
*
- * Implementations for systems that do not allow duplicates will
- * implement a NO-OP here.
+ * The default implementation can be a no-op.
*
- * @param original Original list which may contain duplicates
+ * @param original Original list after it has been created from the server
stream
*
- * @return Original list purged of duplicates
+ * @return Original list as processed by this method.
*/
-FTPFileList removeDuplicates(FTPFileList original);
+FTPFileList preParse(FTPFileList original);
}
1.2 +13 -11
jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java
Index: FTPFileEntryParserImpl.java
===
RCS file:
/home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FTPFileEntryParserImpl.java 10 Jan 2004 16:01:48 - 1.1
+++ FTPFileEntryParserImpl.java 10 Jan 2004 23:19:52 - 1.2
@@ -230,20 +230,22 @@
return reader.readLine();
}
/**
- * Implement hook provided for those implementers (such as
- * VMSVersioningFTPEntryParser, and possibly others) which return
- * multiple files with the same name to remove the duplicates by
- * defining a no-op method which simply returns the original
- * FTPFileList. This method should not be overridden except in
- * parsers that really have to remove duplicates.
+ * This method is a hook for those implementors (such as
+ * VMSVersioningFTPEntryParser, and possibly others) which need to
+ * perform some action upon the FTPFileList after it has been created
+ * from the server stream, but before any clients see the list.
*
- * @param original Original list
+ * This default implementation is a no-op.
*
- * @return Original list
+ * @param original Original list after it has been created from the server
stream
+ *
+ * @return codeoriginal/code unmodified.
*/
-public FTPFileList removeDuplicates(FTPFileList original) {
-return original;
-}
+ public FTPFileList preParse(FTPFileList original) {
+ return original;
+ }
+
+
/**
* return a ListIterator to the internal Vector of lines of codelist/code,
1.9 +1 -1
jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPFileList.java
Index: FTPFileList.java
cvs commit: jakarta-commons/configuration/xdocs/images - New directory
tobrien 2004/01/10 16:58:45 jakarta-commons/configuration/xdocs/images - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/configuration/xdocs/images logo.png
tobrien 2004/01/10 16:59:11 Modified:configuration project.xml Added: configuration/src/media logo.xcf configuration/xdocs/images logo.png Log: Site had no title or logo, added both Revision ChangesPath 1.4 +6 -3 jakarta-commons/configuration/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project.xml 24 Dec 2003 14:28:22 - 1.3 +++ project.xml 11 Jan 2004 00:59:10 - 1.4 @@ -11,11 +11,13 @@ namecommons-configuration/name idcommons-configuration/id currentVersion1.0-dev-3/currentVersion + organization nameApache Software Foundation/name -urlhttp://jakarta.apache.org//url -logo/images/jakarta-logo-blue.gif/logo +urlhttp://www.apache.org/url +logohttp://jakarta.apache.org/images/jakarta-logo.gif/logo /organization + inceptionYear2001/inceptionYear packageorg.apache.commons.configuration/package @@ -23,6 +25,7 @@ !-- Gump integration -- gumpRepositoryIdjakarta/gumpRepositoryId + logo/images/logo.png/logo description Tools to assist in the reading of configuration/preferences files in 1.1 jakarta-commons/configuration/src/media/logo.xcf Binary file 1.1 jakarta-commons/configuration/xdocs/images/logo.png Binary file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/codec/xdocs navigation.xml
tobrien 2004/01/10 17:20:20 Modified:codec/xdocs navigation.xml Log: Added a Jakarta Commons link to the nav links Revision ChangesPath 1.7 +5 -0 jakarta-commons/codec/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/jakarta-commons/codec/xdocs/navigation.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- navigation.xml2 Jan 2004 16:38:14 - 1.6 +++ navigation.xml11 Jan 2004 01:20:20 - 1.7 @@ -12,6 +12,11 @@ /organizationLogo body +links + item name=Jakarta Commons +href=http://jakarta.apache.org/commons// +/links + menu name=Commons Codec item name=Overview href=/index.html/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/betwixt/src/media - New directory
tobrien 2004/01/10 17:22:47 jakarta-commons/betwixt/src/media - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/betwixt/xdocs/images logo.png
tobrien 2004/01/10 17:23:47 Modified:betwixt project.xml betwixt/xdocs navigation.xml Added: betwixt/src/media logo.xcf betwixt/xdocs/images logo.png Log: Added a logo, and regenerated site Revision ChangesPath 1.31 +2 -2 jakarta-commons/betwixt/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/betwixt/project.xml,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- project.xml 21 Aug 2003 22:47:03 - 1.30 +++ project.xml 11 Jan 2004 01:23:47 - 1.31 @@ -9,9 +9,9 @@ organization nameApache Software Foundation/name urlhttp://jakarta.apache.org//url -logohttp://jakarta.apache.org/commons/images/jakarta-logo-blue.gif/logo +logohttp://jakarta.apache.org/images/jakarta-logo.gif/logo /organization -!-- logo/images/logo.gif/logo -- + logo/images/logo.png/logo inceptionYear2002/inceptionYear shortDescriptionCommons Betwixt/shortDescription 1.1 jakarta-commons/betwixt/src/media/logo.xcf Binary file 1.9 +5 -0 jakarta-commons/betwixt/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/jakarta-commons/betwixt/xdocs/navigation.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- navigation.xml10 Sep 2003 22:51:00 - 1.8 +++ navigation.xml11 Jan 2004 01:23:47 - 1.9 @@ -6,6 +6,11 @@ organizationLogo href=/images/jakarta-logo-blue.gifJakarta/organizationLogo body +links + item name=Jakarta Commons +href=http://jakarta.apache.org/commons// +/links + about-menu; menu name=Betwixt item name=Overviewhref=/index.html/ 1.1 jakarta-commons/betwixt/xdocs/images/logo.png Binary file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/configuration/xdocs navigation.xml
tobrien 2004/01/10 17:25:33 Modified:configuration/xdocs navigation.xml Log: Added link to JAkarta Commons Revision ChangesPath 1.2 +5 -0 jakarta-commons/configuration/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/jakarta-commons/configuration/xdocs/navigation.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- navigation.xml23 Dec 2003 15:09:05 - 1.1 +++ navigation.xml11 Jan 2004 01:25:33 - 1.2 @@ -12,6 +12,11 @@ /organizationLogo body +links + item name=Jakarta Commons +href=http://jakarta.apache.org/commons// +/links + menu name=Configuration item name=Homehref=/index.html/ item name=Overviewhref=/overview.html/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/cli/xdocs navigation.xml
tobrien 2004/01/10 17:33:28 Modified:cli/xdocs navigation.xml Log: Added link to JAkarta Commons Revision ChangesPath 1.9 +4 -0 jakarta-commons/cli/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/jakarta-commons/cli/xdocs/navigation.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- navigation.xml10 Jan 2004 02:55:41 - 1.8 +++ navigation.xml11 Jan 2004 01:33:28 - 1.9 @@ -7,6 +7,10 @@ project name=CLI titleCLI/title +links + item name=Jakarta Commons +href=http://jakarta.apache.org/commons// +/links body menu name=User Documentation - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/cli project.xml
tobrien 2004/01/10 17:36:35 Modified:cli project.xml Log: Added link to JAkarta Commons Revision ChangesPath 1.16 +1 -1 jakarta-commons/cli/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/cli/project.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- project.xml 10 Jan 2004 03:02:32 - 1.15 +++ project.xml 11 Jan 2004 01:36:35 - 1.16 @@ -10,7 +10,7 @@ organization nameApache Software Foundation/name urlhttp://www.apache.org/url -logohttp://jakarta.apache.org/images/jakarta-logo-blue.gif/logo +logohttp://jakarta.apache.org/images/jakarta-logo.gif/logo /organization inceptionYear2002/inceptionYear - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/cli/xdocs navigation.xml
tobrien 2004/01/10 17:38:03 Modified:cli/xdocs navigation.xml Log: Added link to JAkarta Commons Revision ChangesPath 1.10 +2 -1 jakarta-commons/cli/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/jakarta-commons/cli/xdocs/navigation.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- navigation.xml11 Jan 2004 01:33:28 - 1.9 +++ navigation.xml11 Jan 2004 01:38:03 - 1.10 @@ -7,12 +7,13 @@ project name=CLI titleCLI/title + + body links item name=Jakarta Commons href=http://jakarta.apache.org/commons// /links - body menu name=User Documentation item name=Introduction href=/introduction.html/ item name=Usage Scenarios href=/usage.html/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/daemon/src/media - New directory
tobrien 2004/01/10 17:47:41 jakarta-commons/daemon/src/media - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/daemon/xdocs/images logo.png
tobrien 2004/01/10 17:48:59 Modified:daemon project.xml daemon/xdocs navigation.xml Added: daemon/src/media logo.xcf daemon/xdocs/images logo.png Log: Updated the L+F of the daemon website Revision ChangesPath 1.6 +8 -0 jakarta-commons/daemon/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/daemon/project.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- project.xml 31 Dec 2003 03:53:52 - 1.5 +++ project.xml 11 Jan 2004 01:48:59 - 1.6 @@ -6,6 +6,14 @@ idcommons-daemon/id logo/images/logo.gif/logo currentVersion1.0-Alpha/currentVersion + + organization +nameApache Software Foundation/name +urlhttp://jakarta.apache.org//url +logohttp://jakarta.apache.org/images/jakarta-logo.gif/logo + /organization + logo/images/logo.png/logo + inceptionYear2003/inceptionYear gumpRepositoryIdjakarta/gumpRepositoryId shortDescriptionCommons Daemon/shortDescription 1.1 jakarta-commons/daemon/src/media/logo.xcf Binary file 1.5 +5 -0 jakarta-commons/daemon/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/jakarta-commons/daemon/xdocs/navigation.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- navigation.xml9 Oct 2003 14:21:23 - 1.4 +++ navigation.xml11 Jan 2004 01:48:59 - 1.5 @@ -12,6 +12,11 @@ /organizationLogo body +links + item name=Jakarta Commons +href=http://jakarta.apache.org/commons// +/links + menu name=Commons Daemon item name=Overview href=/index.html/ 1.1 jakarta-commons/daemon/xdocs/images/logo.png Binary file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/latka/src/media - New directory
tobrien 2004/01/10 18:05:34 jakarta-commons/latka/src/media - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/latka/src/xdocs/images logo.png
tobrien 2004/01/10 18:05:58 Modified:latkaproject.xml latka/src/xdocs navigation.xml Added: latka/src/media logo.xcf latka/src/xdocs/images logo.png Log: Updated l+f of latka site Revision ChangesPath 1.41 +8 -1 jakarta-commons/latka/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/latka/project.xml,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- project.xml 23 Dec 2003 03:52:10 - 1.40 +++ project.xml 11 Jan 2004 02:05:58 - 1.41 @@ -5,7 +5,14 @@ nameLatka/name idcommons-latka/id currentVersion1.0-dev/currentVersion - logo/images/latka.gif/logo + + organization +nameApache Software Foundation/name +urlhttp://jakarta.apache.org//url +logohttp://jakarta.apache.org/images/jakarta-logo.gif/logo + /organization + logo/images/logo.png/logo + inceptionYear2002/inceptionYear shortDescription A functional testing tool for HTTP/HTTPS. 1.1 jakarta-commons/latka/src/media/logo.xcf Binary file 1.3 +7 -2 jakarta-commons/latka/src/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/jakarta-commons/latka/src/xdocs/navigation.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- navigation.xml25 Sep 2003 20:42:12 - 1.2 +++ navigation.xml11 Jan 2004 02:05:58 - 1.3 @@ -1,7 +1,7 @@ ?xml version=1.0 encoding=UTF-8 ? !DOCTYPE project [ -!ENTITY commons-nav SYSTEM ../incl_nav.xml +!ENTITY commons-nav SYSTEM ../../../incl_nav.xml ] project name=Commons - Latka href=http://jakarta.apache.org/commons/latka; @@ -9,6 +9,11 @@ logo href=/images/latka.gifLatka/logo body +links + item name=Jakarta Commons +href=http://jakarta.apache.org/commons// +/links + menu name=Latka item name=Home href=/index.html / item name=User's Guide href=/users-guide.html/ @@ -38,4 +43,4 @@ /body -/project \ No newline at end of file +/project 1.1 jakarta-commons/latka/src/xdocs/images/logo.png Binary file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [collections] Time for 3.0 RC1?
Stephen Colebourne wrote: I reckon its time, as everything now seems quiet. Stephen +1, go for it. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 26041] New: - [Patch][CLI] OptionBuilder implemented like ToStringBuilder from commons-lang
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26041.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26041
[Patch][CLI] OptionBuilder implemented like ToStringBuilder from commons-lang
Summary: [Patch][CLI] OptionBuilder implemented like
ToStringBuilder from commons-lang
Product: Commons
Version: 1.0 Final
Platform: Other
OS/Version: Other
Status: NEW
Severity: Normal
Priority: Other
Component: CLI
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
OptionBuilder uses only static methods instead of a very common java-idiom, the
chain of calls, that is used in many jakarta projects (see ECS or commons-lang
with the implementations of ToStringBuilder, HashCodeBuilder...)
This patch fixes OptionBuilder but as it breaks the current API, it might be
best applied on a 2.0 release.
Ludovic.
Index: src/java/org/apache/commons/cli/OptionBuilder.java
===
retrieving revision 1.16
diff -u -r1.16 OptionBuilder.java
--- src/java/org/apache/commons/cli/OptionBuilder.java 9 Oct 2003 20:57:01
- 1.16
+++ src/java/org/apache/commons/cli/OptionBuilder.java 11 Jan 2004 02:32:24 -
@@ -73,55 +73,34 @@
public class OptionBuilder {
/** long option */
-private static String longopt;
+private String longopt;
/** option description */
-private static String description;
+private String description;
/** argument name */
-private static String argName;
+private String argName;
/** is required? */
-private static boolean required;
+private boolean required;
/** the number of arguments */
-private static int numberOfArgs = Option.UNINITIALIZED;
+private int numberOfArgs = Option.UNINITIALIZED;
/** option type */
-private static Object type;
+private Object type;
/** option can have an optional argument value */
-private static boolean optionalArg;
+private boolean optionalArg;
/** value separator for argument value */
-private static char valuesep;
-
-/** option builder instance */
-private static OptionBuilder instance = new OptionBuilder();
-
-/**
- * private constructor to prevent instances being created
- */
-private OptionBuilder()
-{
-}
+private char valuesep;
/**
- * pResets the member variables to their default values./p
+ * Constructor for OptionBuilder
*/
-private static void reset()
+public OptionBuilder()
{
-description = null;
-argName = arg;
-longopt = null;
-type = null;
-required = false;
-numberOfArgs = Option.UNINITIALIZED;
-
-
-// PMM 9/6/02 - these were missing
-optionalArg = false;
-valuesep = (char) 0;
}
/**
@@ -130,11 +109,11 @@
* @param longopt the long option value
* @return the OptionBuilder instance
*/
-public static OptionBuilder withLongOpt(String longopt)
+public OptionBuilder withLongOpt(String longopt)
{
-instance.longopt = longopt;
+this.longopt = longopt;
-return instance;
+return this;
}
/**
@@ -142,11 +121,11 @@
*
* @return the OptionBuilder instance
*/
-public static OptionBuilder hasArg()
+public OptionBuilder hasArg()
{
-instance.numberOfArgs = 1;
+this.numberOfArgs = 1;
-return instance;
+return this;
}
/**
@@ -156,11 +135,11 @@
* @param hasArg if true then the Option has an argument value
* @return the OptionBuilder instance
*/
-public static OptionBuilder hasArg(boolean hasArg)
+public OptionBuilder hasArg(boolean hasArg)
{
-instance.numberOfArgs = (hasArg == true) ? 1 : Option.UNINITIALIZED;
+this.numberOfArgs = (hasArg == true) ? 1 : Option.UNINITIALIZED;
-return instance;
+return this;
}
/**
@@ -170,11 +149,11 @@
* @param name the name for the argument value
* @return the OptionBuilder instance
*/
-public static OptionBuilder withArgName(String name)
+public OptionBuilder withArgName(String name)
{
-instance.argName = name;
+this.argName = name;
-return instance;
+return this;
}
/**
@@ -182,11 +161,11 @@
*
* @return the OptionBuilder instance
*/
-public static OptionBuilder isRequired()
+public OptionBuilder isRequired()
{
-instance.required = true;
+this.required = true;
-return instance;
+return this;
}
/**
@@ -207,11 +186,11 @@
cvs commit: jakarta-commons/net/src/java/org/apache/commons/net/ftp FTPFileListParserImpl.java
scohen 2004/01/10 19:38:48 Added: net/src/java/org/apache/commons/net/ftp Tag: 1.9 FTPFileListParserImpl.java Log: Add this class back in as jakarta rules prohibit it's deletion at this time. It is now deprecated and unused by any code in this library. Revision ChangesPath No revision No revision 1.9 +14 -33 jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPFileListParserImpl.java - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[id] Need some help figuring this out
Below are some transact SQL (MS-SQL Server) statements that I ran in Query Analyzer. I'm trying to figure out how it is that a UUID in character format translates to the hexidecimal format SQLServer uses. An example is: String format is: B4F00409-CEF8-4822-802C-DEB20704C365 Hexidecimal format is: 0x0904F0B4F8CE2248802CDEB20704C365 I see a pattern, but I can't explain it. My first thought was that it's an endian problem, but that doesn't seem to pan out. Anyone have any ideas? The pattern I see is the last 2 fields are the same. But the high order bytes / half are swapped B4F00409-CEF8-4822-802C-DEB20704C365 \ / \/ \/ / \ /\ /\ 0904F0B4 F8CE 2248 802C DEB20704C365 //T-SQL Statements DECLARE @tmpuuid uniqueidentifier DECLARE @myuuid uniqueidentifier SET @myuuid = newid() print 'MyUUID String Format: ' print Convert(char(36), @myuuid) print '' print 'MyUUID Binary Format: ' print Convert(binary(16), @myuuid) print '' SET @tmpuuid = Convert(binary(16), @myuuid) print 'tmpuuid converted back: ' print @tmpuuid ==OUTPUT== MyUUID String Format: B4F00409-CEF8-4822-802C-DEB20704C365 MyUUID Binary Format: 0x0904F0B4F8CE2248 802CDEB20704C365 tmpuuid converted back: B4F00409-CEF8-4822-802C-DEB20704C365 == Reformatted == MyUUID String Format: B4 F0 04 09 - CE F8- 48 22- 802C-DEB20704C365 MyUUID Binary Format: 0x 09 04 F0 B4 F8 CE 22 48 802C DEB20704C365 tmpuuid converted back: B4F00409-CEF8-4822-802C-DEB20704C365 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [id] Need some help figuring this out
On Sat, 10 Jan 2004, Tim Reilly wrote:
Below are some transact SQL (MS-SQL Server) statements that I ran in Query
Analyzer. I'm trying to figure out how it is that a UUID in character format
translates to the hexidecimal format SQLServer uses.
An example is:
String format is: B4F00409-CEF8-4822-802C-DEB20704C365
Hexidecimal format is: 0x0904F0B4F8CE2248802CDEB20704C365
I see a pattern, but I can't explain it. My first thought was that it's an
endian problem, but that doesn't seem to pan out. Anyone have any ideas?
It looks odd, doesn't it? But it all makes sense when you see the C/C++
type definition, which looks something like this:
typedef struct _GUID {
DWORD Data1;
WORDData2;
WORDData3;
BYTEData4[8];
} GUID;
A DWORD is a 32-bit unsigned value, and a WORD is a 16-bit unsigned value.
The pattern you see is exactly right, and due to the fact that the Data1,
Data2 and Data3 fields have their bytes organised according to the types
specified in the typedef above.
--
Martin Cooper
The pattern I see is the last 2 fields are the same. But the high order
bytes / half are swapped
B4F00409-CEF8-4822-802C-DEB20704C365
\ / \/ \/
/ \ /\ /\
0904F0B4 F8CE 2248 802C DEB20704C365
//T-SQL Statements
DECLARE @tmpuuid uniqueidentifier
DECLARE @myuuid uniqueidentifier
SET @myuuid = newid()
print 'MyUUID String Format: '
print Convert(char(36), @myuuid)
print ''
print 'MyUUID Binary Format: '
print Convert(binary(16), @myuuid)
print ''
SET @tmpuuid = Convert(binary(16), @myuuid)
print 'tmpuuid converted back: '
print @tmpuuid
==OUTPUT==
MyUUID String Format:
B4F00409-CEF8-4822-802C-DEB20704C365
MyUUID Binary Format:
0x0904F0B4F8CE2248 802CDEB20704C365
tmpuuid converted back:
B4F00409-CEF8-4822-802C-DEB20704C365
== Reformatted ==
MyUUID String Format:
B4 F0 04 09 - CE F8- 48 22- 802C-DEB20704C365
MyUUID Binary Format:
0x 09 04 F0 B4 F8 CE 22 48 802C DEB20704C365
tmpuuid converted back:
B4F00409-CEF8-4822-802C-DEB20704C365
-
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]
