Comparing Adobe-Consulting-Services/acs-aem-commons dff0cce..2fdd967

View on GitHub
9 changed files with 225 additions and 10 deletions.
+8, -8•bundle/pom.xml
@@ -49,7 +49,7 @@
<configuration>
<instructions>
<Bundle-Activator>com.adobe.acs.commons.util.impl.Activator</Bundle-Activator>
<Bundle-SymbolicName>com.adobe.acs.acs-aem-commons-bundle</Bundle-SymbolicName>
<Bundle-SymbolicName>com.adobe.acs.acs-aem-commons-bundle</Bundle-SymbolicName>
<Import-Package>
com.adobe.cq.dialogconversion;resolution:=optional,
sun.misc.*;resolution:=optional,
@@ -396,12 +396,12 @@
<version>2.14.0</version>
<scope>test</scope>
</dependency>
<dependency>
<artifactId>jackrabbit-api</artifactId>
<version>2.16.3</version>
<groupId>org.apache.jackrabbit</groupId>
<scope>test</scope>
</dependency>
<dependency>
<artifactId>jackrabbit-api</artifactId>
<version>2.16.3</version>
<groupId>org.apache.jackrabbit</groupId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-imaging</artifactId>
@@ -514,7 +514,7 @@
</dependency>
<!-- Build Dependencies -->
<!-- Build Dependencies -->
<dependency>
<groupId>com.google.code.tld-generator</groupId>
<artifactId>tld-generator</artifactId>
+10•/dev/null → bundle/src/main/resources/META-INF/audio.tld
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<taglib version="2.1" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<tlib-version>1.0</tlib-version>
<uri>http://www.adobe.com/consulting/acs-aem-commons/audio</uri>
<function>
<name>getHtmlSource</name>
<function-class>com.adobe.acs.commons.dam.audio.AudioFunctions</function-class>
<function-signature>java.lang.String getHtmlSource(com.day.cq.dam.api.Rendition,com.day.cq.dam.video.VideoProfile)</function-signature>
</function>
</taglib>
(No newline at end of file.)
+10•/dev/null → bundle/src/main/resources/META-INF/dam.tld
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<taglib version="2.1" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<tlib-version>1.0</tlib-version>
<uri>http://www.adobe.com/consulting/acs-aem-commons/dam</uri>
<function>
<name>getTitleOrName</name>
<function-class>com.adobe.acs.commons.dam.DAMFunctions</function-class>
<function-signature>java.lang.String getTitleOrName(com.day.cq.dam.api.Asset)</function-signature>
</function>
</taglib>
(No newline at end of file.)
+31•/dev/null → bundle/src/main/resources/META-INF/dhlm.tld
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8" ?>
<taglib version="2.1" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<tlib-version>1.0</tlib-version>
<uri>http://www.adobe.com/consulting/acs-aem-commons/dhlm</uri>
<tag>
<name>includeClientLibraries</name>
<tag-class>com.adobe.acs.commons.designer.IncludeDesignLibrariesTag</tag-class>
<body-content>empty</body-content>
<attribute>
<name>css</name>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.Boolean</type>
</attribute>
<attribute>
<name>design</name>
<rtexprvalue>true</rtexprvalue>
<type>com.day.cq.wcm.api.designer.Design</type>
</attribute>
<attribute>
<name>js</name>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.Boolean</type>
</attribute>
<attribute>
<name>region</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
</tag>
</taglib>
(No newline at end of file.)
+28•/dev/null → bundle/src/main/resources/META-INF/wcm.tld
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8" ?>
<taglib version="2.1" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<tlib-version>1.0</tlib-version>
<uri>http://www.adobe.com/consulting/acs-aem-commons/wcm</uri>
<tag>
<name>defineObjects</name>
<tag-class>com.adobe.acs.commons.wcm.tags.DefineObjects</tag-class>
<body-content>JSP</body-content>
</tag>
<tag>
<name>placeholder</name>
<tag-class>com.adobe.acs.commons.wcm.tags.PlaceholderTag</tag-class>
<body-content>JSP</body-content>
<attribute>
<name>classNames</name>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>ddType</name>
<type>java.lang.String</type>
</attribute>
</tag>
<function>
<name>hasTemplate</name>
<function-class>com.adobe.acs.commons.util.TemplateUtil</function-class>
<function-signature>boolean hasTemplate(com.day.cq.wcm.api.Page,java.lang.String)</function-signature>
</function>
</taglib>
(No newline at end of file.)
+81•/dev/null → bundle/src/main/resources/META-INF/wcmmode.tld
@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="UTF-8" ?>
<taglib version="2.1" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<tlib-version>1.0</tlib-version>
<uri>http://www.adobe.com/consulting/acs-aem-commons/wcmmode</uri>
<tag>
<name>preview</name>
<tag-class>com.adobe.acs.commons.wcm.tags.wcmmode.PreviewMode</tag-class>
<body-content>JSP</body-content>
<attribute>
<name>not</name>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.Boolean</type>
</attribute>
</tag>
<tag>
<name>design</name>
<tag-class>com.adobe.acs.commons.wcm.tags.wcmmode.DesignMode</tag-class>
<body-content>JSP</body-content>
<attribute>
<name>not</name>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.Boolean</type>
</attribute>
</tag>
<tag>
<name>disabled</name>
<tag-class>com.adobe.acs.commons.wcm.tags.wcmmode.DisabledMode</tag-class>
<body-content>JSP</body-content>
<attribute>
<name>not</name>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.Boolean</type>
</attribute>
</tag>
<tag>
<name>edit</name>
<tag-class>com.adobe.acs.commons.wcm.tags.wcmmode.EditMode</tag-class>
<body-content>JSP</body-content>
<attribute>
<name>not</name>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.Boolean</type>
</attribute>
</tag>
<tag>
<name>setMode</name>
<tag-class>com.adobe.acs.commons.wcm.tags.wcmmode.SetWCMMode</tag-class>
<body-content>JSP</body-content>
<attribute>
<name>mode</name>
<required>true</required>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.String</type>
</attribute>
<attribute>
<name>restore</name>
<rtexprvalue>true</rtexprvalue>
<type>java.lang.Boolean</type>
</attribute>
</tag>
<function>
<name>isDesign</name>
<function-class>com.adobe.acs.commons.wcm.tags.wcmmode.WCMModeFunctions</function-class>
<function-signature>boolean isDesign(javax.servlet.jsp.PageContext)</function-signature>
</function>
<function>
<name>isDisabled</name>
<function-class>com.adobe.acs.commons.wcm.tags.wcmmode.WCMModeFunctions</function-class>
<function-signature>boolean isDisabled(javax.servlet.jsp.PageContext)</function-signature>
</function>
<function>
<name>isEdit</name>
<function-class>com.adobe.acs.commons.wcm.tags.wcmmode.WCMModeFunctions</function-class>
<function-signature>boolean isEdit(javax.servlet.jsp.PageContext)</function-signature>
</function>
<function>
<name>isPreview</name>
<function-class>com.adobe.acs.commons.wcm.tags.wcmmode.WCMModeFunctions</function-class>
<function-signature>boolean isPreview(javax.servlet.jsp.PageContext)</function-signature>
</function>
</taglib>
(No newline at end of file.)
+10•/dev/null → bundle/src/main/resources/META-INF/widgets.tld
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<taglib version="2.1" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<tlib-version>1.0</tlib-version>
<uri>http://www.adobe.com/consulting/acs-aem-commons/widgets</uri>
<function>
<name>getMultiFieldPanelValues</name>
<function-class>com.adobe.acs.commons.widgets.MultiFieldPanelFunctions</function-class>
<function-signature>java.util.List&lt;java.util.Map&lt;java.lang.String,java.lang.String&gt;&gt; getMultiFieldPanelValues(org.apache.sling.api.resource.Resource,java.lang.String)</function-signature>
</function>
</taglib>
(No newline at end of file.)
+45•/dev/null → bundle/src/main/resources/META-INF/xss.tld
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8" ?>
<taglib version="2.1" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<tlib-version>1.0</tlib-version>
<uri>http://www.adobe.com/consulting/acs-aem-commons/xss</uri>
<function>
<name>encodeForHTML</name>
<function-class>com.adobe.acs.commons.xss.XSSFunctions</function-class>
<function-signature>java.lang.CharSequence encodeForHTML(com.adobe.granite.xss.XSSAPI,java.lang.String)</function-signature>
</function>
<function>
<name>encodeForHTMLAttr</name>
<function-class>com.adobe.acs.commons.xss.XSSFunctions</function-class>
<function-signature>java.lang.CharSequence encodeForHTMLAttr(com.adobe.granite.xss.XSSAPI,java.lang.String)</function-signature>
</function>
<function>
<name>encodeForJSString</name>
<function-class>com.adobe.acs.commons.xss.XSSFunctions</function-class>
<function-signature>java.lang.CharSequence encodeForJSString(com.adobe.granite.xss.XSSAPI,java.lang.String)</function-signature>
</function>
<function>
<name>filterHTML</name>
<function-class>com.adobe.acs.commons.xss.XSSFunctions</function-class>
<function-signature>java.lang.CharSequence filterHTML(com.adobe.granite.xss.XSSAPI,java.lang.String)</function-signature>
</function>
<function>
<name>getValidHref</name>
<function-class>com.adobe.acs.commons.xss.XSSFunctions</function-class>
<function-signature>java.lang.CharSequence getValidHref(com.adobe.granite.xss.XSSAPI,java.lang.String)</function-signature>
</function>
<function>
<name>getValidDimension</name>
<function-class>com.adobe.acs.commons.xss.XSSFunctions</function-class>
<function-signature>java.lang.String getValidDimension(com.adobe.granite.xss.XSSAPI,java.lang.String,java.lang.String)</function-signature>
</function>
<function>
<name>getValidInteger</name>
<function-class>com.adobe.acs.commons.xss.XSSFunctions</function-class>
<function-signature>java.lang.Integer getValidInteger(com.adobe.granite.xss.XSSAPI,java.lang.String,int)</function-signature>
</function>
<function>
<name>getValidJSToken</name>
<function-class>com.adobe.acs.commons.xss.XSSFunctions</function-class>
<function-signature>java.lang.String getValidJSToken(com.adobe.granite.xss.XSSAPI,java.lang.String,java.lang.String)</function-signature>
</function>
</taglib>
(No newline at end of file.)
+2, -2•pom.xml
@@ -71,7 +71,7 @@
3.5.1: Manifest XML files are generated but are completely empty
3.5.0: Produces 57 test failures
-->
<version>3.3.0</version>
<version>3.4.0</version>
<extensions>true</extensions>
<executions>
<execution>
@@ -502,7 +502,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.6</version>
<version>1.6.4</version>
</dependency>
<dependency>
<groupId>org.jacoco</groupId>