cziegeler 2004/05/27 06:14:36
Modified: src/java/org/apache/cocoon/components/xpointer/parser
SimpleCharStream.java
src/java/org/apache/cocoon/components/notification
Notifier.java
src/java/org/apache/cocoon/acting
AbstractComplementaryConfigurableAction.java
src/java/org/apache/cocoon Cocoon.java Constants.java
src/java/org/apache/cocoon/util StringUtils.java
Removed: src/java/org/apache/cocoon/components/modules/input
DefaultsMetaModule.java
Log:
Remove deprecated methods and constants
Revision Changes Path
1.6 +0 -18
cocoon-2.1/src/java/org/apache/cocoon/components/xpointer/parser/SimpleCharStream.java
Index: SimpleCharStream.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/xpointer/parser/SimpleCharStream.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SimpleCharStream.java 15 Apr 2004 14:23:08 -0000 1.5
+++ SimpleCharStream.java 27 May 2004 13:14:35 -0000 1.6
@@ -227,24 +227,6 @@
return (c);
}
- /**
- * @deprecated
- * @see #getEndColumn()
- */
-
- public int getColumn() {
- return bufcolumn[bufpos];
- }
-
- /**
- * @deprecated
- * @see #getEndLine()
- */
-
- public int getLine() {
- return bufline[bufpos];
- }
-
public int getEndColumn() {
return bufcolumn[bufpos];
}
1.5 +1 -26
cocoon-2.1/src/java/org/apache/cocoon/components/notification/Notifier.java
Index: Notifier.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/notification/Notifier.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Notifier.java 5 Mar 2004 13:02:49 -0000 1.4
+++ Notifier.java 27 May 2004 13:14:36 -0000 1.5
@@ -35,21 +35,6 @@
*/
public class Notifier {
- /*
- * Generate notification information as a response.
- * The notification is directly written to the OutputStream.
- * @param n The <code>Notifying</code> object
- * @param outputStream The output stream the notification is written to
- * This could be <code>null</code>.
- * @deprecated There is no way in which this method could understand
what mime/type to use. Instead use void notify(Notifying n, OutputStream
outputStream, String mimetype), where the mime/type is requested.
- * @see #notify(Notifying n, OutputStream, String)
-
- public static String notify(Notifying n, OutputStream outputStream)
throws IOException {
- notify(n, outputStream, "text/html") ;
- return "text/html";
- }
- */
-
/**
* Generate notification information as a response.
* The notification is directly written to the OutputStream.
@@ -108,16 +93,6 @@
if (outputStream != null)
outputStream.write(sb.toString().getBytes());
}
-
- /*
- * Generate notification information in XML format.
- * @deprecated Using a ContentHandler doesn't mean that a mimetype
cannot be specified; it could be svg or
- * @see #notify(Notifying, ContentHandler, String)
-
- public static void notify(Notifying n, ContentHandler ch) throws
SAXException {
- notify(n, ch, "text/xml");
- }
- */
/**
* Generate notification information in XML format.
1.5 +1 -9
cocoon-2.1/src/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java
Index: AbstractComplementaryConfigurableAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractComplementaryConfigurableAction.java 5 Mar 2004 13:02:43
-0000 1.4
+++ AbstractComplementaryConfigurableAction.java 27 May 2004 13:14:36
-0000 1.5
@@ -55,14 +55,6 @@
}
/**
- * @deprecated please use the getConfiguration(String, SourceResolver,
boolean)
- * version of this method instead.
- */
- protected Configuration getConfiguration(String descriptor, boolean
reloadable) throws ConfigurationException {
- return this.getConfiguration( descriptor, null, reloadable );
- }
-
- /**
* Set up the complementary configuration file. Please note that
* multiple Actions can share the same configurations. By using
* this approach, we can limit the number of config files.
1.26 +2 -17 cocoon-2.1/src/java/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Cocoon.java 25 May 2004 07:28:24 -0000 1.25
+++ Cocoon.java 27 May 2004 13:14:36 -0000 1.26
@@ -267,22 +267,7 @@
// Setup the default parser, for parsing configuration.
// If one need to use a different parser, set the given system
property
- // first check for deprecated property to be compatible:
- String parser =
System.getProperty(Constants.DEPRECATED_PARSER_PROPERTY,
Constants.DEFAULT_PARSER);
- if ( !Constants.DEFAULT_PARSER.equals( parser ) ) {
- getLogger().warn("Deprecated property " +
- Constants.DEPRECATED_PARSER_PROPERTY + " is
used. Please use " +
- Constants.PARSER_PROPERTY + " instead.");
- if (
"org.apache.cocoon.components.parser.XercesParser".equals(parser) ) {
- parser = XercesParser.class.getName();
- } else {
- getLogger().warn("Unknown value for deprecated property: " +
- Constants.DEPRECATED_PARSER_PROPERTY + ",
value: " + parser +
- ". If you experience problems during
startup, check the parser configuration section of the documentation.");
- }
- } else {
- parser = System.getProperty(Constants.PARSER_PROPERTY,
Constants.DEFAULT_PARSER);
- }
+ String parser = System.getProperty(Constants.PARSER_PROPERTY,
Constants.DEFAULT_PARSER);
if (getLogger().isDebugEnabled()) {
getLogger().debug("Using parser: " + parser);
getLogger().debug("Classpath = " + classpath);
1.13 +1 -5 cocoon-2.1/src/java/org/apache/cocoon/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Constants.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Constants.java 8 Mar 2004 12:07:40 -0000 1.12
+++ Constants.java 27 May 2004 13:14:36 -0000 1.13
@@ -106,10 +106,6 @@
/** The name of the class for the default XML parser to use */
public static final String DEFAULT_PARSER =
"org.apache.excalibur.xml.impl.JaxpParser";
- /** The name of the property holding the class for a XML parser
- * @deprecated This will be removed in future release */
- public static final String DEPRECATED_PARSER_PROPERTY =
"org.apache.cocoon.components.parser.Parser";
-
/** The namespace for the XSP core logicsheet. */
public static final String XSP_URI = "http://apache.org/xsp";;
1.5 +1 -39
cocoon-2.1/src/java/org/apache/cocoon/util/StringUtils.java
Index: StringUtils.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/util/StringUtils.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StringUtils.java 29 Apr 2004 00:17:25 -0000 1.4
+++ StringUtils.java 27 May 2004 13:14:36 -0000 1.5
@@ -60,44 +60,6 @@
}
/**
- * Counts the occurrence of the given char in the string.
- *
- * @param str The string to be tested
- * @param c the char to be counted
- * @return the occurrence of the character in the string.
- * @deprecated Use [EMAIL PROTECTED]
org.apache.commons.lang.StringUtils#countMatches(String, String)}
- */
- public static int count(String str, char c) {
- int index = 0;
- char[] chars = str.toCharArray();
- for (int i = 0; i < chars.length; i++) {
- if (chars[i] == c) index++;
- }
- return index;
- }
-
- /**
- * Matches two strings.
- *
- * @param a The first string
- * @param b The second string
- * @return the index where the two strings stop matching starting from 0
- * @deprecated Use [EMAIL PROTECTED]
org.apache.commons.lang.StringUtils#indexOfDifference(String, String)}
- */
- public static int matchStrings(String a, String b) {
- int i;
- char[] ca = a.toCharArray();
- char[] cb = b.toCharArray();
- int len = ( ca.length < cb.length ) ? ca.length : cb.length;
-
- for (i = 0; i < len; i++) {
- if (ca[i] != cb[i]) break;
- }
-
- return i;
- }
-
- /**
* Replaces tokens in input with Value present in System.getProperty
*/
public static String replaceToken(String s) {
