You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/03/06 00:59:00 UTC
svn commit: r1453096 - in /myfaces/tobago/trunk: tobago-assembly/
tobago-core/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/
tobago-core/src/test/java/org/apache/myfaces/tobago/internal/taglib/component/
tobago-example/...
Author: lofwyr
Date: Tue Mar 5 23:58:59 2013
New Revision: 1453096
URL: http://svn.apache.org/r1453096
Log:
TOBAGO-1229: Using Facelets 2.0 from JSF 2.0 instead of Facelets 1.1 from Sun
- module/artifact "tobago-taglib-extension" is no longer needed (moved to "tobago-core")
Added:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
- copied unchanged from r1453065, myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/ExtensionPanelTag.java
- copied unchanged from r1452918, myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/ExtensionPanelTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java
- copied unchanged from r1453065, myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java
- copied unchanged from r1453065, myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java
- copied unchanged from r1453065, myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java
- copied unchanged from r1453065, myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java
- copied unchanged from r1453065, myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
- copied unchanged from r1453065, myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java
- copied unchanged from r1453065, myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java
- copied unchanged from r1453065, myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java
- copied unchanged from r1453065, myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java
- copied unchanged from r1453065, myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java
- copied unchanged from r1453065, myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java
- copied unchanged from r1453065, myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java
- copied unchanged from r1453065, myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java
- copied unchanged from r1453065, myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
- copied unchanged from r1453065, myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TobagoExtensionBodyTagSupport.java
- copied unchanged from r1452918, myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TobagoExtensionBodyTagSupport.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/package-info.java
- copied unchanged from r1452918, myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/package-info.java
Removed:
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/
Modified:
myfaces/tobago/trunk/tobago-assembly/pom.xml
myfaces/tobago/trunk/tobago-core/pom.xml
myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/taglib/component/GenericTagUnitTest.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
myfaces/tobago/trunk/tobago-extension/pom.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml
Modified: myfaces/tobago/trunk/tobago-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-assembly/pom.xml?rev=1453096&r1=1453095&r2=1453096&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-assembly/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-assembly/pom.xml Tue Mar 5 23:58:59 2013
@@ -226,12 +226,6 @@
<version>${project.version}</version>
</artifactItem>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>tobago-taglib-extension</artifactId>
- <version>${project.version}</version>
- </artifactItem>
-
</artifactItems>
<outputDirectory>${project.build.directory}/tld
</outputDirectory>
@@ -293,12 +287,6 @@
<version>${project.version}</version>
<classifier>sources</classifier>
</artifactItem>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>tobago-taglib-extension</artifactId>
- <version>${project.version}</version>
- <classifier>sources</classifier>
- </artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/src
Modified: myfaces/tobago/trunk/tobago-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/pom.xml?rev=1453096&r1=1453095&r2=1453096&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-core/pom.xml Tue Mar 5 23:58:59 2013
@@ -64,11 +64,13 @@
<processor>org.apache.myfaces.tobago.apt.processor.ClassesGenerator</processor>
<processor>org.apache.myfaces.tobago.apt.processor.TaglibGenerator</processor>
<processor>org.apache.myfaces.tobago.apt.processor.FacesConfigGenerator</processor>
+ <processor>org.apache.myfaces.tobago.apt.processor.CheckstyleConfigGenerator</processor>
</processors>
<optionMap>
<sourceFacesConfig>${basedir}/src/main/faces-config/faces-config.xml</sourceFacesConfig>
<targetFacesConfig>META-INF/faces-config.xml</targetFacesConfig>
<targetTaglib>META-INF</targetTaglib>
+ <targetCheckstyle>META-INF</targetCheckstyle>
<jsfVersion>${jsf.target}</jsfVersion>
</optionMap>
</configuration>
Modified: myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/taglib/component/GenericTagUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/taglib/component/GenericTagUnitTest.java?rev=1453096&r1=1453095&r2=1453096&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/taglib/component/GenericTagUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/taglib/component/GenericTagUnitTest.java Tue Mar 5 23:58:59 2013
@@ -25,10 +25,10 @@ public class GenericTagUnitTest extends
@Before
public void setUp() throws Exception {
- String[] tldPaths = new String[1];
- tldPaths[0] = "META-INF/org/apache/myfaces/tobago/internal/taglib/component/tobago.tld";
- //TODO move to tobago-taglib-extension
- //tldPaths[1] = "META-INF/org/apache/myfaces/tobago/internal/taglib/extension/tobago-extension.tld";
+ String[] tldPaths = new String[]{
+ "META-INF/org/apache/myfaces/tobago/internal/taglib/component/tobago.tld",
+ "META-INF/org/apache/myfaces/tobago/internal/taglib/extension/tobago-extension.tld"
+ };
setTldPaths(tldPaths);
super.setUp();
}
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml?rev=1453096&r1=1453095&r2=1453096&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml Tue Mar 5 23:58:59 2013
@@ -600,7 +600,7 @@
<dependencies>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-taglib-extension</artifactId>
+ <artifactId>tobago-core</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Modified: myfaces/tobago/trunk/tobago-extension/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/pom.xml?rev=1453096&r1=1453095&r2=1453096&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/pom.xml Tue Mar 5 23:58:59 2013
@@ -31,7 +31,6 @@
<module>tobago-fileupload</module>
<module>tobago-sandbox</module>
<module>tobago-security</module>
- <module>tobago-taglib-extension</module>
</modules>
<dependencies>
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml?rev=1453096&r1=1453095&r2=1453096&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/pom.xml Tue Mar 5 23:58:59 2013
@@ -164,11 +164,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-taglib-extension</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>