This is an automated email from the ASF dual-hosted git repository. thiagohp pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit f70d1ab9cab93c6bc368dae7fb427963b5710993 Author: Thiago H. de Paula Figueiredo <thi...@arsmachina.com.br> AuthorDate: Mon Jun 1 19:03:16 2020 -0300 TAP5-2627: putting all of beanmodel subproject into a single parent package --- .travis.yml | 2 +- .../java/org/apache/tapestry5/beanmodel/BeanModelSourceBuilder.java | 2 +- .../{ioc/internal => beanmodel}/services/PlasticProxyFactoryImpl.java | 3 ++- .../tapestry5/internal/services/ComponentInstantiatorSourceImpl.java | 1 - .../java/org/apache/tapestry5/jcache/internal/CacheLookupUtil.java | 2 +- .../src/main/java/org/apache/tapestry5/ioc/RegistryBuilder.java | 2 +- .../tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java | 1 + tapestry-ioc/src/test/groovy/ioc/specs/DefaultModuleDefImplSpec.groovy | 3 ++- tapestry-ioc/src/test/groovy/ioc/specs/OperationAdvisorSpec.groovy | 2 +- tapestry-ioc/src/test/groovy/ioc/specs/OperationTrackerSpec.groovy | 2 +- 10 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index cba068d..0e22388 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: java jdk: - - oraclejdk9 + - openjdk11 - openjdk8 before_install: diff --git a/beanmodel/src/main/java/org/apache/tapestry5/beanmodel/BeanModelSourceBuilder.java b/beanmodel/src/main/java/org/apache/tapestry5/beanmodel/BeanModelSourceBuilder.java index 208decb..031e236 100644 --- a/beanmodel/src/main/java/org/apache/tapestry5/beanmodel/BeanModelSourceBuilder.java +++ b/beanmodel/src/main/java/org/apache/tapestry5/beanmodel/BeanModelSourceBuilder.java @@ -15,6 +15,7 @@ import org.apache.tapestry5.beanmodel.internal.services.BeanModelSourceImpl; import org.apache.tapestry5.beanmodel.internal.services.PropertyAccessImpl; import org.apache.tapestry5.beanmodel.internal.services.PropertyConduitSourceImpl; import org.apache.tapestry5.beanmodel.services.BeanModelSource; +import org.apache.tapestry5.beanmodel.services.PlasticProxyFactoryImpl; import org.apache.tapestry5.beanmodel.services.PropertyConduitSource; import org.apache.tapestry5.internal.services.StringInterner; import org.apache.tapestry5.internal.services.StringInternerImpl; @@ -23,7 +24,6 @@ import org.apache.tapestry5.ioc.Configuration; import org.apache.tapestry5.ioc.ObjectLocator; import org.apache.tapestry5.ioc.internal.BasicDataTypeAnalyzers; import org.apache.tapestry5.ioc.internal.BasicTypeCoercions; -import org.apache.tapestry5.ioc.internal.services.PlasticProxyFactoryImpl; import org.apache.tapestry5.ioc.internal.services.TypeCoercerImpl; import org.apache.tapestry5.ioc.internal.util.TapestryException; import org.apache.tapestry5.ioc.services.CoercionTuple; diff --git a/beanmodel/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java b/beanmodel/src/main/java/org/apache/tapestry5/beanmodel/services/PlasticProxyFactoryImpl.java similarity index 98% rename from beanmodel/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java rename to beanmodel/src/main/java/org/apache/tapestry5/beanmodel/services/PlasticProxyFactoryImpl.java index c9c8c82..0e95f9e 100644 --- a/beanmodel/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java +++ b/beanmodel/src/main/java/org/apache/tapestry5/beanmodel/services/PlasticProxyFactoryImpl.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.apache.tapestry5.ioc.internal.services; +package org.apache.tapestry5.beanmodel.services; import org.apache.tapestry5.beanmodel.internal.services.PlasticClassListenerLogger; import org.apache.tapestry5.internal.plastic.PlasticInternalUtils; @@ -20,6 +20,7 @@ import org.apache.tapestry5.internal.plastic.asm.Type; import org.apache.tapestry5.internal.plastic.asm.tree.*; import org.apache.tapestry5.ioc.Location; import org.apache.tapestry5.ioc.ObjectCreator; +import org.apache.tapestry5.ioc.internal.services.StringLocation; import org.apache.tapestry5.ioc.internal.util.CollectionFactory; import org.apache.tapestry5.ioc.internal.util.InternalCommonsUtils; import org.apache.tapestry5.ioc.services.PlasticProxyFactory; diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImpl.java index 4e8f9b7..5114fed 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImpl.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImpl.java @@ -26,7 +26,6 @@ import org.apache.tapestry5.ioc.Resource; import org.apache.tapestry5.ioc.annotations.PostInjection; import org.apache.tapestry5.ioc.annotations.Primary; import org.apache.tapestry5.ioc.annotations.Symbol; -import org.apache.tapestry5.ioc.internal.services.PlasticProxyFactoryImpl; import org.apache.tapestry5.ioc.internal.util.ClasspathResource; import org.apache.tapestry5.ioc.internal.util.CollectionFactory; import org.apache.tapestry5.ioc.internal.util.InternalUtils; diff --git a/tapestry-ioc-jcache/src/main/java/org/apache/tapestry5/jcache/internal/CacheLookupUtil.java b/tapestry-ioc-jcache/src/main/java/org/apache/tapestry5/jcache/internal/CacheLookupUtil.java index 81ffd0e..7e7ddae 100644 --- a/tapestry-ioc-jcache/src/main/java/org/apache/tapestry5/jcache/internal/CacheLookupUtil.java +++ b/tapestry-ioc-jcache/src/main/java/org/apache/tapestry5/jcache/internal/CacheLookupUtil.java @@ -22,8 +22,8 @@ import javax.cache.annotation.CacheKeyGenerator; import javax.cache.annotation.CacheResolverFactory; import javax.inject.Singleton; +import org.apache.tapestry5.beanmodel.services.PlasticProxyFactoryImpl; import org.apache.tapestry5.ioc.ObjectLocator; -import org.apache.tapestry5.ioc.internal.services.PlasticProxyFactoryImpl; import org.apache.tapestry5.plastic.MethodInvocation; import org.jsr107.ri.annotations.AbstractCacheLookupUtil; import org.jsr107.ri.annotations.InternalCacheInvocationContext; diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/RegistryBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/RegistryBuilder.java index 9af07fa..53684a4 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/RegistryBuilder.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/RegistryBuilder.java @@ -12,12 +12,12 @@ package org.apache.tapestry5.ioc; +import org.apache.tapestry5.beanmodel.services.PlasticProxyFactoryImpl; import org.apache.tapestry5.ioc.annotations.ImportModule; import org.apache.tapestry5.ioc.annotations.SubModule; import org.apache.tapestry5.ioc.def.ModuleDef; import org.apache.tapestry5.ioc.def.ModuleDef2; import org.apache.tapestry5.ioc.internal.*; -import org.apache.tapestry5.ioc.internal.services.PlasticProxyFactoryImpl; import org.apache.tapestry5.ioc.internal.util.CollectionFactory; import org.apache.tapestry5.ioc.internal.util.InternalUtils; import org.apache.tapestry5.ioc.internal.util.OneShotLock; diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java index 95fb1f6..27f1626 100644 --- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java +++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java @@ -14,6 +14,7 @@ package org.apache.tapestry5.ioc.internal.services; +import org.apache.tapestry5.beanmodel.services.PlasticProxyFactoryImpl; import org.apache.tapestry5.ioc.AnnotationAccess; import org.apache.tapestry5.ioc.internal.util.CollectionFactory; import org.apache.tapestry5.ioc.services.PlasticProxyFactory; diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/DefaultModuleDefImplSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/DefaultModuleDefImplSpec.groovy index e46f469..93f1eed 100644 --- a/tapestry-ioc/src/test/groovy/ioc/specs/DefaultModuleDefImplSpec.groovy +++ b/tapestry-ioc/src/test/groovy/ioc/specs/DefaultModuleDefImplSpec.groovy @@ -4,7 +4,6 @@ import org.apache.tapestry5.internal.plastic.PlasticClassLoader import org.apache.tapestry5.internal.plastic.PlasticInternalUtils import org.apache.tapestry5.internal.plastic.asm.ClassWriter import org.apache.tapestry5.ioc.def.ServiceDef3 -import org.apache.tapestry5.ioc.internal.services.PlasticProxyFactoryImpl import org.apache.tapestry5.ioc.services.PlasticProxyFactory import org.slf4j.Logger @@ -18,6 +17,8 @@ import org.apache.tapestry5.ioc.internal.* import static org.apache.tapestry5.internal.plastic.asm.Opcodes.* +import org.apache.tapestry5.beanmodel.services.PlasticProxyFactoryImpl + class DefaultModuleDefImplSpec extends Specification { @Shared diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/OperationAdvisorSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/OperationAdvisorSpec.groovy index 3f2ef1b..65b740a 100644 --- a/tapestry-ioc/src/test/groovy/ioc/specs/OperationAdvisorSpec.groovy +++ b/tapestry-ioc/src/test/groovy/ioc/specs/OperationAdvisorSpec.groovy @@ -1,10 +1,10 @@ package ioc.specs +import org.apache.tapestry5.beanmodel.services.PlasticProxyFactoryImpl import org.apache.tapestry5.ioc.OperationTracker import org.apache.tapestry5.ioc.internal.DefaultModuleDefImpl import org.apache.tapestry5.ioc.internal.LoggerSourceImpl import org.apache.tapestry5.ioc.internal.RegistryImpl -import org.apache.tapestry5.ioc.internal.services.PlasticProxyFactoryImpl import org.apache.tapestry5.ioc.modules.TapestryIOCModule import org.apache.tapestry5.ioc.services.OperationTrackedModule import org.apache.tapestry5.ioc.services.OperationTrackedService diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/OperationTrackerSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/OperationTrackerSpec.groovy index ba8c036..782da08 100644 --- a/tapestry-ioc/src/test/groovy/ioc/specs/OperationTrackerSpec.groovy +++ b/tapestry-ioc/src/test/groovy/ioc/specs/OperationTrackerSpec.groovy @@ -1,12 +1,12 @@ package ioc.specs +import org.apache.tapestry5.beanmodel.services.PlasticProxyFactoryImpl import org.apache.tapestry5.ioc.OperationTracker import org.apache.tapestry5.ioc.internal.DefaultModuleDefImpl import org.apache.tapestry5.ioc.internal.LoggerSourceImpl import org.apache.tapestry5.ioc.internal.OperationException; import org.apache.tapestry5.ioc.internal.OperationTrackerImpl; import org.apache.tapestry5.ioc.internal.RegistryImpl -import org.apache.tapestry5.ioc.internal.services.PlasticProxyFactoryImpl import org.apache.tapestry5.ioc.modules.TapestryIOCModule import org.apache.tapestry5.ioc.services.OperationTrackedModule import org.apache.tapestry5.ioc.services.OperationTrackedService