You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2008/04/19 05:00:05 UTC

svn commit: r649743 - in /myfaces/myfaces-build-tools/branches/builder_plugin: bigtest/core_trunk_11/api/ bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/ bigtest/core_trunk_11/api/src/main/resources/META-INF/ myfaces-builder-plugin/...

Author: lu4242
Date: Fri Apr 18 19:59:46 2008
New Revision: 649743

URL: http://svn.apache.org/viewvc?rev=649743&view=rev
Log:
Component generation for myfaces 1.1 

Added:
    myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_AccesskeyProperty.java   (with props)
    myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_EventProperties.java   (with props)
    myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_Focus_BlurProperties.java   (with props)
    myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlCommandButton.java   (with props)
    myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlCommandLink.java   (with props)
    myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlForm.java   (with props)
    myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_StyleProperties.java   (with props)
    myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_TabindexProperty.java   (with props)
    myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_UniversalProperties.java   (with props)
    myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/resources/META-INF/componentClass11.vm
Removed:
    myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/HtmlCommandButton.java
    myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/HtmlCommandLink.java
    myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/HtmlForm.java
Modified:
    myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/pom.xml
    myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java
    myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java
    myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/MyfacesUtils.java

Modified: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/pom.xml?rev=649743&r1=649742&r2=649743&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/pom.xml (original)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/pom.xml Fri Apr 18 19:59:46 2008
@@ -29,6 +29,12 @@
               <goal>build-metadata</goal>
             </goals>
           </execution>
+          <execution>
+            <id>makecomp</id>
+            <goals>
+              <goal>make-components</goal>
+            </goals>
+          </execution>          
         </executions>
       </plugin>    
       <plugin>

Added: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_AccesskeyProperty.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_AccesskeyProperty.java?rev=649743&view=auto
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_AccesskeyProperty.java (added)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_AccesskeyProperty.java Fri Apr 18 19:59:46 2008
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 javax.faces.component.html;
+
+interface _AccesskeyProperty
+{
+    /**
+     * @JSFProperty
+     */
+    public abstract String getAccesskey();
+
+}

Propchange: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_AccesskeyProperty.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_AccesskeyProperty.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_EventProperties.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_EventProperties.java?rev=649743&view=auto
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_EventProperties.java (added)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_EventProperties.java Fri Apr 18 19:59:46 2008
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 javax.faces.component.html;
+
+interface _EventProperties
+{
+    
+    /**
+     * @JSFProperty
+     */
+    public String getOnclick();
+
+    /**
+     * @JSFProperty
+     */
+    public String getOndblclick();
+
+    /**
+     * @JSFProperty
+     */
+    public String getOnkeydown();
+
+    /**
+     * @JSFProperty
+     */
+    public String getOnkeypress();
+
+    /**
+     * @JSFProperty
+     */
+    public String getOnkeyup();
+
+    /**
+     * @JSFProperty
+     */
+    public String getOnmousedown();
+
+    /**
+     * @JSFProperty
+     */
+    public String getOnmousemove();
+
+    /**
+     * @JSFProperty
+     */
+    public String getOnmouseout();
+
+    /**
+     * @JSFProperty
+     */
+    public String getOnmouseover();
+
+    /**
+     * @JSFProperty
+     */
+    public String getOnmouseup();
+
+}

Propchange: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_EventProperties.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_EventProperties.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_Focus_BlurProperties.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_Focus_BlurProperties.java?rev=649743&view=auto
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_Focus_BlurProperties.java (added)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_Focus_BlurProperties.java Fri Apr 18 19:59:46 2008
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 javax.faces.component.html;
+
+interface _Focus_BlurProperties
+{
+
+    /**
+     * @JSFProperty
+     */
+    public String getOnblur();
+    
+    /**
+     * @JSFProperty
+     */
+    public String getOnfocus();
+    
+}

Propchange: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_Focus_BlurProperties.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_Focus_BlurProperties.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlCommandButton.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlCommandButton.java?rev=649743&view=auto
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlCommandButton.java (added)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlCommandButton.java Fri Apr 18 19:59:46 2008
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 javax.faces.component.html;
+
+import javax.faces.component.UICommand;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+/**
+ * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">JSF Specification</a>
+ *
+ * @JSFComponent
+ *   name = "h:commandButton"
+ *   class = "javax.faces.component.html.HtmlCommandButton"
+ *   tagClass = "org.apache.myfaces.taglib.html.HtmlCommandButtonTag"
+ *   desc = "h:commandButton"
+ *   
+ * @author Manfred Geiler (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+abstract class _HtmlCommandButton
+        extends UICommand implements _Focus_BlurProperties, 
+        _EventProperties, _StyleProperties, _UniversalProperties,
+        _AccesskeyProperty, _TabindexProperty
+{
+    public static final String COMPONENT_TYPE = "javax.faces.HtmlCommandButton";
+    private static final String DEFAULT_RENDERER_TYPE = "javax.faces.Button";
+        
+    /**
+     * @JSFProperty
+     */
+    public abstract String getAlt();
+            
+    /**
+     * @JSFProperty
+     *   defaultValue = "false"
+     */
+    public abstract boolean isDisabled();
+
+    /**
+     * @JSFProperty
+     */
+    public abstract String getImage();
+
+
+    /**
+     * @JSFProperty
+     */
+    public abstract String getOnchange();
+
+
+    /**
+     * @JSFProperty
+     */
+    public abstract String getOnselect();
+
+    /**
+     * @JSFProperty
+     *   defaultValue = "false"
+     */
+    public abstract boolean isReadonly();
+
+    /**
+     * @JSFProperty
+     *   defaultValue = "submit"
+     */
+    public abstract String getType();
+
+}

Propchange: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlCommandButton.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlCommandButton.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlCommandLink.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlCommandLink.java?rev=649743&view=auto
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlCommandLink.java (added)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlCommandLink.java Fri Apr 18 19:59:46 2008
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 javax.faces.component.html;
+
+import javax.faces.component.UICommand;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+/**
+ * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">JSF Specification</a>
+ * 
+ * @JSFComponent
+ *   name = "h:commandLink"
+ *   class = "javax.faces.component.html.HtmlCommandLink"
+ *   tagClass = "org.apache.myfaces.taglib.html.HtmlCommandLinkTag"
+ *   desc = "h:commandLink"
+ *   
+ * @author Thomas Spiegl (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+abstract class _HtmlCommandLink extends UICommand 
+    implements _EventProperties, _UniversalProperties, _StyleProperties,
+    _Focus_BlurProperties, _AccesskeyProperty, _TabindexProperty
+{
+
+    public static final String COMPONENT_TYPE = "javax.faces.HtmlCommandLink";
+    private static final String DEFAULT_RENDERER_TYPE = "javax.faces.Link";
+
+    /**
+     * @JSFProperty
+     */
+    public abstract String getCharset();
+    
+    /**
+     * @JSFProperty
+     */
+    public abstract String getCoords();
+    
+    /**
+     * @JSFProperty
+     */
+    public abstract String getHreflang();
+    
+    /**
+     * @JSFProperty
+     */
+    public abstract String getRel();
+    
+    /**
+     * @JSFProperty
+     */
+    public abstract String getRev();
+    
+    /**
+     * @JSFProperty
+     */
+    public abstract String getShape();
+    
+    /**
+     * @JSFProperty
+     */
+    public abstract String getTarget();
+    
+    /**
+     * @JSFProperty
+     */
+    public abstract String getType();
+
+}

Propchange: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlCommandLink.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlCommandLink.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlForm.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlForm.java?rev=649743&view=auto
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlForm.java (added)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlForm.java Fri Apr 18 19:59:46 2008
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 javax.faces.component.html;
+
+import javax.faces.component.UIForm;
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+/**
+ * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/api/index.html">JSF Specification</a>
+ *
+ * @JSFComponent
+ *   name = "h:form"
+ *   class = "javax.faces.component.html.HtmlForm"
+ *   tagClass = "org.apache.myfaces.taglib.html.HtmlFormTag"
+ *   desc = "h:form"
+ *   
+ * @author Thomas Spiegl (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+abstract class _HtmlForm extends UIForm implements _EventProperties,
+    _UniversalProperties, _StyleProperties
+{
+
+    public static final String COMPONENT_TYPE = "javax.faces.HtmlForm";
+    private static final String DEFAULT_RENDERER_TYPE = "javax.faces.Form";
+
+    /**
+     * @JSFProperty
+     */
+    public abstract String getAccept();
+
+    /**
+     * @JSFProperty
+     */
+    public abstract String getAcceptcharset();
+
+    /**
+     * @JSFProperty
+     * defaultValue = "application/x-www-form-urlencoded"
+     */
+    public abstract String getEnctype();
+
+    /**
+     * @JSFProperty
+     */
+    public abstract String getOnreset();
+
+    /**
+     * @JSFProperty
+     */
+    public abstract String getOnsubmit();
+    
+    /**
+     * @JSFProperty
+     */
+    public abstract String getTarget();
+    
+}

Propchange: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlForm.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_HtmlForm.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_StyleProperties.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_StyleProperties.java?rev=649743&view=auto
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_StyleProperties.java (added)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_StyleProperties.java Fri Apr 18 19:59:46 2008
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 javax.faces.component.html;
+
+interface _StyleProperties
+{
+    /**
+     * @JSFProperty
+     */
+    public abstract String getStyle();
+
+    /**
+     * @JSFProperty
+     */
+    public abstract String getStyleClass();
+
+}

Propchange: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_StyleProperties.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_StyleProperties.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_TabindexProperty.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_TabindexProperty.java?rev=649743&view=auto
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_TabindexProperty.java (added)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_TabindexProperty.java Fri Apr 18 19:59:46 2008
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 javax.faces.component.html;
+
+interface _TabindexProperty
+{
+    /**
+     * @JSFProperty
+     */
+    public abstract String getTabindex();
+
+}

Propchange: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_TabindexProperty.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_TabindexProperty.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_UniversalProperties.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_UniversalProperties.java?rev=649743&view=auto
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_UniversalProperties.java (added)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_UniversalProperties.java Fri Apr 18 19:59:46 2008
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 javax.faces.component.html;
+
+interface _UniversalProperties
+{
+    /**
+     * @JSFProperty
+     */
+    public abstract String getDir();
+
+    /**
+     * @JSFProperty
+     */
+    public abstract String getLang();
+
+    /**
+     * @JSFProperty
+     */
+    public abstract String getTitle();
+
+
+}

Propchange: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_UniversalProperties.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/java/javax/faces/component/html/_UniversalProperties.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/resources/META-INF/componentClass11.vm
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/resources/META-INF/componentClass11.vm?rev=649743&view=auto
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/resources/META-INF/componentClass11.vm (added)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/bigtest/core_trunk_11/api/src/main/resources/META-INF/componentClass11.vm Fri Apr 18 19:59:46 2008
@@ -0,0 +1,173 @@
+// WARNING: This file was automatically generated. Do not edit it directly,
+//          or you will lose your changes.
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you 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 ${component.packageName};
+
+import javax.faces.component.UIComponent;
+import javax.faces.el.ValueBinding;
+import javax.faces.context.FacesContext;
+$utils.importTagClasses($component)
+
+public class ${utils.getClassFromFullClass($component.className)} extends $component.parentClassName{
+
+##    static public final String COMPONENT_FAMILY =
+##        "$component.family";
+    static public final String COMPONENT_TYPE =
+        "$component.type";
+    
+    public ${utils.getClassFromFullClass($component.className)}()
+    {
+#if ($component.rendererType)
+        setRendererType("$component.rendererType");
+#else
+        setRendererType(null);
+#end
+    }
+
+## On myfaces 1.1 the family is inherited, so this could be commented    
+##    public String getFamily()
+##    {
+##        return COMPONENT_FAMILY;
+##    }
+    
+#set ($propertyList = ${component.propertyComponentList})
+
+#foreach( $property in $propertyList )
+#set ($field = $property.fieldName)
+#set ($type = $utils.getClassFromFullClass($property.className))
+#if($utils.getDefaultValueField($property)) 
+#set ($defaultValue = $utils.getDefaultValueField($property))
+#else
+#set ($defaultValue = false)
+#end
+    // Property: $property.name
+#if ($property.isLiteralOnly() || $property.isTagExcluded() )
+    private $type $field #if($defaultValue) = $defaultValue;#{else};#{end} 
+#else
+    private $type $field;
+#end
+#if($utils.isPrimitiveClass($type) && !$property.isTagExcluded() )
+    private boolean ${field}Set;
+#end
+
+    public $type $utils.getMethodReaderFromProperty($property.name, $type)()
+    {
+#if ($property.isTagExcluded() || $property.isLiteralOnly())
+        return $field;
+#else
+#if ($utils.isPrimitiveClass($type))
+        if (${field}Set)
+#else
+        if ($field != null)
+#end
+        {
+            return $field;
+        }
+        ValueBinding vb = getValueBinding("$property.name");
+        if (vb != null)
+        {
+#if ($utils.isPrimitiveClass($type))
+            return ($utils.castIfNecessary($type) vb.getValue(getFacesContext())).${type}Value();
+#else
+            return $utils.castIfNecessary($type) vb.getValue(getFacesContext());
+#end
+        }
+#if ($defaultValue)
+        return $defaultValue; 
+#elseif ($utils.isPrimitiveClass($type))
+        return $utils.primitiveDefaultValue($type);
+#else       
+        return null;
+#end
+#end
+    }
+
+    public void $utils.getPrefixedPropertyName("set", $property.name)($type $utils.getVariableFromName($property.name))
+    {
+        this.$field = $utils.getVariableFromName($property.name);
+#if ($utils.isPrimitiveClass($type) && !$property.isTagExcluded() )
+        this.${field}Set = true;        
+#end
+    }
+#end
+
+    public Object saveState(FacesContext facesContext)
+    {
+#set ($primitiveCount = $propertyList.size() + 1)
+#foreach( $property in $propertyList )
+#if($utils.isPrimitiveClass($property.className))
+#set ($primitiveCount = $primitiveCount + 1)
+#end
+#end
+        Object[] values = new Object[$primitiveCount];
+        values[0] = super.saveState(facesContext);
+#set ($arrayIndex = 0)
+#foreach( $property in $propertyList )
+#set ($field = $property.fieldName)
+#set ($type = $property.className)
+#set ($arrayIndex = $arrayIndex + 1)
+#if ($property.jspName == "validator" && $property.isMethodBinding() )
+        values[$arrayIndex] = saveAttachedState(facesContext,${field}List);
+#elseif ( $property.stateHolder )## || $utils.isConverter($type)
+        values[$arrayIndex] = saveAttachedState(facesContext,$field);
+#elseif($utils.isPrimitiveClass($type))
+        values[$arrayIndex] = ${utils.getBoxedClass($type)}.valueOf($field);
+#else
+        values[$arrayIndex] = $field;
+#end
+#if($utils.isPrimitiveClass($type) && !$property.isTagExcluded())
+#set ($arrayIndex = $arrayIndex + 1)
+        values[$arrayIndex] = Boolean.valueOf(${field}Set);
+#end
+#end
+        return values; 
+    }
+
+    public void restoreState(FacesContext facesContext, Object state)
+    {
+        Object[] values = (Object[])state;
+        super.restoreState(facesContext,values[0]);
+#set ($arrayIndex = 0)
+#foreach( $property in $propertyList )
+#set ($field = $property.fieldName)
+#set ($type = $property.className)
+#set ($arrayIndex = $arrayIndex + 1)
+#if ( $property.stateHolder )
+#if ($property.jspName == "validator" && $property.isMethodBinding() )
+        ${field}List = (List<Validator>) restoreAttachedState(facesContext,values[$arrayIndex]);
+#elseif ($utils.isList($type))
+        $field = (List) restoreAttachedState(facesContext,values[$arrayIndex]);
+#else
+        $field = $utils.castIfNecessary($type) restoreAttachedState(facesContext,values[$arrayIndex]); 
+#end
+#elseif ($utils.isConverter($type)) 
+        $field = (Converter) restoreAttachedState(facesContext,values[$arrayIndex]);
+#elseif ($utils.isPrimitiveClass($type))
+        $field = ($utils.castIfNecessary($type) values[$arrayIndex]).${type}Value();
+#else
+        $field = $utils.castIfNecessary($type) values[$arrayIndex];
+#end
+#if($utils.isPrimitiveClass($type) && !$property.isTagExcluded() )
+#set ($arrayIndex = $arrayIndex + 1)
+        ${field}Set = ((Boolean) values[$arrayIndex]).booleanValue();
+#end
+#end
+    }
+}

Modified: myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java?rev=649743&r1=649742&r2=649743&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java (original)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java Fri Apr 18 19:59:46 2008
@@ -140,6 +140,8 @@
         
         try
         {
+            project.addCompileSourceRoot( generatedSourceDirectory.getCanonicalPath() );
+            
             if (modelIds == null){
                 modelIds = new ArrayList();
                 modelIds.add(project.getArtifactId());

Modified: myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java?rev=649743&r1=649742&r2=649743&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java (original)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/QdoxModelBuilder.java Fri Apr 18 19:59:46 2008
@@ -381,7 +381,7 @@
             JavaClass iclazz = classes[i];
 
             ComponentMeta ifaceComponent = model
-                    .findComponentByClassName(iclazz.getName());
+                    .findComponentByClassName(iclazz.getFullyQualifiedName());
             if (ifaceComponent != null)
             {
                 ifaceNames.add(ifaceComponent.getClassName());
@@ -643,6 +643,44 @@
             }
         }
         
+        Type [] interfaces = clazz.getImplements();
+        
+        //Scan interfaces for properties to be added to this component
+        //This feature allow us to have groups of functions.
+        for (int i = 0; i < interfaces.length;++i)
+        {
+            JavaClass intf = interfaces[i].getJavaClass();
+
+            //If the interfaces has a JSFComponent Doclet,
+            //this is managed in other way
+            if (intf.getTagByName(DOC_COMPONENT, false) == null)
+            {
+                JavaMethod[] intfmethods = intf.getMethods();
+                for (int j = 0; j < intfmethods.length; ++j)
+                {
+                    JavaMethod intfmethod = intfmethods[j];
+
+                    DocletTag tag = intfmethod.getTagByName(DOC_PROPERTY);
+                    if (tag != null)
+                    {
+                        Map props = tag.getNamedParameterMap();
+                        processInterfaceComponentProperty(props, tag.getContext(), 
+                                clazz, intfmethod, component);
+                    }
+
+                    Annotation anno = getAnnotation(intfmethod, DOC_PROPERTY);
+                    if (anno != null)
+                    {
+                        Map props = anno.getNamedParameterMap();
+                        processInterfaceComponentProperty(props, anno.getContext(),
+                                clazz, intfmethod, component);
+                    }
+                }
+            }
+        }
+
+        //Scan for properties defined only on jsp (special case on myfaces 1.1,
+        //this feature should not be used on typical situations)
         DocletTag[] jspProperties = clazz.getTagsByName(DOC_JSP_PROPERTY);
         for (int i = 0; i < jspProperties.length; ++i)
         {
@@ -656,6 +694,23 @@
             
         }        
     }
+    
+    private void processInterfaceComponentProperty(Map props, AbstractJavaEntity ctx,
+    JavaClass clazz, JavaMethod method, ComponentMeta component){
+        this.processComponentProperty(props, ctx, clazz, method, component);
+        
+        PropertyMeta property = component.getProperty(methodToPropName(method.getName()));
+        
+        //Try to get the method from the component clazz to see if this
+        //has an implementation
+        JavaMethod clazzMethod = clazz.getMethodBySignature(method.getName(), null , false);
+        
+        if (clazzMethod == null)
+        {
+            //The method should be generated!
+            property.setGenerated(Boolean.TRUE);
+        }            
+    }
 
     private void processComponentProperty(Map props, AbstractJavaEntity ctx,
             JavaClass clazz, JavaMethod method, ComponentMeta component)
@@ -675,6 +730,7 @@
         String shortDescription = getString(clazz, "desc", props, descDflt);
         String returnSignature = getString(clazz, "returnSignature", props, null);
         String methodSignature = getString(clazz, "methodSignature", props, null);
+        String defaultValue = getString(clazz,"defaultValue",props,null);
 
         Type returnType = method.getReturns();
         
@@ -688,6 +744,7 @@
         p.setTagExcluded(tagExcluded);
         p.setDescription(shortDescription);
         p.setLongDescription(longDescription);
+        p.setDefaultValue(defaultValue);
         
         if (returnSignature != null)
         {
@@ -845,10 +902,12 @@
         {
             badprops.add("type");
         }
-        if (component.getFamily() == null)
-        {
-            badprops.add("family");
-        }
+        
+        //Family is optional because this can be inherited
+        //if (component.getFamily() == null)
+        //{
+        //    badprops.add("family");
+        //}
         
         //Renderer is optional
         //if (component.getRendererType() == null)

Modified: myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/MyfacesUtils.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/MyfacesUtils.java?rev=649743&r1=649742&r2=649743&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/MyfacesUtils.java (original)
+++ myfaces/myfaces-build-tools/branches/builder_plugin/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/utils/MyfacesUtils.java Fri Apr 18 19:59:46 2008
@@ -560,6 +560,16 @@
             return def;
         }
     }
+    
+    public static String getDefaultValueField(PropertyMeta property)
+    {
+        String def =  getDefaultValue(property);
+
+        if (property.getClassName().endsWith("Boolean")){
+                def = "Boolean.valueOf("+def+")";
+        }
+        return def;
+    }
 
     static private void _buildPropertyClass(StringBuffer buffer, String type)
     {