Move YuiCompressorModule into a modules package
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/6fc351f1 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/6fc351f1 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/6fc351f1 Branch: refs/heads/master Commit: 6fc351f12c3ec58a96a4580213e1778f22a22168 Parents: ed79f2e Author: Howard M. Lewis Ship <[email protected]> Authored: Mon Apr 22 17:11:46 2013 -0700 Committer: Howard M. Lewis Ship <[email protected]> Committed: Mon Apr 22 17:11:46 2013 -0700 ---------------------------------------------------------------------- .../yuicompressor/modules/YuiCompressorModule.java | 43 ++++++++++++++ .../yuicompressor/modules/package-info.java | 18 ++++++ .../services/YuiCompressorModule.java | 45 --------------- .../yuicompressor/services/package-info.java | 18 ------ .../yuicompressor/testapp/services/AppModule.java | 2 +- 5 files changed, 62 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6fc351f1/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/modules/YuiCompressorModule.java ---------------------------------------------------------------------- diff --git a/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/modules/YuiCompressorModule.java b/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/modules/YuiCompressorModule.java new file mode 100644 index 0000000..e7211c4 --- /dev/null +++ b/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/modules/YuiCompressorModule.java @@ -0,0 +1,43 @@ +// Copyright 2011-2013 The Apache Software Foundation +// +// 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.apache.tapestry5.yuicompressor.modules; + +import com.yahoo.platform.yui.compressor.YUICompressor; +import org.apache.tapestry5.internal.yuicompressor.CSSResourceMinimizer; +import org.apache.tapestry5.internal.yuicompressor.JavaScriptResourceMinimizer; +import org.apache.tapestry5.ioc.MappedConfiguration; +import org.apache.tapestry5.ioc.annotations.Contribute; +import org.apache.tapestry5.ioc.annotations.Primary; +import org.apache.tapestry5.services.assets.ResourceMinimizer; + +/** + * Sets up Tapestry to compress JavaScript assets using {@link YUICompressor}. + * + * @since 5.3 + */ +public class YuiCompressorModule +{ + /** + * Contibutes minimizers for <code>text/javascript</code> and <code>test/css</code>. + * + */ + @Contribute(ResourceMinimizer.class) + @Primary + public static void contributeMinimizers(MappedConfiguration<String, ResourceMinimizer> configuration) + { + configuration.addInstance("text/javascript", JavaScriptResourceMinimizer.class); + configuration.addInstance("text/css", CSSResourceMinimizer.class); + } +} http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6fc351f1/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/modules/package-info.java ---------------------------------------------------------------------- diff --git a/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/modules/package-info.java b/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/modules/package-info.java new file mode 100644 index 0000000..4fca63c --- /dev/null +++ b/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/modules/package-info.java @@ -0,0 +1,18 @@ +// Copyright 2012-2013 The Apache Software Foundation +// +// 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. + +/** + * [INTERNAL USE ONLY] support services for the YUICompressor; API subject to change + */ +package org.apache.tapestry5.yuicompressor.modules; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6fc351f1/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/services/YuiCompressorModule.java ---------------------------------------------------------------------- diff --git a/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/services/YuiCompressorModule.java b/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/services/YuiCompressorModule.java deleted file mode 100644 index 1e45b6b..0000000 --- a/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/services/YuiCompressorModule.java +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright 2011 The Apache Software Foundation -// -// 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.apache.tapestry5.yuicompressor.services; - -import org.apache.tapestry5.internal.yuicompressor.CSSResourceMinimizer; -import org.apache.tapestry5.internal.yuicompressor.JavaScriptResourceMinimizer; -import org.apache.tapestry5.ioc.MappedConfiguration; -import org.apache.tapestry5.ioc.annotations.Contribute; -import org.apache.tapestry5.ioc.annotations.Primary; -import org.apache.tapestry5.services.assets.ResourceMinimizer; - -import com.yahoo.platform.yui.compressor.YUICompressor; - -/** - * Sets up Tapestry to compress JavaScript assets using {@link YUICompressor}. - * - * @since 5.3 - */ -public class YuiCompressorModule -{ - /** - * Contibutes minimizers for <code>text/javascript</code> and <code>test/css</code>. - * - * @param configuration - */ - @Contribute(ResourceMinimizer.class) - @Primary - public static void contributeMinimizers(MappedConfiguration<String, ResourceMinimizer> configuration) - { - configuration.addInstance("text/javascript", JavaScriptResourceMinimizer.class); - configuration.addInstance("text/css", CSSResourceMinimizer.class); - } -} http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6fc351f1/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/services/package-info.java ---------------------------------------------------------------------- diff --git a/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/services/package-info.java b/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/services/package-info.java deleted file mode 100644 index e411f3b..0000000 --- a/tapestry-yuicompressor/src/main/java/org/apache/tapestry5/yuicompressor/services/package-info.java +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2012 The Apache Software Foundation -// -// 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. - -/** - * [INTERNAL USE ONLY] support services for the YUICompressor; API subject to change - */ -package org.apache.tapestry5.yuicompressor.services; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6fc351f1/tapestry-yuicompressor/src/test/java/yuicompressor/testapp/services/AppModule.java ---------------------------------------------------------------------- diff --git a/tapestry-yuicompressor/src/test/java/yuicompressor/testapp/services/AppModule.java b/tapestry-yuicompressor/src/test/java/yuicompressor/testapp/services/AppModule.java index be65259..9f1f15a 100644 --- a/tapestry-yuicompressor/src/test/java/yuicompressor/testapp/services/AppModule.java +++ b/tapestry-yuicompressor/src/test/java/yuicompressor/testapp/services/AppModule.java @@ -7,7 +7,7 @@ import org.apache.tapestry5.ioc.annotations.Contribute; import org.apache.tapestry5.ioc.annotations.SubModule; import org.apache.tapestry5.ioc.services.ApplicationDefaults; import org.apache.tapestry5.ioc.services.SymbolProvider; -import org.apache.tapestry5.yuicompressor.services.YuiCompressorModule; +import org.apache.tapestry5.yuicompressor.modules.YuiCompressorModule; @SubModule({YuiCompressorModule.class, InternalTestModule.class}) public class AppModule
