svn commit: r1445425 - in /commons/proper/proxy/branches/version-2.0-work: build-tools/pom.xml pom.xml
Author: mbenson Date: Tue Feb 12 23:00:57 2013 New Revision: 1445425 URL: http://svn.apache.org/r1445425 Log: use commons-proxy2-parent as build-tools parent; fix up checkstyle config Modified: commons/proper/proxy/branches/version-2.0-work/build-tools/pom.xml commons/proper/proxy/branches/version-2.0-work/pom.xml Modified: commons/proper/proxy/branches/version-2.0-work/build-tools/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/build-tools/pom.xml?rev=1445425&r1=1445424&r2=1445425&view=diff == --- commons/proper/proxy/branches/version-2.0-work/build-tools/pom.xml (original) +++ commons/proper/proxy/branches/version-2.0-work/build-tools/pom.xml Tue Feb 12 23:00:57 2013 @@ -17,14 +17,12 @@ 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/xsd/maven-4.0.0.xsd";> -org.apache -apache -7 +org.apache.commons +commons-proxy2-parent +2.0-SNAPSHOT 4.0.0 -org.apache.commons commons-proxy2-build-tools -2.0-SNAPSHOT Commons Proxy Build Tools Provide common setup, from http://maven.apache.org/plugins/maven-checkstyle-plugin/examples/multi-module-config.html Modified: commons/proper/proxy/branches/version-2.0-work/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/proxy/branches/version-2.0-work/pom.xml?rev=1445425&r1=1445424&r2=1445425&view=diff == --- commons/proper/proxy/branches/version-2.0-work/pom.xml (original) +++ commons/proper/proxy/branches/version-2.0-work/pom.xml Tue Feb 12 23:00:57 2013 @@ -141,7 +141,7 @@ ${project.groupId} -commons-proxy-build-tools +commons-proxy2-build-tools ${project.version}
svn commit: r1445422 - /commons/proper/functor/trunk/build-tools/pom.xml
Author: mbenson Date: Tue Feb 12 22:50:30 2013 New Revision: 1445422 URL: http://svn.apache.org/r1445422 Log: bring build-tools into the functor family Modified: commons/proper/functor/trunk/build-tools/pom.xml Modified: commons/proper/functor/trunk/build-tools/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/build-tools/pom.xml?rev=1445422&r1=1445421&r2=1445422&view=diff == --- commons/proper/functor/trunk/build-tools/pom.xml (original) +++ commons/proper/functor/trunk/build-tools/pom.xml Tue Feb 12 22:50:30 2013 @@ -16,9 +16,9 @@ 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/xsd/maven-4.0.0.xsd";> -org.apache -apache -9 +org.apache.commons +commons-functor-parent +1.0-SNAPSHOT 4.0.0 commons-functor-build-tools
svn commit: r1445397 - in /commons/proper/functor/trunk: build-tools/pom.xml pom.xml
Author: kinow Date: Tue Feb 12 21:34:47 2013 New Revision: 1445397 URL: http://svn.apache.org/r1445397 Log: Setting groupId org.apache.commons in parent POM, and removing it from modules Modified: commons/proper/functor/trunk/build-tools/pom.xml commons/proper/functor/trunk/pom.xml Modified: commons/proper/functor/trunk/build-tools/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/build-tools/pom.xml?rev=1445397&r1=1445396&r2=1445397&view=diff == --- commons/proper/functor/trunk/build-tools/pom.xml (original) +++ commons/proper/functor/trunk/build-tools/pom.xml Tue Feb 12 21:34:47 2013 @@ -21,9 +21,7 @@ 9 4.0.0 - org.apache.commons commons-functor-build-tools - 1.0-SNAPSHOT Commons Functor Build Tools Provide common setup, from http://maven.apache.org/plugins/maven-checkstyle-plugin/examples/multi-module-config.html Modified: commons/proper/functor/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/pom.xml?rev=1445397&r1=1445396&r2=1445397&view=diff == --- commons/proper/functor/trunk/pom.xml (original) +++ commons/proper/functor/trunk/pom.xml Tue Feb 12 21:34:47 2013 @@ -23,6 +23,7 @@ commons-parent 28 + org.apache.commons commons-functor-parent 1.0-SNAPSHOT pom
svn commit: r1445368 - /commons/proper/commons-site/trunk/pom.xml
Author: tn Date: Tue Feb 12 21:12:48 2013 New Revision: 1445368 URL: http://svn.apache.org/r1445368 Log: Added myself to commons-site. Modified: commons/proper/commons-site/trunk/pom.xml Modified: commons/proper/commons-site/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/commons-site/trunk/pom.xml?rev=1445368&r1=1445367&r2=1445368&view=diff == --- commons/proper/commons-site/trunk/pom.xml (original) +++ commons/proper/commons-site/trunk/pom.xml Tue Feb 12 21:12:48 2013 @@ -195,7 +195,6 @@ Simone Tripodi PMC Member - skitching Simon Kitching @@ -216,6 +215,11 @@ Torsten Curdt PMC Member + + tn + Thomas Neidhart + PMC Member +
svn commit: r1445367 - /commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/ClassAccessor.java
Author: britter Date: Tue Feb 12 21:11:33 2013 New Revision: 1445367 URL: http://svn.apache.org/r1445367 Log: Add JavaDoc for ClassAccessor - no functional changes Modified: commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/ClassAccessor.java Modified: commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/ClassAccessor.java URL: http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/ClassAccessor.java?rev=1445367&r1=1445366&r2=1445367&view=diff == --- commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/ClassAccessor.java (original) +++ commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/ClassAccessor.java Tue Feb 12 21:11:33 2013 @@ -19,24 +19,69 @@ package org.apache.commons.beanutils2; * under the License. */ +/** + * Provides access to constructors and static methods on classes. + * + * @param The type modeled by this {@code ClassAccessor}. + */ public interface ClassAccessor { // constructors +/** + * Creates a new instance of type {@code B} by calling the parameterless constructor of the wrapped class. + * + * @para the type of the new instance + * @return a {@link BeanAccessor} that wraps the new instance. + */ BeanAccessor newInstance(); +/** + * Invokes the constructor with the parameter list represented by {@code arguments} on the wrapped class. Primitive + * types may be converted to wrapper types and vice versa to match the methods signature. + * + * @param arguments the list of arguments to invoke the constructor with. + * @return a {@link BeanAccessor} that wrapped the new instance + */ BeanAccessor invokeConstructor( Argument... arguments ); +/** + * Invokes the constructor with the parameter list represented by {@code arguments} on the wrapped class. Invoking + * an exact constructor in this context means to not perform any type conversations during invocation. + * + * @param arguments the list of arguments to invoke the constructor with. + * @return a {@link BeanAccessor} that wrapped the new instance + */ BeanAccessor invokeExactConstructor( Argument...arguments ); + // bean properties +/** + * Provides access to the {@link BeanProperties} defined by the wrapped class. + * + * @return the {@link BeanProperties} for the wrapped class. + */ BeanProperties getProperties(); // static methods invocation +/** + * Invokes the method with name {@code methodName} on the wrapped class. Primitive types may be converted to wrapper + * types and vice versa to match the methods signature. + * + * @param methodName the name of the method to invoke. Must not be {@code null}! + * @return the {@link ArgumentsAccessor} for this method invocation. + */ ArgumentsAccessor invokeStatic( String methodName ); +/** + * Invokes the method with name {@code methodName} on the wrapped class. Invoking an exact method in this context + * means to not perform any type conversations during invocation. + * + * @param methodName the name of the method to invoke. Must not be {@code null}! + * @return the {@link ArgumentsAccessor} for this method invocation. + */ ArgumentsAccessor invokeExactStatic( String methodName ); }
svn commit: r1445366 - /commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/MethodUtils.java
Author: britter Date: Tue Feb 12 21:10:18 2013 New Revision: 1445366 URL: http://svn.apache.org/r1445366 Log: Fixed typos in JavaDoc - no functional changes Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/MethodUtils.java Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/MethodUtils.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/MethodUtils.java?rev=1445366&r1=1445365&r2=1445366&view=diff == --- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/MethodUtils.java (original) +++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/MethodUtils.java Tue Feb 12 21:10:18 2013 @@ -143,7 +143,7 @@ public class MethodUtils { * The behaviour of this method is less deterministic * than invokeExactMethod(). * It loops through all methods with names that match - * and then executes the first it finds with compatable parameters. + * and then executes the first it finds with compatible parameters. * * This method supports calls to methods taking primitive parameters * via passing in wrapping classes. So, for example, a Boolean class @@ -185,7 +185,7 @@ public class MethodUtils { * The behaviour of this method is less deterministic * than {@link #invokeExactMethod(Object object,String methodName,Object [] args)}. * It loops through all methods with names that match - * and then executes the first it finds with compatable parameters. + * and then executes the first it finds with compatible parameters. * * This method supports calls to methods taking primitive parameters * via passing in wrapping classes. So, for example, a Boolean class @@ -235,7 +235,7 @@ public class MethodUtils { * than {@link * #invokeExactMethod(Object object,String methodName,Object [] args,Class[] parameterTypes)}. * It loops through all methods with names that match - * and then executes the first it finds with compatable parameters. + * and then executes the first it finds with compatible parameters. * * This method supports calls to methods taking primitive parameters * via passing in wrapping classes. So, for example, a Boolean class @@ -461,7 +461,7 @@ public class MethodUtils { * The behaviour of this method is less deterministic * than {@link #invokeExactMethod(Object, String, Object[], Class[])}. * It loops through all methods with names that match - * and then executes the first it finds with compatable parameters. + * and then executes the first it finds with compatible parameters. * * This method supports calls to methods taking primitive parameters * via passing in wrapping classes. So, for example, a Boolean class @@ -504,7 +504,7 @@ public class MethodUtils { * The behaviour of this method is less deterministic * than {@link #invokeExactMethod(Object object,String methodName,Object [] args)}. * It loops through all methods with names that match - * and then executes the first it finds with compatable parameters. + * and then executes the first it finds with compatible parameters. * * This method supports calls to methods taking primitive parameters * via passing in wrapping classes. So, for example, a Boolean class @@ -555,7 +555,7 @@ public class MethodUtils { * than {@link * #invokeExactStaticMethod(Class objectClass,String methodName,Object [] args,Class[] parameterTypes)}. * It loops through all methods with names that match - * and then executes the first it finds with compatable parameters. + * and then executes the first it finds with compatible parameters. * * This method supports calls to methods taking primitive parameters * via passing in wrapping classes. So, for example, a Boolean class
svn commit: r1445352 - in /commons/proper/cli/trunk/src/main/java/org/apache/commons/cli: GnuParser.java Parser.java
Author: tn Date: Tue Feb 12 20:48:19 2013 New Revision: 1445352 URL: http://svn.apache.org/r1445352 Log: Suppress pmd warnings. Modified: commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/GnuParser.java commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/Parser.java Modified: commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/GnuParser.java URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/GnuParser.java?rev=1445352&r1=1445351&r2=1445352&view=diff == --- commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/GnuParser.java (original) +++ commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/GnuParser.java Tue Feb 12 20:48:19 2013 @@ -103,7 +103,7 @@ public class GnuParser extends Parser if (eatTheRest) { -for (i++; i < arguments.length; i++) +for (i++; i < arguments.length; i++) //NOPMD { tokens.add(arguments[i]); } Modified: commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/Parser.java URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/Parser.java?rev=1445352&r1=1445351&r2=1445352&view=diff == --- commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/Parser.java (original) +++ commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/Parser.java Tue Feb 12 20:48:19 2013 @@ -281,7 +281,7 @@ public abstract class Parser implements { opt.addValueForProcessing(value); } -catch (RuntimeException exp) +catch (RuntimeException exp) //NOPMD { // if we cannot add the value don't worry about it }
svn commit: r1445336 - /commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassAccessor.java
Author: britter Date: Tue Feb 12 20:23:04 2013 New Revision: 1445336 URL: http://svn.apache.org/r1445336 Log: Remove empty JavaDoc skeleton from private method - no functional changes Modified: commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassAccessor.java Modified: commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassAccessor.java URL: http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassAccessor.java?rev=1445336&r1=1445335&r2=1445336&view=diff == --- commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassAccessor.java (original) +++ commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassAccessor.java Tue Feb 12 20:23:04 2013 @@ -81,17 +81,6 @@ final class DefaultClassAccessor return invokeConstructor( true, arguments ); } -/** - * - * @param exact - * @param arguments - * @return - * @throws IllegalArgumentException - * @throws InstantiationException - * @throws IllegalAccessException - * @throws InvocationTargetException - * @throws NoSuchMethodException - */ private BeanAccessor invokeConstructor( boolean exact, Argument... arguments ) { checkInstantiable();
svn commit: r1445335 - in /commons/sandbox/beanutils2/trunk/src: changes/ main/java/org/apache/commons/beanutils2/ test/java/org/apache/commons/beanutils2/
Author: britter Date: Tue Feb 12 20:22:00 2013 New Revision: 1445335 URL: http://svn.apache.org/r1445335 Log: [SANDBOX-441] - Handling of types that can not be instantiated in DefaultClassAccessor should be improved to give users better feedback Modified: commons/sandbox/beanutils2/trunk/src/changes/changes.xml commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/BeanInstantiationException.java commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassAccessor.java commons/sandbox/beanutils2/trunk/src/test/java/org/apache/commons/beanutils2/ConstructorsTestCase.java Modified: commons/sandbox/beanutils2/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/changes/changes.xml?rev=1445335&r1=1445334&r2=1445335&view=diff == --- commons/sandbox/beanutils2/trunk/src/changes/changes.xml (original) +++ commons/sandbox/beanutils2/trunk/src/changes/changes.xml Tue Feb 12 20:22:00 2013 @@ -23,6 +23,10 @@ + + Handling of types that can not be instantiated in DefaultClassAccessor should + be improved to give users better feedback + Rename ClassLoaderBuilder.loadWithClassLoader to loadWith Modified: commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/BeanInstantiationException.java URL: http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/BeanInstantiationException.java?rev=1445335&r1=1445334&r2=1445335&view=diff == --- commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/BeanInstantiationException.java (original) +++ commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/BeanInstantiationException.java Tue Feb 12 20:22:00 2013 @@ -27,7 +27,12 @@ public class BeanInstantiationException public BeanInstantiationException( Class beanType, Throwable cause ) { -super( cause, beanType, "Could not create a new instance of type '%s'.", beanType ); +super( cause, beanType, "Cannot not create a new instance of type '%s'.", beanType ); +} + +BeanInstantiationException( Class beanType, String reason ) +{ +super( null, beanType, "Cannot not create a new instance of type '%s'. Reason: " + reason, beanType ); } } Modified: commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassAccessor.java URL: http://svn.apache.org/viewvc/commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassAccessor.java?rev=1445335&r1=1445334&r2=1445335&view=diff == --- commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassAccessor.java (original) +++ commons/sandbox/beanutils2/trunk/src/main/java/org/apache/commons/beanutils2/DefaultClassAccessor.java Tue Feb 12 20:22:00 2013 @@ -23,6 +23,8 @@ import static org.apache.commons.beanuti import static org.apache.commons.beanutils2.Assertions.checkNoneIsNull; import static org.apache.commons.beanutils2.Assertions.checkNotNull; +import static java.lang.reflect.Modifier.isAbstract; + import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -50,19 +52,7 @@ final class DefaultClassAccessor */ public BeanAccessor newInstance() { -try -{ -B bean = beanClass.newInstance(); -return new DefaultBeanAccessor( bean ); -} -catch ( InstantiationException e ) -{ -throw new BeanInstantiationException( beanClass, e ); -} -catch ( IllegalAccessException e ) -{ -throw new ConstructorNotAccessibleException( beanClass, e ); -} +return invokeConstructor(); } // constructors @@ -104,6 +94,7 @@ final class DefaultClassAccessor */ private BeanAccessor invokeConstructor( boolean exact, Argument... arguments ) { +checkInstantiable(); @SuppressWarnings( "unchecked" ) // type driven by beanClass Constructor constructor = (Constructor) constructorRegistry.get( exact, beanClass, @@ -125,6 +116,35 @@ final class DefaultClassAccessor return new DefaultBeanAccessor( bean ); } +/** + * Checks if {@code beanClass} is instantiable and throws a {@link BeanInstantiationException} with an appropriate + * message otherwise. + */ +private void checkInstantiable() +{ +if ( beanClass.isInterface() ) +{ +throw new BeanInstantiationException( beanClass, "Type is an interface." ); +
svn commit: r1445319 - in /commons/sandbox/weaver/branches/mjb/processor/src: main/java/org/apache/commons/weaver/ test/java/org/apache/commons/weaver/ test/java/org/apache/commons/weaver/test/ test/j
Author: mbenson Date: Tue Feb 12 19:16:20 2013 New Revision: 1445319 URL: http://svn.apache.org/r1445319 Log: clean up and test annotation inflation Added: commons/sandbox/weaver/branches/mjb/processor/src/test/java/org/apache/commons/weaver/FinderTest.java (with props) commons/sandbox/weaver/branches/mjb/processor/src/test/java/org/apache/commons/weaver/test/beans/ComplexAnnotations.java (with props) Modified: commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/Finder.java commons/sandbox/weaver/branches/mjb/processor/src/test/java/org/apache/commons/weaver/test/WeaverTestBase.java Modified: commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/Finder.java URL: http://svn.apache.org/viewvc/commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/Finder.java?rev=1445319&r1=1445318&r2=1445319&view=diff == --- commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/Finder.java (original) +++ commons/sandbox/weaver/branches/mjb/processor/src/main/java/org/apache/commons/weaver/Finder.java Tue Feb 12 19:16:20 2013 @@ -9,6 +9,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Arrays; import java.util.IdentityHashMap; import java.util.LinkedHashMap; import java.util.List; @@ -36,11 +37,7 @@ class Finder extends AnnotationFinder { AnnotationInflater(String desc) { super(); -try { -this.annotationType = Class.forName(Type.getType(desc).getClassName()).asSubclass(Annotation.class); -} catch (ClassNotFoundException e) { -throw new RuntimeException(e); -} +this.annotationType = toClass(Type.getType(desc)).asSubclass(Annotation.class); } Annotation inflate() { @@ -51,17 +48,26 @@ class Finder extends AnnotationFinder { protected void storeValue(String name, Object value) { Validate.notNull(value, "null annotation element"); if (value.getClass().isArray()) { -final int len = Array.getLength(value); -final Object typedArray; +final Class requiredType; try { -typedArray = - Array.newInstance(annotationType.getDeclaredMethod(name).getReturnType().getComponentType(), -len); +requiredType = annotationType.getDeclaredMethod(name).getReturnType(); } catch (Exception e) { throw new RuntimeException(e); } -System.arraycopy(value, 0, typedArray, 0, len); -value = typedArray; +if (!requiredType.isInstance(value)) { +final int len = Array.getLength(value); +final Object typedArray = Array.newInstance(requiredType.getComponentType(), len); +for (int i = 0; i < len; i++) { +Object o = Array.get(value, i); +if (o instanceof Type) { +o = toClass((Type) o); +} +Array.set(typedArray, i, o); +} +value = typedArray; +} +} else if (value instanceof Type) { +value = toClass((Type) value); } elements.put(name, value); } @@ -460,6 +466,21 @@ class Finder extends AnnotationFinder { } }; +private static Class toClass(Type type) { +Class result; +try { +result = Class.forName((type.getSort() == Type.ARRAY ? type.getElementType() : type).getClassName()); +} catch (ClassNotFoundException e) { +throw new RuntimeException(e); +} +if (type.getSort() == Type.ARRAY) { +int[] dims = new int[type.getDimensions()]; +Arrays.fill(dims, 0); +result = Array.newInstance(result, dims).getClass(); +} +return result; +} + private final Map> classfileAnnotations; public Finder(Archive archive) { Added: commons/sandbox/weaver/branches/mjb/processor/src/test/java/org/apache/commons/weaver/FinderTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/weaver/branches/mjb/processor/src/test/java/org/apache/commons/weaver/FinderTest.java?rev=1445319&view=auto == --- commons/sandbox/weaver/branches/mjb/processor/src/test/java/org/apache/commons/weaver/FinderTest.java (added) +++ commons/sandbox/weaver/branches/mjb/processor/src/test/java/org/apache/commons/weaver/FinderTest.java
svn commit: r1445318 - /commons/sandbox/weaver/branches/mjb/modules/privilizer/weaver/pom.xml
Author: mbenson Date: Tue Feb 12 19:15:54 2013 New Revision: 1445318 URL: http://svn.apache.org/r1445318 Log: unused dependency Modified: commons/sandbox/weaver/branches/mjb/modules/privilizer/weaver/pom.xml Modified: commons/sandbox/weaver/branches/mjb/modules/privilizer/weaver/pom.xml URL: http://svn.apache.org/viewvc/commons/sandbox/weaver/branches/mjb/modules/privilizer/weaver/pom.xml?rev=1445318&r1=1445317&r2=1445318&view=diff == --- commons/sandbox/weaver/branches/mjb/modules/privilizer/weaver/pom.xml (original) +++ commons/sandbox/weaver/branches/mjb/modules/privilizer/weaver/pom.xml Tue Feb 12 19:15:54 2013 @@ -49,11 +49,6 @@ javassist 3.16.1-GA - - commons-io - commons-io - 2.4 -
svn commit: r1445317 - /commons/sandbox/weaver/branches/mjb/processor/src/test/java/org/apache/commons/weaver/test/WeaveProcessorTest.java
Author: mbenson Date: Tue Feb 12 19:15:33 2013 New Revision: 1445317 URL: http://svn.apache.org/r1445317 Log: unnecessary method call Modified: commons/sandbox/weaver/branches/mjb/processor/src/test/java/org/apache/commons/weaver/test/WeaveProcessorTest.java Modified: commons/sandbox/weaver/branches/mjb/processor/src/test/java/org/apache/commons/weaver/test/WeaveProcessorTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/weaver/branches/mjb/processor/src/test/java/org/apache/commons/weaver/test/WeaveProcessorTest.java?rev=1445317&r1=1445316&r2=1445317&view=diff == --- commons/sandbox/weaver/branches/mjb/processor/src/test/java/org/apache/commons/weaver/test/WeaveProcessorTest.java (original) +++ commons/sandbox/weaver/branches/mjb/processor/src/test/java/org/apache/commons/weaver/test/WeaveProcessorTest.java Tue Feb 12 19:15:33 2013 @@ -43,8 +43,6 @@ public class WeaveProcessorTest extends Properties config = new Properties(); config.put("configKey", "configValue"); -getTargetFolder(); - wp.configure(getClassPathEntries(), getTargetFolder(), config); TestWeaver.wovenClasses.clear();
svn commit: r1445316 - /commons/sandbox/weaver/branches/mjb/processor/pom.xml
Author: mbenson Date: Tue Feb 12 19:15:11 2013 New Revision: 1445316 URL: http://svn.apache.org/r1445316 Log: removed managed dependency versions Modified: commons/sandbox/weaver/branches/mjb/processor/pom.xml Modified: commons/sandbox/weaver/branches/mjb/processor/pom.xml URL: http://svn.apache.org/viewvc/commons/sandbox/weaver/branches/mjb/processor/pom.xml?rev=1445316&r1=1445315&r2=1445316&view=diff == --- commons/sandbox/weaver/branches/mjb/processor/pom.xml (original) +++ commons/sandbox/weaver/branches/mjb/processor/pom.xml Tue Feb 12 19:15:11 2013 @@ -37,12 +37,10 @@ under the License. org.apache.xbean xbean-finder-shaded - 3.13-SNAPSHOT org.apache.commons commons-lang3 - 3.1 junit
svn commit: r1445167 - in /commons/proper/cli/trunk: RELEASE-NOTES.txt src/site/xdoc/release_1_3.xml
Author: tn Date: Tue Feb 12 13:41:04 2013 New Revision: 1445167 URL: http://svn.apache.org/r1445167 Log: Re-organize new features to reflect significance. Modified: commons/proper/cli/trunk/RELEASE-NOTES.txt commons/proper/cli/trunk/src/site/xdoc/release_1_3.xml Modified: commons/proper/cli/trunk/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/RELEASE-NOTES.txt?rev=1445167&r1=1445166&r2=1445167&view=diff == --- commons/proper/cli/trunk/RELEASE-NOTES.txt (original) +++ commons/proper/cli/trunk/RELEASE-NOTES.txt Tue Feb 12 13:41:04 2013 @@ -19,20 +19,20 @@ More information can be found on the pro NEW FEATURES: - * Added new fluent API to create Option instances via builder class Option.Builder. -This replaces the now deprecated OptionBuilder. Thanks to Duncan Jones, Brian Blount. (CLI-224) - - * Added new method Options.addOption(String, String). Thanks to Alexandru Mocanu. (CLI-214) - * A new parser is available: DefaultParser. It combines the features of the GnuParser and the PosixParser. It also provides additional features like partial matching for the long options, and long options without separator (i.e like the JVM memory settings: -Xmx512m). This new parser deprecates the previous ones. (CLI-161, CLI-167, CLI-181) + * Added new fluent API to create Option instances via builder class Option.Builder. +This replaces the now deprecated OptionBuilder. Thanks to Duncan Jones, Brian Blount. (CLI-224) + * PosixParser now supports partial long options (--ver instead of --version). (CLI-160) * HelpFormatter now supports setting the displayed separator of long options. Thanks to J. Lewis Muir. (CLI-169) + * Added new method Options.addOption(String, String). Thanks to Alexandru Mocanu. (CLI-214) + BUG FIXES: Modified: commons/proper/cli/trunk/src/site/xdoc/release_1_3.xml URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/site/xdoc/release_1_3.xml?rev=1445167&r1=1445166&r2=1445167&view=diff == --- commons/proper/cli/trunk/src/site/xdoc/release_1_3.xml (original) +++ commons/proper/cli/trunk/src/site/xdoc/release_1_3.xml Tue Feb 12 13:41:04 2013 @@ -41,20 +41,20 @@ More information can be found on the pro NEW FEATURES: - * Added new fluent API to create Option instances via builder class Option.Builder. -This replaces the now deprecated OptionBuilder. Thanks to Duncan Jones, Brian Blount. (CLI-224) - - * Added new method Options.addOption(String, String). Thanks to Alexandru Mocanu. (CLI-214) - * A new parser is available: DefaultParser. It combines the features of the GnuParser and the PosixParser. It also provides additional features like partial matching for the long options, and long options without separator (i.e like the JVM memory settings: -Xmx512m). This new parser deprecates the previous ones. (CLI-161, CLI-167, CLI-181) + * Added new fluent API to create Option instances via builder class Option.Builder. +This replaces the now deprecated OptionBuilder. Thanks to Duncan Jones, Brian Blount. (CLI-224) + * PosixParser now supports partial long options (--ver instead of --version). (CLI-160) * HelpFormatter now supports setting the displayed separator of long options. Thanks to J. Lewis Muir. (CLI-169) + * Added new method Options.addOption(String, String). Thanks to Alexandru Mocanu. (CLI-214) + BUG FIXES:
svn commit: r1445166 - in /commons/proper/cli/trunk/src/site: site.xml xdoc/index.xml xdoc/introduction.xml xdoc/properties.xml xdoc/release_1_3.xml
Author: tn Date: Tue Feb 12 13:32:55 2013 New Revision: 1445166 URL: http://svn.apache.org/r1445166 Log: Update site content. Added: commons/proper/cli/trunk/src/site/xdoc/release_1_3.xml Modified: commons/proper/cli/trunk/src/site/site.xml commons/proper/cli/trunk/src/site/xdoc/index.xml commons/proper/cli/trunk/src/site/xdoc/introduction.xml commons/proper/cli/trunk/src/site/xdoc/properties.xml Modified: commons/proper/cli/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/site/site.xml?rev=1445166&r1=1445165&r2=1445166&view=diff == --- commons/proper/cli/trunk/src/site/site.xml (original) +++ commons/proper/cli/trunk/src/site/site.xml Tue Feb 12 13:32:55 2013 @@ -36,7 +36,7 @@ - + Modified: commons/proper/cli/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/site/xdoc/index.xml?rev=1445166&r1=1445165&r2=1445166&view=diff == --- commons/proper/cli/trunk/src/site/xdoc/index.xml (original) +++ commons/proper/cli/trunk/src/site/xdoc/index.xml Tue Feb 12 13:32:55 2013 @@ -78,8 +78,8 @@ usage: ls The Javadoc API documents are available online: -CLI 1.3-SNAPSHOT (latest SVN) -CLI 1.2 (current release) +CLI 1.3 (current release) +CLI 1.2 CLI 1.1 CLI 1.0 @@ -91,10 +91,10 @@ usage: ls -The latest version is v1.2. - +The latest version is v1.3. - http://commons.apache.org/cli/download_cli.cgi";>Download now! -The release notes are also available. +The release notes are also available. For previous releases, see the http://archive.apache.org/dist/commons/cli/";>Apache Archive. Modified: commons/proper/cli/trunk/src/site/xdoc/introduction.xml URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/site/xdoc/introduction.xml?rev=1445166&r1=1445165&r2=1445166&view=diff == --- commons/proper/cli/trunk/src/site/xdoc/introduction.xml (original) +++ commons/proper/cli/trunk/src/site/xdoc/introduction.xml Tue Feb 12 13:32:55 2013 @@ -80,7 +80,7 @@ -The interrogation stage is where the application querys the +The interrogation stage is where the application queries the CommandLine to decide what execution branch to take depending on boolean options and uses the option values to provide the application data. Modified: commons/proper/cli/trunk/src/site/xdoc/properties.xml URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/site/xdoc/properties.xml?rev=1445166&r1=1445165&r2=1445166&view=diff == --- commons/proper/cli/trunk/src/site/xdoc/properties.xml (original) +++ commons/proper/cli/trunk/src/site/xdoc/properties.xml Tue Feb 12 13:32:55 2013 @@ -61,12 +61,6 @@ the command line. - multipleArgs - boolean - a flag to say whether the option takes multiple argument -values - - arg boolean a flag to say whether the option takes an argument Added: commons/proper/cli/trunk/src/site/xdoc/release_1_3.xml URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/site/xdoc/release_1_3.xml?rev=1445166&view=auto == --- commons/proper/cli/trunk/src/site/xdoc/release_1_3.xml (added) +++ commons/proper/cli/trunk/src/site/xdoc/release_1_3.xml Tue Feb 12 13:32:55 2013 @@ -0,0 +1,119 @@ + + + + + Release notes for CLI 1.3 + Commons Documentation Team + + + + + + These are the release notes for Commons CLI 1.3. + + +INTRODUCTION: + +This document contains the release notes for this version of the Commons CLI +package. Commons CLI provides a simple API for working with the command line +arguments and options. + +Commons CLI 1.3 is a bugfix release and binary compatible with the previous versions, +except for the OptionValidator class that is no longer public (change introduced in v1.2). + +More information can be found on the project site at http://commons.apache.org/cli + + +NEW FEATURES: + + * Added new fluent API to create Option instances via builder class Option.Builder. +This replaces the now deprecated OptionBuilder. Thanks to Duncan Jones, Brian Blount. (CLI-224) + + * Added new method Options.addOption(String, String). Thanks to Alexandru Mocanu. (CLI-214) + + * A new parser is available: DefaultParser. It combines the features of the GnuParser and the PosixParser. +I
svn commit: r1445165 - in /commons/proper/cli/trunk: RELEASE-NOTES.txt src/changes/changes.xml
Author: tn Date: Tue Feb 12 13:31:58 2013 New Revision: 1445165 URL: http://svn.apache.org/r1445165 Log: Update release notes. Modified: commons/proper/cli/trunk/RELEASE-NOTES.txt commons/proper/cli/trunk/src/changes/changes.xml Modified: commons/proper/cli/trunk/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/RELEASE-NOTES.txt?rev=1445165&r1=1445164&r2=1445165&view=diff == --- commons/proper/cli/trunk/RELEASE-NOTES.txt (original) +++ commons/proper/cli/trunk/RELEASE-NOTES.txt Tue Feb 12 13:31:58 2013 @@ -1,7 +1,7 @@ $Id$ Commons CLI Package -Version 1.2 +Version 1.3 Release Notes @@ -11,70 +11,81 @@ This document contains the release notes package. Commons CLI provides a simple API for working with the command line arguments and options. -Commons CLI 1.2 is a bugfix release. The following notable changes were made: - - * A major regression introduced in CLI 1.1 that prevented the usage of repeated options has been fixed. - * Several parser issues have been fixed, especially with the PosixParser. - * HelpFormatter now wraps the lines properly - * The ordering of the option in the help message can now be defined. - * Various API enhancements (improved exceptions, serializable classes) - -Commons CLI 1.2 is binary compatible with the previous versions, except for -the OptionValidator class that is no longer public. +Commons CLI 1.3 is a bugfix release and binary compatible with the previous versions, +except for the OptionValidator class that is no longer public (change introduced in v1.2). More information can be found on the project site at http://commons.apache.org/cli NEW FEATURES: - * The method getOptionProperties() in the CommandLine class was added -to retrieve easily the key/value pairs specified with options like --Dkey1=value1 -Dkey2=value2. + * Added new fluent API to create Option instances via builder class Option.Builder. +This replaces the now deprecated OptionBuilder. Thanks to Duncan Jones, Brian Blount. (CLI-224) - * GnuParser now supports long options with an '=' sign -(ie. --foo=bar and -foo=bar) (CLI-157) + * Added new method Options.addOption(String, String). Thanks to Alexandru Mocanu. (CLI-214) + + * A new parser is available: DefaultParser. It combines the features of the GnuParser and the PosixParser. +It also provides additional features like partial matching for the long options, and long options without +separator (i.e like the JVM memory settings: -Xmx512m). This new parser deprecates the previous ones. +(CLI-161, CLI-167, CLI-181) - * The ordering of options can be defined in help messages. (CLI-155) + * PosixParser now supports partial long options (--ver instead of --version). (CLI-160) + + * HelpFormatter now supports setting the displayed separator of long options. Thanks to J. Lewis Muir. (CLI-169) BUG FIXES: - * The number of arguments defined for an option specifies the arguments -per occurrence of the option and not for all occurrences. (CLI-137) + * Default options will now work correctly with required options that are missing. (CLI-202) - * PosixParser no longer ignores unrecognized short options. (CLI-164) + * Default options will now work correctly together with option groups. (CLI-203) + + * HelpFormatter.setArgName(String) now correctly sets the argument name. (CLI-205) - * PosixParser no longer stops the bursting process of a token if stopAtNonOption -is enabled and a non option character is encountered. (CLI-163) + * Passing default values for not defined options to a parser will now trigger +a ParseException instead of a NullPointerException. (CLI-204) - * PosixParser no longer keeps processing the tokens after an unrecognized -long option when stopAtNonOption is enabled. (CLI-165) + * Default properties provided as input to the Parser.parse() methods are now +correctly processed. (CLI-201) - * Required options are properly checked if an Options instance is used twice -to parse a command line. (CLI-156) + * CommandLine.getParsedOptionValue() now returns a String object if no +option type has been explicitly set. Thanks to Manuel Müller. (CLI-215) + + * HelpFormatter now prints command-line options in the same order as they +have been added. Thanks to Per Cederberg. (CLI-212) - * The line wrapping in HelpFormatter now works properly. (CLI-151) (CLI-162) + * Standard help text now shows mandatory arguments also for the first option. Thanks to Kristoff Kiefer. (CLI-186) - * OptionBuilder is now reset back to a blank state when it throws an -Exception. (CLI-177) + * HelpFormatter does not strip anymore leading whitespace in the footer text. Thanks to Uri Moszkowicz. (CLI-207) + * Strip quotes contained in argument values only if
svn commit: r1445163 - in /commons/proper/cli/trunk/src/main/java/org/apache/commons/cli: Option.java OptionBuilder.java
Author: tn Date: Tue Feb 12 13:28:28 2013 New Revision: 1445163 URL: http://svn.apache.org/r1445163 Log: Adding missing since tags. Modified: commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/Option.java commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/OptionBuilder.java Modified: commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/Option.java URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/Option.java?rev=1445163&r1=1445162&r2=1445163&view=diff == --- commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/Option.java (original) +++ commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/Option.java Tue Feb 12 13:28:28 2013 @@ -228,6 +228,7 @@ public class Option implements Cloneable * Sets the type of this Option. * * @param type the type of this Option + * @since 1.3 */ public void setType(Class type) { Modified: commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/OptionBuilder.java URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/OptionBuilder.java?rev=1445163&r1=1445162&r2=1445163&view=diff == --- commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/OptionBuilder.java (original) +++ commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/OptionBuilder.java Tue Feb 12 13:28:28 2013 @@ -303,6 +303,7 @@ public final class OptionBuilder * * @param newType the type of the Options argument value * @return the OptionBuilder instance + * @since 1.3 */ public static OptionBuilder withType(Class newType) {
Nexus: Promotion Completed.
Description:Apache Commons Daemon 1.0.13 contains a fix for regression found in previous release(s).Details:The following artifacts have been promoted to the Releases repository.archetype-catalog.xmlcommons-daemon-1.0.13-javadoc.jarcommons-daemon-1.0.13-javadoc.jar.asccommons-daemon-1.0.13-bin.tar.gzcommons-daemon-1.0.13-bin-windows.zipcommons-daemon-1.0.13.jar.asccommons-daemon-1.0.13-native-src.tar.gz.asccommons-daemon-1.0.13.pom.asccommons-daemon-1.0.13-src.zip.asccommons-daemon-1.0.13-bin.tar.gz.asccommons-daemon-1.0.13-native-src.zipcommons-daemon-1.0.13.pomcommons-daemon-1.0.13-sources.jarcommons-daemon-1.0.13.jarcommons-daemon-1.0.13-bin-windows.zip.asccommons-daemon-1.0.13-src.tar.gzcommons-daemon-1.0.13-src.zipcommons-daemon-1.0.13-bin.zipcommons-daemon-1.0.13-src.tar.gz.asccommons-daemon-1.0.13-bin.zip.asccommons-daemon-1.0.13-sources.jar.asccommons-daemon-1.0.13-native-src.zip.asccommons-daemon-1.0.13-native-src.tar.gz
svn commit: r1445094 - /commons/proper/cli/trunk/src/site/xdoc/download_cli.xml
Author: tn Date: Tue Feb 12 10:36:42 2013 New Revision: 1445094 URL: http://svn.apache.org/r1445094 Log: Update download page. Modified: commons/proper/cli/trunk/src/site/xdoc/download_cli.xml Modified: commons/proper/cli/trunk/src/site/xdoc/download_cli.xml URL: http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/site/xdoc/download_cli.xml?rev=1445094&r1=1445093&r2=1445094&view=diff == --- commons/proper/cli/trunk/src/site/xdoc/download_cli.xml (original) +++ commons/proper/cli/trunk/src/site/xdoc/download_cli.xml Tue Feb 12 10:36:42 2013 @@ -54,7 +54,7 @@ limitations under the License. We recommend you use a mirror to download our release builds, but you must verify the integrity of -the downloaded files using signatures downloaded from our main +the downloaded files using signatures downloaded from our main distribution directories. Recent releases (48 hours) may not yet be available from the mirrors. @@ -71,7 +71,7 @@ limitations under the License. - Other mirrors: + Other mirrors: [if-any http] [for http][http][end] @@ -90,37 +90,37 @@ limitations under the License. The http://www.apache.org/dist/commons/KEYS";>KEYS link links to the code signing keys used to sign the product. -The PGP link downloads the OpenPGP compatible signature from our main site. +The PGP link downloads the OpenPGP compatible signature from our main site. The MD5 link downloads the checksum from the main site. - + - commons-cli-1.2-bin.tar.gz - http://www.apache.org/dist/commons/cli/binaries/commons-cli-1.2-bin.tar.gz.md5";>md5 - http://www.apache.org/dist/commons/cli/binaries/commons-cli-1.2-bin.tar.gz.asc";>pgp + commons-cli-1.3-bin.tar.gz + http://www.apache.org/dist/commons/cli/binaries/commons-cli-1.3-bin.tar.gz.md5";>md5 + http://www.apache.org/dist/commons/cli/binaries/commons-cli-1.3-bin.tar.gz.asc";>pgp - commons-cli-1.2-bin.zip - http://www.apache.org/dist/commons/cli/binaries/commons-cli-1.2-bin.zip.md5";>md5 - http://www.apache.org/dist/commons/cli/binaries/commons-cli-1.2-bin.zip.asc";>pgp + commons-cli-1.3-bin.zip + http://www.apache.org/dist/commons/cli/binaries/commons-cli-1.3-bin.zip.md5";>md5 + http://www.apache.org/dist/commons/cli/binaries/commons-cli-1.3-bin.zip.asc";>pgp - commons-cli-1.2-src.tar.gz - http://www.apache.org/dist/commons/cli/source/commons-cli-1.2-src.tar.gz.md5";>md5 - http://www.apache.org/dist/commons/cli/source/commons-cli-1.2-src.tar.gz.asc";>pgp + commons-cli-1.3-src.tar.gz + http://www.apache.org/dist/commons/cli/source/commons-cli-1.3-src.tar.gz.md5";>md5 + http://www.apache.org/dist/commons/cli/source/commons-cli-1.3-src.tar.gz.asc";>pgp - commons-cli-1.2-src.zip - http://www.apache.org/dist/commons/cli/source/commons-cli-1.2-src.zip.md5";>md5 - http://www.apache.org/dist/commons/cli/source/commons-cli-1.2-src.zip.asc";>pgp + commons-cli-1.3-src.zip + http://www.apache.org/dist/commons/cli/source/commons-cli-1.3-src.zip.md5";>md5 + http://www.apache.org/dist/commons/cli/source/commons-cli-1.3-src.zip.asc";>pgp
svn commit: r1445054 - in /commons/proper/daemon/tags: COMMONS_DAEMON_1_0_13/ COMMONS_DAEMON_1_0_13_RC1/
Author: mturk Date: Tue Feb 12 08:22:42 2013 New Revision: 1445054 URL: http://svn.apache.org/r1445054 Log: Promote RC1 tag to release as per VOTE Added: commons/proper/daemon/tags/COMMONS_DAEMON_1_0_13/ - copied from r1445053, commons/proper/daemon/tags/COMMONS_DAEMON_1_0_13_RC1/ Removed: commons/proper/daemon/tags/COMMONS_DAEMON_1_0_13_RC1/
svn commit: r1445053 - /commons/proper/daemon/tags/COMMONS_DAEMON_1_0_13/
Author: mturk Date: Tue Feb 12 08:22:18 2013 New Revision: 1445053 URL: http://svn.apache.org/r1445053 Log: Tag should be moved not copied Removed: commons/proper/daemon/tags/COMMONS_DAEMON_1_0_13/