You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by dg...@apache.org on 2003/07/09 02:05:17 UTC
cvs commit: jakarta-struts/src/share/org/apache/struts/tiles DefinitionsFactoryConfig.java
dgraham 2003/07/08 17:05:17
Modified: src/share/org/apache/struts/tiles/definition
ComponentDefinitionsFactoryWrapper.java
src/share/org/apache/struts/tiles
DefinitionsFactoryConfig.java
Log:
Removed deprecated debug level functionality.
Revision Changes Path
1.7 +5 -13 jakarta-struts/src/share/org/apache/struts/tiles/definition/ComponentDefinitionsFactoryWrapper.java
Index: ComponentDefinitionsFactoryWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/definition/ComponentDefinitionsFactoryWrapper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ComponentDefinitionsFactoryWrapper.java 8 Jul 2003 23:59:10 -0000 1.6
+++ ComponentDefinitionsFactoryWrapper.java 9 Jul 2003 00:05:17 -0000 1.7
@@ -248,20 +248,12 @@
config.getDefinitionConfigFiles());
map.put(
- DefinitionsFactoryConfig.TILES_DETAILS_PARAMETER_NAME,
- Integer.toString(config.getDebugLevel()));
-
- map.put(
- DefinitionsFactoryConfig.PARSER_DETAILS_PARAMETER_NAME,
- Integer.toString(config.getParserDebugLevel()));
-
- map.put(
DefinitionsFactoryConfig.PARSER_VALIDATE_PARAMETER_NAME,
new Boolean(config.getParserValidate()).toString());
if (!"org.apache.struts.tiles.xmlDefinition.I18nFactorySet"
.equals(config.getFactoryClassname())) {
-
+
map.put(
DefinitionsFactoryConfig.FACTORY_CLASSNAME_PARAMETER_NAME,
config.getFactoryClassname());
@@ -269,5 +261,5 @@
return map;
}
-
+
}
1.9 +15 -62 jakarta-struts/src/share/org/apache/struts/tiles/DefinitionsFactoryConfig.java
Index: DefinitionsFactoryConfig.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/DefinitionsFactoryConfig.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefinitionsFactoryConfig.java 4 Jul 2003 20:53:42 -0000 1.8
+++ DefinitionsFactoryConfig.java 9 Jul 2003 00:05:17 -0000 1.9
@@ -89,24 +89,11 @@
"org.apache.struts.tiles.xmlDefinition.I18nFactorySet";
/**
- * Debug level value. 0=no debug info >0 = debug info.
- * @deprecated Use commons-logging mechanism.
- */
- protected int debugLevel = 0;
-
- /**
- * Debug level value used when parsing configuration file.
- * 0=no debug info; >0 = debug info.
- * @deprecated Use commons-logging mechanism.
- */
- protected int parserDebugLevel = 0;
-
- /**
* Specifies whether the parser will validate configuration files.
* Default value is true.
*/
protected boolean parserValidate = true;
-
+
/**
* Definition configuration file specified by user.
*/
@@ -129,30 +116,32 @@
/**
* Alternate name for parser debug details properties in configuration file.
+ * @deprecated This will be removed in a release after Struts 1.2.
*/
public static final String PARSER_DETAILS_PARAMETER_NAME =
"definitions-parser-details";
-
+
/**
* Alternate name for parser validate properties in configuration file.
*/
public static final String PARSER_VALIDATE_PARAMETER_NAME =
"definitions-parser-validate";
-
+
/**
* Alternate name for factory classname properties in configuration file.
*/
public static final String FACTORY_CLASSNAME_PARAMETER_NAME =
"definitions-factory-class";
-
+
/**
* Alternate name for definition files properties in configuration file.
*/
public static final String DEFINITIONS_CONFIG_PARAMETER_NAME =
"definitions-config";
-
+
/**
* Alternate name for definition debug details properties in configuration file.
+ * @deprecated This will be removed in a release after Struts 1.2.
*/
public static final String TILES_DETAILS_PARAMETER_NAME = "definitions-debug";
@@ -213,42 +202,6 @@
}
/**
- * Get debug level.
- * @return Debug level.
- * @deprecated Use commons-logging mechanism.
- */
- public int getDebugLevel() {
- return debugLevel;
- }
-
- /**
- * Set debug level.
- * @param aDebugLevel Debug level.
- * @deprecated Use commons-logging mechanism.
- */
- public void setDebugLevel(int aDebugLevel) {
- debugLevel = aDebugLevel;
- }
-
- /**
- * Get the debug level for the parser.
- * @return Debug level.
- * @deprecated Use commons-logging mechanism.
- */
- public int getParserDebugLevel() {
- return parserDebugLevel;
- }
-
- /**
- * Set the debug level for the parser.
- * @param aParserDebugLevel Debug level.
- * @deprecated Use commons-logging mechanism.
- */
- public void setParserDebugLevel(int aParserDebugLevel) {
- parserDebugLevel = aParserDebugLevel;
- }
-
- /**
* Determines if the parser is validating.
* @return <code>true<code> when in validating mode.
*/
@@ -368,16 +321,16 @@
if (DEFINITIONS_CONFIG_PARAMETER_NAME.equals(entry.getKey())) {
toAdd.put("definitionConfigFiles", entry.getValue());
-
+
} else if (FACTORY_CLASSNAME_PARAMETER_NAME.equals(entry.getKey())) {
toAdd.put("factoryClassname", entry.getValue());
-
+
} else if (PARSER_DETAILS_PARAMETER_NAME.equals(entry.getKey())) {
toAdd.put("parserDebugLevel", entry.getValue());
-
+
} else if (PARSER_VALIDATE_PARAMETER_NAME.equals(entry.getKey())) {
toAdd.put("parserValidate", entry.getValue());
-
+
} else if (TILES_DETAILS_PARAMETER_NAME.equals(entry.getKey())) {
toAdd.put("debugLevel", entry.getValue());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: struts-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: struts-dev-help@jakarta.apache.org