You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by to...@apache.org on 2005/12/20 00:22:15 UTC
svn commit: r357829 - in /myfaces/build/trunk/tools/src/java:
javax/faces/context/FacesContextSingleton.java
org/apache/myfaces/tools/FaceletsTaglibTask.java
org/apache/myfaces/tools/Tag.java org/apache/myfaces/tools/Taglib.java
Author: tomsp
Date: Mon Dec 19 15:22:08 2005
New Revision: 357829
URL: http://svn.apache.org/viewcvs?rev=357829&view=rev
Log:
added namespace element, sort tags alphabetically
Modified:
myfaces/build/trunk/tools/src/java/javax/faces/context/FacesContextSingleton.java
myfaces/build/trunk/tools/src/java/org/apache/myfaces/tools/FaceletsTaglibTask.java
myfaces/build/trunk/tools/src/java/org/apache/myfaces/tools/Tag.java
myfaces/build/trunk/tools/src/java/org/apache/myfaces/tools/Taglib.java
Modified: myfaces/build/trunk/tools/src/java/javax/faces/context/FacesContextSingleton.java
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/tools/src/java/javax/faces/context/FacesContextSingleton.java?rev=357829&r1=357828&r2=357829&view=diff
==============================================================================
--- myfaces/build/trunk/tools/src/java/javax/faces/context/FacesContextSingleton.java (original)
+++ myfaces/build/trunk/tools/src/java/javax/faces/context/FacesContextSingleton.java Mon Dec 19 15:22:08 2005
@@ -18,10 +18,8 @@
/**
* @author Thomas Spiegl
*/
-public class FacesContextSingleton
-{
- public static void setCurrentInstance(FacesContext facesContext)
- {
+public class FacesContextSingleton {
+ public static void setCurrentInstance(FacesContext facesContext) {
FacesContext.setCurrentInstance(facesContext);
}
}
Modified: myfaces/build/trunk/tools/src/java/org/apache/myfaces/tools/FaceletsTaglibTask.java
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/tools/src/java/org/apache/myfaces/tools/FaceletsTaglibTask.java?rev=357829&r1=357828&r2=357829&view=diff
==============================================================================
--- myfaces/build/trunk/tools/src/java/org/apache/myfaces/tools/FaceletsTaglibTask.java (original)
+++ myfaces/build/trunk/tools/src/java/org/apache/myfaces/tools/FaceletsTaglibTask.java Mon Dec 19 15:22:08 2005
@@ -19,8 +19,9 @@
import org.apache.commons.digester.Digester;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.tools.ant.Task;
import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
@@ -44,59 +45,55 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import java.io.File;
-import java.io.OutputStream;
import java.io.FileOutputStream;
+import java.io.OutputStream;
import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
+import java.util.*;
/**
* @author Thomas Spiegl
*/
-public class FaceletsTaglibTask extends Task
-{
+public class FaceletsTaglibTask extends Task {
private static final Log log = LogFactory.getLog(FaceletsTaglibTask.class);
private String _validatorId;
private String _sourceTld;
private String _targetFile;
- public void setSourceTld(String sourceTld)
- {
+ public void setSourceTld(String sourceTld) {
_sourceTld = sourceTld;
}
- public void setTargetFile(String targetFile)
- {
+ public void setTargetFile(String targetFile) {
_targetFile = targetFile;
}
-
- public void execute() throws BuildException
- {
+ public void execute() throws BuildException {
log.info("generating facelets taglib source: "+ _sourceTld + " target: " + _targetFile);
File source = new File(_sourceTld);
File target = new File(_targetFile);
FaceletsTaglibTask faceletSupport = new FaceletsTaglibTask();
- try
- {
+ try {
faceletSupport.createFaceletTaglib(source, target);
}
- catch (Exception e)
- {
+ catch (BuildException e) {
+ super.log("Error when processing taglib " + source.getName() + " msg: " + e.getMessage(), Project.MSG_VERBOSE);
+ throw e;
+ }
+ catch (Exception e) {
+ super.log("Error when processing taglib " + source.getName() + " msg: " + e.getMessage(), Project.MSG_VERBOSE);
throw new BuildException(e);
}
}
- public void createFaceletTaglib(File source, File target) throws Exception
- {
+ public void createFaceletTaglib(File source, File target) throws Exception {
FacesContextSingleton.setCurrentInstance(new FacesContextMock());
Digester digester = new Digester();
digester.addObjectCreate("taglib", Taglib.class);
+ digester.addCallMethod("taglib/uri", "setUri", 0);
digester.addObjectCreate("taglib/tag", Tag.class);
+ digester.addCallMethod("taglib/uri", "setUri", 0);
digester.addCallMethod("taglib/tag/name", "setName", 0);
digester.addCallMethod("taglib/tag/tag-class", "setTagClass", 0);
digester.addSetNext("taglib/tag", "addTag", "org.apache.myfaces.tools.Tag");
@@ -105,7 +102,14 @@
Document doc = createDocument();
Element taglibElem = doc.createElement("facelet-taglib");
doc.appendChild(taglibElem);
+ if (taglib.getUri() == null) {
+ super.log("Missing uri in tld " + source.getName() + " cannot add namespace", Project.MSG_ERR);
+ throw new RuntimeException("cannot create namespace element");
+ }
+ createElement(doc, taglibElem, "namespace", taglib.getUri());
+
List tags = taglib.getTags();
+ Collections.sort(tags, new TagComperator());
for (int i = 0; i < tags.size(); i++) {
Tag tag = (Tag) tags.get(i);
Class clazz = Thread.currentThread().getContextClassLoader().loadClass(tag.getTagClass());
@@ -119,8 +123,7 @@
if (rendererType != null)
createElement(doc, componentEl, "renderer-type", rendererType);
}
- else if (ValidatorTag.class.isAssignableFrom(clazz))
- {
+ else if (ValidatorTag.class.isAssignableFrom(clazz)) {
Element tagEl = createElement(doc, taglibElem, "tag", null);
createElement(doc, tagEl, "tag-name", tag.getName());
Element componentEl = createElement(doc, tagEl, "validator", null);
@@ -134,8 +137,7 @@
serialize(doc, new FileOutputStream(target));
}
- private Element createElement(Document doc, Element parent, String name, String text)
- {
+ private Element createElement(Document doc, Element parent, String name, String text) {
Element element = doc.createElement(name);
parent.appendChild(element);
if (text != null) {
@@ -145,8 +147,7 @@
return element;
}
- private Document createDocument() throws ParserConfigurationException
- {
+ private Document createDocument() throws ParserConfigurationException {
DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
DocumentBuilder docBuilder =docBuilderFactory.newDocumentBuilder();
return docBuilder.newDocument();
@@ -162,282 +163,232 @@
transformer.transform(new DOMSource(target), new StreamResult(out));
}
- private Transformer createTransformer() throws TransformerConfigurationException
- {
+ private Transformer createTransformer() throws TransformerConfigurationException {
TransformerFactory factory = TransformerFactory.newInstance();
return factory.newTransformer();
}
- private class FacesContextMock extends FacesContext
- {
+ private class FacesContextMock extends FacesContext {
private Application _application = new ApplicationMock();
- public Application getApplication()
- {
+ public Application getApplication() {
return _application;
}
- public Iterator getClientIdsWithMessages()
- {
+ public Iterator getClientIdsWithMessages() {
return null;
}
- public ExternalContext getExternalContext()
- {
+ public ExternalContext getExternalContext() {
return null;
}
- public FacesMessage.Severity getMaximumSeverity()
- {
+ public FacesMessage.Severity getMaximumSeverity() {
return null;
}
- public Iterator getMessages()
- {
+ public Iterator getMessages() {
return null;
}
- public Iterator getMessages(String string)
- {
+ public Iterator getMessages(String string) {
return null;
}
- public RenderKit getRenderKit()
- {
+ public RenderKit getRenderKit() {
return null;
}
- public boolean getRenderResponse()
- {
+ public boolean getRenderResponse() {
return false;
}
- public boolean getResponseComplete()
- {
+ public boolean getResponseComplete() {
return false;
}
- public ResponseStream getResponseStream()
- {
+ public ResponseStream getResponseStream() {
return null;
}
- public void setResponseStream(ResponseStream responseStream)
- {
+ public void setResponseStream(ResponseStream responseStream) {
}
- public ResponseWriter getResponseWriter()
- {
+ public ResponseWriter getResponseWriter() {
return null;
}
- public void setResponseWriter(ResponseWriter responseWriter)
- {
+ public void setResponseWriter(ResponseWriter responseWriter) {
}
- public UIViewRoot getViewRoot()
- {
+ public UIViewRoot getViewRoot() {
return null;
}
- public void setViewRoot(UIViewRoot uiViewRoot)
- {
+ public void setViewRoot(UIViewRoot uiViewRoot) {
}
- public void addMessage(String string, FacesMessage facesMessage)
- {
+ public void addMessage(String string, FacesMessage facesMessage) {
}
- public void release()
- {
+ public void release() {
}
- public void renderResponse()
- {
+ public void renderResponse() {
}
- public void responseComplete()
- {
+ public void responseComplete() {
}
}
- private class ApplicationMock extends Application
- {
- public ActionListener getActionListener()
- {
+ private class ApplicationMock extends Application {
+ public ActionListener getActionListener() {
return null;
}
- public void setActionListener(ActionListener actionListener)
- {
+ public void setActionListener(ActionListener actionListener) {
}
- public Locale getDefaultLocale()
- {
+ public Locale getDefaultLocale() {
return null;
}
- public void setDefaultLocale(Locale locale)
- {
+ public void setDefaultLocale(Locale locale) {
}
- public String getDefaultRenderKitId()
- {
+ public String getDefaultRenderKitId() {
return null;
}
- public void setDefaultRenderKitId(String string)
- {
+ public void setDefaultRenderKitId(String string) {
}
- public String getMessageBundle()
- {
+ public String getMessageBundle() {
return null;
}
- public void setMessageBundle(String string)
- {
+ public void setMessageBundle(String string) {
}
- public NavigationHandler getNavigationHandler()
- {
+ public NavigationHandler getNavigationHandler() {
return null;
}
- public void setNavigationHandler(NavigationHandler navigationHandler)
- {
+ public void setNavigationHandler(NavigationHandler navigationHandler) {
}
- public PropertyResolver getPropertyResolver()
- {
+ public PropertyResolver getPropertyResolver() {
return null;
}
- public void setPropertyResolver(PropertyResolver propertyResolver)
- {
+ public void setPropertyResolver(PropertyResolver propertyResolver) {
}
- public VariableResolver getVariableResolver()
- {
+ public VariableResolver getVariableResolver() {
return null;
}
- public void setVariableResolver(VariableResolver variableResolver)
- {
+ public void setVariableResolver(VariableResolver variableResolver) {
}
- public ViewHandler getViewHandler()
- {
+ public ViewHandler getViewHandler() {
return null;
}
- public void setViewHandler(ViewHandler viewHandler)
- {
+ public void setViewHandler(ViewHandler viewHandler) {
}
- public StateManager getStateManager()
- {
+ public StateManager getStateManager() {
return null;
}
- public void setStateManager(StateManager stateManager)
- {
+ public void setStateManager(StateManager stateManager) {
}
- public void addComponent(String string, String string1)
- {
+ public void addComponent(String string, String string1) {
}
- public UIComponent createComponent(String string) throws FacesException
- {
+ public UIComponent createComponent(String string) throws FacesException {
return null;
}
- public UIComponent createComponent(ValueBinding valueBinding, FacesContext facesContext, String string) throws FacesException
- {
+ public UIComponent createComponent(ValueBinding valueBinding, FacesContext facesContext, String string) throws FacesException {
return null;
}
- public Iterator getComponentTypes()
- {
+ public Iterator getComponentTypes() {
return null;
}
- public void addConverter(String string, String string1)
- {
+ public void addConverter(String string, String string1) {
}
- public void addConverter(Class aClass, String string)
- {
+ public void addConverter(Class aClass, String string) {
}
- public Converter createConverter(String string)
- {
+ public Converter createConverter(String string) {
return null;
}
- public Converter createConverter(Class aClass)
- {
+ public Converter createConverter(Class aClass) {
return null;
}
- public Iterator getConverterIds()
- {
+ public Iterator getConverterIds() {
return null;
}
- public Iterator getConverterTypes()
- {
+ public Iterator getConverterTypes() {
return null;
}
- public MethodBinding createMethodBinding(String string, Class[] classes) throws ReferenceSyntaxException
- {
+ public MethodBinding createMethodBinding(String string, Class[] classes) throws ReferenceSyntaxException {
return null;
}
- public Iterator getSupportedLocales()
- {
+ public Iterator getSupportedLocales() {
return null;
}
- public void setSupportedLocales(Collection collection)
- {
+ public void setSupportedLocales(Collection collection) {
}
- public void addValidator(String string, String string1)
- {
+ public void addValidator(String string, String string1) {
}
- public Validator createValidator(String string) throws FacesException
- {
+ public Validator createValidator(String string) throws FacesException {
_validatorId = string;
return null;
}
- public Iterator getValidatorIds()
- {
+ public Iterator getValidatorIds() {
return null;
}
- public ValueBinding createValueBinding(String string) throws ReferenceSyntaxException
- {
+ public ValueBinding createValueBinding(String string) throws ReferenceSyntaxException {
return null;
}
+ }
+ private static final class TagComperator implements Comparator {
+ public int compare(Object o1, Object o2) {
+ Tag a = (Tag) o1;
+ Tag b = (Tag) o2;
+ return a.getName().compareTo(b.getName());
+ }
}
}
Modified: myfaces/build/trunk/tools/src/java/org/apache/myfaces/tools/Tag.java
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/tools/src/java/org/apache/myfaces/tools/Tag.java?rev=357829&r1=357828&r2=357829&view=diff
==============================================================================
--- myfaces/build/trunk/tools/src/java/org/apache/myfaces/tools/Tag.java (original)
+++ myfaces/build/trunk/tools/src/java/org/apache/myfaces/tools/Tag.java Mon Dec 19 15:22:08 2005
@@ -18,28 +18,23 @@
/**
* @author Thomas Spiegl
*/
-public class Tag
-{
+public class Tag {
private String _tagClass;
private String _name;
- public String getTagClass()
- {
+ public String getTagClass() {
return _tagClass;
}
- public void setTagClass(String tagClass)
- {
+ public void setTagClass(String tagClass) {
_tagClass = tagClass;
}
- public String getName()
- {
+ public String getName() {
return _name;
}
- public void setName(String name)
- {
+ public void setName(String name) {
_name = name;
}
}
Modified: myfaces/build/trunk/tools/src/java/org/apache/myfaces/tools/Taglib.java
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/tools/src/java/org/apache/myfaces/tools/Taglib.java?rev=357829&r1=357828&r2=357829&view=diff
==============================================================================
--- myfaces/build/trunk/tools/src/java/org/apache/myfaces/tools/Taglib.java (original)
+++ myfaces/build/trunk/tools/src/java/org/apache/myfaces/tools/Taglib.java Mon Dec 19 15:22:08 2005
@@ -24,15 +24,22 @@
public class Taglib
{
private List _tags = new ArrayList();
+ private String _uri;
- public void addTag(Tag tag)
- {
+ public void addTag(Tag tag) {
_tags.add(tag);
}
- public List getTags()
- {
+ public List getTags() {
return _tags;
+ }
+
+ public String getUri() {
+ return _uri;
+ }
+
+ public void setUri(String uri) {
+ _uri = uri;
}
}