giacomo 2003/01/07 15:17:10
Modified: src/blocks/bsf/java/org/apache/cocoon/generation
ScriptGenerator.java
src/blocks/databases/java/org/apache/cocoon/transformation
SQLTransformer.java
src/blocks/lucene/java/org/apache/cocoon/components/search
SimpleLuceneCocoonSearcherImpl.java
src/blocks/naming/java/org/apache/cocoon/transformation
LDAPTransformer.java
src/blocks/samples/java/org/apache/cocoon/acting/modular
TestAction.java
src/deprecated/java/org/apache/cocoon/components/store
StoreJanitorImpl.java
src/deprecated/java/org/apache/cocoon/components/treeprocessor
MapStackResolver.java
src/java/org/apache/cocoon Main.java
src/java/org/apache/cocoon/components/flow/javascript
JavaScriptInterpreter.java
src/java/org/apache/cocoon/components/language/markup/xsp
XSPCookieHelper.java
src/java/org/apache/cocoon/components/language/programming/javascript
CompiledJavascriptLanguage.java
src/java/org/apache/cocoon/generation
WebServiceProxyGenerator.java
src/java/org/apache/cocoon/serialization
AbstractTextSerializer.java
src/java/org/apache/cocoon/transformation
CIncludeTransformer.java JPathTransformer.java
src/scratchpad/src/org/apache/cocoon/components/repository
PrincipalGroup.java
src/scratchpad/src/org/apache/cocoon/transformation
XMLDBTransformer.java
Log:
cleaning up eclipse complains
Revision Changes Path
1.2 +2 -2
xml-cocoon2/src/blocks/bsf/java/org/apache/cocoon/generation/ScriptGenerator.java
Index: ScriptGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/bsf/java/org/apache/cocoon/generation/ScriptGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- ScriptGenerator.java 18 Dec 2002 23:40:53 -0000 1.1
+++ ScriptGenerator.java 7 Jan 2003 23:17:07 -0000 1.2
@@ -173,7 +173,7 @@
{
getLogger().debug("adding BSF language " +
this.additionalLanguages[i].name + " with engine " +
this.additionalLanguages[i].engineSrc);
- mgr.registerScriptingEngine(this.additionalLanguages[i].name,
+
BSFManager.registerScriptingEngine(this.additionalLanguages[i].name,
this.additionalLanguages[i].engineSrc,
this.additionalLanguages[i].extensions);
}
1.4 +7 -7
xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java
Index: SQLTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/transformation/SQLTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -b -u -r1.3 -r1.4
--- SQLTransformer.java 14 Nov 2002 15:43:23 -0000 1.3
+++ SQLTransformer.java 7 Jan 2003 23:17:08 -0000 1.4
@@ -1120,9 +1120,9 @@
}
protected String getColumnValue( int i ) throws SQLException {
- String retval = transformer.getStringValue( rs.getObject( i ) );
+ String retval = SQLTransformer.getStringValue( rs.getObject( i ) );
if (rs.getMetaData().getColumnType(i) == 8)
- retval = transformer.getStringValue( rs.getBigDecimal( i ) );
+ retval = SQLTransformer.getStringValue( rs.getBigDecimal( i ) );
return retval;
}
@@ -1130,7 +1130,7 @@
//for a given "name" versus number. That being said this shouldn't be an
issue
//as this function is only called for ancestor lookups.
protected String getColumnValue( String name ) throws SQLException {
- String retval = transformer.getStringValue( rs.getObject( name ) );
+ String retval = SQLTransformer.getStringValue( rs.getObject( name ) );
// if (rs.getMetaData().getColumnType( name ) == 8)
// retval = transformer.getStringValue( rs.getBigDecimal( name ) );
return retval;
@@ -1250,7 +1250,7 @@
Object obj = cst.getObject( counter.intValue() );
if ( !( obj instanceof ResultSet ) ) {
transformer.start( (String) outParametersNames.get(
counter ), attr );
- this.serializeData(manager, transformer.getStringValue(
obj ) );
+ this.serializeData(manager,
SQLTransformer.getStringValue( obj ) );
transformer.end( (String) outParametersNames.get(
counter ) );
} else {
ResultSet rs = (ResultSet) obj;
@@ -1262,9 +1262,9 @@
for ( int i = 1; i <= md.getColumnCount(); i++
) {
transformer.start( md.getColumnName( i
).toLowerCase(), attr );
if ( md.getColumnType( i ) == 8 ) {
//prevent nasty exponent notation
- this.serializeData(manager,
transformer.getStringValue( rs.getBigDecimal( i ) ));
+ this.serializeData(manager,
SQLTransformer.getStringValue( rs.getBigDecimal( i ) ));
} else {
- this.serializeData(manager,
transformer.getStringValue( rs.getObject( i ) ));
+ this.serializeData(manager,
SQLTransformer.getStringValue( rs.getObject( i ) ));
}
transformer.end( md.getColumnName( i
).toLowerCase() );
}
1.2 +3 -3
xml-cocoon2/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneCocoonSearcherImpl.java
Index: SimpleLuceneCocoonSearcherImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/lucene/java/org/apache/cocoon/components/search/SimpleLuceneCocoonSearcherImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- SimpleLuceneCocoonSearcherImpl.java 18 Dec 2002 23:44:51 -0000 1.1
+++ SimpleLuceneCocoonSearcherImpl.java 7 Jan 2003 23:17:08 -0000 1.2
@@ -511,7 +511,7 @@
*/
public boolean indexReaderIsValid(Directory directory) throws IOException {
return indexReader != null &&
- indexReader.lastModified(directory) == lastModified;
+ IndexReader.lastModified(directory) == lastModified;
}
@@ -536,7 +536,7 @@
private void createIndexReader(Directory directory) throws IOException {
close();
indexReader = IndexReader.open(directory);
- lastModified = indexReader.lastModified(directory);
+ lastModified = IndexReader.lastModified(directory);
}
}
}
1.2 +37 -37
xml-cocoon2/src/blocks/naming/java/org/apache/cocoon/transformation/LDAPTransformer.java
Index: LDAPTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/naming/java/org/apache/cocoon/transformation/LDAPTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- LDAPTransformer.java 28 Nov 2002 15:12:33 -0000 1.1
+++ LDAPTransformer.java 7 Jan 2003 23:17:08 -0000 1.2
@@ -1173,59 +1173,59 @@
protected LDAPQuery (LDAPTransformer transformer) {
this.transformer = transformer;
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_INITIALIZER_ELEMENT)) {
- initializer =
transformer.default_properties.getProperty(transformer.MAGIC_INITIALIZER_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_INITIALIZER_ELEMENT)) {
+ initializer =
transformer.default_properties.getProperty(MAGIC_INITIALIZER_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_SERVERURL_ELEMENT)) {
- serverurl =
transformer.default_properties.getProperty(transformer.MAGIC_SERVERURL_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_SERVERURL_ELEMENT)) {
+ serverurl =
transformer.default_properties.getProperty(MAGIC_SERVERURL_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_PORT_ELEMENT)) {
- port =
Integer.parseInt(transformer.default_properties.getProperty(transformer.MAGIC_PORT_ELEMENT));
+ if (null !=
transformer.default_properties.getProperty(MAGIC_PORT_ELEMENT)) {
+ port =
Integer.parseInt(transformer.default_properties.getProperty(MAGIC_PORT_ELEMENT));
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_ROOT_DN_ELEMENT)) {
- root_dn =
transformer.default_properties.getProperty(transformer.MAGIC_ROOT_DN_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_ROOT_DN_ELEMENT)) {
+ root_dn =
transformer.default_properties.getProperty(MAGIC_ROOT_DN_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_PASSWORD_ELEMENT)) {
- password =
transformer.default_properties.getProperty(transformer.MAGIC_PASSWORD_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_PASSWORD_ELEMENT)) {
+ password =
transformer.default_properties.getProperty(MAGIC_PASSWORD_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_VERSION_ELEMENT)) {
- version =
transformer.default_properties.getProperty(transformer.MAGIC_VERSION_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_VERSION_ELEMENT)) {
+ version =
transformer.default_properties.getProperty(MAGIC_VERSION_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_SCOPE_ELEMENT)) {
- scope =
transformer.default_properties.getProperty(transformer.MAGIC_SCOPE_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_SCOPE_ELEMENT)) {
+ scope =
transformer.default_properties.getProperty(MAGIC_SCOPE_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_AUTHENTICATION_ELEMENT)) {
- authentication =
transformer.default_properties.getProperty(transformer.MAGIC_AUTHENTICATION_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_AUTHENTICATION_ELEMENT)) {
+ authentication =
transformer.default_properties.getProperty(MAGIC_AUTHENTICATION_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_SEARCHBASE_ELEMENT)) {
- searchbase =
transformer.default_properties.getProperty(transformer.MAGIC_SEARCHBASE_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_SEARCHBASE_ELEMENT)) {
+ searchbase =
transformer.default_properties.getProperty(MAGIC_SEARCHBASE_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_SHOW_ATTRIBUTE_ELEMENT)) {
- showAttribute =
transformer.default_properties.getProperty(transformer.MAGIC_SHOW_ATTRIBUTE_ELEMENT).equals("FALSE")
? false : true;
+ if (null !=
transformer.default_properties.getProperty(MAGIC_SHOW_ATTRIBUTE_ELEMENT)) {
+ showAttribute =
transformer.default_properties.getProperty(MAGIC_SHOW_ATTRIBUTE_ELEMENT).equals("FALSE")
? false : true;
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_DOC_ELEMENT)) {
- doc_element =
transformer.default_properties.getProperty(transformer.MAGIC_DOC_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_DOC_ELEMENT)) {
+ doc_element =
transformer.default_properties.getProperty(MAGIC_DOC_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_ROW_ELEMENT)) {
- row_element =
transformer.default_properties.getProperty(transformer.MAGIC_ROW_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_ROW_ELEMENT)) {
+ row_element =
transformer.default_properties.getProperty(MAGIC_ROW_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_ERROR_ELEMENT)) {
- error_element =
transformer.default_properties.getProperty(transformer.MAGIC_ERROR_ELEMENT);
+ if (null !=
transformer.default_properties.getProperty(MAGIC_ERROR_ELEMENT)) {
+ error_element =
transformer.default_properties.getProperty(MAGIC_ERROR_ELEMENT);
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_SAX_ERROR)) {
- sax_error =
transformer.default_properties.getProperty(transformer.MAGIC_SAX_ERROR).equals("TRUE")
? true : false;
+ if (null !=
transformer.default_properties.getProperty(MAGIC_SAX_ERROR)) {
+ sax_error =
transformer.default_properties.getProperty(MAGIC_SAX_ERROR).equals("TRUE") ? true :
false;
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_DEREF_LINK_ELEMENT)) {
- deref_link =
transformer.default_properties.getProperty(transformer.MAGIC_DEREF_LINK_ELEMENT).equals("TRUE")
? true : false;
+ if (null !=
transformer.default_properties.getProperty(MAGIC_DEREF_LINK_ELEMENT)) {
+ deref_link =
transformer.default_properties.getProperty(MAGIC_DEREF_LINK_ELEMENT).equals("TRUE") ?
true : false;
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_COUNT_LIMIT_ELEMENT)) {
- count_limit =
Long.parseLong(transformer.default_properties.getProperty(transformer.MAGIC_COUNT_LIMIT_ELEMENT));
+ if (null !=
transformer.default_properties.getProperty(MAGIC_COUNT_LIMIT_ELEMENT)) {
+ count_limit =
Long.parseLong(transformer.default_properties.getProperty(MAGIC_COUNT_LIMIT_ELEMENT));
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_TIME_LIMIT_ELEMENT)) {
- time_limit =
Integer.parseInt(transformer.default_properties.getProperty(transformer.MAGIC_TIME_LIMIT_ELEMENT));
+ if (null !=
transformer.default_properties.getProperty(MAGIC_TIME_LIMIT_ELEMENT)) {
+ time_limit =
Integer.parseInt(transformer.default_properties.getProperty(MAGIC_TIME_LIMIT_ELEMENT));
}
- if (null !=
transformer.default_properties.getProperty(transformer.MAGIC_DEBUG_ELEMENT)) {
- debug =
transformer.default_properties.getProperty(transformer.MAGIC_DEBUG_ELEMENT).equals("TRUE")
? true : false;
+ if (null !=
transformer.default_properties.getProperty(MAGIC_DEBUG_ELEMENT)) {
+ debug =
transformer.default_properties.getProperty(MAGIC_DEBUG_ELEMENT).equals("TRUE") ? true
: false;
}
}
1.2 +1 -1
xml-cocoon2/src/blocks/samples/java/org/apache/cocoon/acting/modular/TestAction.java
Index: TestAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/samples/java/org/apache/cocoon/acting/modular/TestAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- TestAction.java 18 Dec 2002 23:47:37 -0000 1.1
+++ TestAction.java 7 Jan 2003 23:17:08 -0000 1.2
@@ -198,7 +198,7 @@
}
if (getLogger().isDebugEnabled()) getLogger().debug("... end");
}
- return this.EMPTY_MAP;
+ return EMPTY_MAP;
}
}
1.2 +2 -2
xml-cocoon2/src/deprecated/java/org/apache/cocoon/components/store/StoreJanitorImpl.java
Index: StoreJanitorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/deprecated/java/org/apache/cocoon/components/store/StoreJanitorImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- StoreJanitorImpl.java 26 Dec 2002 18:38:56 -0000 1.1
+++ StoreJanitorImpl.java 7 Jan 2003 23:17:08 -0000 1.2
@@ -182,7 +182,7 @@
}
}
try {
- Thread.currentThread().sleep(this.cleanupthreadinterval * 1000);
+ Thread.sleep(this.cleanupthreadinterval * 1000);
} catch (InterruptedException ignore) {}
}
}
1.2 +4 -4
xml-cocoon2/src/deprecated/java/org/apache/cocoon/components/treeprocessor/MapStackResolver.java
Index: MapStackResolver.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/deprecated/java/org/apache/cocoon/components/treeprocessor/MapStackResolver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- MapStackResolver.java 26 Dec 2002 18:38:57 -0000 1.1
+++ MapStackResolver.java 7 Jan 2003 23:17:08 -0000 1.2
@@ -203,7 +203,7 @@
public NullResolver(String expression) {
if (expression != null) {
this.originalExpr = expression;
- this.expression = this.unescape(expression);
+ this.expression = unescape(expression);
}
}
@@ -257,7 +257,7 @@
if (pos >= length || pos == -1) {
// no more braces
if (prev < length) {
- stringList.add(this.unescape(expr.substring(prev)));
+ stringList.add(unescape(expr.substring(prev)));
levelList.add(new Integer(-1));
}
break comp;
@@ -268,7 +268,7 @@
// Add litteral strings between closing and next opening brace
if (prev < pos-1) {
- stringList.add(this.unescape(expr.substring(prev, pos - 1)));
+ stringList.add(unescape(expr.substring(prev, pos - 1)));
levelList.add(new Integer(-1));
}
1.28 +9 -10 xml-cocoon2/src/java/org/apache/cocoon/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Main.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -b -u -r1.27 -r1.28
--- Main.java 5 Dec 2002 09:23:35 -0000 1.27
+++ Main.java 7 Jan 2003 23:17:08 -0000 1.28
@@ -394,7 +394,6 @@
subcontext.put("context-root", contextDir);
logKitManager.contextualize(subcontext);
logKitManager.configure(logKitConf);
- logKitManager = logKitManager;
if (logger != null) {
log = logKitManager.getLogger(logger);
} else {
@@ -585,7 +584,7 @@
//log.info(" [Cocoon might need to compile the sitemaps, this might take a
while]");
//cocoon.process(new LinkSamplingEnvironment("/", context, attributes,
null));
cocoon.generateSitemap(new LinkSamplingEnvironment("/", context,
attributes, null,
- new
LogKitLogger(this.log)));
+ new LogKitLogger(log)));
}
/**
@@ -678,7 +677,7 @@
String markupLanguage = "xsp";
String programmingLanguage = "java";
Environment env = new LinkSamplingEnvironment("/", context, attributes,
null,
- new LogKitLogger(this.log));
+ new LogKitLogger(log));
cocoon.precompile(uri, env, markupLanguage, programmingLanguage);
}
@@ -692,7 +691,7 @@
String markupLanguage = "sitemap";
String programmingLanguage = "java";
Environment env = new LinkSamplingEnvironment("/", context, attributes,
null,
- new LogKitLogger(this.log));
+ new LogKitLogger(log));
cocoon.precompile(uri, env, markupLanguage, programmingLanguage);
}
@@ -815,13 +814,13 @@
output.close();
}
catch(IOException ioex){
- this.log.warn(ioex.toString());
+ log.warn(ioex.toString());
}
}
} catch (Exception rnfe) {
System.out.println("XXX"+rnfe);
- this.log.warn("Could not process URI: " + deparameterizedURI);
+ log.warn("Could not process URI: " + deparameterizedURI);
if (verbose) System.out.println("Could not process URI: " +
deparameterizedURI);
}
@@ -918,7 +917,7 @@
context,
attributes,
parameters,
- new LogKitLogger(this.log));
+ new LogKitLogger(log));
processLenient(env);
return env.getLinks();
}
@@ -940,7 +939,7 @@
parameters,
links,
stream,
- new LogKitLogger(this.log));
+ new LogKitLogger(log));
//Here Cocoon can throw an exception if there are errors in processing
the page
cocoon.process(env);
@@ -972,7 +971,7 @@
parameters,
empty,
new NullOutputStream(),
- new LogKitLogger(this.log));
+ new LogKitLogger(log));
processLenient(env);
return env.getContentType();
}
1.12 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java
Index: JavaScriptInterpreter.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -b -u -r1.11 -r1.12
--- JavaScriptInterpreter.java 7 Dec 2002 21:53:57 -0000 1.11
+++ JavaScriptInterpreter.java 7 Jan 2003 23:17:09 -0000 1.12
@@ -184,7 +184,7 @@
scope.put("log", scope, log);
}
catch (Exception e) {
- context.exit();
+ Context.exit();
e.printStackTrace();
throw e;
}
@@ -340,7 +340,7 @@
{
JSCocoon cocoon = (JSCocoon)thrScope.get("cocoon", thrScope);
cocoon.invalidateContext();
- Context.getCurrentContext().exit();
+ Context.exit();
}
public void readScripts(Environment environment, ListInputStream is)
@@ -570,7 +570,7 @@
throw ex;
}
finally {
- context.exit();
+ Context.exit();
}
}
}
1.12 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java
Index: XSPCookieHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPCookieHelper.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -b -u -r1.11 -r1.12
--- XSPCookieHelper.java 27 Feb 2002 05:33:50 -0000 1.11
+++ XSPCookieHelper.java 7 Jan 2003 23:17:09 -0000 1.12
@@ -568,7 +568,7 @@
else if(propertyPrefix.equals("P"))
returnValue = currentCookie.getPath();
else if(propertyPrefix.equals("S"))
- returnValue = returnValue.valueOf(currentCookie.getSecure());
+ returnValue = String.valueOf(currentCookie.getSecure());
else if(propertyPrefix.equals("V"))
returnValue = currentCookie.getValue();
else if(propertyPrefix.equals("Ve"))
1.4 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/javascript/CompiledJavascriptLanguage.java
Index: CompiledJavascriptLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/javascript/CompiledJavascriptLanguage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -b -u -r1.3 -r1.4
--- CompiledJavascriptLanguage.java 22 Feb 2002 07:00:10 -0000 1.3
+++ CompiledJavascriptLanguage.java 7 Jan 2003 23:17:09 -0000 1.4
@@ -107,7 +107,7 @@
pathname + File.separator + filename + "." +
this.getSourceExtension()
};
- compiler.main(args);
+ Main.main(args);
} catch (Exception e) {
getLogger().warn("JavascriptLanguage.compile", e);
throw new LanguageException(e.getMessage());
1.6 +1 -1
xml-cocoon2/src/java/org/apache/cocoon/generation/WebServiceProxyGenerator.java
Index: WebServiceProxyGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/generation/WebServiceProxyGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -b -u -r1.5 -r1.6
--- WebServiceProxyGenerator.java 17 Dec 2002 04:09:36 -0000 1.5
+++ WebServiceProxyGenerator.java 7 Jan 2003 23:17:09 -0000 1.6
@@ -260,7 +260,7 @@
// @todo: fix-me
// This sleep() is a temporary workaround
// to avoid NullPointerException in the next line.
- Thread.currentThread().sleep( 100 );
+ Thread.sleep( 100 );
String ret = method.getResponseBodyAsString();
1.19 +3 -3
xml-cocoon2/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java
Index: AbstractTextSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -b -u -r1.18 -r1.19
--- AbstractTextSerializer.java 4 Dec 2002 09:48:40 -0000 1.18
+++ AbstractTextSerializer.java 7 Jan 2003 23:17:09 -0000 1.19
@@ -319,7 +319,7 @@
SAXTransformerFactory factory = getTransformerFactory();
- Boolean cacheValue =
(Boolean)this.needsNamespaceCache.get(factory.getClass().getName());
+ Boolean cacheValue =
(Boolean)needsNamespaceCache.get(factory.getClass().getName());
if (cacheValue != null) {
return cacheValue.booleanValue();
@@ -353,7 +353,7 @@
getLogger().debug("Trax handler " + handler.getClass().getName() + msg);
- this.needsNamespaceCache.put(factory.getClass().getName(), new
Boolean(needsIt));
+ needsNamespaceCache.put(factory.getClass().getName(), new
Boolean(needsIt));
return needsIt;
}
1.16 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java
Index: CIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -b -u -r1.15 -r1.16
--- CIncludeTransformer.java 8 Oct 2002 14:43:21 -0000 1.15
+++ CIncludeTransformer.java 7 Jan 2003 23:17:09 -0000 1.16
@@ -372,7 +372,7 @@
NodeList list = processor.selectNodeList(document, select);
int length = list.getLength();
for (int i=0; i<length; i++) {
- consumer.includeNode((Node)list.item(i),
+ IncludeXMLConsumer.includeNode((Node)list.item(i),
(ContentHandler)this,
(LexicalHandler)this);
}
1.6 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/transformation/JPathTransformer.java
Index: JPathTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/JPathTransformer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -b -u -r1.5 -r1.6
--- JPathTransformer.java 5 Dec 2002 10:40:07 -0000 1.5
+++ JPathTransformer.java 7 Jan 2003 23:17:10 -0000 1.6
@@ -278,7 +278,7 @@
if (m_cache.containsKey(variable)) {
value = m_cache.get(variable);
} else {
- value = m_jxpathContext.compile(variable).getValue(m_jxpathContext);
+ value = JXPathContext.compile(variable).getValue(m_jxpathContext);
if (value == null) {
if (getLogger().isWarnEnabled()) {
1.2 +2 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/repository/PrincipalGroup.java
Index: PrincipalGroup.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/repository/PrincipalGroup.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -b -u -r1.1 -r1.2
--- PrincipalGroup.java 4 Jul 2002 17:32:41 -0000 1.1
+++ PrincipalGroup.java 7 Jan 2003 23:17:10 -0000 1.2
@@ -75,7 +75,7 @@
* @return Name of the group.
*/
public String getName() {
- return this.name = name;
+ return this.name;
}
/**
1.9 +2 -2
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/XMLDBTransformer.java
Index: XMLDBTransformer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/transformation/XMLDBTransformer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -b -u -r1.8 -r1.9
--- XMLDBTransformer.java 2 Aug 2002 09:21:00 -0000 1.8
+++ XMLDBTransformer.java 7 Jan 2003 23:17:10 -0000 1.9
@@ -199,7 +199,7 @@
/** True when inside <query> element. */
private boolean processing;
- public void XMLDBTransformer() {
+ public XMLDBTransformer() {
format.put(OutputKeys.ENCODING, "utf-8");
format.put(OutputKeys.INDENT, "no");
format.put(OutputKeys.OMIT_XML_DECLARATION, "yes");
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
