svn commit: r636413 - /commons/proper/lang/branches/LANG_POST_2_4/
Author: mbenson Date: Wed Mar 12 09:55:39 2008 New Revision: 636413 URL: http://svn.apache.org/viewvc?rev=636413view=rev Log: create a branch for work on post 2.4 features Added: commons/proper/lang/branches/LANG_POST_2_4/ - copied from r636412, commons/proper/lang/trunk/
svn commit: r636418 - in /commons/proper/lang/branches/LANG_POST_2_4: default.properties pom.xml project.xml
Author: mbenson
Date: Wed Mar 12 10:03:46 2008
New Revision: 636418
URL: http://svn.apache.org/viewvc?rev=636418view=rev
Log:
version
Modified:
commons/proper/lang/branches/LANG_POST_2_4/default.properties
commons/proper/lang/branches/LANG_POST_2_4/pom.xml
commons/proper/lang/branches/LANG_POST_2_4/project.xml
Modified: commons/proper/lang/branches/LANG_POST_2_4/default.properties
URL:
http://svn.apache.org/viewvc/commons/proper/lang/branches/LANG_POST_2_4/default.properties?rev=636418r1=636417r2=636418view=diff
==
--- commons/proper/lang/branches/LANG_POST_2_4/default.properties (original)
+++ commons/proper/lang/branches/LANG_POST_2_4/default.properties Wed Mar 12
10:03:46 2008
@@ -33,7 +33,7 @@
component.title = Core Language Utilities
# The current version number of this component
-component.version = 2.4-SNAPSHOT
+component.version = 2.5-SNAPSHOT
# The name that is used to create the jar file
final.name = ${component.name}-${component.version}
Modified: commons/proper/lang/branches/LANG_POST_2_4/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/branches/LANG_POST_2_4/pom.xml?rev=636418r1=636417r2=636418view=diff
==
--- commons/proper/lang/branches/LANG_POST_2_4/pom.xml (original)
+++ commons/proper/lang/branches/LANG_POST_2_4/pom.xml Wed Mar 12 10:03:46 2008
@@ -27,7 +27,7 @@
modelVersion4.0.0/modelVersion
groupIdcommons-lang/groupId
artifactIdcommons-lang/artifactId
- version2.4-SNAPSHOT/version
+ version2.5-SNAPSHOT/version
nameCommons Lang/name
inceptionYear2001/inceptionYear
Modified: commons/proper/lang/branches/LANG_POST_2_4/project.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/branches/LANG_POST_2_4/project.xml?rev=636418r1=636417r2=636418view=diff
==
--- commons/proper/lang/branches/LANG_POST_2_4/project.xml (original)
+++ commons/proper/lang/branches/LANG_POST_2_4/project.xml Wed Mar 12 10:03:46
2008
@@ -20,7 +20,7 @@
groupIdcommons-lang/groupId
artifactIdcommons-lang/artifactId
nameLang/name
-currentVersion2.4-SNAPSHOT/currentVersion
+currentVersion2.5-SNAPSHOT/currentVersion
inceptionYear2001/inceptionYear
shortDescriptionJava Common Components/shortDescription
description
svn commit: r636446 - /commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/Article.java
Author: sebb
Date: Wed Mar 12 11:45:54 2008
New Revision: 636446
URL: http://svn.apache.org/viewvc?rev=636446view=rev
Log:
Fix up missing ArrayList types.
Remove unnecessary casts.
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/Article.java
Modified:
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/Article.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/Article.java?rev=636446r1=636445r2=636446view=diff
==
---
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/Article.java
(original)
+++
commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/nntp/Article.java
Wed Mar 12 11:45:54 2008
@@ -75,14 +75,14 @@
public String[] getReferences() {
if (references == null)
return new String[0];
- ArrayList list = new ArrayList();
+ ArrayListString list = new ArrayListString();
int terminator = references.toString().indexOf(':');
StringTokenizer st =
new StringTokenizer(references.substring(terminator),
\t);
while (st.hasMoreTokens()) {
list.add(st.nextToken());
}
- return (String[]) list.toArray(new String[list.size()]);
+ return list.toArray(new String[list.size()]);
}
/**
@@ -248,6 +248,6 @@
public Threadable makeDummy() {
- return (Threadable)new Article();
+ return new Article();
}
}
svn commit: r636450 - in /commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/echo: EchoTCPClient.java EchoUDPClient.java
Author: sebb Date: Wed Mar 12 11:50:35 2008 New Revision: 636450 URL: http://svn.apache.org/viewvc?rev=636450view=rev Log: Remove unused imports Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/echo/EchoTCPClient.java commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/echo/EchoUDPClient.java Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/echo/EchoTCPClient.java URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/echo/EchoTCPClient.java?rev=636450r1=636449r2=636450view=diff == --- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/echo/EchoTCPClient.java (original) +++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/echo/EchoTCPClient.java Wed Mar 12 11:50:35 2008 @@ -19,7 +19,6 @@ import java.io.InputStream; -import org.apache.commons.net.SocketClient; import org.apache.commons.net.discard.DiscardTCPClient; /*** Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/echo/EchoUDPClient.java URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/echo/EchoUDPClient.java?rev=636450r1=636449r2=636450view=diff == --- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/echo/EchoUDPClient.java (original) +++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/echo/EchoUDPClient.java Wed Mar 12 11:50:35 2008 @@ -21,7 +21,6 @@ import java.net.DatagramPacket; import java.net.InetAddress; -import org.apache.commons.net.DatagramSocketClient; import org.apache.commons.net.discard.DiscardUDPClient; /***
svn commit: r636477 - /commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
Author: sebb
Date: Wed Mar 12 12:45:35 2008
New Revision: 636477
URL: http://svn.apache.org/viewvc?rev=636477view=rev
Log:
Disable future-dated tests until it has been decided how to handle +6 months
dates
Modified:
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
Modified:
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java?rev=636477r1=636476r2=636477view=diff
==
---
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
(original)
+++
commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
Wed Mar 12 12:45:35 2008
@@ -271,29 +271,31 @@
checkShortParse(2004-8-1 -26 weeks,now,target);
}
-public void testParseShortFutureDates1() throws Exception {
-GregorianCalendar now = new GregorianCalendar(2001, Calendar.MAY, 30,
12, 0);
-checkShortParse(2001-5-30,now,now); // should always work
-GregorianCalendar target = (GregorianCalendar) now.clone();
-target.add(Calendar.WEEK_OF_YEAR, 1);
-checkShortParse(2001-5-30 +1 week,now,target);
-target.add(Calendar.WEEK_OF_YEAR, 12);
-checkShortParse(2001-5-30 +13 weeks,now,target);
-target.add(Calendar.WEEK_OF_YEAR, 13);
-checkShortParse(2001-5-30 +26 weeks,now,target);
-}
+//It has not yet been decided how to handle future dates, so skip these
tests for now
+
+//public void testParseShortFutureDates1() throws Exception {
+//GregorianCalendar now = new GregorianCalendar(2001, Calendar.MAY,
30, 12, 0);
+//checkShortParse(2001-5-30,now,now); // should always work
+//GregorianCalendar target = (GregorianCalendar) now.clone();
+//target.add(Calendar.WEEK_OF_YEAR, 1);
+//checkShortParse(2001-5-30 +1 week,now,target);
+//target.add(Calendar.WEEK_OF_YEAR, 12);
+//checkShortParse(2001-5-30 +13 weeks,now,target);
+//target.add(Calendar.WEEK_OF_YEAR, 13);
+//checkShortParse(2001-5-30 +26 weeks,now,target);
+//}
-public void testParseShortFutureDates2() throws Exception {
-GregorianCalendar now = new GregorianCalendar(2004, Calendar.AUGUST,
1, 12, 0);
-checkShortParse(2004-8-1,now,now); // should always work
-GregorianCalendar target = (GregorianCalendar) now.clone();
-target.add(Calendar.WEEK_OF_YEAR, 1);
-checkShortParse(2004-8-1 +1 week,now,target);
-target.add(Calendar.WEEK_OF_YEAR, 12);
-checkShortParse(2004-8-1 +13 weeks,now,target);
-target.add(Calendar.WEEK_OF_YEAR, 13);
-checkShortParse(2004-8-1 +26 weeks,now,target);
-}
+//public void testParseShortFutureDates2() throws Exception {
+//GregorianCalendar now = new GregorianCalendar(2004, Calendar.AUGUST,
1, 12, 0);
+//checkShortParse(2004-8-1,now,now); // should always work
+//GregorianCalendar target = (GregorianCalendar) now.clone();
+//target.add(Calendar.WEEK_OF_YEAR, 1);
+//checkShortParse(2004-8-1 +1 week,now,target);
+//target.add(Calendar.WEEK_OF_YEAR, 12);
+//checkShortParse(2004-8-1 +13 weeks,now,target);
+//target.add(Calendar.WEEK_OF_YEAR, 13);
+//checkShortParse(2004-8-1 +26 weeks,now,target);
+//}
// Test leap year if current year is a leap year
public void testFeb29IfLeapYear() throws Exception{
svn commit: r636478 - /commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
Author: sebb
Date: Wed Mar 12 12:46:32 2008
New Revision: 636478
URL: http://svn.apache.org/viewvc?rev=636478view=rev
Log:
Disable future-dated tests until it has been decided how to handle +6 months
dates
Modified:
commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
Modified:
commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java?rev=636478r1=636477r2=636478view=diff
==
---
commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
(original)
+++
commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java
Wed Mar 12 12:46:32 2008
@@ -271,29 +271,31 @@
checkShortParse(2004-8-1 -26 weeks,now,target);
}
-public void testParseShortFutureDates1() throws Exception {
-GregorianCalendar now = new GregorianCalendar(2001, Calendar.MAY, 30,
12, 0);
-checkShortParse(2001-5-30,now,now); // should always work
-GregorianCalendar target = (GregorianCalendar) now.clone();
-target.add(Calendar.WEEK_OF_YEAR, 1);
-checkShortParse(2001-5-30 +1 week,now,target);
-target.add(Calendar.WEEK_OF_YEAR, 12);
-checkShortParse(2001-5-30 +13 weeks,now,target);
-target.add(Calendar.WEEK_OF_YEAR, 13);
-checkShortParse(2001-5-30 +26 weeks,now,target);
-}
+//It has not yet been decided how to handle future dates, so skip these
tests for now
+
+//public void testParseShortFutureDates1() throws Exception {
+//GregorianCalendar now = new GregorianCalendar(2001, Calendar.MAY,
30, 12, 0);
+//checkShortParse(2001-5-30,now,now); // should always work
+//GregorianCalendar target = (GregorianCalendar) now.clone();
+//target.add(Calendar.WEEK_OF_YEAR, 1);
+//checkShortParse(2001-5-30 +1 week,now,target);
+//target.add(Calendar.WEEK_OF_YEAR, 12);
+//checkShortParse(2001-5-30 +13 weeks,now,target);
+//target.add(Calendar.WEEK_OF_YEAR, 13);
+//checkShortParse(2001-5-30 +26 weeks,now,target);
+//}
-public void testParseShortFutureDates2() throws Exception {
-GregorianCalendar now = new GregorianCalendar(2004, Calendar.AUGUST,
1, 12, 0);
-checkShortParse(2004-8-1,now,now); // should always work
-GregorianCalendar target = (GregorianCalendar) now.clone();
-target.add(Calendar.WEEK_OF_YEAR, 1);
-checkShortParse(2004-8-1 +1 week,now,target);
-target.add(Calendar.WEEK_OF_YEAR, 12);
-checkShortParse(2004-8-1 +13 weeks,now,target);
-target.add(Calendar.WEEK_OF_YEAR, 13);
-checkShortParse(2004-8-1 +26 weeks,now,target);
-}
+//public void testParseShortFutureDates2() throws Exception {
+//GregorianCalendar now = new GregorianCalendar(2004, Calendar.AUGUST,
1, 12, 0);
+//checkShortParse(2004-8-1,now,now); // should always work
+//GregorianCalendar target = (GregorianCalendar) now.clone();
+//target.add(Calendar.WEEK_OF_YEAR, 1);
+//checkShortParse(2004-8-1 +1 week,now,target);
+//target.add(Calendar.WEEK_OF_YEAR, 12);
+//checkShortParse(2004-8-1 +13 weeks,now,target);
+//target.add(Calendar.WEEK_OF_YEAR, 13);
+//checkShortParse(2004-8-1 +26 weeks,now,target);
+//}
// Test leap year if current year is a leap year
public void testFeb29IfLeapYear() throws Exception{
svn commit: r636482 - /commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java
Author: sebb Date: Wed Mar 12 12:54:15 2008 New Revision: 636482 URL: http://svn.apache.org/viewvc?rev=636482view=rev Log: Remove unused imports Modified: commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java Modified: commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java?rev=636482r1=636481r2=636482view=diff == --- commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java (original) +++ commons/proper/net/trunk/src/test/org/apache/commons/net/ftp/FTPClientConfigFunctionalTest.java Wed Mar 12 12:54:15 2008 @@ -20,7 +20,6 @@ import junit.framework.TestCase; import java.io.IOException; import java.net.SocketException; -import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Comparator; import java.util.Iterator;
svn commit: r636484 - /commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
Author: sebb
Date: Wed Mar 12 12:55:15 2008
New Revision: 636484
URL: http://svn.apache.org/viewvc?rev=636484view=rev
Log:
Remove unnecessary casts
Modified:
commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
Modified:
commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java?rev=636484r1=636483r2=636484view=diff
==
---
commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
(original)
+++
commons/proper/net/trunk/src/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java
Wed Mar 12 12:55:15 2008
@@ -193,12 +193,12 @@
public FTPFileEntryParser createUnixFTPEntryParser()
{
-return (FTPFileEntryParser) new UnixFTPEntryParser();
+return new UnixFTPEntryParser();
}
public FTPFileEntryParser createVMSVersioningFTPEntryParser()
{
-return (FTPFileEntryParser) new VMSVersioningFTPEntryParser();
+return new VMSVersioningFTPEntryParser();
}
public FTPFileEntryParser createNetwareFTPEntryParser() {
@@ -222,7 +222,7 @@
public FTPFileEntryParser createOS2FTPEntryParser()
{
-return (FTPFileEntryParser) new OS2FTPEntryParser();
+return new OS2FTPEntryParser();
}
public FTPFileEntryParser createOS400FTPEntryParser()
svn commit: r636506 - /commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/expr/xpath/
Author: oheger
Date: Wed Mar 12 13:53:56 2008
New Revision: 636506
URL: http://svn.apache.org/viewvc?rev=636506view=rev
Log:
Tests for helper classes for XPathExpressionEngine
Added:
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/expr/xpath/
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/expr/xpath/AbstractXPathTest.java
- copied, changed from r635359,
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/AbstractXPathTest.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/expr/xpath/TestConfigurationAttributePointer.java
(with props)
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/expr/xpath/TestConfigurationIteratorAttributes.java
- copied, changed from r635359,
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationIteratorAttributes.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/expr/xpath/TestConfigurationNodeIteratorChildren.java
- copied, changed from r635359,
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodeIteratorChildren.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/expr/xpath/TestConfigurationNodePointer.java
- copied, changed from r635359,
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodePointer.java
Copied:
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/expr/xpath/AbstractXPathTest.java
(from r635359,
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/AbstractXPathTest.java)
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/expr/xpath/AbstractXPathTest.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/expr/xpath/AbstractXPathTest.javap1=commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/AbstractXPathTest.javar1=635359r2=636506rev=636506view=diff
==
---
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/AbstractXPathTest.java
(original)
+++
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/expr/xpath/AbstractXPathTest.java
Wed Mar 12 13:53:56 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.configuration2.tree.xpath;
+package org.apache.commons.configuration2.expr.xpath;
import java.util.ArrayList;
import java.util.List;
@@ -22,6 +22,7 @@
import org.apache.commons.configuration2.tree.ConfigurationNode;
import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
import org.apache.commons.jxpath.ri.model.NodeIterator;
+import org.apache.commons.jxpath.ri.model.NodePointer;
import junit.framework.TestCase;
@@ -53,6 +54,7 @@
/** Stores the root node of the hierarchy. */
protected ConfigurationNode root;
+@Override
protected void setUp() throws Exception
{
super.setUp();
@@ -62,6 +64,7 @@
/**
* Clears the test environment.
*/
+@Override
protected void tearDown() throws Exception
{
root = null;
@@ -108,19 +111,18 @@
}
/**
- * Returns a list with all configuration nodes contained in the specified
- * iteration. It is assumed that the iteration contains only elements of
- * this type.
+ * Returns a list with all node pointers contained in the specified
+ * iteration.
*
* @param iterator the iterator
- * @return a list with configuration nodes obtained from the iterator
+ * @return a list with the node pointers obtained from the iterator
*/
-protected List iterationElements(NodeIterator iterator)
+protected ListNodePointer iterationElements(NodeIterator iterator)
{
-List result = new ArrayList();
+ListNodePointer result = new ArrayListNodePointer();
for (int pos = 1;
svn commit: r636515 - in /commons/proper/configuration/branches/configuration2_experimental/src: main/java/org/apache/commons/configuration2/expr/xpath/ test/java/org/apache/commons/configuration2/exp
Author: oheger
Date: Wed Mar 12 14:27:01 2008
New Revision: 636515
URL: http://svn.apache.org/viewvc?rev=636515view=rev
Log:
Implementation of the NodePointerFactory for configuration nodes based on the
NodeHandler approach
Added:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/expr/xpath/ConfigurationNodePointerFactory.java
- copied, changed from r635335,
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/expr/xpath/TestConfigurationNodePointerFactory.java
- copied, changed from r636104,
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationNodePointerFactory.java
Copied:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/expr/xpath/ConfigurationNodePointerFactory.java
(from r635335,
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java)
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/expr/xpath/ConfigurationNodePointerFactory.java?p2=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/expr/xpath/ConfigurationNodePointerFactory.javap1=commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.javar1=635335r2=636515rev=636515view=diff
==
---
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java
(original)
+++
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/expr/xpath/ConfigurationNodePointerFactory.java
Wed Mar 12 14:27:01 2008
@@ -14,21 +14,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-package org.apache.commons.configuration2.tree.xpath;
+package org.apache.commons.configuration2.expr.xpath;
import java.util.Locale;
-import org.apache.commons.configuration2.tree.ConfigurationNode;
+import org.apache.commons.configuration2.expr.NodeHandler;
import org.apache.commons.jxpath.ri.QName;
import org.apache.commons.jxpath.ri.model.NodePointer;
import org.apache.commons.jxpath.ri.model.NodePointerFactory;
/**
- * Implementation of the codeNodePointerFactory/code interface for
- * configuration nodes.
+ * pImplementation of the codeNodePointerFactory/code interface for
+ * configuration nodes./p
+ * pThis class is able to create codeNodePointer/codes for the nodes of
+ * hierarchical configurations. Because there is no common base class for
+ * configuration nodes (any specific configuration implementation can use its
+ * own node class) a trick is needed for activating this factory for a concrete
+ * JXPath query: The codewrapNode()/code method has to be called with the
+ * node object and its corresponding codeNodeHandler/code. This creates a
+ * wrapper object containing all information required by the factory for
processing
+ * a query. Then this wrapper object has to be passed to the query methods of
+ * the JXPath context./p
*
- * @since 1.3
+ * @since 2.0
* @author Oliver Heger
* @version $Id$
*/
@@ -56,11 +64,14 @@
* @param locale the locale
* @return a pointer for a configuration node if the bean is such a node
*/
+@SuppressWarnings(unchecked)
public NodePointer createNodePointer(QName name, Object bean, Locale
locale)
{
-if (bean instanceof ConfigurationNode)
+if (bean instanceof NodeWrapper)
{
-return new ConfigurationNodePointer((ConfigurationNode) bean,
locale);
+NodeWrapper? wrapper = (NodeWrapper?) bean;
+return new ConfigurationNodePointer(wrapper.getNode(), wrapper
+.getNodeHandler(), locale);
}
return null;
}
@@ -74,12 +85,78 @@
* @param bean the bean
* @return a pointer for a configuration node if the bean is such a node
*/
-public NodePointer createNodePointer(NodePointer parent, QName name,
Object bean)
+@SuppressWarnings(unchecked)
+public NodePointer createNodePointer(NodePointer parent, QName name,
+Object bean)
{
-if (bean instanceof ConfigurationNode)
+if (bean instanceof NodeWrapper)
{
-return new
svn commit: r636541 - in /commons/proper/net/branches/NET_2_0/src: main/java/org/apache/commons/net/ftp/ main/java/org/apache/commons/net/ftp/parser/ main/java/org/apache/commons/net/ntp/ main/java/or
Author: sebb Date: Wed Mar 12 15:24:03 2008 New Revision: 636541 URL: http://svn.apache.org/viewvc?rev=636541view=rev Log: Remove unnecessary casts Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ntp/NtpV3Impl.java commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/smtp/SMTP.java commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/Telnet.java commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/time/TimeTCPClient.java commons/proper/net/branches/NET_2_0/src/test/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImplTest.java Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java?rev=636541r1=636540r2=636541view=diff == --- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java (original) +++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPClient.java Wed Mar 12 15:24:03 2008 @@ -497,7 +497,7 @@ if (pasv() != FTPReply.ENTERING_PASSIVE_MODE) return null; -__parsePassiveModeReply((String)_replyLines.get(_replyLines.size() - 1)); +__parsePassiveModeReply(_replyLines.get(_replyLines.size() - 1)); socket = _socketFactory_.createSocket(__passiveHost, __passivePort); if ((__restartOffset 0) !restart(__restartOffset)) @@ -886,7 +886,7 @@ return false; __dataConnectionMode = PASSIVE_REMOTE_DATA_CONNECTION_MODE; -__parsePassiveModeReply((String)_replyLines.get(0)); +__parsePassiveModeReply(_replyLines.get(0)); return true; } @@ -1798,7 +1798,7 @@ if (pwd() != FTPReply.PATHNAME_CREATED) return null; -return __parsePathname((String)_replyLines.get( _replyLines.size() - 1)); +return __parsePathname(_replyLines.get( _replyLines.size() - 1)); } @@ -1845,7 +1845,7 @@ // in practice FTP servers deviate, so we soften the condition to // a positive completion. if (__systemName == null FTPReply.isPositiveCompletion(syst())) -__systemName = ((String)_replyLines.get(_replyLines.size() - 1)).substring(4); +__systemName = _replyLines.get(_replyLines.size() - 1).substring(4); return __systemName; } Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java?rev=636541r1=636540r2=636541view=diff == --- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java (original) +++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java Wed Mar 12 15:24:03 2008 @@ -191,7 +191,7 @@ tmpResults.add(temp); count--; } -return (FTPFile[]) tmpResults.toArray(new FTPFile[0]); +return tmpResults.toArray(new FTPFile[0]); } @@ -230,7 +230,7 @@ tmpResults.add(0,temp); count--; } -return (FTPFile[]) tmpResults.toArray(new FTPFile[0]); +return tmpResults.toArray(new FTPFile[0]); } /** @@ -255,7 +255,7 @@ FTPFile temp = this.parser.parseFTPEntry(entry); tmpResults.add(temp); } -return (FTPFile[]) tmpResults.toArray(new FTPFile[0]); +return tmpResults.toArray(new FTPFile[0]); } Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java?rev=636541r1=636540r2=636541view=diff
svn commit: r636552 - /commons/proper/commons-parent/trunk/pom.xml
Author: niallp Date: Wed Mar 12 15:46:32 2008 New Revision: 636552 URL: http://svn.apache.org/viewvc?rev=636552view=rev Log: Put back the license the maven-release-plugin removed Modified: commons/proper/commons-parent/trunk/pom.xml Modified: commons/proper/commons-parent/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/pom.xml?rev=636552r1=636551r2=636552view=diff == --- commons/proper/commons-parent/trunk/pom.xml (original) +++ commons/proper/commons-parent/trunk/pom.xml Wed Mar 12 15:46:32 2008 @@ -1,3 +1,22 @@ +?xml version=1.0 encoding=ISO-8859-1? +!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +-- project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; modelVersion4.0.0/modelVersion parent @@ -564,4 +583,4 @@ /properties -/project \ No newline at end of file +/project
svn commit: r636579 - /commons/proper/collections/branches/collections_jdk5_branch/build.xml
Author: skestle
Date: Wed Mar 12 16:51:04 2008
New Revision: 636579
URL: http://svn.apache.org/viewvc?rev=636579view=rev
Log:
Added KeyValue for creation of deprecated jar to support Hibernate (dependency
of SequencedHashMap)
Modified:
commons/proper/collections/branches/collections_jdk5_branch/build.xml
Modified: commons/proper/collections/branches/collections_jdk5_branch/build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/collections/branches/collections_jdk5_branch/build.xml?rev=636579r1=636578r2=636579view=diff
==
--- commons/proper/collections/branches/collections_jdk5_branch/build.xml
(original)
+++ commons/proper/collections/branches/collections_jdk5_branch/build.xml Wed
Mar 12 16:51:04 2008
@@ -708,6 +708,7 @@
zipfileset src=${collections-3.jar}
!-- used by Hibernate --
include name=**/SequencedHashMap*/
+ include name=**/KeyValue*/ !-- used by
SequencedHashMap --
include name=**/LRUMap*/
include name=**/ReferenceMap*/
/zipfileset
svn commit: r636634 - /commons/proper/lang/trunk/doap_lang.rdf
Author: bayard Date: Wed Mar 12 22:52:03 2008 New Revision: 636634 URL: http://svn.apache.org/viewvc?rev=636634view=rev Log: Adding 2.3 Modified: commons/proper/lang/trunk/doap_lang.rdf Modified: commons/proper/lang/trunk/doap_lang.rdf URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/doap_lang.rdf?rev=636634r1=636633r2=636634view=diff == --- commons/proper/lang/trunk/doap_lang.rdf (original) +++ commons/proper/lang/trunk/doap_lang.rdf Wed Mar 12 22:52:03 2008 @@ -40,6 +40,11 @@ release revision namecommons-lang/name +created2007-02-13/created +version2.3/version + /revision + revision +namecommons-lang/name created2006-10-04/created version2.2/version /revision
