This is an automated email from the ASF dual-hosted git repository. thiagohp pushed a commit to branch javax-import-class-hierarchy in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/javax-import-class-hierarchy by this push: new ecc4cfb68 More testing for @Import with multiple classloader mode on ecc4cfb68 is described below commit ecc4cfb684a6b42712286e07ab3cbc59d99330b0 Author: Thiago H. de Paula Figueiredo <thi...@arsmachina.com.br> AuthorDate: Sun Dec 8 19:05:41 2024 -0300 More testing for @Import with multiple classloader mode on --- .../src/test/java/t5/webresources/base/PageWrapper.java | 3 ++- .../src/test/java/t5/webresources/base/TrainingDocPage.java | 3 ++- .../src/test/java/t5/webresources/pages/TrainingWrapper.java | 3 ++- .../src/test/resources/META-INF/assets/PageWrapper.js | 1 + .../src/test/resources/META-INF/assets/TrainingDocPage.js | 1 + .../src/test/resources/META-INF/assets/TrainingWrapper.js | 1 + .../src/test/resources/t5/webresources/pages/MessageCatalogue.tml | 2 +- 7 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tapestry-webresources/src/test/java/t5/webresources/base/PageWrapper.java b/tapestry-webresources/src/test/java/t5/webresources/base/PageWrapper.java index 2d60317b2..60b143c49 100644 --- a/tapestry-webresources/src/test/java/t5/webresources/base/PageWrapper.java +++ b/tapestry-webresources/src/test/java/t5/webresources/base/PageWrapper.java @@ -2,6 +2,7 @@ package t5.webresources.base; import org.apache.tapestry5.annotations.Import; -@Import(stylesheet = "classpath:/META-INF/assets/PageWrapper.less") +@Import(stylesheet = "classpath:/META-INF/assets/PageWrapper.less", + library = "classpath:/META-INF/assets/PageWrapper.js") public abstract class PageWrapper extends ComponentCommonBase { } diff --git a/tapestry-webresources/src/test/java/t5/webresources/base/TrainingDocPage.java b/tapestry-webresources/src/test/java/t5/webresources/base/TrainingDocPage.java index c5ee88920..82579afee 100644 --- a/tapestry-webresources/src/test/java/t5/webresources/base/TrainingDocPage.java +++ b/tapestry-webresources/src/test/java/t5/webresources/base/TrainingDocPage.java @@ -4,6 +4,7 @@ import org.apache.tapestry5.annotations.Import; import t5.webresources.pages.TrainingWrapper; -@Import(stylesheet = "classpath:/META-INF/assets/TrainingDocPage.less") +@Import(stylesheet = "classpath:/META-INF/assets/TrainingDocPage.less", + library = "classpath:/META-INF/assets/TrainingDocPage.js") public abstract class TrainingDocPage extends TrainingWrapper { } diff --git a/tapestry-webresources/src/test/java/t5/webresources/pages/TrainingWrapper.java b/tapestry-webresources/src/test/java/t5/webresources/pages/TrainingWrapper.java index 295306e13..5039fa50f 100644 --- a/tapestry-webresources/src/test/java/t5/webresources/pages/TrainingWrapper.java +++ b/tapestry-webresources/src/test/java/t5/webresources/pages/TrainingWrapper.java @@ -4,6 +4,7 @@ import org.apache.tapestry5.annotations.Import; import t5.webresources.base.PageWrapper; -@Import(stylesheet = "classpath:/META-INF/assets/TrainingWrapper.less") +@Import(stylesheet = "classpath:/META-INF/assets/TrainingWrapper.less", + library = "classpath:/META-INF/assets/TrainingWrapper.js") public class TrainingWrapper extends PageWrapper { } diff --git a/tapestry-webresources/src/test/resources/META-INF/assets/PageWrapper.js b/tapestry-webresources/src/test/resources/META-INF/assets/PageWrapper.js new file mode 100644 index 000000000..4a7b41430 --- /dev/null +++ b/tapestry-webresources/src/test/resources/META-INF/assets/PageWrapper.js @@ -0,0 +1 @@ +console.log("PageWrapper"); \ No newline at end of file diff --git a/tapestry-webresources/src/test/resources/META-INF/assets/TrainingDocPage.js b/tapestry-webresources/src/test/resources/META-INF/assets/TrainingDocPage.js new file mode 100644 index 000000000..d0d2c0f1f --- /dev/null +++ b/tapestry-webresources/src/test/resources/META-INF/assets/TrainingDocPage.js @@ -0,0 +1 @@ +console.log("TrainingDocPage"); \ No newline at end of file diff --git a/tapestry-webresources/src/test/resources/META-INF/assets/TrainingWrapper.js b/tapestry-webresources/src/test/resources/META-INF/assets/TrainingWrapper.js new file mode 100644 index 000000000..538131599 --- /dev/null +++ b/tapestry-webresources/src/test/resources/META-INF/assets/TrainingWrapper.js @@ -0,0 +1 @@ +console.log("TrainingWrapper"); \ No newline at end of file diff --git a/tapestry-webresources/src/test/resources/t5/webresources/pages/MessageCatalogue.tml b/tapestry-webresources/src/test/resources/t5/webresources/pages/MessageCatalogue.tml index 8e4e6bc39..783ac101b 100644 --- a/tapestry-webresources/src/test/resources/t5/webresources/pages/MessageCatalogue.tml +++ b/tapestry-webresources/src/test/resources/t5/webresources/pages/MessageCatalogue.tml @@ -16,7 +16,7 @@ <div class="training-wrapper"> <p> - This should be red (training wrapper). + This should be red (training wrapper) </p> </div>