svn commit: r478625 [3/4] - in /struts/struts2/trunk: apps/blank/src/main/resources/example/ apps/blank/src/main/webapp/ apps/mailreader/ apps/mailreader/src/main/java/ apps/mailreader/src/main/java/mailreader2/ apps/showcase/src/main/java/org/apache/s...

[ws...@apache.org]

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/annotations/taglib/apt/Tag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/annotations/taglib/apt/Tag.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/annotations/taglib/apt/Tag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/annotations/taglib/apt/Tag.java Thu Nov 23 09:31:52 2006
@@ -1,92 +1,92 @@
-/*
- * $Id:  $
- *
- * 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.struts2.annotations.taglib.apt;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-public class Tag {
-  private String name;
-  private String tldBodyContent;
-  private String tldTagClass;
-  private String description;
-  private boolean include = true;
-  private String declaredType;
-
-  private Map<String, TagAttribute> attributes = new HashMap<String, TagAttribute>();
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public String getTldBodyContent() {
-    return tldBodyContent;
-  }
-
-  public void setTldBodyContent(String tldBodyContent) {
-    this.tldBodyContent = tldBodyContent;
-  }
-
-  public String getTldTagClass() {
-    return tldTagClass;
-  }
-
-  public void setTldTagClass(String tldTagClass) {
-    this.tldTagClass = tldTagClass;
-  }
-
-  public void addTagAttribute(TagAttribute attribute) {
-    attributes.put(attribute.getName(), attribute);
-  }
-
-  public Collection<TagAttribute> getAttributes() {
-    return attributes.values();
-  }
-
-  public boolean isInclude() {
-    return include;
-  }
-
-  public void setInclude(boolean include) {
-    this.include = include;
-  }
-
-  public String getDeclaredType() {
-    return declaredType;
-  }
-
-  public void setDeclaredType(String declaredType) {
-    this.declaredType = declaredType;
-  }
-}
+/*
+ * $Id$
+ *
+ * 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.struts2.annotations.taglib.apt;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Tag {
+  private String name;
+  private String tldBodyContent;
+  private String tldTagClass;
+  private String description;
+  private boolean include = true;
+  private String declaredType;
+
+  private Map<String, TagAttribute> attributes = new HashMap<String, TagAttribute>();
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getTldBodyContent() {
+    return tldBodyContent;
+  }
+
+  public void setTldBodyContent(String tldBodyContent) {
+    this.tldBodyContent = tldBodyContent;
+  }
+
+  public String getTldTagClass() {
+    return tldTagClass;
+  }
+
+  public void setTldTagClass(String tldTagClass) {
+    this.tldTagClass = tldTagClass;
+  }
+
+  public void addTagAttribute(TagAttribute attribute) {
+    attributes.put(attribute.getName(), attribute);
+  }
+
+  public Collection<TagAttribute> getAttributes() {
+    return attributes.values();
+  }
+
+  public boolean isInclude() {
+    return include;
+  }
+
+  public void setInclude(boolean include) {
+    this.include = include;
+  }
+
+  public String getDeclaredType() {
+    return declaredType;
+  }
+
+  public void setDeclaredType(String declaredType) {
+    this.declaredType = declaredType;
+  }
+}

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/annotations/taglib/apt/Tag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/annotations/taglib/apt/Tag.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TagAnnotationProcessor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TagAnnotationProcessor.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TagAnnotationProcessor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TagAnnotationProcessor.java Thu Nov 23 09:31:52 2006
@@ -1,299 +1,299 @@
-/*
- * $Id:  $
- *
- * 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.struts2.annotations.taglib.apt;
-import java.io.FileOutputStream;
-import java.io.OutputStreamWriter;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-
-public class TagAnnotationProcessor implements AnnotationProcessor {
-  public static final String TAG = "org.apache.struts2.annotations.taglib.StrutsTag";
-  public static final String TAG_ATTRIBUTE = "org.apache.struts2.annotations.taglib.StrutsTagAttribute";
-
-  private AnnotationProcessorEnvironment environment;
-  private AnnotationTypeDeclaration tagDeclaration;
-  private AnnotationTypeDeclaration tagAttributeDeclaration;
-  private Map<String, Tag> tags = new HashMap<String, Tag>();
-
-  public TagAnnotationProcessor(AnnotationProcessorEnvironment env) {
-    environment = env;
-    tagDeclaration = (AnnotationTypeDeclaration) environment.getTypeDeclaration(TAG);
-    tagAttributeDeclaration = (AnnotationTypeDeclaration) environment
-        .getTypeDeclaration(TAG_ATTRIBUTE);
-  }
-
-  public void process() {
-    //make sure all paramters were set
-    checkOptions();
-
-    // tags
-    Collection<Declaration> tagDeclarations = environment
-        .getDeclarationsAnnotatedWith(tagDeclaration);
-    Collection<Declaration> attributesDeclarations = environment
-        .getDeclarationsAnnotatedWith(tagAttributeDeclaration);
-
-    // find Tags
-    for (Declaration declaration : tagDeclarations) {
-      // type
-      TypeDeclaration typeDeclaration = (TypeDeclaration) declaration;
-      String typeName = typeDeclaration.getQualifiedName();
-      HashMap<String, Object> values = getValues(typeDeclaration, tagDeclaration);
-      // create Tag and apply values found
-      Tag tag = new Tag();
-      tag.setDescription((String) values.get("description"));
-      tag.setName((String) values.get("name"));
-      tag.setTldBodyContent((String) values.get("tldBodyContent"));
-      tag.setTldTagClass((String) values.get("tldTagClass"));
-      tag.setDeclaredType(typeName);
-      // add to map
-      tags.put(typeName, tag);
-    }
-
-    // find Tags Attributes
-    for (Declaration declaration : attributesDeclarations) {
-      // type
-      MethodDeclaration methodDeclaration = (MethodDeclaration) declaration;
-      String typeName = methodDeclaration.getDeclaringType().getQualifiedName();
-      HashMap<String, Object> values = getValues(methodDeclaration, tagAttributeDeclaration);
-      // create Attribute and apply values found
-      TagAttribute attribute = new TagAttribute();
-      attribute.setDescription((String) values.get("description"));
-      String name = (String) values.get("name");
-      if(name == null || name.length() == 0) {
-        //get name from method
-        String methodName = methodDeclaration.getSimpleName();
-        name = String.valueOf(Character.toLowerCase(methodName.charAt(3))) + methodName.substring(4);
-      }
-      methodDeclaration.getSimpleName();
-      attribute.setName(name);
-      attribute.setRequired((Boolean) values.get("required"));
-      attribute.setRtexprvalue((Boolean) values.get("rtexprvalue"));
-      // add to map
-      Tag parentTag = tags.get(typeName);
-      if(parentTag != null)
-        tags.get(typeName).addTagAttribute(attribute);
-      else {
-        //an abstract or base class
-        parentTag = new Tag();
-        parentTag.setDeclaredType(typeName);
-        parentTag.setInclude(false);
-        parentTag.addTagAttribute(attribute);
-        tags.put(typeName, parentTag);
-      }
-    }
-
-    //we can't process the hierarchy on the first pass because
-    //apt does not garantees that the base classes will be processed
-    //before their subclasses
-    for(Map.Entry<String, Tag> entry : tags.entrySet()) {
-      processHierarchy(entry.getValue());
-    }
-    // save as xml
-    save();
-  }
-
-  private void processHierarchy(Tag tag) {
-    try {
-      Class clazz = Class.forName(tag.getDeclaredType());
-      while((clazz = clazz.getSuperclass()) != null) {
-        Tag parentTag = tags.get(clazz.getName());
-        //copy parent annotations to this tag
-        if(parentTag != null) {
-          for(TagAttribute attribute : parentTag.getAttributes()) {
-            tag.addTagAttribute(attribute);
-          }
-        }
-      }
-    } catch (ClassNotFoundException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  private void checkOptions() {
-    if(getOption("tlibVersion") == null)
-      throw new IllegalArgumentException("'tlibVersion' is missing");
-    if(getOption("jspVersion") == null)
-      throw new IllegalArgumentException("'jspVersion' is missing");
-    if(getOption("shortName") == null)
-      throw new IllegalArgumentException("'shortName' is missing");
-    if(getOption("description") == null)
-      throw new IllegalArgumentException("'description' is missing");
-    if(getOption("displayName") == null)
-      throw new IllegalArgumentException("'displayName' is missing");
-    if(getOption("uri") == null)
-      throw new IllegalArgumentException("'uri' is missing");
-  }
-
-  private void save() {
-    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-    DocumentBuilder builder;
-
-    try {
-      // create xml document
-      builder = factory.newDocumentBuilder();
-      Document document = builder.newDocument();
-      document.setXmlVersion("1.0");
-
-      // taglib
-      Element tagLib = document.createElement("taglib");
-      document.appendChild(tagLib);
-      // tag lib attributes
-      appendTextNode(document, tagLib, "tlib-version", getOption("tlibVersion"), false);
-      appendTextNode(document, tagLib, "jsp-version", getOption("jspVersion"), false);
-      appendTextNode(document, tagLib, "short-name", getOption("shortName"), false);
-      appendTextNode(document, tagLib, "uri", getOption("uri"), false);
-      appendTextNode(document, tagLib, "display-name", getOption("displayName"), false);
-      appendTextNode(document, tagLib, "description", getOption("description"), true);
-
-      // create tags
-      for (Map.Entry<String, Tag> entry : tags.entrySet()) {
-        Tag tag = entry.getValue();
-        if(tag.isInclude())
-          createElement(document, tagLib, tag);
-      }
-
-      // save to file
-      TransformerFactory tf = TransformerFactory.newInstance();
-      tf.setAttribute("indent-number", new Integer(2));
-      Transformer transformer = tf.newTransformer();
-      //if tiger would just format it :(
-      //formatting bug in tiger (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6296446)
-
-      transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-      transformer.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC, "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN");
-      transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd");
-      transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
-
-      Source source = new DOMSource(document);
-      Result result = new StreamResult(new OutputStreamWriter(new FileOutputStream(getOption("out"))));
-      transformer.transform(source, result);
-    } catch (Exception e) {
-      // oops we cannot throw checked exceptions
-      throw new RuntimeException(e);
-    }
-  }
-
-  private String getOption(String name) {
-    // there is a bug in the 1.5 apt implementation:
-    // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6258929
-    // this is a hack-around
-    if (environment.getOptions().containsKey(name))
-      return environment.getOptions().get(name);
-
-    for (Map.Entry<String, String> entry : environment.getOptions().entrySet()) {
-      String key = entry.getKey();
-      if (key.startsWith("-A" + name))
-        return key.substring(key.indexOf("=") + 1);
-    }
-    return null;
-  }
-
-  private void createElement(Document doc, Element tagLibElement, Tag tag) {
-    Element tagElement = doc.createElement("tag");
-    tagLibElement.appendChild(tagElement);
-    appendTextNode(doc, tagElement, "name", tag.getName(), false);
-    appendTextNode(doc, tagElement, "tag-class", tag.getTldTagClass(), false);
-    appendTextNode(doc, tagElement, "body-content", tag.getTldBodyContent(), false);
-    appendTextNode(doc, tagElement, "description", tag.getDescription(), true);
-
-    // save attributes
-    for (TagAttribute attribute : tag.getAttributes()) {
-      createElement(doc, tagElement, attribute);
-    }
-
-  }
-
-  private void createElement(Document doc, Element tagElement, TagAttribute attribute) {
-    Element attributeElement = doc.createElement("attribute");
-    tagElement.appendChild(attributeElement);
-    appendTextNode(doc, attributeElement, "name", attribute.getName(), false);
-    appendTextNode(doc, attributeElement, "required", String.valueOf(attribute.isRequired()), false);
-    appendTextNode(doc,
-        attributeElement,
-        "rtexprvalue",
-        String.valueOf(attribute.isRtexprvalue()),
-        false);
-    appendTextNode(doc, attributeElement, "description", attribute.getDescription(), true);
-  }
-
-  private void appendTextNode(Document doc, Element element, String name, String text, boolean cdata) {
-    Text textNode = cdata ? doc.createCDATASection(text) : doc.createTextNode(text);
-    Element newElement = doc.createElement(name);
-    newElement.appendChild(textNode);
-    element.appendChild(newElement);
-  }
-
-  /**
-   * Get values of annotation
-   *
-   * @param declaration
-   * @param type
-   *          The type of the annotation
-   * @return name->value map of annotation values
-   */
-  private HashMap<String, Object> getValues(Declaration declaration, AnnotationTypeDeclaration type) {
-    HashMap<String, Object> values = new HashMap<String, Object>();
-    Collection<AnnotationMirror> annotations = declaration.getAnnotationMirrors();
-    // iterate over the mirrors.
-    for (AnnotationMirror mirror : annotations) {
-      // if the mirror in this iteration is for our note declaration...
-      if (mirror.getAnnotationType().getDeclaration().equals(type)) {
-
-        // print out the goodies.
-        Map<AnnotationTypeElementDeclaration, AnnotationValue> annotationValues = mirror
-            .getElementValues();
-
-        for (Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue> entry : annotationValues
-            .entrySet()) {
-          AnnotationTypeElementDeclaration key = entry.getKey();
-          AnnotationValue value = entry.getValue();
-          values.put(key.getSimpleName(), value.getValue());
-        }
-      }
-    }
-    return values;
-  }
-}
+/*
+ * $Id$
+ *
+ * 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.struts2.annotations.taglib.apt;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Text;
+
+import com.sun.mirror.apt.AnnotationProcessor;
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
+import com.sun.mirror.declaration.AnnotationMirror;
+import com.sun.mirror.declaration.AnnotationTypeDeclaration;
+import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
+import com.sun.mirror.declaration.AnnotationValue;
+import com.sun.mirror.declaration.Declaration;
+import com.sun.mirror.declaration.MethodDeclaration;
+import com.sun.mirror.declaration.TypeDeclaration;
+
+public class TagAnnotationProcessor implements AnnotationProcessor {
+  public static final String TAG = "org.apache.struts2.annotations.taglib.StrutsTag";
+  public static final String TAG_ATTRIBUTE = "org.apache.struts2.annotations.taglib.StrutsTagAttribute";
+
+  private AnnotationProcessorEnvironment environment;
+  private AnnotationTypeDeclaration tagDeclaration;
+  private AnnotationTypeDeclaration tagAttributeDeclaration;
+  private Map<String, Tag> tags = new HashMap<String, Tag>();
+
+  public TagAnnotationProcessor(AnnotationProcessorEnvironment env) {
+    environment = env;
+    tagDeclaration = (AnnotationTypeDeclaration) environment.getTypeDeclaration(TAG);
+    tagAttributeDeclaration = (AnnotationTypeDeclaration) environment
+        .getTypeDeclaration(TAG_ATTRIBUTE);
+  }
+
+  public void process() {
+    //make sure all paramters were set
+    checkOptions();
+
+    // tags
+    Collection<Declaration> tagDeclarations = environment
+        .getDeclarationsAnnotatedWith(tagDeclaration);
+    Collection<Declaration> attributesDeclarations = environment
+        .getDeclarationsAnnotatedWith(tagAttributeDeclaration);
+
+    // find Tags
+    for (Declaration declaration : tagDeclarations) {
+      // type
+      TypeDeclaration typeDeclaration = (TypeDeclaration) declaration;
+      String typeName = typeDeclaration.getQualifiedName();
+      HashMap<String, Object> values = getValues(typeDeclaration, tagDeclaration);
+      // create Tag and apply values found
+      Tag tag = new Tag();
+      tag.setDescription((String) values.get("description"));
+      tag.setName((String) values.get("name"));
+      tag.setTldBodyContent((String) values.get("tldBodyContent"));
+      tag.setTldTagClass((String) values.get("tldTagClass"));
+      tag.setDeclaredType(typeName);
+      // add to map
+      tags.put(typeName, tag);
+    }
+
+    // find Tags Attributes
+    for (Declaration declaration : attributesDeclarations) {
+      // type
+      MethodDeclaration methodDeclaration = (MethodDeclaration) declaration;
+      String typeName = methodDeclaration.getDeclaringType().getQualifiedName();
+      HashMap<String, Object> values = getValues(methodDeclaration, tagAttributeDeclaration);
+      // create Attribute and apply values found
+      TagAttribute attribute = new TagAttribute();
+      attribute.setDescription((String) values.get("description"));
+      String name = (String) values.get("name");
+      if(name == null || name.length() == 0) {
+        //get name from method
+        String methodName = methodDeclaration.getSimpleName();
+        name = String.valueOf(Character.toLowerCase(methodName.charAt(3))) + methodName.substring(4);
+      }
+      methodDeclaration.getSimpleName();
+      attribute.setName(name);
+      attribute.setRequired((Boolean) values.get("required"));
+      attribute.setRtexprvalue((Boolean) values.get("rtexprvalue"));
+      // add to map
+      Tag parentTag = tags.get(typeName);
+      if(parentTag != null)
+        tags.get(typeName).addTagAttribute(attribute);
+      else {
+        //an abstract or base class
+        parentTag = new Tag();
+        parentTag.setDeclaredType(typeName);
+        parentTag.setInclude(false);
+        parentTag.addTagAttribute(attribute);
+        tags.put(typeName, parentTag);
+      }
+    }
+
+    //we can't process the hierarchy on the first pass because
+    //apt does not garantees that the base classes will be processed
+    //before their subclasses
+    for(Map.Entry<String, Tag> entry : tags.entrySet()) {
+      processHierarchy(entry.getValue());
+    }
+    // save as xml
+    save();
+  }
+
+  private void processHierarchy(Tag tag) {
+    try {
+      Class clazz = Class.forName(tag.getDeclaredType());
+      while((clazz = clazz.getSuperclass()) != null) {
+        Tag parentTag = tags.get(clazz.getName());
+        //copy parent annotations to this tag
+        if(parentTag != null) {
+          for(TagAttribute attribute : parentTag.getAttributes()) {
+            tag.addTagAttribute(attribute);
+          }
+        }
+      }
+    } catch (ClassNotFoundException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private void checkOptions() {
+    if(getOption("tlibVersion") == null)
+      throw new IllegalArgumentException("'tlibVersion' is missing");
+    if(getOption("jspVersion") == null)
+      throw new IllegalArgumentException("'jspVersion' is missing");
+    if(getOption("shortName") == null)
+      throw new IllegalArgumentException("'shortName' is missing");
+    if(getOption("description") == null)
+      throw new IllegalArgumentException("'description' is missing");
+    if(getOption("displayName") == null)
+      throw new IllegalArgumentException("'displayName' is missing");
+    if(getOption("uri") == null)
+      throw new IllegalArgumentException("'uri' is missing");
+  }
+
+  private void save() {
+    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+    DocumentBuilder builder;
+
+    try {
+      // create xml document
+      builder = factory.newDocumentBuilder();
+      Document document = builder.newDocument();
+      document.setXmlVersion("1.0");
+
+      // taglib
+      Element tagLib = document.createElement("taglib");
+      document.appendChild(tagLib);
+      // tag lib attributes
+      appendTextNode(document, tagLib, "tlib-version", getOption("tlibVersion"), false);
+      appendTextNode(document, tagLib, "jsp-version", getOption("jspVersion"), false);
+      appendTextNode(document, tagLib, "short-name", getOption("shortName"), false);
+      appendTextNode(document, tagLib, "uri", getOption("uri"), false);
+      appendTextNode(document, tagLib, "display-name", getOption("displayName"), false);
+      appendTextNode(document, tagLib, "description", getOption("description"), true);
+
+      // create tags
+      for (Map.Entry<String, Tag> entry : tags.entrySet()) {
+        Tag tag = entry.getValue();
+        if(tag.isInclude())
+          createElement(document, tagLib, tag);
+      }
+
+      // save to file
+      TransformerFactory tf = TransformerFactory.newInstance();
+      tf.setAttribute("indent-number", new Integer(2));
+      Transformer transformer = tf.newTransformer();
+      //if tiger would just format it :(
+      //formatting bug in tiger (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6296446)
+
+      transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+      transformer.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC, "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN");
+      transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd");
+      transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+
+      Source source = new DOMSource(document);
+      Result result = new StreamResult(new OutputStreamWriter(new FileOutputStream(getOption("out"))));
+      transformer.transform(source, result);
+    } catch (Exception e) {
+      // oops we cannot throw checked exceptions
+      throw new RuntimeException(e);
+    }
+  }
+
+  private String getOption(String name) {
+    // there is a bug in the 1.5 apt implementation:
+    // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6258929
+    // this is a hack-around
+    if (environment.getOptions().containsKey(name))
+      return environment.getOptions().get(name);
+
+    for (Map.Entry<String, String> entry : environment.getOptions().entrySet()) {
+      String key = entry.getKey();
+      if (key.startsWith("-A" + name))
+        return key.substring(key.indexOf("=") + 1);
+    }
+    return null;
+  }
+
+  private void createElement(Document doc, Element tagLibElement, Tag tag) {
+    Element tagElement = doc.createElement("tag");
+    tagLibElement.appendChild(tagElement);
+    appendTextNode(doc, tagElement, "name", tag.getName(), false);
+    appendTextNode(doc, tagElement, "tag-class", tag.getTldTagClass(), false);
+    appendTextNode(doc, tagElement, "body-content", tag.getTldBodyContent(), false);
+    appendTextNode(doc, tagElement, "description", tag.getDescription(), true);
+
+    // save attributes
+    for (TagAttribute attribute : tag.getAttributes()) {
+      createElement(doc, tagElement, attribute);
+    }
+
+  }
+
+  private void createElement(Document doc, Element tagElement, TagAttribute attribute) {
+    Element attributeElement = doc.createElement("attribute");
+    tagElement.appendChild(attributeElement);
+    appendTextNode(doc, attributeElement, "name", attribute.getName(), false);
+    appendTextNode(doc, attributeElement, "required", String.valueOf(attribute.isRequired()), false);
+    appendTextNode(doc,
+        attributeElement,
+        "rtexprvalue",
+        String.valueOf(attribute.isRtexprvalue()),
+        false);
+    appendTextNode(doc, attributeElement, "description", attribute.getDescription(), true);
+  }
+
+  private void appendTextNode(Document doc, Element element, String name, String text, boolean cdata) {
+    Text textNode = cdata ? doc.createCDATASection(text) : doc.createTextNode(text);
+    Element newElement = doc.createElement(name);
+    newElement.appendChild(textNode);
+    element.appendChild(newElement);
+  }
+
+  /**
+   * Get values of annotation
+   *
+   * @param declaration
+   * @param type
+   *          The type of the annotation
+   * @return name->value map of annotation values
+   */
+  private HashMap<String, Object> getValues(Declaration declaration, AnnotationTypeDeclaration type) {
+    HashMap<String, Object> values = new HashMap<String, Object>();
+    Collection<AnnotationMirror> annotations = declaration.getAnnotationMirrors();
+    // iterate over the mirrors.
+    for (AnnotationMirror mirror : annotations) {
+      // if the mirror in this iteration is for our note declaration...
+      if (mirror.getAnnotationType().getDeclaration().equals(type)) {
+
+        // print out the goodies.
+        Map<AnnotationTypeElementDeclaration, AnnotationValue> annotationValues = mirror
+            .getElementValues();
+
+        for (Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue> entry : annotationValues
+            .entrySet()) {
+          AnnotationTypeElementDeclaration key = entry.getKey();
+          AnnotationValue value = entry.getValue();
+          values.put(key.getSimpleName(), value.getValue());
+        }
+      }
+    }
+    return values;
+  }
+}

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TagAnnotationProcessor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TagAnnotationProcessor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TagAttribute.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TagAttribute.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TagAttribute.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TagAttribute.java Thu Nov 23 09:31:52 2006
@@ -1,65 +1,65 @@
-/*
- * $Id:  $
- *
- * 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.struts2.annotations.taglib.apt;
-
-/**
- * Used to hold tag attribute information for TLD generation
- *
- */
-class TagAttribute {
-  private String name;
-  private boolean required;
-  private boolean rtexprvalue;
-  private String description;
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public boolean isRequired() {
-    return required;
-  }
-
-  public void setRequired(boolean required) {
-    this.required = required;
-  }
-
-  public boolean isRtexprvalue() {
-    return rtexprvalue;
-  }
-
-  public void setRtexprvalue(boolean rtexprvalue) {
-    this.rtexprvalue = rtexprvalue;
-  }
-}
+/*
+ * $Id$
+ *
+ * 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.struts2.annotations.taglib.apt;
+
+/**
+ * Used to hold tag attribute information for TLD generation
+ *
+ */
+class TagAttribute {
+  private String name;
+  private boolean required;
+  private boolean rtexprvalue;
+  private String description;
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public boolean isRequired() {
+    return required;
+  }
+
+  public void setRequired(boolean required) {
+    this.required = required;
+  }
+
+  public boolean isRtexprvalue() {
+    return rtexprvalue;
+  }
+
+  public void setRtexprvalue(boolean rtexprvalue) {
+    this.rtexprvalue = rtexprvalue;
+  }
+}

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TagAttribute.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TagAttribute.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: RemoteCallUIBean.java 451544 2006-09-30 05:38:02Z mrdon $
+ * $Id$
  *
  * Copyright 2006 The Apache Software Foundation.
  *

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DropdownDateTimePicker.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DropdownDateTimePicker.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DropdownDateTimePicker.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DropdownDateTimePicker.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: DatePicker.java 451544 2006-09-30 05:38:02Z mrdon $
+ * $Id$
  *
  * Copyright 2006 The Apache Software Foundation.
  *

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DropdownDateTimePicker.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/RemoteUICallBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/table/renderer/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Namespace.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Namespace.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Namespace.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Namespace.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Namespace.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Namespace.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/NullResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/NullResult.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/NullResult.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/NullResult.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/NullResult.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/NullResult.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ParentPackage.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ParentPackage.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ParentPackage.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ParentPackage.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ParentPackage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/ParentPackage.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Result.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Result.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Result.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Result.java Thu Nov 23 09:31:52 2006
@@ -1,36 +1,36 @@
-/*
- * $Id:  $
- *
- * 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.struts2.config;
-
-import com.opensymphony.xwork2.Action;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Defines an XWork Result
- */
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Result {
-    String name() default Action.SUCCESS;
-    Class type() default NullResult.class;
-    String value();
-}
+/*
+ * $Id$
+ *
+ * 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.struts2.config;
+
+import com.opensymphony.xwork2.Action;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Defines an XWork Result
+ */
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Result {
+    String name() default Action.SUCCESS;
+    Class type() default NullResult.class;
+    String value();
+}

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Result.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Result.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Results.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Results.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Results.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Results.java Thu Nov 23 09:31:52 2006
@@ -1,32 +1,32 @@
-/*
- * $Id:  $
- *
- * 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.struts2.config;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Defines multiple XWork Results
- */
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Results {
-    Result[] value();
-}
+/*
+ * $Id$
+ *
+ * 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.struts2.config;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Defines multiple XWork Results
+ */
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Results {
+    Result[] value();
+}

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Results.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/Results.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ProfilingActivationInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ProfilingActivationInterceptor.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ProfilingActivationInterceptor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ProfilingActivationInterceptor.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ProfilingActivationInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ProfilingActivationInterceptor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DropdownDateTimePickerModel.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DropdownDateTimePickerModel.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DropdownDateTimePickerModel.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DropdownDateTimePickerModel.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: DatePickerModel.java 451544 2006-09-30 05:38:02Z mrdon $
+ * $Id$
  *
  * Copyright 2006 The Apache Software Foundation.
  *

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/DropdownDateTimePickerModel.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractRemoteCallUITag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractRemoteCallUITag.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractRemoteCallUITag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractRemoteCallUITag.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: DivTag.java 451544 2006-09-30 05:38:02Z mrdon $
+ * $Id$
  *
  * Copyright 2006 The Apache Software Foundation.
  *

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractRemoteCallUITag.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DropdownDateTimePickerTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DropdownDateTimePickerTag.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DropdownDateTimePickerTag.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DropdownDateTimePickerTag.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: DatePickerTag.java 451544 2006-09-30 05:38:02Z mrdon $
+ * $Id$
  *
  * Copyright 2006 The Apache Software Foundation.
  *

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/DropdownDateTimePickerTag.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DropdownDateTimePickerDirective.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DropdownDateTimePickerDirective.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DropdownDateTimePickerDirective.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DropdownDateTimePickerDirective.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: DatePickerDirective.java 451544 2006-09-30 05:38:02Z mrdon $
+ * $Id$
  *
  * Copyright 2006 The Apache Software Foundation.
  *

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/components/DropdownDateTimePickerDirective.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/velocity/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/interceptor/debugging/webconsole.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/interceptor/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/templates/Wizard.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/util/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/views/freemarker/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/views/jsp/iterator/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/views/jsp/ui/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/views/jsp/ui/table/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/main/resources/overview.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/ClasspathConfigurationProviderTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/ClasspathConfigurationProviderTest.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/ClasspathConfigurationProviderTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/ClasspathConfigurationProviderTest.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/ClasspathConfigurationProviderTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/ClasspathConfigurationProviderTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/CustomNamespaceAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/CustomNamespaceAction.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/CustomNamespaceAction.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/CustomNamespaceAction.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/CustomNamespaceAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/CustomNamespaceAction.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/CustomParentPackageAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/CustomParentPackageAction.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/CustomParentPackageAction.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/CustomParentPackageAction.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/CustomParentPackageAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/CustomParentPackageAction.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/cltest/ActionImpl.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/cltest/ActionImpl.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/cltest/ActionImpl.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/cltest/ActionImpl.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/cltest/ActionImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/cltest/ActionImpl.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/cltest/OneResultAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/cltest/OneResultAction.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/cltest/OneResultAction.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/cltest/OneResultAction.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/cltest/OneResultAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/cltest/OneResultAction.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/cltest/TwoResultAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/cltest/TwoResultAction.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/cltest/TwoResultAction.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/cltest/TwoResultAction.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/cltest/TwoResultAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/cltest/TwoResultAction.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ActionContextCleanUpTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ActionContextCleanUpTest.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ActionContextCleanUpTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ActionContextCleanUpTest.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ActionContextCleanUpTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ActionContextCleanUpTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/RolesInterceptorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/RolesInterceptorTest.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/RolesInterceptorTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/RolesInterceptorTest.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/RolesInterceptorTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/RolesInterceptorTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/ContainUtilTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/ContainUtilTest.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/ContainUtilTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/ContainUtilTest.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/ContainUtilTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/core/src/test/java/org/apache/struts2/util/ContainUtilTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/plugins/codebehind/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/codebehind/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java (original)
+++ struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: DWRValidator.java 476642 2006-11-18 22:40:18Z mrdon $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java?view=diff&rev=478625&r1=478624&r2=478625
==============================================================================
--- struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java (original)
+++ struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java Thu Nov 23 09:31:52 2006
@@ -1,5 +1,5 @@
 /*
- * $Id: DWRValidator.java 476642 2006-11-18 22:40:18Z mrdon $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Propchange: struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/plugins/config-browser/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/config-browser/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/plugins/jasperreports/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/jasperreports/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/plugins/jasperreports/src/main/resources/org/apache/struts2/views/jasperreports/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/jfreechart/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/jfreechart/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/plugins/jsf/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/jsf/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/plugins/jsf/src/main/resources/org/apache/struts2/jsf/package.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/pell-multipart/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/pell-multipart/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/plugins/plexus/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/plexus/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/plugins/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/plugins/quickstart/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/quickstart/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/plugins/sitegraph/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/sitegraph/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/plugins/sitemesh/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/sitemesh/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/plugins/spring/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/spring/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: struts/struts2/trunk/plugins/struts1/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/struts2/trunk/plugins/struts1/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL