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 2011/07/05 11:42:48 UTC
svn commit: r1142947 - in /myfaces/tobago/trunk: src/site/resources/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.5.dtd
Author: lofwyr
Date: Tue Jul 5 09:42:48 2011
New Revision: 1142947
URL: http://svn.apache.org/viewvc?rev=1142947&view=rev
Log:
TOBAGO-990
- remove DTD for Tobago 1.5, only XSD is supported
Removed:
myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.5.dtd
Modified:
myfaces/tobago/trunk/src/site/resources/ (props changed)
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
Propchange: myfaces/tobago/trunk/src/site/resources/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Tue Jul 5 09:42:48 2011
@@ -2,5 +2,4 @@
/repos/asf/myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.0.29.dtd tobago-config-1.0.29.dtd
/repos/asf/myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.0.30.dtd tobago-config-1.0.30.dtd
/repos/asf/myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.0.34.dtd tobago-config-1.0.34.dtd
-/repos/asf/myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.5.dtd tobago-config-1.5.dtd
/repos/asf/myfaces/tobago/trunk/tobago-core/src/main/resources/org/apache/myfaces/tobago/config/tobago-config-1.5.xsd tobago-config-1.5.xsd
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java?rev=1142947&r1=1142946&r2=1142947&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java Tue Jul 5 09:42:48 2011
@@ -40,8 +40,6 @@ public class TobagoConfigParser {
private static final String TOBAGO_CONFIG_DTD_1_0_29 = "/org/apache/myfaces/tobago/config/tobago-config-1.0.29.dtd";
private static final String TOBAGO_CONFIG_DTD_1_0_30 = "/org/apache/myfaces/tobago/config/tobago-config-1.0.30.dtd";
private static final String TOBAGO_CONFIG_DTD_1_0_34 = "/org/apache/myfaces/tobago/config/tobago-config-1.0.34.dtd";
- @Deprecated
- private static final String TOBAGO_CONFIG_DTD_1_5 = "/org/apache/myfaces/tobago/config/tobago-config-1.5.dtd";
private static final String TOBAGO_CONFIG_XSD_1_5 = "/org/apache/myfaces/tobago/config/tobago-config-1.5.xsd";
private Digester digester;
@@ -158,7 +156,6 @@ public class TobagoConfigParser {
registerDtd("-//The Apache Software Foundation//DTD Tobago Config 1.0.29//EN", TOBAGO_CONFIG_DTD_1_0_29);
registerDtd("-//The Apache Software Foundation//DTD Tobago Config 1.0.30//EN", TOBAGO_CONFIG_DTD_1_0_30);
registerDtd("-//The Apache Software Foundation//DTD Tobago Config 1.0.34//EN", TOBAGO_CONFIG_DTD_1_0_34);
- registerDtd("-//The Apache Software Foundation//DTD Tobago Config 1.5//EN", TOBAGO_CONFIG_DTD_1_5);
// todo: find a way to register the schema
// registerDtd("http://myfaces.apache.org/tobago/tobago-config", TOBAGO_CONFIG_XSD_1_5);
// registerXsd("http://myfaces.apache.org/tobago/tobago-config", TOBAGO_CONFIG_XSD_1_5);