You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2011/10/24 12:39:43 UTC
svn commit: r1188086 [2/17] - in /myfaces/core/trunk:
api/src/main/resources/META-INF/ api/src/main/resources/META-INF/licenses/
api/src/site/apt/ api/src/site/fml/ impl/src/main/conf/META-INF/
impl/src/main/resources/META-INF/ impl/src/main/resources/...
Modified: myfaces/core/trunk/api/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/site/apt/index.apt?rev=1188086&r1=1188085&r2=1188086&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/site/apt/index.apt (original)
+++ myfaces/core/trunk/api/src/site/apt/index.apt Mon Oct 24 10:39:24 2011
@@ -1,29 +1,29 @@
- ------
- MyFaces Core 2.1: API
- ------
-
- ~~ 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.
-
-MyFaces Core 2.1: API Project
-
- The API submodule implements all of the classes that are defined in the specification.
- If you are looking for API documentation about the classes that your JSF application
- needs to use, then see the javadoc for this module.
-
- Check the download page or you can check the nightly builds {{{https://repository.apache.org/content/repositories/snapshots/org/apache/myfaces/core}here}}.
+ ------
+ MyFaces Core 2.1: API
+ ------
+
+ ~~ 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.
+
+MyFaces Core 2.1: API Project
+
+ The API submodule implements all of the classes that are defined in the specification.
+ If you are looking for API documentation about the classes that your JSF application
+ needs to use, then see the javadoc for this module.
+
+ Check the download page or you can check the nightly builds {{{https://repository.apache.org/content/repositories/snapshots/org/apache/myfaces/core}here}}.
\ No newline at end of file
Propchange: myfaces/core/trunk/api/src/site/apt/index.apt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/core/trunk/api/src/site/fml/faq_maven.fml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/trunk/impl/src/main/conf/META-INF/.standard-faces-config-base.xml.jsfdia
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/conf/META-INF/.standard-faces-config-base.xml.jsfdia?rev=1188086&r1=1188085&r2=1188086&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/conf/META-INF/.standard-faces-config-base.xml.jsfdia (original)
+++ myfaces/core/trunk/impl/src/main/conf/META-INF/.standard-faces-config-base.xml.jsfdia Mon Oct 24 10:39:24 2011
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<PROCESS model-entity="JSFProcess"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<PROCESS model-entity="JSFProcess"/>
Propchange: myfaces/core/trunk/impl/src/main/conf/META-INF/.standard-faces-config-base.xml.jsfdia
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/trunk/impl/src/main/resources/META-INF/WebConfigParamsLogger.vm
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/resources/META-INF/WebConfigParamsLogger.vm?rev=1188086&r1=1188085&r2=1188086&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/resources/META-INF/WebConfigParamsLogger.vm (original)
+++ myfaces/core/trunk/impl/src/main/resources/META-INF/WebConfigParamsLogger.vm Mon Oct 24 10:39:24 2011
@@ -1,181 +1,181 @@
-// 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 org.apache.myfaces.webapp;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.faces.application.ProjectStage;
-import javax.faces.context.FacesContext;
-
-import org.apache.myfaces.shared.config.MyfacesConfig;
-import org.apache.myfaces.shared.util.StringUtils;
-import org.apache.myfaces.shared.util.WebConfigParamUtils;
-
-public class WebConfigParamsLogger
-{
- private static final Logger log = Logger.getLogger(WebConfigParamsLogger.class.getName());
-
- public static void logWebContextParams(FacesContext facesContext)
- {
- String logCommand = WebConfigParamUtils.getStringInitParameter(
- facesContext.getExternalContext(),
- AbstractFacesInitializer.INIT_PARAM_LOG_WEB_CONTEXT_PARAMS, AbstractFacesInitializer.INIT_PARAM_LOG_WEB_CONTEXT_PARAMS_DEFAULT);
-
- if ( logCommand.equals("false") ||
- (logCommand.equals("auto") && !facesContext.isProjectStage(ProjectStage.Development) && !facesContext.isProjectStage(ProjectStage.Production) )
- )
- {
- //No log if is disabled or is in auto mode and project stage is UnitTest or SystemTest
- return;
- }
-
- MyfacesConfig myfacesConfig = MyfacesConfig.getCurrentInstance(facesContext.getExternalContext());
-
- if (myfacesConfig.isTomahawkAvailable())
- {
- if(myfacesConfig.isMyfacesImplAvailable())
- {
- if(log.isLoggable(Level.INFO))
- {
- log.info("Starting up Tomahawk on the RI-JSF-Implementation.");
- }
- }
-
- if(myfacesConfig.isRiImplAvailable())
- {
- if(log.isLoggable(Level.INFO))
- {
- log.info("Starting up Tomahawk on the MyFaces-JSF-Implementation");
- }
- }
- }
- else
- {
- if (log.isLoggable(Level.INFO))
- {
- log.info("Tomahawk jar not available. Autoscrolling, DetectJavascript, AddResourceClass and CheckExtensionsFilter are disabled now.");
- }
- }
-
- if(myfacesConfig.isRiImplAvailable() && myfacesConfig.isMyfacesImplAvailable())
- {
- log.severe("Both MyFaces and the RI are on your classpath. Please make sure to use only one of the two JSF-implementations.");
- }
-
-
-## ----------------------------- PROPERTY MACROS -----------------------------
-##
-## -------------------------------
-## writePropertyCheck
-## -------------------------------
-##
-#macro (writePropertyCheck $webConfigParam)
- paramValue = facesContext.getExternalContext().getInitParameter("$webConfigParam.name");
- if (paramValue == null)
- {
- log.info("No context init parameter '$webConfigParam.name' found#if($webConfigParam.defaultValue), using default value '$webConfigParam.defaultValue'#end.");
- }
-#if (!$webConfigParam.isDeprecated())
-#if ($webConfigParam.expectedValues)
- else
- {
- boolean found = false;
- String[] expectedValues = StringUtils.trim(StringUtils.splitShortString("$webConfigParam.expectedValues",','));
- for (int i = 0; i < expectedValues.length; i++)
- {
-#if ($webConfigParam.isIgnoreUpperLowerCase())
- if (paramValue.equalsIgnoreCase(expectedValues[i]))
-#else
- if (paramValue.equals(expectedValues[i]))
-#end
- {
- found = true;
- break;
- }
- }
- if (!found)
- {
- if (log.isLoggable(Level.WARNING))
- {
- log.warning("Wrong value in context init parameter '$webConfigParam.name' (='" + paramValue + "'), using default value #if($webConfigParam.defaultValue)'$webConfigParam.defaultValue'#else'null'#end");
- }
- }
- }
-#elseif ($webConfigParam.classType)
- else
- {
- try
- {
- ${webConfigParam.classType}.valueOf(paramValue);
- }
- catch(Exception e)
- {
- if (log.isLoggable(Level.WARNING))
- {
- log.warning("Wrong value in context init parameter '$webConfigParam.name' (='" + paramValue + "'), using default value #if($webConfigParam.defaultValue)'$webConfigParam.defaultValue'#else'null'#end");
- }
- }
- }
-#end
-#end
-#end
-##
-## ----------------------------- END PROPERTY MACROS -------------------------
-##
-
- if (log.isLoggable(Level.INFO))
- {
- log.info("Scanning for context init parameters not defined. It is not necessary to define them all into your web.xml, " +
- "they are just provided here for informative purposes. To disable this messages set " +
- AbstractFacesInitializer.INIT_PARAM_LOG_WEB_CONTEXT_PARAMS + " config param to 'false'");
- String paramValue = null;
-#set ($webConfigList = ${model.getWebConfigs()})
-#foreach( $webConfig in $webConfigList )
-#if ($modelIds.contains($webConfig.modelId))
-#set ($webConfigParamList = ${webConfig.getWebConfigParametersList()})
-#foreach( $webConfigParam in $webConfigParamList )
-#if (not $webConfigParam.containsTag('tomahawk'))
-
-#writePropertyCheck($webConfigParam)
-#end
-#end
-#end
-#end
- }
-##
- if (log.isLoggable(Level.INFO) && myfacesConfig.isTomahawkAvailable())
- {
- String paramValue = null;
-#foreach( $webConfig in $webConfigList )
-#if ($modelIds.contains($webConfig.modelId))
-#set ($webConfigParamList = ${webConfig.getWebConfigParametersList()})
-#foreach( $webConfigParam in $webConfigParamList )
-#if ($webConfigParam.containsTag('tomahawk'))
-
-#writePropertyCheck($webConfigParam)
-#end
-#end
-#end
-#end
- }
- }
-}
+// 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 org.apache.myfaces.webapp;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.faces.application.ProjectStage;
+import javax.faces.context.FacesContext;
+
+import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.shared.util.StringUtils;
+import org.apache.myfaces.shared.util.WebConfigParamUtils;
+
+public class WebConfigParamsLogger
+{
+ private static final Logger log = Logger.getLogger(WebConfigParamsLogger.class.getName());
+
+ public static void logWebContextParams(FacesContext facesContext)
+ {
+ String logCommand = WebConfigParamUtils.getStringInitParameter(
+ facesContext.getExternalContext(),
+ AbstractFacesInitializer.INIT_PARAM_LOG_WEB_CONTEXT_PARAMS, AbstractFacesInitializer.INIT_PARAM_LOG_WEB_CONTEXT_PARAMS_DEFAULT);
+
+ if ( logCommand.equals("false") ||
+ (logCommand.equals("auto") && !facesContext.isProjectStage(ProjectStage.Development) && !facesContext.isProjectStage(ProjectStage.Production) )
+ )
+ {
+ //No log if is disabled or is in auto mode and project stage is UnitTest or SystemTest
+ return;
+ }
+
+ MyfacesConfig myfacesConfig = MyfacesConfig.getCurrentInstance(facesContext.getExternalContext());
+
+ if (myfacesConfig.isTomahawkAvailable())
+ {
+ if(myfacesConfig.isMyfacesImplAvailable())
+ {
+ if(log.isLoggable(Level.INFO))
+ {
+ log.info("Starting up Tomahawk on the RI-JSF-Implementation.");
+ }
+ }
+
+ if(myfacesConfig.isRiImplAvailable())
+ {
+ if(log.isLoggable(Level.INFO))
+ {
+ log.info("Starting up Tomahawk on the MyFaces-JSF-Implementation");
+ }
+ }
+ }
+ else
+ {
+ if (log.isLoggable(Level.INFO))
+ {
+ log.info("Tomahawk jar not available. Autoscrolling, DetectJavascript, AddResourceClass and CheckExtensionsFilter are disabled now.");
+ }
+ }
+
+ if(myfacesConfig.isRiImplAvailable() && myfacesConfig.isMyfacesImplAvailable())
+ {
+ log.severe("Both MyFaces and the RI are on your classpath. Please make sure to use only one of the two JSF-implementations.");
+ }
+
+
+## ----------------------------- PROPERTY MACROS -----------------------------
+##
+## -------------------------------
+## writePropertyCheck
+## -------------------------------
+##
+#macro (writePropertyCheck $webConfigParam)
+ paramValue = facesContext.getExternalContext().getInitParameter("$webConfigParam.name");
+ if (paramValue == null)
+ {
+ log.info("No context init parameter '$webConfigParam.name' found#if($webConfigParam.defaultValue), using default value '$webConfigParam.defaultValue'#end.");
+ }
+#if (!$webConfigParam.isDeprecated())
+#if ($webConfigParam.expectedValues)
+ else
+ {
+ boolean found = false;
+ String[] expectedValues = StringUtils.trim(StringUtils.splitShortString("$webConfigParam.expectedValues",','));
+ for (int i = 0; i < expectedValues.length; i++)
+ {
+#if ($webConfigParam.isIgnoreUpperLowerCase())
+ if (paramValue.equalsIgnoreCase(expectedValues[i]))
+#else
+ if (paramValue.equals(expectedValues[i]))
+#end
+ {
+ found = true;
+ break;
+ }
+ }
+ if (!found)
+ {
+ if (log.isLoggable(Level.WARNING))
+ {
+ log.warning("Wrong value in context init parameter '$webConfigParam.name' (='" + paramValue + "'), using default value #if($webConfigParam.defaultValue)'$webConfigParam.defaultValue'#else'null'#end");
+ }
+ }
+ }
+#elseif ($webConfigParam.classType)
+ else
+ {
+ try
+ {
+ ${webConfigParam.classType}.valueOf(paramValue);
+ }
+ catch(Exception e)
+ {
+ if (log.isLoggable(Level.WARNING))
+ {
+ log.warning("Wrong value in context init parameter '$webConfigParam.name' (='" + paramValue + "'), using default value #if($webConfigParam.defaultValue)'$webConfigParam.defaultValue'#else'null'#end");
+ }
+ }
+ }
+#end
+#end
+#end
+##
+## ----------------------------- END PROPERTY MACROS -------------------------
+##
+
+ if (log.isLoggable(Level.INFO))
+ {
+ log.info("Scanning for context init parameters not defined. It is not necessary to define them all into your web.xml, " +
+ "they are just provided here for informative purposes. To disable this messages set " +
+ AbstractFacesInitializer.INIT_PARAM_LOG_WEB_CONTEXT_PARAMS + " config param to 'false'");
+ String paramValue = null;
+#set ($webConfigList = ${model.getWebConfigs()})
+#foreach( $webConfig in $webConfigList )
+#if ($modelIds.contains($webConfig.modelId))
+#set ($webConfigParamList = ${webConfig.getWebConfigParametersList()})
+#foreach( $webConfigParam in $webConfigParamList )
+#if (not $webConfigParam.containsTag('tomahawk'))
+
+#writePropertyCheck($webConfigParam)
+#end
+#end
+#end
+#end
+ }
+##
+ if (log.isLoggable(Level.INFO) && myfacesConfig.isTomahawkAvailable())
+ {
+ String paramValue = null;
+#foreach( $webConfig in $webConfigList )
+#if ($modelIds.contains($webConfig.modelId))
+#set ($webConfigParamList = ${webConfig.getWebConfigParametersList()})
+#foreach( $webConfigParam in $webConfigParamList )
+#if ($webConfigParam.containsTag('tomahawk'))
+
+#writePropertyCheck($webConfigParam)
+#end
+#end
+#end
+#end
+ }
+ }
+}
Propchange: myfaces/core/trunk/impl/src/main/resources/META-INF/WebConfigParamsLogger.vm
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/trunk/impl/src/main/resources/META-INF/faces-config20.vm
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/resources/META-INF/faces-config20.vm?rev=1188086&r1=1188085&r2=1188086&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/resources/META-INF/faces-config20.vm (original)
+++ myfaces/core/trunk/impl/src/main/resources/META-INF/faces-config20.vm Mon Oct 24 10:39:24 2011
@@ -1,130 +1,130 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * 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.
--->
-
-<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
- version="2.0">
-
-$baseContent
-
-#set ($componentList = ${model.getComponents()})
-#foreach( $component in $componentList )
-#if ($modelIds.contains($component.modelId)
- && !($component.isConfigExcluded()))
- <component>
-#if ($component.longDescription)
- <description><![CDATA[$component.longDescription]]></description>
-#end
- <component-type>$component.type</component-type>
- <component-class>$component.className</component-class>
-#set ($facetList = ${component.facetList})
-#foreach( $facet in $facetList )
- <facet>
-#if ($facet.longDescription)
- <description><![CDATA[$facet.longDescription]]></description>
-#end
- <facet-name>$facet.name</facet-name>
- </facet>
-#end
-#set ($propertyList = ${component.propertyList})
-#foreach( $property in $propertyList )
-## Theorically, it should only add properties visible on tld or transient
-## (not visible on tld but used on renderers like "transient").
-## On myfaces core 1.2, only "transient" property use it.
-## But inclusive, some tagExcluded properties belongs to the
-## component class or are used by some reason (for example in UIInput
-## valid, localValueSet or submittedValue).
-## Anyway, this information works only as metadata.
-#if (!$property.isTagExcluded() || $property.isTransient())
- <property>
-#if ($property.longDescription)
- <description><![CDATA[$property.longDescription]]></description>
-#end
- <property-name>$property.name</property-name>
- <property-class>$property.className</property-class>
-#if($utils.getDefaultValueField($property))
-#set ($defaultValue = $utils.getDefaultValueField($property))
- <default-value>$defaultValue</default-value>
-#end
- </property>
-#end
-#end
- <component-extension>
- <component-family>$component.family</component-family>
-#if ($component.rendererType)
-#if (!($component.rendererType == ""))
- <renderer-type>$component.rendererType</renderer-type>
-#end
-#end
- </component-extension>
- </component>
-#end
-#end
-#set ($converterList = ${model.getConverters()})
-#foreach( $converter in $converterList )
-#if ($modelIds.contains($converter.modelId))
- <converter>
-#if ($converter.longDescription)
- <description><![CDATA[$converter.longDescription]]></description>
-#end
- <converter-id>$converter.converterId</converter-id>
- <converter-class>$converter.className</converter-class>
- </converter>
-#end
-#end
-#set ($validatorList = ${model.getValidators()})
-#foreach( $validator in $validatorList )
-#if ($modelIds.contains($validator.modelId) &&
- !($validator.isConfigExcluded().booleanValue()) &&
- $validator.validatorId)
- <validator>
-#if ($validator.longDescription)
- <description><![CDATA[$validator.longDescription]]></description>
-#end
- <validator-id>$validator.validatorId</validator-id>
- <validator-class>$validator.className</validator-class>
- </validator>
-#end
-#end
-#set ($renderKitList = ${model.getRenderKits()})
-#foreach( $renderKit in $renderKitList )
- <render-kit>
- <render-kit-id>$renderKit.renderKitId</render-kit-id>
-#if ($renderKit.className)
- <render-kit-class>$renderKit.className</render-kit-class>
-#end
-#set ($rendererList = ${renderKit.getRenderers()})
-#foreach( $renderer in $rendererList )
- <renderer>
- <component-family>$renderer.componentFamily</component-family>
- <renderer-type>$renderer.rendererType</renderer-type>
- <renderer-class>$renderer.className</renderer-class>
- </renderer>
-#end
-## TODO: Create a myfaces builder annotation and add through this class
- <client-behavior-renderer>
- <client-behavior-renderer-type>javax.faces.behavior.Ajax</client-behavior-renderer-type>
- <client-behavior-renderer-class>org.apache.myfaces.renderkit.html.HtmlAjaxBehaviorRenderer</client-behavior-renderer-class>
- </client-behavior-renderer>
- </render-kit>
-#end
-</faces-config>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * 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.
+-->
+
+<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+ version="2.0">
+
+$baseContent
+
+#set ($componentList = ${model.getComponents()})
+#foreach( $component in $componentList )
+#if ($modelIds.contains($component.modelId)
+ && !($component.isConfigExcluded()))
+ <component>
+#if ($component.longDescription)
+ <description><![CDATA[$component.longDescription]]></description>
+#end
+ <component-type>$component.type</component-type>
+ <component-class>$component.className</component-class>
+#set ($facetList = ${component.facetList})
+#foreach( $facet in $facetList )
+ <facet>
+#if ($facet.longDescription)
+ <description><![CDATA[$facet.longDescription]]></description>
+#end
+ <facet-name>$facet.name</facet-name>
+ </facet>
+#end
+#set ($propertyList = ${component.propertyList})
+#foreach( $property in $propertyList )
+## Theorically, it should only add properties visible on tld or transient
+## (not visible on tld but used on renderers like "transient").
+## On myfaces core 1.2, only "transient" property use it.
+## But inclusive, some tagExcluded properties belongs to the
+## component class or are used by some reason (for example in UIInput
+## valid, localValueSet or submittedValue).
+## Anyway, this information works only as metadata.
+#if (!$property.isTagExcluded() || $property.isTransient())
+ <property>
+#if ($property.longDescription)
+ <description><![CDATA[$property.longDescription]]></description>
+#end
+ <property-name>$property.name</property-name>
+ <property-class>$property.className</property-class>
+#if($utils.getDefaultValueField($property))
+#set ($defaultValue = $utils.getDefaultValueField($property))
+ <default-value>$defaultValue</default-value>
+#end
+ </property>
+#end
+#end
+ <component-extension>
+ <component-family>$component.family</component-family>
+#if ($component.rendererType)
+#if (!($component.rendererType == ""))
+ <renderer-type>$component.rendererType</renderer-type>
+#end
+#end
+ </component-extension>
+ </component>
+#end
+#end
+#set ($converterList = ${model.getConverters()})
+#foreach( $converter in $converterList )
+#if ($modelIds.contains($converter.modelId))
+ <converter>
+#if ($converter.longDescription)
+ <description><![CDATA[$converter.longDescription]]></description>
+#end
+ <converter-id>$converter.converterId</converter-id>
+ <converter-class>$converter.className</converter-class>
+ </converter>
+#end
+#end
+#set ($validatorList = ${model.getValidators()})
+#foreach( $validator in $validatorList )
+#if ($modelIds.contains($validator.modelId) &&
+ !($validator.isConfigExcluded().booleanValue()) &&
+ $validator.validatorId)
+ <validator>
+#if ($validator.longDescription)
+ <description><![CDATA[$validator.longDescription]]></description>
+#end
+ <validator-id>$validator.validatorId</validator-id>
+ <validator-class>$validator.className</validator-class>
+ </validator>
+#end
+#end
+#set ($renderKitList = ${model.getRenderKits()})
+#foreach( $renderKit in $renderKitList )
+ <render-kit>
+ <render-kit-id>$renderKit.renderKitId</render-kit-id>
+#if ($renderKit.className)
+ <render-kit-class>$renderKit.className</render-kit-class>
+#end
+#set ($rendererList = ${renderKit.getRenderers()})
+#foreach( $renderer in $rendererList )
+ <renderer>
+ <component-family>$renderer.componentFamily</component-family>
+ <renderer-type>$renderer.rendererType</renderer-type>
+ <renderer-class>$renderer.className</renderer-class>
+ </renderer>
+#end
+## TODO: Create a myfaces builder annotation and add through this class
+ <client-behavior-renderer>
+ <client-behavior-renderer-type>javax.faces.behavior.Ajax</client-behavior-renderer-type>
+ <client-behavior-renderer-class>org.apache.myfaces.renderkit.html.HtmlAjaxBehaviorRenderer</client-behavior-renderer-class>
+ </client-behavior-renderer>
+ </render-kit>
+#end
+</faces-config>
Propchange: myfaces/core/trunk/impl/src/main/resources/META-INF/faces-config20.vm
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_core12.vm
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_core12.vm?rev=1188086&r1=1188085&r2=1188086&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_core12.vm (original)
+++ myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_core12.vm Mon Oct 24 10:39:24 2011
@@ -1,273 +1,273 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * 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.
--->
-<taglib xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
- version="2.1">
- <description>$description</description>
- <display-name>$displayname</display-name>
- <tlib-version>1.2</tlib-version>
- <short-name>$shortname</short-name>
- <uri>$uri</uri>
-
-
-
-$baseContent
-
- <!-- Component Tags -->
-#set ($componentList = ${model.getComponents()})
-#foreach( $component in $componentList )
-#if ($modelIds.contains($component.modelId)
- && ($component.name) && ($component.tagClass))
-#if ($utils.getTagPrefix($component.name) == $shortname)
- <tag>
- <description><![CDATA[$component.longDescription]]></description>
- <name>$utils.getTagName($component.name)</name>
- <tag-class>$component.tagClass</tag-class>
-#if ($component.bodyContent)
- <body-content>$component.bodyContent</body-content>
-#else
- <body-content>JSP</body-content>
-#end
-
-#set ($propertyList = ${component.propertyList})
-#foreach( $property in $propertyList )
-#if (!$property.isTagExcluded() && !$property.isFaceletsOnly())
- <attribute>
-#if ($property.longDescription)
- <description><![CDATA[$property.longDescription]]></description>
-#else
- <description><![CDATA[]]></description>
-#end
- <name>$property.jspName</name>
-#if ($property.isRequired())
- <required>$property.isRequired()</required>
-#end
-#if ($property.isMethodExpression() || $property.isMethodBinding())
-#if ($property.getMethodBindingSignature())
- <deferred-method>
-#set ($sig = $property.getMethodBindingSignature())
- <method-signature>$sig.returnType myMethod( $sig.parameterTypesAsString )</method-signature>
-
- </deferred-method>
-#else
-## This is a very special case. If a property is MethodBinding or MethodExpression
-## this should have a signature. If not, for allow multiple MethodBinding
-## simulate a ValueExpression and write a custom code like in
-## org.apache.myfaces.custom.suggestajax.AbstractSuggestAjaxTag
- <deferred-value/>
-#end
-#elseif ($property.isLiteralOnly())
- <rtexprvalue>false</rtexprvalue>
-#else
-#if ( "$!property.isRtexprvalue()" == "")
-#set ($type = $utils.getClassFromFullClass($property.className))
-#if($property.deferredValueType)
- <deferred-value>
- <type>$property.deferredValueType</type>
- </deferred-value>
-#elseif ($type == "String")
- <deferred-value>
- <type>java.lang.String</type>
- </deferred-value>
-#elseif (($property.className == "java.util.Locale") && ($component.name == "f:view"))
- <deferred-value>
- <type>java.lang.Object</type>
- </deferred-value>
-#else
- <deferred-value>
- <type>$property.className</type>
- </deferred-value>
-#end
-#else
- <rtexprvalue>$property.isRtexprvalue().booleanValue()</rtexprvalue>
-#end
-#end
- </attribute>
-#end
-#end
- </tag>
-#end
-#end
-#end
- <!-- Converter tags -->
-#set ($componentList = ${model.getConverters()})
-#foreach( $component in $componentList )
-#if ($modelIds.contains($component.modelId)
- && ($component.name) && ($component.tagClass))
-#if ($utils.getTagPrefix($component.name) == $shortname)
- <tag>
- <description><![CDATA[$component.longDescription]]></description>
- <name>$utils.getTagName($component.name)</name>
- <tag-class>$component.tagClass</tag-class>
-#if ($component.bodyContent)
- <body-content>$component.bodyContent</body-content>
-#else
- <body-content>empty</body-content>
-#end
-
-#set ($propertyList = ${component.propertyList})
-#foreach( $property in $propertyList )
-#if (!$property.isTagExcluded() && !$property.isFaceletsOnly())
- <attribute>
-#if ($property.longDescription)
- <description><![CDATA[$property.longDescription]]></description>
-#else
- <description><![CDATA[]]></description>
-#end
- <name>$property.name</name>
-#if ($property.isRequired())
- <required>$property.isRequired()</required>
-#end
-#if ($property.isLiteralOnly())
- <rtexprvalue>false</rtexprvalue>
-#else
-#set ($type = $utils.getClassFromFullClass($property.className))
-#if($property.deferredValueType)
- <deferred-value>
- <type>$property.deferredValueType</type>
- </deferred-value>
-#elseif ($type == "String")
- <deferred-value>
- <type>java.lang.String</type>
- </deferred-value>
-#elseif ($property.className == "java.util.Locale" && $component.name == "f:convertDateTime")
- <deferred-value>
- <type>java.lang.Object</type>
- </deferred-value>
-#elseif ($property.className == "java.util.TimeZone" && $component.name == "f:convertDateTime")
- <deferred-value>
- <type>java.lang.Object</type>
- </deferred-value>
-#else
- <deferred-value>
- <type>$property.className</type>
- </deferred-value>
-#end
-#end
- </attribute>
-#end
-#end
- </tag>
-#end
-#end
-#end
- <!-- Validator tags -->
-#set ($componentList = ${model.getValidators()})
-#foreach( $component in $componentList )
-#if ($modelIds.contains($component.modelId)
- && ($component.name) && ($component.tagClass))
-#if ($utils.getTagPrefix($component.name) == $shortname)
- <tag>
- <description><![CDATA[$component.longDescription]]></description>
- <name>$utils.getTagName($component.name)</name>
- <tag-class>$component.tagClass</tag-class>
-#if ($component.bodyContent)
- <body-content>$component.bodyContent</body-content>
-#else
- <body-content>empty</body-content>
-#end
-
-#set ($propertyList = ${component.propertyList})
-#foreach( $property in $propertyList )
-#if (!$property.isTagExcluded() && !$property.isFaceletsOnly())
- <attribute>
-#if ($property.longDescription)
- <description><![CDATA[$property.longDescription]]></description>
-#else
- <description><![CDATA[]]></description>
-#end
- <name>$property.name</name>
-#if ($property.isRequired())
- <required>$property.isRequired()</required>
-#end
-#if ($property.isLiteralOnly())
- <rtexprvalue>false</rtexprvalue>
-#else
-#set ($type = $utils.getClassFromFullClass($property.className))
-#if($property.deferredValueType)
- <deferred-value>
- <type>$property.deferredValueType</type>
- </deferred-value>
-#elseif ($type == "String")
- <deferred-value>
- <type>java.lang.String</type>
- </deferred-value>
-#else
- <deferred-value>
- <type>$property.className</type>
- </deferred-value>
-#end
-#end
- </attribute>
-#end
-#end
- </tag>
-#end
-#end
-#end
- <!-- Single Tags -->
-#set ($tagList = $model.getTags())
-#foreach( $tag in $tagList )
-#if ($modelIds.contains($tag.modelId))
-#if ($utils.getTagPrefix($tag.name) == $shortname)
- <tag>
- <description><![CDATA[$tag.longDescription]]></description>
- <name>$utils.getTagName($tag.name)</name>
- <tag-class>$tag.className</tag-class>
- <body-content>$tag.bodyContent</body-content>
-#set ($attributeList = ${tag.attributeList})
-#foreach( $attribute in $attributeList )
-#if (!$attribute.isFaceletsOnly())
- <attribute>
-#if ($attribute.longDescription)
- <description><![CDATA[$attribute.longDescription]]></description>
-#else
- <description><![CDATA[]]></description>
-#end
- <name>$attribute.name</name>
- <required>$attribute.isRequired()</required>
-#set ($type = $utils.getClassFromFullClass($attribute.className))
-#if ($type == "MethodExpression")
- <deferred-method>
- <method-signature>${attribute.deferredMethodSignature}</method-signature>
- </deferred-method>
-#elseif ($type == "ValueExpression")
- <deferred-value>
-#if($attribute.deferredValueType)
- <type>$attribute.deferredValueType</type>
-#end
- </deferred-value>
-#else
- <rtexprvalue>$attribute.isRtexprvalue()</rtexprvalue>
-#if ($attribute.className)
- <type>$attribute.className</type>
-#else
- <type>java.lang.String</type>
-#end
-#end
- </attribute>
-#end
-#end
- </tag>
-#end
-#end
-#end
-</taglib>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ * 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.
+-->
+<taglib xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
+ version="2.1">
+ <description>$description</description>
+ <display-name>$displayname</display-name>
+ <tlib-version>1.2</tlib-version>
+ <short-name>$shortname</short-name>
+ <uri>$uri</uri>
+
+
+
+$baseContent
+
+ <!-- Component Tags -->
+#set ($componentList = ${model.getComponents()})
+#foreach( $component in $componentList )
+#if ($modelIds.contains($component.modelId)
+ && ($component.name) && ($component.tagClass))
+#if ($utils.getTagPrefix($component.name) == $shortname)
+ <tag>
+ <description><![CDATA[$component.longDescription]]></description>
+ <name>$utils.getTagName($component.name)</name>
+ <tag-class>$component.tagClass</tag-class>
+#if ($component.bodyContent)
+ <body-content>$component.bodyContent</body-content>
+#else
+ <body-content>JSP</body-content>
+#end
+
+#set ($propertyList = ${component.propertyList})
+#foreach( $property in $propertyList )
+#if (!$property.isTagExcluded() && !$property.isFaceletsOnly())
+ <attribute>
+#if ($property.longDescription)
+ <description><![CDATA[$property.longDescription]]></description>
+#else
+ <description><![CDATA[]]></description>
+#end
+ <name>$property.jspName</name>
+#if ($property.isRequired())
+ <required>$property.isRequired()</required>
+#end
+#if ($property.isMethodExpression() || $property.isMethodBinding())
+#if ($property.getMethodBindingSignature())
+ <deferred-method>
+#set ($sig = $property.getMethodBindingSignature())
+ <method-signature>$sig.returnType myMethod( $sig.parameterTypesAsString )</method-signature>
+
+ </deferred-method>
+#else
+## This is a very special case. If a property is MethodBinding or MethodExpression
+## this should have a signature. If not, for allow multiple MethodBinding
+## simulate a ValueExpression and write a custom code like in
+## org.apache.myfaces.custom.suggestajax.AbstractSuggestAjaxTag
+ <deferred-value/>
+#end
+#elseif ($property.isLiteralOnly())
+ <rtexprvalue>false</rtexprvalue>
+#else
+#if ( "$!property.isRtexprvalue()" == "")
+#set ($type = $utils.getClassFromFullClass($property.className))
+#if($property.deferredValueType)
+ <deferred-value>
+ <type>$property.deferredValueType</type>
+ </deferred-value>
+#elseif ($type == "String")
+ <deferred-value>
+ <type>java.lang.String</type>
+ </deferred-value>
+#elseif (($property.className == "java.util.Locale") && ($component.name == "f:view"))
+ <deferred-value>
+ <type>java.lang.Object</type>
+ </deferred-value>
+#else
+ <deferred-value>
+ <type>$property.className</type>
+ </deferred-value>
+#end
+#else
+ <rtexprvalue>$property.isRtexprvalue().booleanValue()</rtexprvalue>
+#end
+#end
+ </attribute>
+#end
+#end
+ </tag>
+#end
+#end
+#end
+ <!-- Converter tags -->
+#set ($componentList = ${model.getConverters()})
+#foreach( $component in $componentList )
+#if ($modelIds.contains($component.modelId)
+ && ($component.name) && ($component.tagClass))
+#if ($utils.getTagPrefix($component.name) == $shortname)
+ <tag>
+ <description><![CDATA[$component.longDescription]]></description>
+ <name>$utils.getTagName($component.name)</name>
+ <tag-class>$component.tagClass</tag-class>
+#if ($component.bodyContent)
+ <body-content>$component.bodyContent</body-content>
+#else
+ <body-content>empty</body-content>
+#end
+
+#set ($propertyList = ${component.propertyList})
+#foreach( $property in $propertyList )
+#if (!$property.isTagExcluded() && !$property.isFaceletsOnly())
+ <attribute>
+#if ($property.longDescription)
+ <description><![CDATA[$property.longDescription]]></description>
+#else
+ <description><![CDATA[]]></description>
+#end
+ <name>$property.name</name>
+#if ($property.isRequired())
+ <required>$property.isRequired()</required>
+#end
+#if ($property.isLiteralOnly())
+ <rtexprvalue>false</rtexprvalue>
+#else
+#set ($type = $utils.getClassFromFullClass($property.className))
+#if($property.deferredValueType)
+ <deferred-value>
+ <type>$property.deferredValueType</type>
+ </deferred-value>
+#elseif ($type == "String")
+ <deferred-value>
+ <type>java.lang.String</type>
+ </deferred-value>
+#elseif ($property.className == "java.util.Locale" && $component.name == "f:convertDateTime")
+ <deferred-value>
+ <type>java.lang.Object</type>
+ </deferred-value>
+#elseif ($property.className == "java.util.TimeZone" && $component.name == "f:convertDateTime")
+ <deferred-value>
+ <type>java.lang.Object</type>
+ </deferred-value>
+#else
+ <deferred-value>
+ <type>$property.className</type>
+ </deferred-value>
+#end
+#end
+ </attribute>
+#end
+#end
+ </tag>
+#end
+#end
+#end
+ <!-- Validator tags -->
+#set ($componentList = ${model.getValidators()})
+#foreach( $component in $componentList )
+#if ($modelIds.contains($component.modelId)
+ && ($component.name) && ($component.tagClass))
+#if ($utils.getTagPrefix($component.name) == $shortname)
+ <tag>
+ <description><![CDATA[$component.longDescription]]></description>
+ <name>$utils.getTagName($component.name)</name>
+ <tag-class>$component.tagClass</tag-class>
+#if ($component.bodyContent)
+ <body-content>$component.bodyContent</body-content>
+#else
+ <body-content>empty</body-content>
+#end
+
+#set ($propertyList = ${component.propertyList})
+#foreach( $property in $propertyList )
+#if (!$property.isTagExcluded() && !$property.isFaceletsOnly())
+ <attribute>
+#if ($property.longDescription)
+ <description><![CDATA[$property.longDescription]]></description>
+#else
+ <description><![CDATA[]]></description>
+#end
+ <name>$property.name</name>
+#if ($property.isRequired())
+ <required>$property.isRequired()</required>
+#end
+#if ($property.isLiteralOnly())
+ <rtexprvalue>false</rtexprvalue>
+#else
+#set ($type = $utils.getClassFromFullClass($property.className))
+#if($property.deferredValueType)
+ <deferred-value>
+ <type>$property.deferredValueType</type>
+ </deferred-value>
+#elseif ($type == "String")
+ <deferred-value>
+ <type>java.lang.String</type>
+ </deferred-value>
+#else
+ <deferred-value>
+ <type>$property.className</type>
+ </deferred-value>
+#end
+#end
+ </attribute>
+#end
+#end
+ </tag>
+#end
+#end
+#end
+ <!-- Single Tags -->
+#set ($tagList = $model.getTags())
+#foreach( $tag in $tagList )
+#if ($modelIds.contains($tag.modelId))
+#if ($utils.getTagPrefix($tag.name) == $shortname)
+ <tag>
+ <description><![CDATA[$tag.longDescription]]></description>
+ <name>$utils.getTagName($tag.name)</name>
+ <tag-class>$tag.className</tag-class>
+ <body-content>$tag.bodyContent</body-content>
+#set ($attributeList = ${tag.attributeList})
+#foreach( $attribute in $attributeList )
+#if (!$attribute.isFaceletsOnly())
+ <attribute>
+#if ($attribute.longDescription)
+ <description><![CDATA[$attribute.longDescription]]></description>
+#else
+ <description><![CDATA[]]></description>
+#end
+ <name>$attribute.name</name>
+ <required>$attribute.isRequired()</required>
+#set ($type = $utils.getClassFromFullClass($attribute.className))
+#if ($type == "MethodExpression")
+ <deferred-method>
+ <method-signature>${attribute.deferredMethodSignature}</method-signature>
+ </deferred-method>
+#elseif ($type == "ValueExpression")
+ <deferred-value>
+#if($attribute.deferredValueType)
+ <type>$attribute.deferredValueType</type>
+#end
+ </deferred-value>
+#else
+ <rtexprvalue>$attribute.isRtexprvalue()</rtexprvalue>
+#if ($attribute.className)
+ <type>$attribute.className</type>
+#else
+ <type>java.lang.String</type>
+#end
+#end
+ </attribute>
+#end
+#end
+ </tag>
+#end
+#end
+#end
+</taglib>
Propchange: myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_core12.vm
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_core20.vm
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_core20.vm?rev=1188086&r1=1188085&r2=1188086&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_core20.vm (original)
+++ myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_core20.vm Mon Oct 24 10:39:24 2011
@@ -1,329 +1,329 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * 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.
--->
-<taglib xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
- version="2.1">
- <description>$description</description>
- <display-name>$displayname</display-name>
- <tlib-version>2.0</tlib-version>
- <short-name>$shortname</short-name>
- <uri>$uri</uri>
-
-
-
-$baseContent
-
- <!-- Component Tags -->
-#set ($componentList = ${model.getComponents()})
-#foreach( $component in $componentList )
-#if ($modelIds.contains($component.modelId)
- && ($component.name))
-#if ($utils.getTagPrefix($component.name) == $shortname)
-## Check if we don't have a facelet tag taking precedence over this description
-#if (! ${model.findFaceletTagByName($component.name)})
- <tag>
- <description><![CDATA[$component.longDescription]]></description>
- <name>$utils.getTagName($component.name)</name>
- <tag-class>$component.tagClass</tag-class>
-#if ($component.bodyContent)
- <body-content>$component.bodyContent</body-content>
-#else
- <body-content>JSP</body-content>
-#end
-
-#set ($propertyList = ${component.propertyList})
-#foreach( $property in $propertyList )
-#if (!$property.isTagExcluded())
- <attribute>
-#if ($property.longDescription)
- <description><![CDATA[$property.longDescription]]></description>
-#else
- <description><![CDATA[]]></description>
-#end
- <name>$property.jspName</name>
-#if ($property.isRequired())
- <required>$property.isRequired()</required>
-#end
-#if ($property.isMethodExpression() || $property.isMethodBinding())
-#if ($property.getMethodBindingSignature())
- <deferred-method>
-#set ($sig = $property.getMethodBindingSignature())
- <method-signature>$sig.returnType myMethod( $sig.parameterTypesAsString )</method-signature>
-
- </deferred-method>
-#else
-## This is a very special case. If a property is MethodBinding or MethodExpression
-## this should have a signature. If not, for allow multiple MethodBinding
-## simulate a ValueExpression and write a custom code like in
-## org.apache.myfaces.custom.suggestajax.AbstractSuggestAjaxTag
- <deferred-value/>
-#end
-#elseif ($property.isLiteralOnly())
- <rtexprvalue>false</rtexprvalue>
-#else
-#if ( "$!property.isRtexprvalue()" == "")
-#set ($type = $utils.getClassFromFullClass($property.className))
-#if($property.deferredValueType)
- <deferred-value>
- <type>$property.deferredValueType</type>
- </deferred-value>
-#elseif ($type == "String")
- <deferred-value>
- <type>java.lang.String</type>
- </deferred-value>
-#elseif (($property.className == "java.util.Locale") && ($component.name == "f:view"))
- <deferred-value>
- <type>java.lang.Object</type>
- </deferred-value>
-#else
- <deferred-value>
- <type>$property.className</type>
- </deferred-value>
-#end
-#else
- <rtexprvalue>$property.isRtexprvalue().booleanValue()</rtexprvalue>
-#end
-#end
- </attribute>
-#end
-#end
- </tag>
-#end
-#end
-#end
-#end
- <!-- Converter tags -->
-#set ($componentList = ${model.getConverters()})
-#foreach( $component in $componentList )
-#if ($modelIds.contains($component.modelId)
- && ($component.name))
-#if ($utils.getTagPrefix($component.name) == $shortname)
-## Check if we don't have a facelet tag taking precedence over this description
-#if (! ${model.findFaceletTagByName($component.name)})
- <tag>
- <description><![CDATA[$component.longDescription]]></description>
- <name>$utils.getTagName($component.name)</name>
- <tag-class>$component.tagClass</tag-class>
-#if ($component.bodyContent)
- <body-content>$component.bodyContent</body-content>
-#else
- <body-content>empty</body-content>
-#end
-
-#set ($propertyList = ${component.propertyList})
-#foreach( $property in $propertyList )
-#if (!$property.isTagExcluded())
- <attribute>
-#if ($property.longDescription)
- <description><![CDATA[$property.longDescription]]></description>
-#else
- <description><![CDATA[]]></description>
-#end
- <name>$property.name</name>
-#if ($property.isRequired())
- <required>$property.isRequired()</required>
-#end
-#if ($property.isLiteralOnly())
- <rtexprvalue>false</rtexprvalue>
-#else
-#set ($type = $utils.getClassFromFullClass($property.className))
-#if($property.deferredValueType)
- <deferred-value>
- <type>$property.deferredValueType</type>
- </deferred-value>
-#elseif ($type == "String")
- <deferred-value>
- <type>java.lang.String</type>
- </deferred-value>
-#elseif ($property.className == "java.util.Locale" && $component.name == "f:convertDateTime")
- <deferred-value>
- <type>java.lang.Object</type>
- </deferred-value>
-#elseif ($property.className == "java.util.TimeZone" && $component.name == "f:convertDateTime")
- <deferred-value>
- <type>java.lang.Object</type>
- </deferred-value>
-#else
- <deferred-value>
- <type>$property.className</type>
- </deferred-value>
-#end
-#end
- </attribute>
-#end
-#end
- </tag>
-#end
-#end
-#end
-#end
- <!-- Validator tags -->
-#set ($componentList = ${model.getValidators()})
-#foreach( $component in $componentList )
-#if ($modelIds.contains($component.modelId)
- && ($component.name))
-#if ($utils.getTagPrefix($component.name) == $shortname)
-## Check if we don't have a facelet tag taking precedence over this description
-#if (! ${model.findFaceletTagByName($component.name)})
- <tag>
- <description><![CDATA[$component.longDescription]]></description>
- <name>$utils.getTagName($component.name)</name>
- <tag-class>$component.tagClass</tag-class>
-#if ($component.bodyContent)
- <body-content>$component.bodyContent</body-content>
-#else
- <body-content>empty</body-content>
-#end
-
-#set ($propertyList = ${component.propertyList})
-#foreach( $property in $propertyList )
-#if (!$property.isTagExcluded())
- <attribute>
-#if ($property.longDescription)
- <description><![CDATA[$property.longDescription]]></description>
-#else
- <description><![CDATA[]]></description>
-#end
- <name>$property.name</name>
-#if ($property.isRequired())
- <required>$property.isRequired()</required>
-#end
-#if ($property.isLiteralOnly())
- <rtexprvalue>false</rtexprvalue>
-#else
-#set ($type = $utils.getClassFromFullClass($property.className))
-#if($property.deferredValueType)
- <deferred-value>
- <type>$property.deferredValueType</type>
- </deferred-value>
-#elseif ($type == "String")
- <deferred-value>
- <type>java.lang.String</type>
- </deferred-value>
-#else
- <deferred-value>
- <type>$property.className</type>
- </deferred-value>
-#end
-#end
- </attribute>
-#end
-#end
- </tag>
-#end
-#end
-#end
-#end
- <!-- Single Tags -->
-#set ($tagList = $model.getTags())
-#foreach( $tag in $tagList )
-#if ($modelIds.contains($tag.modelId) && ($tag.name))
-#if ($utils.getTagPrefix($tag.name) == $shortname)
-## Check if we don't have a facelet tag taking precedence over this description
-#if (! ${model.findFaceletTagByName($tag.name)})
- <tag>
- <description><![CDATA[$tag.longDescription]]></description>
- <name>$utils.getTagName($tag.name)</name>
- <tag-class>$tag.className</tag-class>
- <body-content>$tag.bodyContent</body-content>
-#set ($attributeList = ${tag.attributeList})
-#foreach( $attribute in $attributeList )
- <attribute>
-#if ($attribute.longDescription)
- <description><![CDATA[$attribute.longDescription]]></description>
-#else
- <description><![CDATA[]]></description>
-#end
- <name>$attribute.name</name>
- <required>$attribute.isRequired()</required>
-#set ($type = $utils.getClassFromFullClass($attribute.className))
-#if ($type == "MethodExpression")
- <deferred-method>
- <method-signature>${attribute.deferredMethodSignature}</method-signature>
- </deferred-method>
-#elseif ($type == "ValueExpression")
- <deferred-value>
-#if($attribute.deferredValueType)
- <type>$attribute.deferredValueType</type>
-#end
- </deferred-value>
-#else
- <rtexprvalue>$attribute.isRtexprvalue()</rtexprvalue>
-#if ($attribute.className)
- <type>$attribute.className</type>
-#else
- <type>java.lang.String</type>
-#end
-#end
- </attribute>
-#end
- </tag>
-#end
-#end
-#end
-#end
-
- <!-- Facelets Tags -->
-#set ($tagList = $model.getFaceletTags())
-#foreach( $tag in $tagList )
-#if ($modelIds.contains($tag.modelId) && ($tag.name))
-#if ($utils.getTagPrefix($tag.name) == $shortname)
- <tag>
- <description><![CDATA[$tag.longDescription]]></description>
- <name>$utils.getTagName($tag.name)</name>
- <tag-class>$tag.className</tag-class>
- <body-content>$tag.bodyContent</body-content>
-#set ($attributeList = ${tag.attributeList})
-#foreach( $attribute in $attributeList )
- <attribute>
-#if ($attribute.longDescription)
- <description><![CDATA[$attribute.longDescription]]></description>
-#else
- <description><![CDATA[]]></description>
-#end
- <name>$attribute.name</name>
- <required>$attribute.isRequired()</required>
-#set ($type = $utils.getClassFromFullClass($attribute.className))
-#if ($type == "MethodExpression")
- <deferred-method>
- <method-signature>${attribute.deferredMethodSignature}</method-signature>
- </deferred-method>
-#elseif ($type == "ValueExpression")
- <deferred-value>
-#if($attribute.deferredValueType)
- <type>$attribute.deferredValueType</type>
-#end
- </deferred-value>
-#else
- <rtexprvalue>$attribute.isRtexprvalue()</rtexprvalue>
-#if ($attribute.className)
- <type>$attribute.className</type>
-#else
- <type>java.lang.String</type>
-#end
-#end
- </attribute>
-#end
- </tag>
-#end
-#end
-#end
-</taglib>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ * 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.
+-->
+<taglib xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
+ version="2.1">
+ <description>$description</description>
+ <display-name>$displayname</display-name>
+ <tlib-version>2.0</tlib-version>
+ <short-name>$shortname</short-name>
+ <uri>$uri</uri>
+
+
+
+$baseContent
+
+ <!-- Component Tags -->
+#set ($componentList = ${model.getComponents()})
+#foreach( $component in $componentList )
+#if ($modelIds.contains($component.modelId)
+ && ($component.name))
+#if ($utils.getTagPrefix($component.name) == $shortname)
+## Check if we don't have a facelet tag taking precedence over this description
+#if (! ${model.findFaceletTagByName($component.name)})
+ <tag>
+ <description><![CDATA[$component.longDescription]]></description>
+ <name>$utils.getTagName($component.name)</name>
+ <tag-class>$component.tagClass</tag-class>
+#if ($component.bodyContent)
+ <body-content>$component.bodyContent</body-content>
+#else
+ <body-content>JSP</body-content>
+#end
+
+#set ($propertyList = ${component.propertyList})
+#foreach( $property in $propertyList )
+#if (!$property.isTagExcluded())
+ <attribute>
+#if ($property.longDescription)
+ <description><![CDATA[$property.longDescription]]></description>
+#else
+ <description><![CDATA[]]></description>
+#end
+ <name>$property.jspName</name>
+#if ($property.isRequired())
+ <required>$property.isRequired()</required>
+#end
+#if ($property.isMethodExpression() || $property.isMethodBinding())
+#if ($property.getMethodBindingSignature())
+ <deferred-method>
+#set ($sig = $property.getMethodBindingSignature())
+ <method-signature>$sig.returnType myMethod( $sig.parameterTypesAsString )</method-signature>
+
+ </deferred-method>
+#else
+## This is a very special case. If a property is MethodBinding or MethodExpression
+## this should have a signature. If not, for allow multiple MethodBinding
+## simulate a ValueExpression and write a custom code like in
+## org.apache.myfaces.custom.suggestajax.AbstractSuggestAjaxTag
+ <deferred-value/>
+#end
+#elseif ($property.isLiteralOnly())
+ <rtexprvalue>false</rtexprvalue>
+#else
+#if ( "$!property.isRtexprvalue()" == "")
+#set ($type = $utils.getClassFromFullClass($property.className))
+#if($property.deferredValueType)
+ <deferred-value>
+ <type>$property.deferredValueType</type>
+ </deferred-value>
+#elseif ($type == "String")
+ <deferred-value>
+ <type>java.lang.String</type>
+ </deferred-value>
+#elseif (($property.className == "java.util.Locale") && ($component.name == "f:view"))
+ <deferred-value>
+ <type>java.lang.Object</type>
+ </deferred-value>
+#else
+ <deferred-value>
+ <type>$property.className</type>
+ </deferred-value>
+#end
+#else
+ <rtexprvalue>$property.isRtexprvalue().booleanValue()</rtexprvalue>
+#end
+#end
+ </attribute>
+#end
+#end
+ </tag>
+#end
+#end
+#end
+#end
+ <!-- Converter tags -->
+#set ($componentList = ${model.getConverters()})
+#foreach( $component in $componentList )
+#if ($modelIds.contains($component.modelId)
+ && ($component.name))
+#if ($utils.getTagPrefix($component.name) == $shortname)
+## Check if we don't have a facelet tag taking precedence over this description
+#if (! ${model.findFaceletTagByName($component.name)})
+ <tag>
+ <description><![CDATA[$component.longDescription]]></description>
+ <name>$utils.getTagName($component.name)</name>
+ <tag-class>$component.tagClass</tag-class>
+#if ($component.bodyContent)
+ <body-content>$component.bodyContent</body-content>
+#else
+ <body-content>empty</body-content>
+#end
+
+#set ($propertyList = ${component.propertyList})
+#foreach( $property in $propertyList )
+#if (!$property.isTagExcluded())
+ <attribute>
+#if ($property.longDescription)
+ <description><![CDATA[$property.longDescription]]></description>
+#else
+ <description><![CDATA[]]></description>
+#end
+ <name>$property.name</name>
+#if ($property.isRequired())
+ <required>$property.isRequired()</required>
+#end
+#if ($property.isLiteralOnly())
+ <rtexprvalue>false</rtexprvalue>
+#else
+#set ($type = $utils.getClassFromFullClass($property.className))
+#if($property.deferredValueType)
+ <deferred-value>
+ <type>$property.deferredValueType</type>
+ </deferred-value>
+#elseif ($type == "String")
+ <deferred-value>
+ <type>java.lang.String</type>
+ </deferred-value>
+#elseif ($property.className == "java.util.Locale" && $component.name == "f:convertDateTime")
+ <deferred-value>
+ <type>java.lang.Object</type>
+ </deferred-value>
+#elseif ($property.className == "java.util.TimeZone" && $component.name == "f:convertDateTime")
+ <deferred-value>
+ <type>java.lang.Object</type>
+ </deferred-value>
+#else
+ <deferred-value>
+ <type>$property.className</type>
+ </deferred-value>
+#end
+#end
+ </attribute>
+#end
+#end
+ </tag>
+#end
+#end
+#end
+#end
+ <!-- Validator tags -->
+#set ($componentList = ${model.getValidators()})
+#foreach( $component in $componentList )
+#if ($modelIds.contains($component.modelId)
+ && ($component.name))
+#if ($utils.getTagPrefix($component.name) == $shortname)
+## Check if we don't have a facelet tag taking precedence over this description
+#if (! ${model.findFaceletTagByName($component.name)})
+ <tag>
+ <description><![CDATA[$component.longDescription]]></description>
+ <name>$utils.getTagName($component.name)</name>
+ <tag-class>$component.tagClass</tag-class>
+#if ($component.bodyContent)
+ <body-content>$component.bodyContent</body-content>
+#else
+ <body-content>empty</body-content>
+#end
+
+#set ($propertyList = ${component.propertyList})
+#foreach( $property in $propertyList )
+#if (!$property.isTagExcluded())
+ <attribute>
+#if ($property.longDescription)
+ <description><![CDATA[$property.longDescription]]></description>
+#else
+ <description><![CDATA[]]></description>
+#end
+ <name>$property.name</name>
+#if ($property.isRequired())
+ <required>$property.isRequired()</required>
+#end
+#if ($property.isLiteralOnly())
+ <rtexprvalue>false</rtexprvalue>
+#else
+#set ($type = $utils.getClassFromFullClass($property.className))
+#if($property.deferredValueType)
+ <deferred-value>
+ <type>$property.deferredValueType</type>
+ </deferred-value>
+#elseif ($type == "String")
+ <deferred-value>
+ <type>java.lang.String</type>
+ </deferred-value>
+#else
+ <deferred-value>
+ <type>$property.className</type>
+ </deferred-value>
+#end
+#end
+ </attribute>
+#end
+#end
+ </tag>
+#end
+#end
+#end
+#end
+ <!-- Single Tags -->
+#set ($tagList = $model.getTags())
+#foreach( $tag in $tagList )
+#if ($modelIds.contains($tag.modelId) && ($tag.name))
+#if ($utils.getTagPrefix($tag.name) == $shortname)
+## Check if we don't have a facelet tag taking precedence over this description
+#if (! ${model.findFaceletTagByName($tag.name)})
+ <tag>
+ <description><![CDATA[$tag.longDescription]]></description>
+ <name>$utils.getTagName($tag.name)</name>
+ <tag-class>$tag.className</tag-class>
+ <body-content>$tag.bodyContent</body-content>
+#set ($attributeList = ${tag.attributeList})
+#foreach( $attribute in $attributeList )
+ <attribute>
+#if ($attribute.longDescription)
+ <description><![CDATA[$attribute.longDescription]]></description>
+#else
+ <description><![CDATA[]]></description>
+#end
+ <name>$attribute.name</name>
+ <required>$attribute.isRequired()</required>
+#set ($type = $utils.getClassFromFullClass($attribute.className))
+#if ($type == "MethodExpression")
+ <deferred-method>
+ <method-signature>${attribute.deferredMethodSignature}</method-signature>
+ </deferred-method>
+#elseif ($type == "ValueExpression")
+ <deferred-value>
+#if($attribute.deferredValueType)
+ <type>$attribute.deferredValueType</type>
+#end
+ </deferred-value>
+#else
+ <rtexprvalue>$attribute.isRtexprvalue()</rtexprvalue>
+#if ($attribute.className)
+ <type>$attribute.className</type>
+#else
+ <type>java.lang.String</type>
+#end
+#end
+ </attribute>
+#end
+ </tag>
+#end
+#end
+#end
+#end
+
+ <!-- Facelets Tags -->
+#set ($tagList = $model.getFaceletTags())
+#foreach( $tag in $tagList )
+#if ($modelIds.contains($tag.modelId) && ($tag.name))
+#if ($utils.getTagPrefix($tag.name) == $shortname)
+ <tag>
+ <description><![CDATA[$tag.longDescription]]></description>
+ <name>$utils.getTagName($tag.name)</name>
+ <tag-class>$tag.className</tag-class>
+ <body-content>$tag.bodyContent</body-content>
+#set ($attributeList = ${tag.attributeList})
+#foreach( $attribute in $attributeList )
+ <attribute>
+#if ($attribute.longDescription)
+ <description><![CDATA[$attribute.longDescription]]></description>
+#else
+ <description><![CDATA[]]></description>
+#end
+ <name>$attribute.name</name>
+ <required>$attribute.isRequired()</required>
+#set ($type = $utils.getClassFromFullClass($attribute.className))
+#if ($type == "MethodExpression")
+ <deferred-method>
+ <method-signature>${attribute.deferredMethodSignature}</method-signature>
+ </deferred-method>
+#elseif ($type == "ValueExpression")
+ <deferred-value>
+#if($attribute.deferredValueType)
+ <type>$attribute.deferredValueType</type>
+#end
+ </deferred-value>
+#else
+ <rtexprvalue>$attribute.isRtexprvalue()</rtexprvalue>
+#if ($attribute.className)
+ <type>$attribute.className</type>
+#else
+ <type>java.lang.String</type>
+#end
+#end
+ </attribute>
+#end
+ </tag>
+#end
+#end
+#end
+</taglib>
Propchange: myfaces/core/trunk/impl/src/main/resources/META-INF/myfaces_facelet_core20.vm
------------------------------------------------------------------------------
svn:eol-style = native