diff --git a/org.springframework.testsuite/.settings/org.springframework.ide.eclipse.core.prefs b/org.springframework.testsuite/.settings/org.springframework.ide.eclipse.core.prefs new file mode 100644 index 00000000000..af196ac0b14 --- /dev/null +++ b/org.springframework.testsuite/.settings/org.springframework.ide.eclipse.core.prefs @@ -0,0 +1,67 @@ +#Wed Dec 17 14:53:01 PST 2008 +eclipse.preferences.version=1 +org.springframework.ide.eclipse.core.builders.enable.aopreferencemodelbuilder=true +org.springframework.ide.eclipse.core.builders.enable.beanmetadatabuilder=true +org.springframework.ide.eclipse.core.builders.enable.osgibundleupdater=true +org.springframework.ide.eclipse.core.enable.project.preferences=false +org.springframework.ide.eclipse.core.validator.enable.com.springsource.platform.ide.manifest.core.manifestvalidator=true +org.springframework.ide.eclipse.core.validator.enable.com.springsource.sts.ap.quickfix.manifestvalidator=true +org.springframework.ide.eclipse.core.validator.enable.com.springsource.sts.bestpractices.beansvalidator=true +org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.beans.core.beansvalidator=true +org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.core.springvalidator=false +org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.webflow.core.validator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.platform.ide.manifest.core.applicationSymbolicNameRule-com.springsource.platform.ide.manifest.core.manifestvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.platform.ide.manifest.core.applicationVersionRule-com.springsource.platform.ide.manifest.core.manifestvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.platform.ide.manifest.core.bundleActivationPolicyRule-com.springsource.platform.ide.manifest.core.manifestvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.platform.ide.manifest.core.bundleActivatorRule-com.springsource.platform.ide.manifest.core.manifestvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.platform.ide.manifest.core.bundleManifestVersionRule-com.springsource.platform.ide.manifest.core.manifestvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.platform.ide.manifest.core.bundleNameRule-com.springsource.platform.ide.manifest.core.manifestvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.platform.ide.manifest.core.bundleSymbolicNameRule-com.springsource.platform.ide.manifest.core.manifestvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.platform.ide.manifest.core.bundleVersionRule-com.springsource.platform.ide.manifest.core.manifestvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.platform.ide.manifest.core.exportPackageRule-com.springsource.platform.ide.manifest.core.manifestvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.platform.ide.manifest.core.importRule-com.springsource.platform.ide.manifest.core.manifestvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.platform.ide.manifest.core.parsingProblemsRule-com.springsource.platform.ide.manifest.core.manifestvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.platform.ide.manifest.core.requireBundleRule-com.springsource.platform.ide.manifest.core.manifestvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.ap.quickfix.importBundleVersionRule-com.springsource.sts.ap.quickfix.manifestvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.ap.quickfix.importLibraryVersionRule-com.springsource.sts.ap.quickfix.manifestvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.ap.quickfix.importPackageVersionRule-com.springsource.sts.ap.quickfix.manifestvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.ap.quickfix.requireBundleVersionRule-com.springsource.sts.ap.quickfix.manifestvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.AvoidDriverManagerDataSource-com.springsource.sts.bestpractices.beansvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.ImportElementsAtTopRulee-com.springsource.sts.bestpractices.beansvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.ParentBeanSpecifiesAbstractClassRule-com.springsource.sts.bestpractices.beansvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.RefElementRule-com.springsource.sts.bestpractices.beansvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.TooManyBeansInFileRule-com.springsource.sts.bestpractices.beansvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.UnnecessaryValueElementRule-com.springsource.sts.bestpractices.beansvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.UseBeanInheritance-com.springsource.sts.bestpractices.beansvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.legacyxmlusage.jndiobjectfactory-com.springsource.sts.bestpractices.beansvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanAlias-org.springframework.ide.eclipse.beans.core.beansvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanClass-org.springframework.ide.eclipse.beans.core.beansvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanConstructorArgument-org.springframework.ide.eclipse.beans.core.beansvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinition-org.springframework.ide.eclipse.beans.core.beansvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinitionHolder-org.springframework.ide.eclipse.beans.core.beansvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanFactory-org.springframework.ide.eclipse.beans.core.beansvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanInitDestroyMethod-org.springframework.ide.eclipse.beans.core.beansvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanReference-org.springframework.ide.eclipse.beans.core.beansvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.methodOverride-org.springframework.ide.eclipse.beans.core.beansvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.parsingProblems-org.springframework.ide.eclipse.beans.core.beansvalidator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.requiredProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=false +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.core.springClasspath-org.springframework.ide.eclipse.core.springvalidator=false +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.action-org.springframework.ide.eclipse.webflow.core.validator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.actionstate-org.springframework.ide.eclipse.webflow.core.validator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.attribute-org.springframework.ide.eclipse.webflow.core.validator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.attributemapper-org.springframework.ide.eclipse.webflow.core.validator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.beanaction-org.springframework.ide.eclipse.webflow.core.validator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.evaluationaction-org.springframework.ide.eclipse.webflow.core.validator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.evaluationresult-org.springframework.ide.eclipse.webflow.core.validator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.exceptionhandler-org.springframework.ide.eclipse.webflow.core.validator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.import-org.springframework.ide.eclipse.webflow.core.validator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.inputattribute-org.springframework.ide.eclipse.webflow.core.validator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.mapping-org.springframework.ide.eclipse.webflow.core.validator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.outputattribute-org.springframework.ide.eclipse.webflow.core.validator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.set-org.springframework.ide.eclipse.webflow.core.validator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.state-org.springframework.ide.eclipse.webflow.core.validator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.subflowstate-org.springframework.ide.eclipse.webflow.core.validator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.transition-org.springframework.ide.eclipse.webflow.core.validator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.variable-org.springframework.ide.eclipse.webflow.core.validator=true +org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.webflowstate-org.springframework.ide.eclipse.webflow.core.validator=true diff --git a/org.springframework.testsuite/.springBeans b/org.springframework.testsuite/.springBeans new file mode 100644 index 00000000000..16e931784c6 --- /dev/null +++ b/org.springframework.testsuite/.springBeans @@ -0,0 +1,148 @@ + + + 1 + + + + + + + src/test/java/org/springframework/aop/aspectj/advice-precedence-tests.xml + src/test/java/org/springframework/aop/aspectj/after-advice-tests.xml + src/test/java/org/springframework/aop/aspectj/afterReturning-advice-tests.xml + src/test/java/org/springframework/aop/aspectj/afterThrowing-advice-tests.xml + src/test/java/org/springframework/aop/aspectj/ambiguous-advice-tests.xml + src/test/java/org/springframework/aop/aspectj/args-mismatch.xml + src/test/java/org/springframework/aop/aspectj/around-advice-circular-tests.xml + src/test/java/org/springframework/aop/aspectj/around-advice-tests.xml + src/test/java/org/springframework/aop/aspectj/aspectj.xml + src/test/java/org/springframework/aop/aspectj/bean-name-pointcut-atAspect-tests.xml + src/test/java/org/springframework/aop/aspectj/bean-name-pointcut-tests.xml + src/test/java/org/springframework/aop/aspectj/before-advice-tests.xml + src/test/java/org/springframework/aop/aspectj/declare-parents-tests.xml + src/test/java/org/springframework/aop/aspectj/implicit-jp-argument-matching-atAspectJ-tests.xml + src/test/java/org/springframework/aop/aspectj/implicit-jp-argument-matching-tests.xml + src/test/java/org/springframework/aop/aspectj/overloaded-advice-tests.xml + src/test/java/org/springframework/aop/aspectj/proceedTests.xml + src/test/java/org/springframework/aop/aspectj/property-dependent-aspect-property-after-aspect-test.xml + src/test/java/org/springframework/aop/aspectj/property-dependent-aspect-property-before-aspect-test.xml + src/test/java/org/springframework/aop/aspectj/property-dependent-atAspectJ-aspect-property-after-aspect-test.xml + src/test/java/org/springframework/aop/aspectj/property-dependent-atAspectJ-aspect-property-before-aspect-test.xml + src/test/java/org/springframework/aop/aspectj/targetPointcutSelectionTests.xml + src/test/java/org/springframework/aop/aspectj/this-and-target-selectionOnly-pointcuts-atAspectJ-tests.xml + src/test/java/org/springframework/aop/aspectj/this-and-target-selectionOnly-pointcuts-tests.xml + src/test/java/org/springframework/aop/aspectj/topsy-turvy-aspect.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/afterThrowingAdviceTests.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/annotationPointcut.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/around-advice-tests.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/aspect-implementing-interface-tests.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/aspects.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/aspectsPlusAdvisor.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/aspectsWithAbstractBean.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/aspectsWithCGLIB.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/aspectsWithOrdering.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/ataspectj-around-advice-tests.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/lazy.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/pertarget.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/perthis.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/retryAspect.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/twoAdviceAspect.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/twoAdviceAspectPrototype.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/usesInclude.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/usesJoinPointAspect.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/aspectj.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/springAop.xml + src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/annotationbinding-spr3064.xml + src/test/java/org/springframework/aop/aspectj/generic/afterReturningGenericTypeMatchingTests-context.xml + src/test/java/org/springframework/aop/aspectj/generic/genericBridgeMethodMatchingTests-classProxy-context.xml + src/test/java/org/springframework/aop/aspectj/generic/genericBridgeMethodMatchingTests-context.xml + src/test/java/org/springframework/aop/aspectj/generic/genericParameterMatchingTests-context.xml + src/test/java/org/springframework/aop/config/aopNamespaceHandlerAdviceTypeOKTests.xml + src/test/java/org/springframework/aop/config/aopNamespaceHandlerArgNamesErrorTests.xml + src/test/java/org/springframework/aop/config/aopNamespaceHandlerArgNamesOKTests.xml + src/test/java/org/springframework/aop/config/aopNamespaceHandlerProxyTargetClassTests.xml + src/test/java/org/springframework/aop/config/aopNamespaceHandlerReturningOKTests.xml + src/test/java/org/springframework/aop/config/aopNamespaceHandlerScopeTests.xml + src/test/java/org/springframework/aop/config/aopNamespaceHandlerTests.xml + src/test/java/org/springframework/aop/config/aopNamespaceHandlerThrowingOKTests.xml + src/test/java/org/springframework/aop/config/prototypeProxy.xml + src/test/java/org/springframework/aop/framework/frozenProxyFactoryBean.xml + src/test/java/org/springframework/aop/framework/innerBeanTarget.xml + src/test/java/org/springframework/aop/framework/invalidProxyFactory.xml + src/test/java/org/springframework/aop/framework/prototypeTests.xml + src/test/java/org/springframework/aop/framework/proxyFactoryBeanAutowiringTests.xml + src/test/java/org/springframework/aop/framework/proxyFactoryDoubleTargetSourceTests.xml + src/test/java/org/springframework/aop/framework/proxyFactoryTargetSourceNotLastTests.xml + src/test/java/org/springframework/aop/framework/proxyFactoryTargetSourceTests.xml + src/test/java/org/springframework/aop/framework/proxyFactoryTests.xml + src/test/java/org/springframework/aop/framework/serializationTests.xml + src/test/java/org/springframework/aop/framework/throwsAdvice.xml + src/test/java/org/springframework/aop/framework/withDependencyChecking.xml + src/test/java/org/springframework/aop/framework/adapter/withBPPContext.xml + src/test/java/org/springframework/aop/framework/adapter/withoutBPPContext.xml + src/test/java/org/springframework/aop/framework/autoproxy/advisorAutoProxyCreator.xml + src/test/java/org/springframework/aop/framework/autoproxy/advisorAutoProxyCreatorWithCommonInterceptors.xml + src/test/java/org/springframework/aop/framework/autoproxy/beanNameAutoProxyCreatorInitTests.xml + src/test/java/org/springframework/aop/framework/autoproxy/beanNameAutoProxyCreatorTests.xml + src/test/java/org/springframework/aop/framework/autoproxy/customTargetSource.xml + src/test/java/org/springframework/aop/framework/autoproxy/optimizedAutoProxyCreator.xml + src/test/java/org/springframework/aop/scope/scopedList.xml + src/test/java/org/springframework/aop/scope/scopedMap.xml + src/test/java/org/springframework/aop/scope/scopedOverride.xml + src/test/java/org/springframework/aop/scope/scopedTestBean.xml + src/test/java/org/springframework/aop/target/commonsPoolTests.xml + src/test/java/org/springframework/beans/factory/config/test-properties.xml + src/test/java/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml + src/test/java/org/springframework/beans/factory/xml/beanEvents.xml + src/test/java/org/springframework/beans/factory/xml/beanEventsImported.xml + src/test/java/org/springframework/beans/factory/xml/beanNameGeneration.xml + src/test/java/org/springframework/beans/factory/xml/child.xml + src/test/java/org/springframework/beans/factory/xml/classNotFound.xml + src/test/java/org/springframework/beans/factory/xml/collectionMerging.xml + src/test/java/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml + src/test/java/org/springframework/beans/factory/xml/complexFactoryCircle.xml + src/test/java/org/springframework/beans/factory/xml/constructorOverrides.xml + src/test/java/org/springframework/beans/factory/xml/default-autowire.xml + src/test/java/org/springframework/beans/factory/xml/default-lazy-init.xml + src/test/java/org/springframework/beans/factory/xml/defaultLifecycleMethods.xml + src/test/java/org/springframework/beans/factory/xml/delegationOverrides.xml + src/test/java/org/springframework/beans/factory/xml/dependencies-carg-autowire.xml + src/test/java/org/springframework/beans/factory/xml/dependencies-carg-inner.xml + src/test/java/org/springframework/beans/factory/xml/dependencies-carg.xml + src/test/java/org/springframework/beans/factory/xml/dependencies-dependsOn-inner.xml + src/test/java/org/springframework/beans/factory/xml/dependencies-dependsOn.xml + src/test/java/org/springframework/beans/factory/xml/dependencies-prop-autowireByName.xml + src/test/java/org/springframework/beans/factory/xml/dependencies-prop-autowireByType.xml + src/test/java/org/springframework/beans/factory/xml/dependencies-prop-inner.xml + src/test/java/org/springframework/beans/factory/xml/dependencies-prop-inTheMiddle.xml + src/test/java/org/springframework/beans/factory/xml/dependencies-prop.xml + src/test/java/org/springframework/beans/factory/xml/dependenciesMaterializeThis.xml + src/test/java/org/springframework/beans/factory/xml/factoryCircle.xml + src/test/java/org/springframework/beans/factory/xml/ignoreDefaultLifecycleMethods.xml + src/test/java/org/springframework/beans/factory/xml/invalid-factory.xml + src/test/java/org/springframework/beans/factory/xml/local-collections-using-XSD.xml + src/test/java/org/springframework/beans/factory/xml/no-such-factory-method.xml + src/test/java/org/springframework/beans/factory/xml/overloadOverrides.xml + src/test/java/org/springframework/beans/factory/xml/overrides.xml + src/test/java/org/springframework/beans/factory/xml/parent.xml + src/test/java/org/springframework/beans/factory/xml/qualifierAnnotationTests.xml + src/test/java/org/springframework/beans/factory/xml/recursiveImport.xml + src/test/java/org/springframework/beans/factory/xml/reftypes.xml + src/test/java/org/springframework/beans/factory/xml/resource.xml + src/test/java/org/springframework/beans/factory/xml/resourceImport.xml + src/test/java/org/springframework/beans/factory/xml/satisfiedAllDependencyCheck.xml + src/test/java/org/springframework/beans/factory/xml/satisfiedObjectDependencyCheck.xml + src/test/java/org/springframework/beans/factory/xml/satisfiedSimpleDependencyCheck.xml + src/test/java/org/springframework/beans/factory/xml/schemaValidated.xml + src/test/java/org/springframework/beans/factory/xml/shortcutTests.xml + src/test/java/org/springframework/beans/factory/xml/test.xml + src/test/java/org/springframework/beans/factory/xml/unsatisfiedAllDependencyCheckMissingObjects.xml + src/test/java/org/springframework/beans/factory/xml/unsatisfiedObjectDependencyCheck.xml + src/test/java/org/springframework/beans/factory/xml/unsatisfiedSimpleDependencyCheck.xml + src/test/java/org/springframework/beans/factory/xml/validateWithDtd.xml + src/test/java/org/springframework/beans/factory/xml/validateWithXsd.xml + src/test/java/org/springframework/beans/factory/xml/withMeta.xml + + + + diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/AbstractMakeModifiable.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/AbstractMakeModifiable.java deleted file mode 100644 index bae85794d94..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/AbstractMakeModifiable.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright 2002-2006 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.aop.aspectj.annotation; - -import java.lang.reflect.Method; - -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.aspectj.lang.reflect.MethodSignature; - -import org.springframework.util.ObjectUtils; - -/** - * Add a DeclareParents field in concrete subclasses, to identify - * the type pattern to apply the introduction to. - * - * @author Rod Johnson - * @since 2.0 - */ -@Aspect -public abstract class AbstractMakeModifiable { - - public interface MutableModifable extends Modifiable { - void markDirty(); - } - - public static class ModifiableImpl implements MutableModifable { - private boolean modified; - - public void acceptChanges() { - modified = false; - } - - public boolean isModified() { - return modified; - } - - public void markDirty() { - this.modified = true; - } - } - - @Before(value="execution(void set*(*)) && this(modifiable) && args(newValue)", - argNames="modifiable,newValue") - public void recordModificationIfSetterArgumentDiffersFromOldValue(JoinPoint jp, - MutableModifable mixin, Object newValue) { - - /* - * We use the mixin to check and, if necessary, change, - * modification status. We need the JoinPoint to get the - * setter method. We use newValue for comparison. - * We try to invoke the getter if possible. - */ - - if (mixin.isModified()) { - // Already changed, don't need to change again - //System.out.println("changed"); - return; - } - - // Find the current raw value, by invoking the corresponding setter - Method correspondingGetter = getGetterFromSetter(((MethodSignature) jp.getSignature()).getMethod()); - boolean modified = true; - if (correspondingGetter != null) { - try { - Object oldValue = correspondingGetter.invoke(jp.getTarget()); - //System.out.println("Old value=" + oldValue + "; new=" + newValue); - modified = !ObjectUtils.nullSafeEquals(oldValue, newValue); - } - catch (Exception ex) { - ex.printStackTrace(); - // Don't sweat on exceptions; assume value was modified - } - } - else { - //System.out.println("cannot get getter for " + jp); - } - if (modified) { - mixin.markDirty(); - } - } - - private Method getGetterFromSetter(Method setter) { - String getterName = setter.getName().replaceFirst("set", "get"); - try { - return setter.getDeclaringClass().getMethod(getterName, (Class[]) null); - } - catch (NoSuchMethodException ex) { - // must be write only - return null; - } - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/CannotBeUnlocked.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/CannotBeUnlocked.java deleted file mode 100644 index fa63675b71e..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/CannotBeUnlocked.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2002-2005 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.aop.aspectj.annotation; - -import org.springframework.aop.framework.Lockable; - -/** - * - * - * @author Rod Johnson - * - */ -public class CannotBeUnlocked implements Lockable, Comparable { - - public void lock() { - } - - public void unlock() { - throw new UnsupportedOperationException(); - } - - public boolean locked() { - return true; - } - - public int compareTo(Object arg0) { - throw new UnsupportedOperationException(); - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/FooAspect.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/FooAspect.java deleted file mode 100644 index 04db891a7df..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/FooAspect.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2002-2006 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.aop.aspectj.annotation; - -import org.aspectj.lang.annotation.Aspect; - -/** - * @author Rob Harrop - * @since 2.o - */ -@Aspect -public class FooAspect { - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/MakeITestBeanModifiable.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/MakeITestBeanModifiable.java deleted file mode 100644 index 58bc09c9f6c..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/MakeITestBeanModifiable.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2002-2006 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.aop.aspectj.annotation; - -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.DeclareParents; - -/** - * Adds a declare parents pointcut. - * @author Rod Johnson - * @since 2.0 - */ -@Aspect -public class MakeITestBeanModifiable extends AbstractMakeModifiable { - - @DeclareParents(value = "org.springframework.beans.ITestBean+", - defaultImpl=ModifiableImpl.class) - public static MutableModifable mixin; - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/MakeLockable.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/MakeLockable.java deleted file mode 100644 index 071be326c74..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/MakeLockable.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright 2002-2006 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.aop.aspectj.annotation; - -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.aspectj.lang.annotation.DeclareParents; -import org.springframework.aop.framework.DefaultLockable; -import org.springframework.aop.framework.Lockable; - -/** - * Demonstrates introductions, AspectJ annotation style. - *

- * @author Rod Johnson - * @since 2.0 - */ -@Aspect -public class MakeLockable { - - @DeclareParents(value = "org.springframework..*", - defaultImpl=DefaultLockable.class) - public static Lockable mixin; - - @Before(value="execution(void set*(*)) && this(mixin)", argNames="mixin") - public void checkNotLocked( - Lockable mixin) // Bind to arg - { - // Can also obtain the mixin (this) this way - //Lockable mixin = (Lockable) jp.getThis(); - if (mixin.locked()) { - throw new IllegalStateException(); - } - } - -} - -/* - * - * public aspect MakeLockable { - * - * declare parents org....* implements Lockable; - * - * private boolean Lockable.locked; - - * public void Lockable.lock() { - this.locked = true; - } - - * public void Lockable.unlock() { - this.locked = false; - } - - * public boolean Lockable.locked() { - return this.locked; - } - * - * - * } - */ diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/Modifiable.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/Modifiable.java deleted file mode 100644 index 1bdfe67fe5a..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/Modifiable.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2002-2006 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.aop.aspectj.annotation; - -/** - * Used as a mixin. - * - * @author Rod Johnson - */ -public interface Modifiable { - - boolean isModified(); - - void acceptChanges(); - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/NamedPointcutWithArgs.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/NamedPointcutWithArgs.java deleted file mode 100644 index 8f80a5644c2..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/NamedPointcutWithArgs.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2002-2007 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.aop.aspectj.annotation; - -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Pointcut; - -/** - * @author Adrian Colyer - */ -@Aspect -public class NamedPointcutWithArgs { - - @Pointcut("execution(* *(..)) && args(s,..)") - public void pointcutWithArgs(String s) {} - - @Around("pointcutWithArgs(aString)") - public Object doAround(ProceedingJoinPoint pjp, String aString) throws Throwable { - System.out.println("got '" + aString + "' at '" + pjp + "'"); - throw new IllegalArgumentException(aString); - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/NotLockable.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/NotLockable.java deleted file mode 100644 index 928e006f182..00000000000 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/aspectj/annotation/NotLockable.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.springframework.aop.aspectj.annotation; - -public class NotLockable { - - private int intValue; - - public int getIntValue() { - return intValue; - } - - public void setIntValue(int intValue) { - this.intValue = intValue; - } - -} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/SimpleBeforeAdvice.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/framework/adapter/SimpleBeforeAdvice.java similarity index 89% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/SimpleBeforeAdvice.java rename to org.springframework.testsuite/src/test/java/org/springframework/aop/framework/adapter/SimpleBeforeAdvice.java index 402625a27d0..3a9c276888a 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/SimpleBeforeAdvice.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/framework/adapter/SimpleBeforeAdvice.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package org.springframework.aop; +package org.springframework.aop.framework.adapter; + +import org.springframework.aop.BeforeAdvice; /** * Simple BeforeAdvice for testing. diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/SimpleBeforeAdviceAdapter.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/framework/adapter/SimpleBeforeAdviceAdapter.java similarity index 93% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/SimpleBeforeAdviceAdapter.java rename to org.springframework.testsuite/src/test/java/org/springframework/aop/framework/adapter/SimpleBeforeAdviceAdapter.java index 8273435502c..abc588d9e5d 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/SimpleBeforeAdviceAdapter.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/framework/adapter/SimpleBeforeAdviceAdapter.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.aop; +package org.springframework.aop.framework.adapter; import java.io.Serializable; import org.aopalliance.aop.Advice; import org.aopalliance.intercept.MethodInterceptor; +import org.springframework.aop.Advisor; import org.springframework.aop.framework.adapter.AdvisorAdapter; /** diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/SimpleBeforeAdviceImpl.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/framework/adapter/SimpleBeforeAdviceImpl.java similarity index 94% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/SimpleBeforeAdviceImpl.java rename to org.springframework.testsuite/src/test/java/org/springframework/aop/framework/adapter/SimpleBeforeAdviceImpl.java index 83715314e74..33eae58208c 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/SimpleBeforeAdviceImpl.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/framework/adapter/SimpleBeforeAdviceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aop; +package org.springframework.aop.framework.adapter; /** * @author Dmitriy Kopylenko diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/SimpleBeforeAdviceInterceptor.java b/org.springframework.testsuite/src/test/java/org/springframework/aop/framework/adapter/SimpleBeforeAdviceInterceptor.java similarity index 95% rename from org.springframework.testsuite/src/test/java/org/springframework/aop/SimpleBeforeAdviceInterceptor.java rename to org.springframework.testsuite/src/test/java/org/springframework/aop/framework/adapter/SimpleBeforeAdviceInterceptor.java index d2056190e3e..2c60182f4d0 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/SimpleBeforeAdviceInterceptor.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/framework/adapter/SimpleBeforeAdviceInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aop; +package org.springframework.aop.framework.adapter; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/framework/adapter/withBPPContext.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/framework/adapter/withBPPContext.xml index df51623facd..0aa3b46d648 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/framework/adapter/withBPPContext.xml +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/framework/adapter/withBPPContext.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ simpleBeforeAdviceAdvisor,testBeanTarget - + diff --git a/org.springframework.testsuite/src/test/java/org/springframework/aop/framework/adapter/withoutBPPContext.xml b/org.springframework.testsuite/src/test/java/org/springframework/aop/framework/adapter/withoutBPPContext.xml index d977ac4ee73..36718003309 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/aop/framework/adapter/withoutBPPContext.xml +++ b/org.springframework.testsuite/src/test/java/org/springframework/aop/framework/adapter/withoutBPPContext.xml @@ -5,7 +5,7 @@ - + @@ -16,6 +16,6 @@ simpleBeforeAdviceAdvisor,testBeanTarget - +