You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by th...@apache.org on 2020/12/02 02:51:09 UTC
[tapestry-5] branch master updated (a234c52 -> 64e051a)
This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git.
from a234c52 Fixing JavaDoc failures in Jenkins
new b270d74 TAP5-2636: Tapestry-IoC shouldn't accept advisers with the same id
new 64e051a Changing JavaDoc URL to Java 9 to avoid javadoc error
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.gradle | 3 +--
.../src/main/java/org/apache/tapestry5/jcache/module/JCacheModule.java | 2 ++
.../src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
[tapestry-5] 01/02: TAP5-2636: Tapestry-IoC shouldn't accept
advisers with the same id
Posted by th...@apache.org.
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 b270d74110ce40a9d902661a1b2123482d8de7ba
Author: Thiago H. de Paula Figueiredo <th...@arsmachina.com.br>
AuthorDate: Tue Dec 1 23:45:47 2020 -0300
TAP5-2636: Tapestry-IoC shouldn't accept advisers with the same id
---
.../src/main/java/org/apache/tapestry5/jcache/module/JCacheModule.java | 2 ++
.../src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/tapestry-ioc-jcache/src/main/java/org/apache/tapestry5/jcache/module/JCacheModule.java b/tapestry-ioc-jcache/src/main/java/org/apache/tapestry5/jcache/module/JCacheModule.java
index 5873547..11d13eb 100644
--- a/tapestry-ioc-jcache/src/main/java/org/apache/tapestry5/jcache/module/JCacheModule.java
+++ b/tapestry-ioc-jcache/src/main/java/org/apache/tapestry5/jcache/module/JCacheModule.java
@@ -26,6 +26,7 @@ import javax.cache.annotation.CacheResult;
import org.apache.tapestry5.commons.ObjectLocator;
import org.apache.tapestry5.ioc.MethodAdviceReceiver;
import org.apache.tapestry5.ioc.ServiceBinder;
+import org.apache.tapestry5.ioc.annotations.Advise;
import org.apache.tapestry5.ioc.annotations.Match;
import org.apache.tapestry5.jcache.internal.CacheLookupUtil;
import org.apache.tapestry5.jcache.internal.CacheMethodAdvice;
@@ -70,6 +71,7 @@ public final class JCacheModule
* an {@link ObjectLocator}.
*/
@Match("*")
+ @Advise(id = "JCache")
public static void adviseCache(MethodAdviceReceiver receiver, ObjectLocator objectLocator)
{
advise(CachePut.class, objectLocator, CachePutMethodAdvice.class, receiver);
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java
index 2d0c245..c28e0f0 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java
@@ -982,7 +982,7 @@ public class RegistryImpl implements Registry, InternalRegistry, ServiceProxyPro
Logger logger = getServiceLogger(serviceDef.getServiceId());
- Orderer<ServiceAdvisor> orderer = new Orderer<ServiceAdvisor>(logger);
+ Orderer<ServiceAdvisor> orderer = new Orderer<ServiceAdvisor>(logger, true);
for (Module module : moduleToServiceDefs.keySet())
{
[tapestry-5] 02/02: Changing JavaDoc URL to Java 9 to avoid javadoc
error
Posted by th...@apache.org.
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 64e051a7fb37aefb7d3babfbdae20c19b30dc7b0
Author: Thiago H. de Paula Figueiredo <th...@arsmachina.com.br>
AuthorDate: Tue Dec 1 23:50:50 2020 -0300
Changing JavaDoc URL to Java 9 to avoid javadoc error
---
build.gradle | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index 67034c2..28d60ed 100755
--- a/build.gradle
+++ b/build.gradle
@@ -350,8 +350,7 @@ task aggregateJavadoc(type: Javadoc) {
docTitle "Tapestry API - ($project.version)"
bottom "${project.version} - Copyright © 2003-${thisYear} <a href=\"http://tapestry.apache.org/\">The Apache Software Foundation</a>."
use = true // 'use' seems to be a reserved word for the DSL
- links "https://docs.oracle.com/javase/8/docs/api/"
- links "https://docs.oracle.com/javaee/7/api/"
+ links "https://docs.oracle.com/javase/9/docs/api/" // Just to have javadoc not error out when running in Jenkins
addStringOption "tagletpath", configurations.javadoc.asPath
addStringOption "taglet", "org.apache.tapestry5.javadoc.TapestryDocTaglet"
exclude "org/apache/tapestry5/internal/plastic/asm/**"