Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ServiceMessages.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ServiceMessages.java?view=diff&rev=517950&r1=517949&r2=517950 ============================================================================== --- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ServiceMessages.java (original) +++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ServiceMessages.java Tue Mar 13 17:26:56 2007 @@ -174,6 +174,6 @@ static String failedCoercion(Object input, Class targetType, Coercion coercion, Throwable cause) { return MESSAGES.format("failed-coercion", String.valueOf(input), ClassFabUtils - .getJavaClassName(targetType), coercion, cause); + .toJavaClassName(targetType), coercion, cause); } }
Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java?view=diff&rev=517950&r1=517949&r2=517950 ============================================================================== --- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java (original) +++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java Tue Mar 13 17:26:56 2007 @@ -15,6 +15,7 @@ package org.apache.tapestry.ioc.internal.util; import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList; +import static org.apache.tapestry.ioc.internal.util.Defense.notBlank; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -401,7 +402,7 @@ */ public static String lastTerm(String input) { - Defense.notBlank(input, "input"); + notBlank(input, "input"); int dotx = input.lastIndexOf('.'); Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGenerator.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGenerator.java?view=diff&rev=517950&r1=517949&r2=517950 ============================================================================== --- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGenerator.java (original) +++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGenerator.java Tue Mar 13 17:26:56 2007 @@ -1,4 +1,4 @@ -// Copyright 2004, 2005, 2006 The Apache Software Foundation +// Copyright 2006, 2007 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,10 +23,7 @@ * (which must include a suffix) and locale. * <P> * This class is not threadsafe. - * - * @author Howard Lewis Ship */ - public class LocalizedNameGenerator implements Iterator<String>, Iterable<String> { private final int _baseNameLength; @@ -95,15 +92,13 @@ { case LCV: - if (InternalUtils.isBlank(_variant)) - continue; + if (InternalUtils.isBlank(_variant)) continue; return; case LC: - if (InternalUtils.isBlank(_country)) - continue; + if (InternalUtils.isBlank(_country)) continue; return; @@ -119,8 +114,7 @@ case L: - if (InternalUtils.isBlank(_language)) - continue; + if (InternalUtils.isBlank(_language)) continue; return; @@ -149,8 +143,7 @@ public String next() { - if (_state == EXHAUSTED) - throw new NoSuchElementException(); + if (_state == EXHAUSTED) throw new NoSuchElementException(); String result = build(); @@ -176,8 +169,7 @@ { _builder.append('_'); - if (_state != LV) - _builder.append(_country); + if (_state != LV) _builder.append(_country); } if (_state == LV || _state == LCV) @@ -186,8 +178,7 @@ _builder.append(_variant); } - if (_suffix != null) - _builder.append(_suffix); + if (_suffix != null) _builder.append(_suffix); return _builder.toString(); } Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFab.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFab.java?view=diff&rev=517950&r1=517949&r2=517950 ============================================================================== --- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFab.java (original) +++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFab.java Tue Mar 13 17:26:56 2007 @@ -1,4 +1,4 @@ -// Copyright 2004, 2005, 2006 The Apache Software Foundation +// Copyright 2006, 2007 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -40,8 +40,6 @@ * ClassFab instances are not thread safe. * <p> * ClassFab instances are created by a [EMAIL PROTECTED] org.apache.tapestry.ioc.services.ClassFactory}. - * - * @author Howard Lewis Ship */ public interface ClassFab { Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFabUtils.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFabUtils.java?view=diff&rev=517950&r1=517949&r2=517950 ============================================================================== --- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFabUtils.java (original) +++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFabUtils.java Tue Mar 13 17:26:56 2007 @@ -1,4 +1,4 @@ -// Copyright 2004, 2005, 2006 The Apache Software Foundation +// Copyright 2006, 2007The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -59,9 +59,9 @@ * getName() on a Class instance representing an array returns the internal format (i.e, "[...;" * or something). This returns it as it would appear in Java code. */ - public static String getJavaClassName(Class inputClass) + public static String toJavaClassName(Class inputClass) { - if (inputClass.isArray()) return getJavaClassName(inputClass.getComponentType()) + "[]"; + if (inputClass.isArray()) return toJavaClassName(inputClass.getComponentType()) + "[]"; return inputClass.getName(); } @@ -135,7 +135,7 @@ * remains java.util.Locale, but int[][] is translated to [[I and java.lang.Object[] to * [Ljava.lang.Object; */ - public static String getJVMClassName(String type) + public static String toJVMBinaryName(String type) { // if it is not an array, just return the type itself if (!type.endsWith("[]")) return type; Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFactory.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFactory.java?view=diff&rev=517950&r1=517949&r2=517950 ============================================================================== --- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFactory.java (original) +++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ClassFactory.java Tue Mar 13 17:26:56 2007 @@ -18,8 +18,6 @@ /** * Service used when dynamically creating new classes. - * - * @author Howard Lewis Ship */ public interface ClassFactory { Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java?view=diff&rev=517950&r1=517949&r2=517950 ============================================================================== --- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java (original) +++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java Tue Mar 13 17:26:56 2007 @@ -63,7 +63,7 @@ { if (void.class.equals(type)) return "null"; - String name = ClassFabUtils.getJavaClassName(type); + String name = ClassFabUtils.toJavaClassName(type); int dotx = name.lastIndexOf('.'); Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java?view=diff&rev=517950&r1=517949&r2=517950 ============================================================================== --- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java (original) +++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java Tue Mar 13 17:26:56 2007 @@ -1,4 +1,4 @@ -// Copyright 2004, 2005, 2006 The Apache Software Foundation +// Copyright 2006, 2007 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -33,12 +33,7 @@ * <p> * This version of MethodSignature works with <em>loaded</em> classes, and it usually used in the * context of [EMAIL PROTECTED] org.apache.tapestry.ioc.services.ClassFab} to create new classes and - * subclasses. Another class with the same name, - * [EMAIL PROTECTED] org.apache.tapestry.services.MethodSignature} is similar, but is used <em>before</em> - * classes are loaded, to transform the classes as they are loaded (it uses strings for class names, - * where this class uses Class instances). - * - * @author Howard Lewis Ship + * subclasses. */ public class MethodSignature { @@ -165,7 +160,7 @@ { StringBuilder buffer = new StringBuilder(); - buffer.append(ClassFabUtils.getJavaClassName(_returnType)); + buffer.append(ClassFabUtils.toJavaClassName(_returnType)); buffer.append(" "); buffer.append(_name); buffer.append("("); @@ -174,7 +169,7 @@ { if (i > 0) buffer.append(", "); - buffer.append(ClassFabUtils.getJavaClassName(_parameterTypes[i])); + buffer.append(ClassFabUtils.toJavaClassName(_parameterTypes[i])); } buffer.append(")"); @@ -209,7 +204,7 @@ { if (i > 0) buffer.append(","); - buffer.append(ClassFabUtils.getJavaClassName(_parameterTypes[i])); + buffer.append(ClassFabUtils.toJavaClassName(_parameterTypes[i])); } buffer.append(")"); Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java?view=diff&rev=517950&r1=517949&r2=517950 ============================================================================== --- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java (original) +++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java Tue Mar 13 17:26:56 2007 @@ -339,4 +339,14 @@ { expect(messages.contains(isA(String.class))).andStubReturn(contained); } + + protected final void train_forFile(Resource resource, String relativePath, Resource file) + { + expect(resource.forFile(relativePath)).andReturn(file); + } + + protected final void train_forLocale(Resource base, Locale locale, Resource resource) + { + expect(base.forLocale(locale)).andReturn(resource); + } } Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/util/BodyBuilder.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/util/BodyBuilder.java?view=diff&rev=517950&r1=517949&r2=517950 ============================================================================== --- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/util/BodyBuilder.java (original) +++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/util/BodyBuilder.java Tue Mar 13 17:26:56 2007 @@ -1,4 +1,4 @@ -// Copyright 2004, 2005, 2006 The Apache Software Foundation +// Copyright 2006, 2007 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,10 +24,7 @@ * input code before worrying about why it doesn't compile or execute properly). * <p> * This class is not threadsafe. - * - * @author Howard Lewis Ship */ - public final class BodyBuilder { /** @@ -91,8 +88,7 @@ _formatter.format(format, args); - if (newLine) - newline(); + if (newLine) newline(); } private void newline() @@ -106,8 +102,7 @@ */ public void begin() { - if (!_atNewLine) - newline(); + if (!_atNewLine) newline(); indent(); _buffer.append("{"); @@ -121,8 +116,7 @@ */ public void end() { - if (!_atNewLine) - newline(); + if (!_atNewLine) newline(); // TODO: Could check here if nesting depth goes below zero. Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodInvokerTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodInvokerTest.java?view=diff&rev=517950&r1=517949&r2=517950 ============================================================================== --- tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodInvokerTest.java (original) +++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodInvokerTest.java Tue Mar 13 17:26:56 2007 @@ -1,4 +1,4 @@ -// Copyright 2006 The Apache Software Foundation +// Copyright 2006, 2007 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ import org.apache.commons.logging.Log; import org.apache.tapestry.ioc.ObjectCreator; import org.apache.tapestry.ioc.ServiceBuilderResources; +import org.apache.tapestry.ioc.internal.util.InternalUtils; import org.testng.Assert; import org.testng.annotations.Test; @@ -49,7 +50,7 @@ replay(); ObjectCreator sc = new ServiceBuilderMethodInvoker(findMethod(fixture, "build_noargs"), - resources); + resources, getClassFactory()); Object actual = sc.createObject(); @@ -89,11 +90,11 @@ train_isDebugEnabled(log, true); - log.debug(IOCMessages.invokingMethod(method)); + log.debug(IOCMessages.invokingMethod(InternalUtils.asString(method, getClassFactory()))); replay(); - ObjectCreator sc = new ServiceBuilderMethodInvoker(method, resources); + ObjectCreator sc = new ServiceBuilderMethodInvoker(method, resources, getClassFactory()); Object actual = sc.createObject(); @@ -123,7 +124,7 @@ replay(); ObjectCreator sc = new ServiceBuilderMethodInvoker(findMethod(fixture, "build_injected"), - resources); + resources, getClassFactory()); Object actual = sc.createObject(); @@ -156,7 +157,7 @@ ObjectCreator sc = new ServiceBuilderMethodInvoker(findMethod( fixture, - "buildWithOrderedConfiguration"), resources); + "buildWithOrderedConfiguration"), resources, getClassFactory()); Object actual = sc.createObject(); @@ -190,7 +191,7 @@ ObjectCreator sc = new ServiceBuilderMethodInvoker(findMethod( fixture, - "buildWithUnorderedConfiguration"), resources); + "buildWithUnorderedConfiguration"), resources, getClassFactory()); Object actual = sc.createObject(); @@ -211,6 +212,10 @@ ServiceBuilderResources resources = newServiceCreatorResources(); Log log = newLog(); + Method method = findMethod(fixture, "build_noargs"); + + String methodId = InternalUtils.asString(method, getClassFactory()); + trainForConstructor(resources, log); train_getModuleBuilder(resources, fixture); @@ -219,8 +224,7 @@ replay(); - ObjectCreator sc = new ServiceBuilderMethodInvoker(findMethod(fixture, "build_noargs"), - resources); + ObjectCreator sc = new ServiceBuilderMethodInvoker(method, resources, getClassFactory()); try { @@ -229,9 +233,8 @@ } catch (RuntimeException ex) { - Assert.assertEquals(ex.getMessage(), "Builder method " - + ServiceBuilderMethodFixture.class.getName() + ".build_noargs() " - + "(for service 'ioc.Fie') returned null."); + Assert.assertEquals(ex.getMessage(), "Builder method " + methodId + + " (for service 'ioc.Fie') returned null."); } verify(); @@ -244,6 +247,9 @@ ServiceBuilderResources resources = newServiceCreatorResources(); Log log = newLog(); + Method method = findMethod(fixture, "build_fail"); + String methodId = InternalUtils.asString(method, getClassFactory()); + trainForConstructor(resources, log); train_getModuleBuilder(resources, fixture); @@ -252,8 +258,7 @@ replay(); - ObjectCreator sc = new ServiceBuilderMethodInvoker(findMethod(fixture, "build_fail"), - resources); + ObjectCreator sc = new ServiceBuilderMethodInvoker(method, resources, getClassFactory()); try { @@ -262,9 +267,8 @@ } catch (RuntimeException ex) { - assertEquals(ex.getMessage(), "Error invoking service builder method " - + ServiceBuilderMethodFixture.class.getName() + ".build_fail() " - + "(for service 'ioc.Fie'): Method failed."); + assertEquals(ex.getMessage(), "Error invoking service builder method " + methodId + + " (for service 'ioc.Fie'): Method failed."); Throwable cause = ex.getCause(); @@ -296,7 +300,7 @@ replay(); - ObjectCreator sc = new ServiceBuilderMethodInvoker(method, resources); + ObjectCreator sc = new ServiceBuilderMethodInvoker(method, resources, getClassFactory()); Object actual = sc.createObject(); Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImplTest.java?view=diff&rev=517950&r1=517949&r2=517950 ============================================================================== --- tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImplTest.java (original) +++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImplTest.java Tue Mar 13 17:26:56 2007 @@ -1,4 +1,4 @@ -// Copyright 2006 The Apache Software Foundation +// Copyright 2006, 2007 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ import org.apache.commons.logging.Log; import org.apache.tapestry.ioc.ModuleBuilderSource; import org.apache.tapestry.ioc.ServiceResources; +import org.apache.tapestry.ioc.internal.util.InternalUtils; import org.testng.annotations.Test; public class ServiceDecoratorImplTest extends IOCInternalTestCase @@ -57,14 +58,15 @@ train_isDebugEnabled(log, true); - log.debug(IOCMessages.invokingMethod(m)); + log.debug(IOCMessages.invokingMethod(InternalUtils.asString(m, getClassFactory()))); replay(); // Check that the delegate gets passed in; check that the return value of the // decorator method is the return value of the ServiceDecorator. - ServiceDecoratorImpl decorator = new ServiceDecoratorImpl(m, source, resources); + ServiceDecoratorImpl decorator = new ServiceDecoratorImpl(m, source, resources, + getClassFactory()); Object interceptor = decorator.createInterceptor(fixture._expectedDelegate); @@ -90,7 +92,8 @@ Method m = findMethod(fixture, "decorateReturnNull"); - ServiceDecoratorImpl decorator = new ServiceDecoratorImpl(m, source, resources); + ServiceDecoratorImpl decorator = new ServiceDecoratorImpl(m, source, resources, + getClassFactory()); Object interceptor = decorator.createInterceptor(delegate); @@ -123,7 +126,8 @@ replay(); - ServiceDecoratorImpl decorator = new ServiceDecoratorImpl(m, source, resources); + ServiceDecoratorImpl decorator = new ServiceDecoratorImpl(m, source, resources, + getClassFactory()); Object interceptor = decorator.createInterceptor(fixture._expectedDelegate); @@ -150,7 +154,8 @@ Method m = findMethod(fixture, "decoratorThrowsException"); - ServiceDecoratorImpl decorator = new ServiceDecoratorImpl(m, source, resources); + ServiceDecoratorImpl decorator = new ServiceDecoratorImpl(m, source, resources, + getClassFactory()); try { Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/AbstractIntWrapper.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/AbstractIntWrapper.java?view=diff&rev=517950&r1=517949&r2=517950 ============================================================================== --- tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/AbstractIntWrapper.java (original) +++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/AbstractIntWrapper.java Tue Mar 13 17:26:56 2007 @@ -1,4 +1,4 @@ -// Copyright 2004, 2005, 2006 The Apache Software Foundation +// Copyright 2006, 2007 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ /** * Used by [EMAIL PROTECTED] org.apache.tapestry.ioc.internal.services.ClassFabImplTest}. - * - * @author Howard Lewis Ship */ public abstract class AbstractIntWrapper { Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SimpleService.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SimpleService.java?view=diff&rev=517950&r1=517949&r2=517950 ============================================================================== --- tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SimpleService.java (original) +++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SimpleService.java Tue Mar 13 17:26:56 2007 @@ -1,4 +1,4 @@ -// Copyright 2004, 2005, 2006 The Apache Software Foundation +// Copyright 2006, 2007 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,8 +16,6 @@ /** * Used by [EMAIL PROTECTED] org.apache.tapestry.ioc.internal.services.ClassFabImplTest}. - * - * @author Howard Lewis Ship */ public interface SimpleService { Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/services/ClassFabUtilsTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/services/ClassFabUtilsTest.java?view=diff&rev=517950&r1=517949&r2=517950 ============================================================================== --- tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/services/ClassFabUtilsTest.java (original) +++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/services/ClassFabUtilsTest.java Tue Mar 13 17:26:56 2007 @@ -1,4 +1,4 @@ -// Copyright 2006 The Apache Software Foundation +// Copyright 2006, 2007 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -22,9 +22,9 @@ { @Test(dataProvider = "provider") - public void get_jvm_classname(String input, String expected) + public void to_jvm_binary_name(String input, String expected) { - String actual = ClassFabUtils.getJVMClassName(input); + String actual = ClassFabUtils.toJVMBinaryName(input); assertEquals(actual, expected); }
