lofwyr14 closed pull request #15: Tobago 4.x
URL: https://github.com/apache/myfaces-tobago/pull/15
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java
b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java
index 4067ca723..222346a82 100644
---
a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java
+++
b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java
@@ -44,7 +44,6 @@
protected static final String TOBAGO_CONFIG_XSD_2_0_6 =
"/org/apache/myfaces/tobago/config/tobago-config-2.0.6.xsd";
protected static final String TOBAGO_CONFIG_XSD_3_0 =
"/org/apache/myfaces/tobago/config/tobago-config-3.0.xsd";
protected static final String TOBAGO_CONFIG_XSD_4_0 =
"/org/apache/myfaces/tobago/config/tobago-config-4.0.xsd";
- protected static final String TOBAGO_CONFIG_XSD_4_3 =
"/org/apache/myfaces/tobago/config/tobago-config-4.3.xsd";
private static final Logger LOG =
LoggerFactory.getLogger(TobagoConfigEntityResolver.class);
diff --git
a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
index ec2962554..8821def43 100644
---
a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
+++
b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
@@ -90,7 +90,6 @@
private static final int FALLBACK = 761243362;
private static final int VERSIONED = -1407102089;
private static final int RESOURCES = -1983070683;
- private static final int INCLUDES = 90259659;
private static final int EXCLUDES = 1994055129;
private static final int SANITIZER = 1807639849;
private static final int SANITIZER_CLASS = -974266412;
@@ -256,7 +255,6 @@ public void startElement(final String uri, final String
localName, final String
case TYPE:
case RENDERERS:
case RENDERER:
- case INCLUDES:
// nothing to do
break;
@@ -420,7 +418,6 @@ public void endElement(final String uri, final String
localName, final String qN
case PROPERTIES:
case MIME_TYPES:
case MARKUP:
- case INCLUDES:
// nothing to do
break;
@@ -451,9 +448,7 @@ private void validate(final URL url, final
TobagoConfigVersion version)
final SchemaFactory schemaFactory =
SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
final Schema schema;
- if ("4.3".equals(version.getVersion())) {
- schema =
schemaFactory.newSchema(getClass().getResource(TOBAGO_CONFIG_XSD_4_3));
- } else if ("4.0".equals(version.getVersion())) {
+ if ("4.0".equals(version.getVersion())) {
schema =
schemaFactory.newSchema(getClass().getResource(TOBAGO_CONFIG_XSD_4_0));
} else if ("3.0".equals(version.getVersion())) {
schema =
schemaFactory.newSchema(getClass().getResource(TOBAGO_CONFIG_XSD_3_0));
diff --git a/tobago-core/src/main/resources/META-INF/tobago-config.xml
b/tobago-core/src/main/resources/META-INF/tobago-config.xml
index 3ec4891e1..ec4662a18 100644
--- a/tobago-core/src/main/resources/META-INF/tobago-config.xml
+++ b/tobago-core/src/main/resources/META-INF/tobago-config.xml
@@ -20,8 +20,8 @@
<tobago-config
xmlns="http://myfaces.apache.org/tobago/tobago-config";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config
http://myfaces.apache.org/tobago/tobago-config-4.3.xsd";
- version="4.3">
+ xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config
http://myfaces.apache.org/tobago/tobago-config-4.0.xsd";
+ version="4.0">
<name>tobago-config</name>
diff --git
a/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-4.3.xsd
b/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-4.3.xsd
deleted file mode 100644
index c3787f5ab..000000000
---
a/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-4.3.xsd
+++ /dev/null
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xs:schema
- targetNamespace="http://myfaces.apache.org/tobago/tobago-config";
- xmlns:tobago="http://myfaces.apache.org/tobago/tobago-config";
- xmlns:xs="http://www.w3.org/2001/XMLSchema";
- elementFormDefault="qualified"
- version="4.3">
-
- <xs:annotation>
- <xs:documentation>
- <![CDATA[
- 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.
- ]]>
- </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
- <xs:documentation>
- <![CDATA[
-
-
************************************************************************************
-
************************************************************************************
- WARNING
- THIS IS A PRE-RELEASE VERSION OF THIS FILE, PLEASE CHECK IF THERE IS AN
UPDATE ON
- http://myfaces.apache.org/tobago/tobago-config-4.3.xsd
-
************************************************************************************
-
************************************************************************************
-
- This is the XML schema for the Tobago configuration files version 4.3.
-
- Use the following definition:
-
- <tobago-config
- xmlns="http://myfaces.apache.org/tobago/tobago-config";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config
http://myfaces.apache.org/tobago/tobago-config-4.3.xsd";
- version="4.3">
- ...
- </tobago-config>
- ]]>
- </xs:documentation>
- </xs:annotation>
-
- <xs:element name="tobago-config" type="tobago:tobago-config-type"/>
-
- <xs:complexType name="tobago-config-type">
- <xs:sequence>
- <xs:element name="name" type="tobago:name-type" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- Name of this instance of the configuration to be referenced in
other tobago-config.xml files.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ordering" type="tobago:ordering-type" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- Can be used to order this instance of the configuration against
other tobago-config.xml files.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="theme-config" type="tobago:theme-config-type"
minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- Configure the themes to be used.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="create-session-secret" type="xs:boolean" minOccurs="0"
default="true">
-
- </xs:element>
- <xs:element name="check-session-secret" type="xs:boolean" minOccurs="0"
default="true">
-
- </xs:element>
- <xs:element name="prevent-frame-attacks" type="xs:boolean" minOccurs="0"
default="true">
- <xs:annotation>
- <xs:documentation>
- Sets the HTTP header "X-Frame-Options" to "DENY".
- This setting is deprecated but needed for IE11. The current way to
configure this is using
- the Content Security Policy directive 'frame-ancestors'.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="set-nosniff-header" type="xs:boolean" minOccurs="0"
default="true">
- <xs:annotation>
- <xs:documentation>
- Sets the HTTP header "X-Content-Type-Options" to "nosniff".
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="classic-date-time-picker" type="xs:boolean"
minOccurs="0" default="false">
- <xs:annotation>
- <xs:documentation>
- Warning: No longer supported.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="content-security-policy"
type="tobago:content-security-policy-type" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- Define rule for CSP.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="sanitizer" type="tobago:sanitizer-type" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- <![CDATA[
- Define a Java class which implements
org.apache.myfaces.tobago.sanitizer.Sanitizer
- to protect against HTML content of <tc:out escape="true"/> and
- <tc:textarea/>.
-
- This is the default:
- <sanitizer>
-
<sanitizer-class>org.apache.myfaces.tobago.sanitizer.JsoupSanitizer</sanitizer-class>
- <properties>
- <entry key="whitelist">relaxed</entry>
- </properties>
- </sanitizer>
- ]]>
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="decode-line-feed" type="xs:boolean" minOccurs="0"
default="true">
- <xs:annotation>
- <xs:documentation>
- Use LF instead of CR+LF in textarea while decoding.
- HTTP transports usually a line break with CR+LF
- (see https://www.w3.org/TR/html401/interact/forms.html#h-17.13.4).
- When this property is set to true (by default), the Java bean will
get the string only with LF ('\n').
-
- When this property is set to false, there might be a conflict with
the length validator,
- because you have 2 character for each line break.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="security-annotation"
type="tobago:security-annotation-type" minOccurs="0" default="disable">
- <xs:annotation>
- <xs:documentation>
- Defines the behavior of actions in buttons and links, if the
MethodExpression
- has a security annotation.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="theme-definitions"
type="tobago:theme-definitions-type" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- Configuration of a new theme which may come with this JAR file.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="version"
- type="tobago:tobago-config-version-type"
- use="required"/>
- </xs:complexType>
-
- <xs:simpleType name="security-annotation-type">
- <xs:restriction base="xs:token">
- <xs:enumeration value="hide"/>
- <xs:enumeration value="disable"/>
- <xs:enumeration value="ignore"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="tobago-config-version-type">
- <xs:restriction base="xs:token">
- <xs:enumeration value="4.3"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:complexType name="ordering-type">
- <xs:sequence>
- <xs:element name="after" type="tobago:before-after-type" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- This configuration instance needs to be applied after the
referenced instance.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="before" type="tobago:before-after-type" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- This configuration instance needs to be applied before the
referenced instance.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="before-after-type">
- <xs:sequence>
- <xs:element name="name" type="tobago:name-type" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="theme-config-type">
- <xs:sequence>
- <xs:element name="default-theme" type="xs:string">
- <xs:annotation>
- <xs:documentation>
- The default theme, which is used when no theme is selected
programmatically.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="supported-theme" type="xs:string" minOccurs="0"
maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>
- Other supported theme for this application.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="content-security-policy-type">
- <xs:sequence>
- <xs:element name="directive" type="tobago:directive-type"
maxOccurs="unbounded" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- CSP directive to be added to the HTTP header.
- It is possible to define more than one directive with the same
name, to allow
- more than one value.
- The mode defines, if the SCP headers should be written, not
written, or only
- reporting headers should be written.
-
- For more information about the directives see
- https://www.w3.org/TR/CSP/
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="mode" type="tobago:csp-mode-type" use="required"/>
- </xs:complexType>
-
- <xs:complexType name="directive-type">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string" use="required">
- <xs:annotation>
- <xs:documentation>
- Name of the CSP directive e. g. script-src, style-src,
frame-ancestors, child-src, ...
- </xs:documentation>
- </xs:annotation>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:complexType name="sanitizer-type">
- <xs:sequence>
- <xs:element name="sanitizer-class" type="xs:string"/>
- <xs:element name="properties" type="tobago:properties-type"
minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="properties-type">
- <xs:sequence>
- <xs:element name="entry" type="tobago:entry-type" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="entry-type">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="key" type="xs:string" use="required"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
- <xs:simpleType name="csp-mode-type">
- <xs:restriction base="xs:token">
- <xs:enumeration value="on"/>
- <xs:enumeration value="off"/>
- <xs:enumeration value="report-only"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:complexType name="theme-definitions-type">
- <xs:sequence>
- <xs:element name="theme-definition" type="tobago:theme-definition-type"
maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="theme-definition-type">
- <xs:sequence>
- <xs:element name="name" type="xs:string">
- <xs:annotation>
- <xs:documentation>
- The technical name of the theme, which e. g. is used in paths.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="display-name" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- The display name of the theme, which may be used in a theme
selector.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="fallback" type="xs:string" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- The parent of the theme.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="versioned" type="xs:boolean" minOccurs="0"
default="false">
- <xs:annotation>
- <xs:documentation>
- The mode of the theme. If the theme is versioned, a version string
will be encoded into the
- resource path, to avoid caching problems.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="resources" type="tobago:resources-type" minOccurs="0"
maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>
- A list of resources this theme is using.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="resources-type">
- <xs:annotation>
- <xs:documentation>
- Resources can be added, or removed (if they are coming from its
fallback theme).
- To removed the resources, put it inside the "excludes" with the same
name it was included
- in the parent.
-
- There a two different sets of resources, one for production and one
for development.
- Use the production flag to set this mode explicitly.
- </xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="includes" type="tobago:includes-excludes-type"
minOccurs="0"/>
- <xs:element name="excludes" type="tobago:includes-excludes-type"
minOccurs="0"/>
- <xs:element name="script" type="tobago:script-type" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:element name="style" type="tobago:style-type" minOccurs="0"
maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="production" type="xs:boolean" use="required"/>
- </xs:complexType>
-
- <xs:complexType name="includes-excludes-type">
- <xs:sequence>
- <xs:element name="script" type="tobago:script-type" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:element name="style" type="tobago:style-type" minOccurs="0"
maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="script-type">
- <xs:attribute name="name" type="xs:string" use="required"/>
- </xs:complexType>
-
- <xs:complexType name="style-type">
- <xs:attribute name="name" type="xs:string" use="required"/>
- </xs:complexType>
-
- <xs:simpleType name="name-type">
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
-
-</xs:schema>
diff --git
a/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/tobago-config.xml
b/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/tobago-config.xml
index e4839f53a..6756dd6cd 100644
---
a/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/tobago-config.xml
+++
b/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/tobago-config.xml
@@ -20,8 +20,8 @@
<tobago-config
xmlns="http://myfaces.apache.org/tobago/tobago-config";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config
http://myfaces.apache.org/tobago/tobago-config-4.3.xsd";
- version="4.3">
+ xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config
http://myfaces.apache.org/tobago/tobago-config-4.0.xsd";
+ version="4.0">
<theme-config>
<default-theme>standard</default-theme>
diff --git
a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
index 0dac99db7..0187999b7 100644
---
a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
+++
b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
@@ -20,8 +20,8 @@
<tobago-config
xmlns="http://myfaces.apache.org/tobago/tobago-config";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config
http://myfaces.apache.org/tobago/tobago-config-4.3.xsd";
- version="4.3">
+ xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config
http://myfaces.apache.org/tobago/tobago-config-4.0.xsd";
+ version="4.0">
<name>demo</name>
diff --git
a/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml
b/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml
index 31863f2f5..04e9b0f45 100644
---
a/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml
+++
b/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/tobago-config.xml
@@ -20,8 +20,8 @@
<tobago-config
xmlns="http://myfaces.apache.org/tobago/tobago-config";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config
http://myfaces.apache.org/tobago/tobago-config-4.3.xsd";
- version="4.3">
+ xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config
http://myfaces.apache.org/tobago/tobago-config-4.0.xsd";
+ version="4.0">
<name>tobago-theme-charlotteville</name>
<ordering>
<after>
@@ -35,20 +35,18 @@
<fallback>standard</fallback>
<versioned>true</versioned>
<resources production="true">
- <includes>
- <style
name="/tobago/charlotteville/tobago-bootstrap/${project.version}/css/tobago.min.css"/>
- </includes>
<excludes>
<style
name="/tobago/standard/tobago-bootstrap/${project.version}/css/tobago.min.css"/>
</excludes>
+ <script
name="/tobago/charlotteville/tobago-bootstrap/${project.version}/js/bootstrap.min.js"/>
+ <style
name="/tobago/charlotteville/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
</resources>
<resources production="false">
- <includes>
- <style
name="/tobago/charlotteville/tobago-bootstrap/${project.version}/css/tobago.css"/>
- </includes>
<excludes>
<style
name="/tobago/standard/tobago-bootstrap/${project.version}/css/tobago.css"/>
</excludes>
+ <script
name="/tobago/charlotteville/tobago-bootstrap/${project.version}/js/bootstrap.js"/>
+ <style
name="/tobago/charlotteville/tobago-bootstrap/${project.version}/css/bootstrap.css"/>
</resources>
</theme-definition>
</theme-definitions>
diff --git
a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/tobago-config.xml
b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/tobago-config.xml
index 7bc79d743..e607f5009 100644
---
a/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/tobago-config.xml
+++
b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/tobago-config.xml
@@ -20,8 +20,8 @@
<tobago-config
xmlns="http://myfaces.apache.org/tobago/tobago-config";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config
http://myfaces.apache.org/tobago/tobago-config-4.3.xsd";
- version="4.3">
+ xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config
http://myfaces.apache.org/tobago/tobago-config-4.0.xsd";
+ version="4.0">
<name>tobago-theme-roxborough</name>
<ordering>
<after>
@@ -35,20 +35,18 @@
<fallback>standard</fallback>
<versioned>true</versioned>
<resources production="true">
- <includes>
- <style
name="/tobago/roxborough/tobago-bootstrap/${project.version}/css/tobago.min.css"/>
- </includes>
<excludes>
<style
name="/tobago/standard/tobago-bootstrap/${project.version}/css/tobago.min.css"/>
</excludes>
+ <script
name="/tobago/roxborough/tobago-bootstrap/${project.version}/js/bootstrap.min.js"/>
+ <style
name="/tobago/roxborough/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
</resources>
<resources production="false">
- <includes>
- <style
name="/tobago/roxborough/tobago-bootstrap/${project.version}/css/tobago.css"/>
- </includes>
<excludes>
<style
name="/tobago/standard/tobago-bootstrap/${project.version}/css/tobago.css"/>
</excludes>
+ <script
name="/tobago/roxborough/tobago-bootstrap/${project.version}/js/bootstrap.js"/>
+ <style
name="/tobago/roxborough/tobago-bootstrap/${project.version}/css/bootstrap.css"/>
</resources>
</theme-definition>
</theme-definitions>
diff --git
a/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml
b/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml
index 884f0aba1..12fa99b75 100644
---
a/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml
+++
b/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/tobago-config.xml
@@ -20,8 +20,8 @@
<tobago-config
xmlns="http://myfaces.apache.org/tobago/tobago-config";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config
http://myfaces.apache.org/tobago/tobago-config-4.3.xsd";
- version="4.3">
+ xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config
http://myfaces.apache.org/tobago/tobago-config-4.0.xsd";
+ version="4.0">
<name>tobago-theme-scarborough</name>
<ordering>
<after>
@@ -35,20 +35,18 @@
<fallback>standard</fallback>
<versioned>true</versioned>
<resources production="true">
- <includes>
- <style
name="/tobago/scarborough/tobago-bootstrap/${project.version}/css/tobago.min.css"/>
- </includes>
<excludes>
<style
name="/tobago/standard/tobago-bootstrap/${project.version}/css/tobago.min.css"/>
</excludes>
+ <script
name="/tobago/scarborough/tobago-bootstrap/${project.version}/js/bootstrap.min.js"/>
+ <style
name="/tobago/scarborough/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
</resources>
<resources production="false">
- <includes>
- <style
name="/tobago/scarborough/tobago-bootstrap/${project.version}/css/tobago.css"/>
- </includes>
<excludes>
<style
name="/tobago/standard/tobago-bootstrap/${project.version}/css/tobago.css"/>
</excludes>
+ <script
name="/tobago/scarborough/tobago-bootstrap/${project.version}/js/bootstrap.js"/>
+ <style
name="/tobago/scarborough/tobago-bootstrap/${project.version}/css/bootstrap.css"/>
</resources>
</theme-definition>
</theme-definitions>
diff --git
a/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml
b/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml
index 20467871b..32138d71e 100644
---
a/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml
+++
b/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/tobago-config.xml
@@ -20,8 +20,8 @@
<tobago-config
xmlns="http://myfaces.apache.org/tobago/tobago-config";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config
http://myfaces.apache.org/tobago/tobago-config-4.3.xsd";
- version="4.3">
+ xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config
http://myfaces.apache.org/tobago/tobago-config-4.0.xsd";
+ version="4.0">
<name>tobago-theme-speyside</name>
<ordering>
<after>
@@ -35,20 +35,18 @@
<fallback>standard</fallback>
<versioned>true</versioned>
<resources production="true">
- <includes>
- <style
name="/tobago/speyside/tobago-bootstrap/${project.version}/css/tobago.min.css"/>
- </includes>
<excludes>
<style
name="/tobago/standard/tobago-bootstrap/${project.version}/css/tobago.min.css"/>
</excludes>
+ <script
name="/tobago/speyside/tobago-bootstrap/${project.version}/js/bootstrap.min.js"/>
+ <style
name="/tobago/speyside/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
</resources>
<resources production="false">
- <includes>
- <style
name="/tobago/speyside/tobago-bootstrap/${project.version}/css/tobago.css"/>
- </includes>
<excludes>
<style
name="/tobago/standard/tobago-bootstrap/${project.version}/css/tobago.css"/>
</excludes>
+ <script
name="/tobago/speyside/tobago-bootstrap/${project.version}/js/bootstrap.js"/>
+ <style
name="/tobago/speyside/tobago-bootstrap/${project.version}/css/bootstrap.css"/>
</resources>
</theme-definition>
</theme-definitions>
diff --git
a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
index 6c8baf3c7..0aef60b8d 100644
---
a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
+++
b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
@@ -20,8 +20,8 @@
<tobago-config
xmlns="http://myfaces.apache.org/tobago/tobago-config";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config
http://myfaces.apache.org/tobago/tobago-config-4.3.xsd";
- version="4.3">
+ xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config
http://myfaces.apache.org/tobago/tobago-config-4.0.xsd";
+ version="4.0">
<name>tobago-theme-standard</name>
@@ -37,53 +37,49 @@
<display-name>Standard Theme</display-name>
<versioned>true</versioned>
<resources production="true">
- <includes>
- <script name="/webjars/jquery/3.3.1-1/jquery.min.js"/>
- <script
name="/tobago/pack/jquery-ui/1.12.1.custom/jquery-ui.min.js"/>
- <script name="/webjars/tether/1.4.0/js/tether.min.js"/>
- <script name="/webjars/popper.js/1.14.3/umd/popper.min.js"/>
- <script name="/webjars/bootstrap/4.1.3/js/bootstrap.min.js"/>
- <script
name="/webjars/momentjs/2.22.2/min/moment-with-locales.min.js"/>
- <script
name="/webjars/Eonasdan-bootstrap-datetimepicker/4.17.47/js/bootstrap-datetimepicker.min.js"/>
- <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago.min.js"/>
- <script
name="/tobago/pack/typeahead/0.11.1-patched-with-1212/typeahead.min.js"/>
- <style name="/webjars/tether/1.4.0/css/tether.min.css"/>
- <style
name="/tobago/standard/tobago-bootstrap/${project.version}/css/tobago.min.css"/>
- <style name="/webjars/font-awesome/4.7.0/css/font-awesome.min.css"/>
- <style
name="/webjars/Eonasdan-bootstrap-datetimepicker/4.17.47/css/bootstrap-datetimepicker.min.css"/>
- </includes>
+ <script name="/tobago/standard/jquery/jquery-3.3.1.min.js"/>
+ <script
name="/tobago/standard/jquery-ui/1.12.1.custom/jquery-ui.min.js"/>
+ <script name="/tobago/standard/tether/1.1.1/js/tether.min.js"/>
+ <script name="/tobago/standard/popper-js/1.12.3/popper.min.js"/>
+ <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/bootstrap.min.js"/>
+ <script
name="/tobago/standard/moment/2.13.0/moment-with-locales.min.js"/>
+ <script
name="/tobago/standard/bootstrap-datetimepicker/4.17.45/js/bootstrap-datetimepicker.min.js"/>
+ <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago.min.js"/>
+ <script
name="/tobago/standard/typeahead/0.11.1-patched-with-1212/typeahead.min.js"/>
+ <style name="/tobago/standard/tether/1.1.1/css/tether.min.css"/>
+ <style
name="/tobago/standard/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
+ <style
name="/tobago/standard/font-awesome/4.7.0/css/font-awesome.min.css"/>
+ <style
name="/tobago/standard/bootstrap-datetimepicker/4.17.45/css/bootstrap-datetimepicker.min.css"/>
</resources>
<resources production="false">
- <includes>
- <script name="/webjars/jquery/3.3.1-1/jquery.js"/>
- <script name="/tobago/pack/jquery-ui/1.12.1.custom/jquery-ui.js"/>
- <script name="/webjars/tether/1.4.0/js/tether.js"/>
- <script name="/webjars/popper.js/1.14.3/umd/popper.js"/>
- <script name="/webjars/bootstrap/4.1.3/js/bootstrap.js"/>
- <script name="/webjars/momentjs/2.22.2/min/moment-with-locales.js"/>
- <script
name="/webjars/Eonasdan-bootstrap-datetimepicker/4.17.47/js/bootstrap-datetimepicker.js"/>
- <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-jsf.js"/>
- <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-deltaspike.js"/>
- <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago.js"/>
- <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-dropdown.js"/>
- <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-calendar.js"/>
- <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-console.js"/>
- <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-in.js"/>
- <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-layout.js"/>
- <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-overlay.js"/>
- <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-popup.js"/>
- <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-sheet.js"/>
- <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-stars.js"/>
- <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-suggest.js"/>
- <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-tab.js"/>
- <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-tree.js"/>
- <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-utils.js"/>
- <script
name="/tobago/pack/typeahead/0.11.1-patched-with-1212/typeahead.js"/>
- <style name="/webjars/tether/1.4.0/css/tether.css"/>
- <style
name="/tobago/standard/tobago-bootstrap/${project.version}/css/tobago.css"/>
- <style name="/webjars/font-awesome/4.7.0/css/font-awesome.css"/>
- <style
name="/webjars/Eonasdan-bootstrap-datetimepicker/4.17.47/css/bootstrap-datetimepicker.css"/>
- </includes>
+ <script name="/tobago/standard/jquery/jquery-3.3.1.js"/>
+ <script name="/tobago/standard/jquery-ui/1.12.1.custom/jquery-ui.js"/>
+ <script name="/tobago/standard/tether/1.1.1/js/tether.js"/>
+ <script name="/tobago/standard/popper-js/1.12.3/popper.js"/>
+ <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/bootstrap.js"/>
+ <script name="/tobago/standard/moment/2.13.0/moment-with-locales.js"/>
+ <script
name="/tobago/standard/bootstrap-datetimepicker/4.17.45/js/bootstrap-datetimepicker.js"/>
+ <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-jsf.js"/>
+ <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-deltaspike.js"/>
+ <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago.js"/>
+ <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-dropdown.js"/>
+ <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-calendar.js"/>
+ <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-console.js"/>
+ <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-in.js"/>
+ <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-layout.js"/>
+ <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-overlay.js"/>
+ <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-popup.js"/>
+ <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-sheet.js"/>
+ <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-stars.js"/>
+ <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-suggest.js"/>
+ <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-tab.js"/>
+ <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-tree.js"/>
+ <script
name="/tobago/standard/tobago-bootstrap/${project.version}/js/tobago-utils.js"/>
+ <script
name="/tobago/standard/typeahead/0.11.1-patched-with-1212/typeahead.js"/>
+ <style name="/tobago/standard/tether/1.1.1/css/tether.css"/>
+ <style
name="/tobago/standard/tobago-bootstrap/${project.version}/css/bootstrap.css"/>
+ <style
name="/tobago/standard/font-awesome/4.7.0/css/font-awesome.css"/>
+ <style
name="/tobago/standard/bootstrap-datetimepicker/4.17.45/css/bootstrap-datetimepicker.css"/>
</resources>
</theme-definition>
</theme-definitions>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
