Merge remote-tracking branch 'origin/1.x'

ao-apps · Oct 2, 2023 · 0865575 · 0865575
2 parents dba367c + c98369a
commit 0865575
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/book/src/main/resources-filtered/META-INF/resources/core/taglib/changelog.jspx b/book/src/main/resources-filtered/META-INF/resources/core/taglib/changelog.jspx
@@ -37,7 +37,7 @@ along with semanticcms-core-taglib.  If not, see <https://www.gnu.org/licenses/>
     shortTitle="Changelog"
     tocLevels="1"
     datePublished="2016-10-30T20:28:28-05:00"
-    dateModified="2022-02-15T21:37:30-06:00"
+    dateModified="2023-10-02T12:28:06Z"
   >
     <c:set var="latestRelease" value="1.15.2" />
     <c:if test="${
@@ -120,6 +120,10 @@ along with semanticcms-core-taglib.  If not, see <https://www.gnu.org/licenses/>
             No longer using <code>HideJspExtensionFilter</code> because <core:link book="/" page="/" /> 2
             references pages by abstract path instead of implementation page.
           </li>
+          <li>
+            <code>PropertyTag.name</code> attribute is now
+            <code>java.lang.Object</code> instead of <code>java.lang.String</code>.
+          </li>
         </ul>
       </changelog:release>
     </c:if>

diff --git a/src/main/java/com/semanticcms/core/taglib/ElementTag.java b/src/main/java/com/semanticcms/core/taglib/ElementTag.java
@@ -1,6 +1,6 @@
 /*
  * semanticcms-core-taglib - Java API for modeling web page content and relationships in a JSP environment.
- * Copyright (C) 2013, 2014, 2015, 2016, 2017, 2019, 2020, 2021, 2022  AO Industries, Inc.
+ * Copyright (C) 2013, 2014, 2015, 2016, 2017, 2019, 2020, 2021, 2022, 2023  AO Industries, Inc.
  *     [email protected]
  *     7262 Bull Pen Cir
  *     Mobile, AL 36695
@@ -24,7 +24,7 @@
 package com.semanticcms.core.taglib;
 
 import static com.aoapps.lang.Strings.nullIfEmpty;
-import static com.aoapps.taglib.AttributeUtils.resolveValue;
+import static com.aoapps.servlet.el.ElUtils.resolveValue;
 import static com.semanticcms.core.taglib.PageTag.PROPERTY_ATTRIBUTE_PREFIX;
 
 import com.aoapps.encoding.taglib.EncodingBufferedTag;

diff --git a/src/main/java/com/semanticcms/core/taglib/PropertyTag.java b/src/main/java/com/semanticcms/core/taglib/PropertyTag.java
@@ -1,6 +1,6 @@
 /*
  * semanticcms-core-taglib - Java API for modeling web page content and relationships in a JSP environment.
- * Copyright (C) 2017, 2020, 2021, 2022  AO Industries, Inc.
+ * Copyright (C) 2017, 2020, 2021, 2022, 2023  AO Industries, Inc.
  *     [email protected]
  *     7262 Bull Pen Cir
  *     Mobile, AL 36695
@@ -25,7 +25,9 @@
 
 import com.aoapps.encoding.MediaType;
 import com.aoapps.encoding.taglib.EncodingBufferedTag;
+import com.aoapps.html.any.attributes.text.Name;
 import com.aoapps.io.buffer.BufferResult;
+import com.aoapps.lang.Coercion;
 import com.aoapps.servlet.jsp.LocalizedJspTagException;
 import com.aoapps.taglib.AttributeRequiredException;
 import com.aoapps.taglib.NameAttribute;
@@ -61,8 +63,8 @@ public MediaType getOutputType() {
   }
 
   @Override
-  public void setName(String name) {
-    this.name = name;
+  public void setName(Object name) throws IOException {
+    this.name = Coercion.toString(Name.name.normalize(name));
   }
 
   @Override

diff --git a/src/main/java/com/semanticcms/core/taglib/WriteNodeBodyTag.java b/src/main/java/com/semanticcms/core/taglib/WriteNodeBodyTag.java
@@ -1,6 +1,6 @@
 /*
  * semanticcms-core-taglib - Java API for modeling web page content and relationships in a JSP environment.
- * Copyright (C) 2015, 2016, 2017, 2020, 2021, 2022  AO Industries, Inc.
+ * Copyright (C) 2015, 2016, 2017, 2020, 2021, 2022, 2023  AO Industries, Inc.
  *     [email protected]
  *     7262 Bull Pen Cir
  *     Mobile, AL 36695
@@ -23,7 +23,7 @@
 
 package com.semanticcms.core.taglib;
 
-import static com.aoapps.taglib.AttributeUtils.resolveValue;
+import static com.aoapps.servlet.el.ElUtils.resolveValue;
 
 import com.semanticcms.core.model.Node;
 import com.semanticcms.core.model.NodeBodyWriter;

diff --git a/src/main/resources-filtered/META-INF/semanticcms-core.tld b/src/main/resources-filtered/META-INF/semanticcms-core.tld
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 semanticcms-core-taglib - Java API for modeling web page content and relationships in a JSP environment.
-Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022  AO Industries, Inc.
+Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023  AO Industries, Inc.
     [email protected]
     7262 Bull Pen Cir
     Mobile, AL 36695
@@ -1128,7 +1128,7 @@ along with semanticcms-core-taglib.  If not, see <https://www.gnu.org/licenses/>
   </tag>
   <tag>
     <!-- datePublished="2017-07-19T12:12:39-05:00" -->
-    <!-- dateModified="2021-06-16T13:20:50-05:00" -->
+    <!-- dateModified="2023-10-02T12:28:06Z" -->
     <description><![CDATA[
       <p>
         Sets a property of a
@@ -1152,7 +1152,7 @@ along with semanticcms-core-taglib.  If not, see <https://www.gnu.org/licenses/>
       <name>name</name>
       <required>true</required>
       <rtexprvalue>true</rtexprvalue>
-      <type>java.lang.String</type>
+      <type>java.lang.Object</type>
     </attribute>
     <attribute>
       <description><![CDATA[