You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2015/02/18 15:30:05 UTC
svn commit: r1660635 - in
/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src:
main/java/org/apache/myfaces/tobago/config/
main/java/org/apache/myfaces/tobago/internal/config/
main/java/org/apache/myfaces/tobago/internal/util/ main/resources/org/apac...
Author: lofwyr
Date: Wed Feb 18 14:30:04 2015
New Revision: 1660635
URL: http://svn.apache.org/r1660635
Log:
TOBAGO-1433: Supported resource types should be configurable
Added:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-2.0.6.xsd
- copied, changed from r1658912, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-2.0.xsd
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/TobagoConfigMergingUnitTest.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtilsUniTest.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/resources/tobago-config-merge-1.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/resources/tobago-config-merge-2.xml
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java?rev=1660635&r1=1660634&r2=1660635&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java Wed Feb 18 14:30:04 2015
@@ -27,6 +27,7 @@ import org.apache.myfaces.tobago.sanitiz
import javax.faces.context.FacesContext;
import javax.servlet.ServletContext;
import java.util.List;
+import java.util.Map;
public abstract class TobagoConfig {
@@ -62,6 +63,8 @@ public abstract class TobagoConfig {
public abstract boolean isAutoAccessKeyFromLabel();
+ public abstract Map<String, String> getMimeTypes();
+
/**
* @return false
* @deprecated since Tobago 3.0.0
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java?rev=1660635&r1=1660634&r2=1660635&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigEntityResolver.java Wed Feb 18 14:30:04 2015
@@ -38,6 +38,7 @@ public class TobagoConfigEntityResolver
@Deprecated
protected static final String TOBAGO_CONFIG_XSD_1_6 = "/org/apache/myfaces/tobago/config/tobago-config-1.6.xsd";
protected static final String TOBAGO_CONFIG_XSD_2_0 = "/org/apache/myfaces/tobago/config/tobago-config-2.0.xsd";
+ protected static final String TOBAGO_CONFIG_XSD_2_0_6 = "/org/apache/myfaces/tobago/config/tobago-config-2.0.6.xsd";
private static final Logger LOG = LoggerFactory.getLogger(TobagoConfigEntityResolver.class);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java?rev=1660635&r1=1660634&r2=1660635&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigFragment.java Wed Feb 18 14:30:04 2015
@@ -25,7 +25,9 @@ import org.slf4j.LoggerFactory;
import java.net.URL;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
public class TobagoConfigFragment {
@@ -50,6 +52,7 @@ public class TobagoConfigFragment {
private String sanitizerClass;
private Properties sanitizerProperties;
private Boolean autoAccessKeyFromLabel;
+ private Map<String, String> mimeTypes;
public TobagoConfigFragment() {
before = new ArrayList<String>();
@@ -57,6 +60,7 @@ public class TobagoConfigFragment {
supportedThemeNames = new ArrayList<String>();
resourceDirs = new ArrayList<String>();
themeDefinitions = new ArrayList<ThemeImpl>();
+ mimeTypes = new HashMap<String, String>();
}
public void addSupportedThemeName(final String name) {
@@ -200,6 +204,14 @@ public class TobagoConfigFragment {
this.autoAccessKeyFromLabel = autoAccessKeyFromLabel;
}
+ public void addMimeType(String extension, String type) {
+ this.mimeTypes.put(extension, type);
+ }
+
+ public Map<String, String> getMimeTypes() {
+ return mimeTypes;
+ }
+
@Override
public String toString() {
return name != null ? name : "(id=" + System.identityHashCode(this) + ")";
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java?rev=1660635&r1=1660634&r2=1660635&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java Wed Feb 18 14:30:04 2015
@@ -36,6 +36,7 @@ import javax.naming.NamingException;
import javax.servlet.ServletContext;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -66,6 +67,7 @@ public class TobagoConfigImpl extends To
private Map<String, String> defaultValidatorInfo;
private Sanitizer sanitizer;
private boolean autoAccessKeyFromLabel;
+ private Map<String, String> mimeTypes;
private boolean unmodifiable = false;
@@ -79,6 +81,7 @@ public class TobagoConfigImpl extends To
setNosniffHeader = true;
contentSecurityPolicy = new ContentSecurityPolicy(ContentSecurityPolicy.Mode.OFF.getValue());
autoAccessKeyFromLabel = true;
+ mimeTypes = new HashMap<String, String>();
}
/**
@@ -98,6 +101,8 @@ public class TobagoConfigImpl extends To
((RenderersConfigImpl) renderersConfig).lock();
}
contentSecurityPolicy.lock();
+
+ mimeTypes = Collections.unmodifiableMap(mimeTypes);
}
private void checkLocked() throws IllegalStateException {
@@ -360,6 +365,11 @@ public class TobagoConfigImpl extends To
this.autoAccessKeyFromLabel = autoAccessKeyFromLabel;
}
+ @Override
+ public Map<String, String> getMimeTypes() {
+ return mimeTypes;
+ }
+
/**
* {@inheritDoc}
*/
@@ -405,6 +415,8 @@ public class TobagoConfigImpl extends To
builder.append(", \nthemes=");
final Set<Theme> all = new HashSet<Theme>(availableThemes.values());
builder.append(all);
+ builder.append(", \nmimeTypes=");
+ builder.append(mimeTypes);
builder.append('}');
return builder.toString();
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java?rev=1660635&r1=1660634&r2=1660635&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java Wed Feb 18 14:30:04 2015
@@ -82,6 +82,10 @@ public class TobagoConfigParser extends
private static final int PROPERTIES = -926053069;
private static final int ENTRY = 96667762;
private static final int AUTO_ACCESS_KEY_FROM_LABEL = 2070339882;
+ private static final int MIME_TYPES = 1081186720;
+ private static final int MIME_TYPE = -242217677;
+ private static final int EXTENSION = -612557761;
+ private static final int TYPE = 3575610;
private TobagoConfigFragment tobagoConfig;
private RendererConfig currentRenderer;
@@ -90,6 +94,8 @@ public class TobagoConfigParser extends
private StringBuilder buffer;
private Properties properties;
private String entryKey;
+ private String extension;
+ private String type;
private Stack<String> stack;
@@ -237,6 +243,10 @@ public class TobagoConfigParser extends
case SANITIZER:
case SANITIZER_CLASS:
case AUTO_ACCESS_KEY_FROM_LABEL:
+ case MIME_TYPES:
+ case MIME_TYPE:
+ case EXTENSION:
+ case TYPE:
break;
default:
@@ -372,6 +382,18 @@ public class TobagoConfigParser extends
tobagoConfig.setAutoAccessKeyFromLabel(Boolean.parseBoolean(text));
break;
+ case EXTENSION:
+ extension = text;
+ break;
+
+ case TYPE:
+ type = text;
+ break;
+
+ case MIME_TYPE:
+ tobagoConfig.addMimeType(extension, type);
+ break;
+
case TOBAGO_CONFIG:
case THEME_CONFIG:
case ORDERING:
@@ -385,6 +407,7 @@ public class TobagoConfigParser extends
case SCRIPT:
case STYLE:
case PROPERTIES:
+ case MIME_TYPES:
break;
default:
@@ -414,7 +437,9 @@ public class TobagoConfigParser extends
final SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
final Schema schema;
- if ("2.0".equals(version.getVersion())) {
+ if ("2.0.6".equals(version.getVersion())) {
+ schema = schemaFactory.newSchema(getClass().getResource(TOBAGO_CONFIG_XSD_2_0_6));
+ } else if ("2.0".equals(version.getVersion())) {
schema = schemaFactory.newSchema(getClass().getResource(TOBAGO_CONFIG_XSD_2_0));
} else if ("1.6".equals(version.getVersion())) {
LOG.warn("Using deprecated schema with version attribute 1.6 in file: '" + url + "'");
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java?rev=1660635&r1=1660634&r2=1660635&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java Wed Feb 18 14:30:04 2015
@@ -29,6 +29,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
public class TobagoConfigSorter implements Comparator<TobagoConfigFragment> {
@@ -143,6 +144,11 @@ public class TobagoConfigSorter implemen
// url
// todo???
+ final Map<String, String> mimeTypes = result.getMimeTypes();
+ for (final Map.Entry<String, String> entry : fragment.getMimeTypes().entrySet()) {
+ mimeTypes.put(entry.getKey(), entry.getValue());
+ }
+
}
if (sanitizerClass != null) {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java?rev=1660635&r1=1660634&r2=1660635&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtils.java Wed Feb 18 14:30:04 2015
@@ -19,8 +19,15 @@
package org.apache.myfaces.tobago.internal.util;
+import org.apache.myfaces.tobago.config.TobagoConfig;
+
+import javax.faces.context.FacesContext;
+import java.util.Map;
+
public final class MimeTypeUtils {
+ private static Map<String, String> ADDITIONAL_MIME_TYPES = null;
+
private MimeTypeUtils() {
// utils class
}
@@ -72,6 +79,11 @@ public final class MimeTypeUtils {
}
}
+ if(ADDITIONAL_MIME_TYPES == null) {
+ final TobagoConfig tobagoConfig = TobagoConfig.getInstance(FacesContext.getCurrentInstance());
+ ADDITIONAL_MIME_TYPES = tobagoConfig.getMimeTypes();
+ }
+
return null;
}
}
Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-2.0.6.xsd (from r1658912, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-2.0.xsd)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-2.0.6.xsd?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-2.0.6.xsd&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-2.0.xsd&r1=1658912&r2=1660635&rev=1660635&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-2.0.xsd (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-2.0.6.xsd Wed Feb 18 14:30:04 2015
@@ -6,7 +6,7 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
- version="2.0">
+ version="2.0.6">
<xs:annotation>
<xs:documentation>
@@ -73,6 +73,7 @@
<xs:element name="sanitizer" type="tobago:sanitizer-type" minOccurs="0"/>
<xs:element name="renderers" type="tobago:renderers-type" minOccurs="0"/>
<xs:element name="theme-definitions" type="tobago:theme-definitions-type" minOccurs="0"/>
+ <xs:element name="mime-types" type="tobago:mime-types-type" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="version"
type="tobago:tobago-config-version-type"
@@ -81,7 +82,7 @@
<xs:simpleType name="tobago-config-version-type">
<xs:restriction base="xs:token">
- <xs:enumeration value="2.0"/>
+ <xs:enumeration value="2.0.6"/>
</xs:restriction>
</xs:simpleType>
@@ -198,4 +199,17 @@
</xs:simpleContent>
</xs:complexType>
+ <xs:complexType name="mime-types-type">
+ <xs:sequence>
+ <xs:element name="mime-type" type="tobago:mime-type-type" minOccurs="1" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="mime-type-type">
+ <xs:sequence>
+ <xs:element name="extension" type="xs:string"/>
+ <xs:element name="type" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+
</xs:schema>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/TobagoConfigMergingUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/TobagoConfigMergingUnitTest.java?rev=1660635&r1=1660634&r2=1660635&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/TobagoConfigMergingUnitTest.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/TobagoConfigMergingUnitTest.java Wed Feb 18 14:30:04 2015
@@ -29,6 +29,7 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
public class TobagoConfigMergingUnitTest {
@@ -100,6 +101,22 @@ public class TobagoConfigMergingUnitTest
Assert.assertEquals(2, config.getContentSecurityPolicy().getDirectiveList().size());
}
+ @Test
+ public void testMimeTypes()
+ throws IOException, SAXException, ParserConfigurationException, URISyntaxException {
+
+ final TobagoConfigImpl config = loadAndMerge(
+ "tobago-config-merge-0.xml",
+ "tobago-config-merge-1.xml",
+ "tobago-config-merge-2.xml");
+
+ final Map<String, String> mimeTypes = config.getMimeTypes();
+ Assert.assertTrue(mimeTypes.size() == 3);
+ Assert.assertEquals("test/one", mimeTypes.get("test-1"));
+ Assert.assertEquals("test/zwei", mimeTypes.get("test-2"));
+ Assert.assertEquals("test/three", mimeTypes.get("test-3"));
+ }
+
private TobagoConfigImpl loadAndMerge(final String... names)
throws IOException, SAXException, ParserConfigurationException, URISyntaxException {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtilsUniTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtilsUniTest.java?rev=1660635&r1=1660634&r2=1660635&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtilsUniTest.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/util/MimeTypeUtilsUniTest.java Wed Feb 18 14:30:04 2015
@@ -1,9 +1,10 @@
package org.apache.myfaces.tobago.internal.util;
+import org.apache.myfaces.tobago.internal.config.AbstractTobagoTestBase;
import org.junit.Assert;
import org.junit.Test;
-public class MimeTypeUtilsUniTest {
+public class MimeTypeUtilsUniTest extends AbstractTobagoTestBase {
public static final int INT = 100000000;
@@ -24,6 +25,7 @@ public class MimeTypeUtilsUniTest {
public static final String UNKNOWN1 = "http:///localhost:8080/demo/demos._png";
public static final String UNKNOWN2 = "http:///localhost:8080/demo/demo.ggif";
public static final String UNKNOWN3 = "http:///localhost:8080/demo/demos.ppg";
+ public static final String UNKNOWN4 = "http:///localhost:8080/demo/demos.pngx";
@Test
public void testMimeTypes() {
@@ -49,6 +51,7 @@ public class MimeTypeUtilsUniTest {
Assert.assertEquals(null, MimeTypeUtils.getMimeTypeForFile(UNKNOWN1));
Assert.assertEquals(null, MimeTypeUtils.getMimeTypeForFile(UNKNOWN2));
Assert.assertEquals(null, MimeTypeUtils.getMimeTypeForFile(UNKNOWN3));
+ Assert.assertEquals(null, MimeTypeUtils.getMimeTypeForFile(UNKNOWN4));
}
// @Test
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/resources/tobago-config-merge-1.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/resources/tobago-config-merge-1.xml?rev=1660635&r1=1660634&r2=1660635&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/resources/tobago-config-merge-1.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/resources/tobago-config-merge-1.xml Wed Feb 18 14:30:04 2015
@@ -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-2.0.xsd"
- version="2.0">
+ xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config http://myfaces.apache.org/tobago/tobago-config-2.0.6.xsd"
+ version="2.0.6">
<name>name-1</name>
@@ -35,4 +35,19 @@
<directive>image-src http://apache.org</directive>
</content-security-policy>
+ <mime-types>
+ <mime-type>
+ <extension>test-1</extension>
+ <type>test/one</type>
+ </mime-type>
+ <mime-type>
+ <extension>test-2</extension>
+ <type>test/two</type>
+ </mime-type>
+ <mime-type>
+ <extension>test-3</extension>
+ <type>test/three</type>
+ </mime-type>
+ </mime-types>
+
</tobago-config>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/resources/tobago-config-merge-2.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/resources/tobago-config-merge-2.xml?rev=1660635&r1=1660634&r2=1660635&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/resources/tobago-config-merge-2.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/resources/tobago-config-merge-2.xml Wed Feb 18 14:30:04 2015
@@ -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-2.0.xsd"
- version="2.0">
+ xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config http://myfaces.apache.org/tobago/tobago-config-2.0.6.xsd"
+ version="2.0.6">
<name>name-2</name>
@@ -33,4 +33,11 @@
<content-security-policy mode="off"/>
+ <mime-types>
+ <mime-type>
+ <extension>test-2</extension>
+ <type>test/zwei</type>
+ </mime-type>
+ </mime-types>
+
</tobago-config>