svn commit: r497663 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations: StrutsTag.java StrutsTagAttribute.java

[rg...@apache.org]

Author: rgielen
Date: Thu Jan 18 16:44:43 2007
New Revision: 497663

URL: http://svn.apache.org/viewvc?view=rev&rev=497663
Log:
WW-1392:
- Move annotation definitions back to core, due to making the taglib extensible and removing the runtime deps on struts-annotations
- Set annotation retention to RUNTIME to enable external taglib extensions

Added:
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTag.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTagAttribute.java

Added: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTag.java?view=auto&rev=497663
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTag.java (added)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTag.java Thu Jan 18 16:44:43 2007
@@ -0,0 +1,42 @@
+/*
+ * $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.views.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * An annotation to document a Struts jsp/freemarker/velocity tag
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface StrutsTag {
+    String name();
+
+    String tldBodyContent() default "JSP";
+
+    String tldTagClass();
+
+    String description();
+}

Added: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTagAttribute.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTagAttribute.java?view=auto&rev=497663
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTagAttribute.java (added)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/annotations/StrutsTagAttribute.java Thu Jan 18 16:44:43 2007
@@ -0,0 +1,46 @@
+/*
+ * $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.views.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Documents an attribute to a Struts tag
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface StrutsTagAttribute {
+    String name() default "";
+
+    boolean required() default false;
+
+    boolean rtexprvalue() default true;
+
+    String description();
+
+    String defaultValue() default "";
+
+    String type() default "String";
+}