diff --git a/tapx-datefield/src/main/java/com/howardlewisship/tapx/datefield/services/DateFieldModule.java b/tapx-datefield/src/main/java/com/howardlewisship/tapx/datefield/services/DateFieldModule.java index b3cc9cd..8ae3076 100644 --- a/tapx-datefield/src/main/java/com/howardlewisship/tapx/datefield/services/DateFieldModule.java +++ b/tapx-datefield/src/main/java/com/howardlewisship/tapx/datefield/services/DateFieldModule.java @@ -58,7 +58,7 @@ public static void contributeJavascriptStackSource(MappedConfiguration configuration, - @Value("classpath:com/howardlewisship/tapx/datefield/tapx-datefield.properties") + @Value("com/howardlewisship/tapx/datefield/tapx-datefield.properties") Resource catalog) { configuration.add("TapxDateField", catalog, "before:AppCatalog"); diff --git a/tapx-datefield/src/main/java/com/howardlewisship/tapx/datefield/services/DateFieldStack.java b/tapx-datefield/src/main/java/com/howardlewisship/tapx/datefield/services/DateFieldStack.java index 51832e0..6145004 100644 --- a/tapx-datefield/src/main/java/com/howardlewisship/tapx/datefield/services/DateFieldStack.java +++ b/tapx-datefield/src/main/java/com/howardlewisship/tapx/datefield/services/DateFieldStack.java @@ -19,7 +19,6 @@ import org.apache.tapestry5.Asset; import org.apache.tapestry5.internal.TapestryInternalUtils; -import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.annotations.Symbol; import org.apache.tapestry5.ioc.internal.util.CollectionFactory; import org.apache.tapestry5.ioc.internal.util.Func; @@ -44,9 +43,11 @@ public class DateFieldStack implements JavascriptStack private final List stylesheets; - public DateFieldStack(ThreadLocale threadLocale, AssetSource assetSource, @Inject + public DateFieldStack(ThreadLocale threadLocale, AssetSource assetSource, + @Symbol(DateFieldSymbols.SKIN) - String skin, @Inject + String skin, + @Symbol(DateFieldSymbols.THEME) String theme) { diff --git a/tapx-yui/src/main/java/com/howardlewisship/tapx/yui/services/internal/ImportYUIWorker.java b/tapx-yui/src/main/java/com/howardlewisship/tapx/yui/services/internal/ImportYUIWorker.java index c9bc6cd..b0d42c1 100644 --- a/tapx-yui/src/main/java/com/howardlewisship/tapx/yui/services/internal/ImportYUIWorker.java +++ b/tapx-yui/src/main/java/com/howardlewisship/tapx/yui/services/internal/ImportYUIWorker.java @@ -17,7 +17,6 @@ import org.apache.tapestry5.Asset; import org.apache.tapestry5.SymbolConstants; import org.apache.tapestry5.annotations.BeginRender; -import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.annotations.Symbol; import org.apache.tapestry5.model.MutableComponentModel; import org.apache.tapestry5.services.AssetSource; @@ -46,7 +45,6 @@ public ImportYUIWorker(AssetSource assetSource, JavascriptSupport javascriptSupport, - @Inject @Symbol(YuiSymbols.BASE) String yuiBase,