You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/10/01 12:13:36 UTC
svn commit: r451734 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/taglib/decl/ tobago-sandbox/
tobago-sandbox/src/main/faces-config/
tobago-sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/
tobago-sandbox/src/ma...
Author: bommel
Date: Sun Oct 1 03:13:35 2006
New Revision: 451734
URL: http://svn.apache.org/viewvc?view=rev&rev=451734
Log:
[TOBAGO-140] generate faces-config from annotations
Added:
myfaces/tobago/trunk/tobago-sandbox/src/main/faces-config/
myfaces/tobago/trunk/tobago-sandbox/src/main/faces-config/faces-config.xml
- copied, changed from r450936, myfaces/tobago/trunk/tobago-sandbox/src/main/resources/META-INF/faces-config.xml
Removed:
myfaces/tobago/trunk/tobago-sandbox/src/main/resources/META-INF/faces-config.xml
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasBinding.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasIdBindingAndRendered.java
myfaces/tobago/trunk/tobago-sandbox/pom.xml
myfaces/tobago/trunk/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/SeparatorTag.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasBinding.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasBinding.java?view=diff&rev=451734&r1=451733&r2=451734
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasBinding.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasBinding.java Sun Oct 1 03:13:35 2006
@@ -29,6 +29,7 @@
* The value binding expression linking this
* component to a property in a backing bean.
*/
- @TagAttribute @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
+ @TagAttribute
+ //@UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
void setBinding(String binding) throws JspException;
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasIdBindingAndRendered.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasIdBindingAndRendered.java?view=diff&rev=451734&r1=451733&r2=451734
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasIdBindingAndRendered.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasIdBindingAndRendered.java Sun Oct 1 03:13:35 2006
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-/**
+/*
* User: weber
* Date: Apr 19, 2005
* Time: 4:16:09 PM
Modified: myfaces/tobago/trunk/tobago-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-sandbox/pom.xml?view=diff&rev=451734&r1=451733&r2=451734
==============================================================================
--- myfaces/tobago/trunk/tobago-sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-sandbox/pom.xml Sun Oct 1 03:13:35 2006
@@ -72,6 +72,34 @@
<encoding>UTF-8</encoding>
</configuration>
</execution>
+ <execution>
+ <id>tobago-faces-config</id>
+ <goals><goal>execute</goal></goals>
+ <phase>process-classes</phase>
+ <configuration>
+ <targetFiles>
+ <targetFile>target/classes/META-INF/faces-config.xml</targetFile>
+ </targetFiles>
+ <excludes>
+ <exclude>org/apache/myfaces/tobago/util/CommonsLoggingLogger.java</exclude>
+ <exclude>org/apache/myfaces/tobago/application/FopConverter.java</exclude>
+ <exclude>org/apache/myfaces/tobago/taglib/component/*</exclude>
+ <exclude>org/apache/myfaces/tobago/taglib/extension/*</exclude>
+ </excludes>
+ <aptSourceRoots>
+ <aptSourceRoot>${project.build.directory}/tobago-core-sources</aptSourceRoot>
+ </aptSourceRoots>
+ <resourceTargetPath>META-INF</resourceTargetPath>
+ <generated>target/generated-tld</generated>
+ <factory>org.apache.myfaces.tobago.apt.FacesConfigAnnotationProcessorFactory</factory>
+ <!--<force>true</force>-->
+ <fork>true</fork>
+ <nocompile>true</nocompile>
+ <encoding>UTF-8</encoding>
+ <A>sourceFacesConfig=src/main/faces-config/faces-config.xml,targetFacesConfig=target/classes/META-INF/faces-config.xml</A>
+ <!--verbose>true</verbose-->
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
Copied: myfaces/tobago/trunk/tobago-sandbox/src/main/faces-config/faces-config.xml (from r450936, myfaces/tobago/trunk/tobago-sandbox/src/main/resources/META-INF/faces-config.xml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-sandbox/src/main/faces-config/faces-config.xml?view=diff&rev=451734&p1=myfaces/tobago/trunk/tobago-sandbox/src/main/resources/META-INF/faces-config.xml&r1=450936&p2=myfaces/tobago/trunk/tobago-sandbox/src/main/faces-config/faces-config.xml&r2=451734
==============================================================================
--- myfaces/tobago/trunk/tobago-sandbox/src/main/resources/META-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/tobago-sandbox/src/main/faces-config/faces-config.xml Sun Oct 1 03:13:35 2006
@@ -22,11 +22,6 @@
<faces-config>
- <component>
- <component-type>org.apache.myfaces.tobago.Separator</component-type>
- <component-class>org.apache.myfaces.tobago.component.UISeparator</component-class>
- </component>
-
<render-kit>
<render-kit-id>tobago</render-kit-id>
<render-kit-class>org.apache.myfaces.tobago.renderkit.TobagoRenderKit</render-kit-class>
Modified: myfaces/tobago/trunk/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/SeparatorTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/SeparatorTag.java?view=diff&rev=451734&r1=451733&r2=451734
==============================================================================
--- myfaces/tobago/trunk/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/SeparatorTag.java (original)
+++ myfaces/tobago/trunk/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/SeparatorTag.java Sun Oct 1 03:13:35 2006
@@ -24,6 +24,7 @@
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.BodyContent;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
+import org.apache.myfaces.tobago.apt.annotation.Facet;
/**
* Created by IntelliJ IDEA.
@@ -38,7 +39,8 @@
@Tag(name = "separator")
@UIComponentTag(rendererType = "Separator",
- uiComponent = "org.apache.myfaces.tobago.component.UISeparator")
+ uiComponent = "org.apache.myfaces.tobago.component.UISeparator",
+ facets = { @Facet(name = "label", description = "This facet contains a UILabel") } )
public class SeparatorTag extends TobagoTag implements HasIdBindingAndRendered{