cziegeler 2004/03/31 02:28:34
Modified: src/kernel/org/apache/cocoon/kernel/identification
AbstractDescriptor.java InterfaceDescriptor.java
BlockDescriptor.java
src/kernel/org/apache/cocoon/kernel/configuration
ConfigurationSerializer.java Parameters.java
tools/targets compile-build.xml
src/kernel/org/apache/cocoon/kernel/deployment Deployer.java
Log:
Minor code cleanup :)
Add kernel to build script
Revision Changes Path
1.3 +0 -1
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/identification/AbstractDescriptor.java
Index: AbstractDescriptor.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/identification/AbstractDescriptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractDescriptor.java 31 Mar 2004 10:19:00 -0000 1.2
+++ AbstractDescriptor.java 31 Mar 2004 10:28:34 -0000 1.3
@@ -23,7 +23,6 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import org.apache.cocoon.kernel.configuration.Configuration;
import org.apache.cocoon.kernel.configuration.ConfigurationException;
1.2 +2 -2
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/identification/InterfaceDescriptor.java
Index: InterfaceDescriptor.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/identification/InterfaceDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InterfaceDescriptor.java 30 Mar 2004 13:30:38 -0000 1.1
+++ InterfaceDescriptor.java 31 Mar 2004 10:28:34 -0000 1.2
@@ -75,7 +75,7 @@
* descriptor doesn't expose any interface.
*/
public String exposedInterface() {
- return((String)this.exposition);
+ return this.exposition;
}
/**
1.2 +3 -6
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/identification/BlockDescriptor.java
Index: BlockDescriptor.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/identification/BlockDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BlockDescriptor.java 30 Mar 2004 13:30:38 -0000 1.1
+++ BlockDescriptor.java 31 Mar 2004 10:28:34 -0000 1.2
@@ -18,12 +18,9 @@
*
========================================================================== */
package org.apache.cocoon.kernel.identification;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import org.apache.cocoon.kernel.configuration.Configuration;
import org.apache.cocoon.kernel.configuration.ConfigurationException;
@@ -96,7 +93,7 @@
* [EMAIL PROTECTED] BlockDescriptor} doesn't specify any class.
*/
public String providedClass() {
- return(String)this.provision;
+ return this.provision;
}
/**
@@ -107,7 +104,7 @@
* [EMAIL PROTECTED] BlockDescriptor} doesn't specify any
composer.
*/
public String providedComposer() {
- return(String)this.composer;
+ return this.composer;
}
/*
====================================================================== */
1.2 +1 -2
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/configuration/ConfigurationSerializer.java
Index: ConfigurationSerializer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/configuration/ConfigurationSerializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConfigurationSerializer.java 30 Mar 2004 13:30:37 -0000 1.1
+++ ConfigurationSerializer.java 31 Mar 2004 10:28:34 -0000 1.2
@@ -100,7 +100,6 @@
public static void serialize(Configuration configuration, ContentHandler
h)
throws SAXException, ConfigurationException {
h.startDocument();
- String namespace = configuration.namespace();
element(configuration, h, 0, null);
h.endDocument();
}
1.2 +1 -2
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/configuration/Parameters.java
Index: Parameters.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/configuration/Parameters.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Parameters.java 30 Mar 2004 13:30:37 -0000 1.1
+++ Parameters.java 31 Mar 2004 10:28:34 -0000 1.2
@@ -62,7 +62,6 @@
public Parameters(Configuration configuration)
throws ConfigurationException {
super();
- String v = "value";
Iterator iterator = configuration.children("parameter");
while (iterator.hasNext()) try {
Configuration c = (Configuration)iterator.next();
1.6 +11 -0 cocoon-2.2/tools/targets/compile-build.xml
Index: compile-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/compile-build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- compile-build.xml 15 Mar 2004 18:15:11 -0000 1.5
+++ compile-build.xml 31 Mar 2004 10:28:34 -0000 1.6
@@ -54,6 +54,17 @@
compiler="${compiler}"
classpathref="classpath"/>
+ <!-- compile kernel source files -->
+ <javac srcdir="src/kernel"
+ destdir="${build.dest}"
+ debug="${compiler.debug}"
+ optimize="${compiler.optimize}"
+ deprecation="${compiler.deprecation}"
+ target="${target.vm}"
+ nowarn="${compiler.nowarn}"
+ compiler="${compiler}"
+ classpathref="classpath"/>
+
<!-- compile core source files -->
<javac srcdir="${java}"
destdir="${build.dest}"
1.3 +1 -2
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/deployment/Deployer.java
Index: Deployer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/deployment/Deployer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Deployer.java 30 Mar 2004 16:19:06 -0000 1.2
+++ Deployer.java 31 Mar 2004 10:28:34 -0000 1.3
@@ -20,7 +20,6 @@
import java.util.Iterator;
import org.apache.cocoon.kernel.identification.Identifier;
-import org.apache.cocoon.kernel.archival.Library;
/**
* <p>A [EMAIL PROTECTED] Deployer} describes a simple container where block
instances
