Author: pier
Date: Sun Nov 7 15:40:47 2004
New Revision: 56879
Modified:
cocoon/whiteboard/kernel/build.xml
cocoon/whiteboard/kernel/sources/blocks/commons-dbcp/cocoon.xml
cocoon/whiteboard/kernel/sources/blocks/jasper/cocoon.xml
cocoon/whiteboard/kernel/sources/blocks/saxon/cocoon.xml
cocoon/whiteboard/kernel/sources/contracts/datasource/cocoon.xml
cocoon/whiteboard/kernel/sources/contracts/jaxp/cocoon.xml
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/AbstractProvider.java
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/BuilderProvider.java
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/JaxpException.java
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/JaxpProvider.java
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/ParserProvider.java
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/TransformerProvider.java
cocoon/whiteboard/kernel/sources/contracts/servlet/cocoon.xml
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpBuilderPlugin.java
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpParserPlugin.java
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpPlugin.java
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpTransformerPlugin.java
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/deployment/Deployer.java
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/deployment/Factory.java
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/deployment/Instance.java
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/description/Block.java
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/description/Contract.java
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/description/Descriptor.java
cocoon/whiteboard/kernel/sources/webapp/WEB-INF/configuration.xml
Log:
Phase 4 of renaming "Interfaces" to "Contracts"
Modified: cocoon/whiteboard/kernel/build.xml
==============================================================================
--- cocoon/whiteboard/kernel/build.xml (original)
+++ cocoon/whiteboard/kernel/build.xml Sun Nov 7 15:40:47 2004
@@ -152,7 +152,7 @@
<mapper>
<mapper
type="regexp"
-
from="^(blocks|extensions|interfaces|modules)/([a-z\-\_\.]+)/src/(.*)\.(html|java)$"
+
from="^(blocks|extensions|contracts|modules)/([a-z\-\_\.]+)/src/(.*)\.(html|java)$"
to="\3.\4"/>
<mapper
type="regexp"
@@ -188,9 +188,9 @@
<!--
========================================================================== -->
<target name="kernel.components">
- <antcall target="kernel.component"><param name="name"
value="interfaces/datasource"/></antcall>
- <antcall target="kernel.component"><param name="name"
value="interfaces/jaxp"/></antcall>
- <antcall target="kernel.component"><param name="name"
value="interfaces/servlet"/></antcall>
+ <antcall target="kernel.component"><param name="name"
value="contracts/datasource"/></antcall>
+ <antcall target="kernel.component"><param name="name"
value="contracts/jaxp"/></antcall>
+ <antcall target="kernel.component"><param name="name"
value="contracts/servlet"/></antcall>
<antcall target="kernel.component"><param name="name"
value="extensions/logging"/></antcall>
<antcall target="kernel.component"><param name="name"
value="extensions/jaxp"/></antcall>
<antcall target="kernel.component"><param name="name"
value="modules/ant"/></antcall>
Modified: cocoon/whiteboard/kernel/sources/blocks/commons-dbcp/cocoon.xml
==============================================================================
--- cocoon/whiteboard/kernel/sources/blocks/commons-dbcp/cocoon.xml
(original)
+++ cocoon/whiteboard/kernel/sources/blocks/commons-dbcp/cocoon.xml Sun Nov
7 15:40:47 2004
@@ -8,7 +8,7 @@
</requirements>
<implementations>
- <implements
interface="http://cocoon.apache.org/kernel/interfaces/datasource/1.0"/>
+ <implements
contract="http://cocoon.apache.org/kernel/contracts/datasource/1.0"/>
</implementations>
<libraries>
Modified: cocoon/whiteboard/kernel/sources/blocks/jasper/cocoon.xml
==============================================================================
--- cocoon/whiteboard/kernel/sources/blocks/jasper/cocoon.xml (original)
+++ cocoon/whiteboard/kernel/sources/blocks/jasper/cocoon.xml Sun Nov 7
15:40:47 2004
@@ -4,7 +4,7 @@
id="http://cocoon.apache.org/kernel/blocks/jasper/4.1.30";>
<implementations>
- <implements
interface="http://cocoon.apache.org/kernel/interfaces/servlet/2.3"/>
+ <implements
contract="http://cocoon.apache.org/kernel/contracts/servlet/2.3"/>
</implementations>
<provides component="org.apache.cocoon.blocks.jasper.JasperServlet"/>
Modified: cocoon/whiteboard/kernel/sources/blocks/saxon/cocoon.xml
==============================================================================
--- cocoon/whiteboard/kernel/sources/blocks/saxon/cocoon.xml (original)
+++ cocoon/whiteboard/kernel/sources/blocks/saxon/cocoon.xml Sun Nov 7
15:40:47 2004
@@ -4,14 +4,14 @@
id="http://cocoon.apache.org/kernel/blocks/saxon-b/8.1.1";>
<implementations>
- <implements
interface="http://cocoon.apache.org/kernel/interfaces/jaxp/1.0"/>
+ <implements contract="http://cocoon.apache.org/kernel/contracts/jaxp/1.0"/>
</implementations>
<libraries>
<library href="saxonb-8.1.1.jar"/>
</libraries>
- <provides component="org.apache.cocoon.interfaces.jaxp.TransformerProvider">
+ <provides component="org.apache.cocoon.contracts.jaxp.TransformerProvider">
<set property="className" value="net.sf.saxon.TransformerFactoryImpl"/>
</provides>
Modified: cocoon/whiteboard/kernel/sources/contracts/datasource/cocoon.xml
==============================================================================
--- cocoon/whiteboard/kernel/sources/contracts/datasource/cocoon.xml
(original)
+++ cocoon/whiteboard/kernel/sources/contracts/datasource/cocoon.xml Sun Nov
7 15:40:47 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface xmlns="http://apache.org/cocoon/kernel/descriptor/1.0";
- id="http://cocoon.apache.org/kernel/interfaces/datasource/1.0";>
+<contract xmlns="http://apache.org/cocoon/kernel/descriptor/1.0";
+ id="http://cocoon.apache.org/kernel/contracts/datasource/1.0";>
<exposes interface="javax.sql.DataSource"/>
-</interface>
\ No newline at end of file
+</contract>
\ No newline at end of file
Modified: cocoon/whiteboard/kernel/sources/contracts/jaxp/cocoon.xml
==============================================================================
--- cocoon/whiteboard/kernel/sources/contracts/jaxp/cocoon.xml (original)
+++ cocoon/whiteboard/kernel/sources/contracts/jaxp/cocoon.xml Sun Nov 7
15:40:47 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface xmlns="http://apache.org/cocoon/kernel/descriptor/1.0";
- id="http://cocoon.apache.org/kernel/interfaces/jaxp/1.0";>
+<contract xmlns="http://apache.org/cocoon/kernel/descriptor/1.0";
+ id="http://cocoon.apache.org/kernel/contracts/jaxp/1.0";>
- <exposes interface="org.apache.cocoon.interfaces.jaxp.JaxpProvider"/>
+ <exposes interface="org.apache.cocoon.contracts.jaxp.JaxpProvider"/>
-</interface>
\ No newline at end of file
+</contract>
\ No newline at end of file
Modified:
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/AbstractProvider.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/AbstractProvider.java
(original)
+++
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/AbstractProvider.java
Sun Nov 7 15:40:47 2004
@@ -10,7 +10,7 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for
the *
* specific language governing permissions and limitations under the License.
*
*
===============================================================================
*/
-package org.apache.cocoon.interfaces.jaxp;
+package org.apache.cocoon.contracts.jaxp;
/**
* <p>The default base implementation of all instances of [EMAIL PROTECTED]
JaxpProvider}.</p>
Modified:
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/BuilderProvider.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/BuilderProvider.java
(original)
+++
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/BuilderProvider.java
Sun Nov 7 15:40:47 2004
@@ -10,7 +10,7 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for
the *
* specific language governing permissions and limitations under the License.
*
*
===============================================================================
*/
-package org.apache.cocoon.interfaces.jaxp;
+package org.apache.cocoon.contracts.jaxp;
import javax.xml.parsers.DocumentBuilderFactory;
Modified:
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/JaxpException.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/JaxpException.java
(original)
+++
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/JaxpException.java
Sun Nov 7 15:40:47 2004
@@ -10,7 +10,7 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for
the *
* specific language governing permissions and limitations under the License.
*
*
===============================================================================
*/
-package org.apache.cocoon.interfaces.jaxp;
+package org.apache.cocoon.contracts.jaxp;
/**
* <p>The [EMAIL PROTECTED] JaxpException} is thrown whenever an error
occurred accessing the
Modified:
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/JaxpProvider.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/JaxpProvider.java
(original)
+++
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/JaxpProvider.java
Sun Nov 7 15:40:47 2004
@@ -10,7 +10,7 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for
the *
* specific language governing permissions and limitations under the License.
*
*
===============================================================================
*/
-package org.apache.cocoon.interfaces.jaxp;
+package org.apache.cocoon.contracts.jaxp;
/**
* <p>A [EMAIL PROTECTED] JaxpProvider} gives access to the several parts of
the JAXP API.</p>
Modified:
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/ParserProvider.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/ParserProvider.java
(original)
+++
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/ParserProvider.java
Sun Nov 7 15:40:47 2004
@@ -10,7 +10,7 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for
the *
* specific language governing permissions and limitations under the License.
*
*
===============================================================================
*/
-package org.apache.cocoon.interfaces.jaxp;
+package org.apache.cocoon.contracts.jaxp;
import javax.xml.parsers.SAXParserFactory;
Modified:
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/TransformerProvider.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/TransformerProvider.java
(original)
+++
cocoon/whiteboard/kernel/sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp/TransformerProvider.java
Sun Nov 7 15:40:47 2004
@@ -10,7 +10,7 @@
* CONDITIONS OF ANY KIND, either express or implied. See the License for
the *
* specific language governing permissions and limitations under the License.
*
*
===============================================================================
*/
-package org.apache.cocoon.interfaces.jaxp;
+package org.apache.cocoon.contracts.jaxp;
import javax.xml.transform.sax.SAXTransformerFactory;
Modified: cocoon/whiteboard/kernel/sources/contracts/servlet/cocoon.xml
==============================================================================
--- cocoon/whiteboard/kernel/sources/contracts/servlet/cocoon.xml
(original)
+++ cocoon/whiteboard/kernel/sources/contracts/servlet/cocoon.xml Sun Nov
7 15:40:47 2004
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface xmlns="http://apache.org/cocoon/kernel/descriptor/1.0";
- id="http://cocoon.apache.org/kernel/interfaces/servlet/2.3";>
+<contract xmlns="http://apache.org/cocoon/kernel/descriptor/1.0";
+ id="http://cocoon.apache.org/kernel/contracts/servlet/2.3";>
<exposes interface="javax.servlet.Servlet"/>
-</interface>
\ No newline at end of file
+</contract>
\ No newline at end of file
Modified:
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpBuilderPlugin.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpBuilderPlugin.java
(original)
+++
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpBuilderPlugin.java
Sun Nov 7 15:40:47 2004
@@ -16,7 +16,7 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.cocoon.interfaces.jaxp.JaxpException;
+import org.apache.cocoon.contracts.jaxp.JaxpException;
/**
* <p>A kernel plugin interoperating with the [EMAIL PROTECTED]
DocumentBuilderFactory}
Modified:
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpParserPlugin.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpParserPlugin.java
(original)
+++
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpParserPlugin.java
Sun Nov 7 15:40:47 2004
@@ -15,7 +15,8 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.cocoon.interfaces.jaxp.JaxpException;
+
+import org.apache.cocoon.contracts.jaxp.JaxpException;
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
Modified:
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpPlugin.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpPlugin.java
(original)
+++
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpPlugin.java
Sun Nov 7 15:40:47 2004
@@ -17,8 +17,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.cocoon.interfaces.jaxp.JaxpException;
-import org.apache.cocoon.interfaces.jaxp.JaxpProvider;
+import org.apache.cocoon.contracts.jaxp.JaxpException;
+import org.apache.cocoon.contracts.jaxp.JaxpProvider;
import org.apache.cocoon.kernel.configuration.Configuration;
import org.apache.cocoon.kernel.deployment.Instance;
Modified:
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpTransformerPlugin.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpTransformerPlugin.java
(original)
+++
cocoon/whiteboard/kernel/sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins/JaxpTransformerPlugin.java
Sun Nov 7 15:40:47 2004
@@ -22,7 +22,7 @@
import javax.xml.transform.sax.TemplatesHandler;
import javax.xml.transform.sax.TransformerHandler;
-import org.apache.cocoon.interfaces.jaxp.JaxpException;
+import org.apache.cocoon.contracts.jaxp.JaxpException;
import org.xml.sax.XMLFilter;
/**
Modified:
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/deployment/Deployer.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/deployment/Deployer.java
(original)
+++
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/deployment/Deployer.java
Sun Nov 7 15:40:47 2004
@@ -48,7 +48,7 @@
/** <p>The [EMAIL PROTECTED] KernelLoader} loading our instance.</p> */
private KernelLoader loader = null;
- /** <p>The [EMAIL PROTECTED] Library} of all [EMAIL PROTECTED] Block}s and
[EMAIL PROTECTED] Interface}s.</p> */
+ /** <p>The [EMAIL PROTECTED] Library} of all [EMAIL PROTECTED] Block}s and
[EMAIL PROTECTED] Contract}s.</p> */
private Library library = null;
/** <p>A [EMAIL PROTECTED] Set} containing all components being
initialized.</p> */
private Set initializing = new HashSet();
@@ -96,10 +96,10 @@
/* Retrieve all descriptors and put them in the library */
Factory.configure(this.library, descriptors);
- /* Make sure that our loader adds the interface libraries */
- Iterator interfaces = library.iterator(Descriptor.INTERFACE);
- while (interfaces.hasNext()) {
- Descriptor descriptor = ((Descriptor) interfaces.next());
+ /* Make sure that our loader adds the contract libraries */
+ Iterator contracts = library.iterator(Descriptor.CONTRACT);
+ while (contracts.hasNext()) {
+ Descriptor descriptor = ((Descriptor) contracts.next());
this.loader.addURL(this, descriptor.getLibraries());
}
@@ -237,9 +237,9 @@
Wiring wiring = new Wiring(component);
/* Create and return the proxy instance */
- Class interfaces[] = wrapper.instance.getImplementedInterfaces();
+ Class contracts[] = wrapper.instance.getImplementedInterfaces();
try {
- return Proxy.newProxyInstance(this.loader, interfaces, wiring);
+ return Proxy.newProxyInstance(this.loader, contracts, wiring);
} catch (Throwable t) {
throw new KernelException("Unable to create component proxy
instance "
+ " for block \"" + wrapper.instance.getBlock()
Modified:
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/deployment/Factory.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/deployment/Factory.java
(original)
+++
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/deployment/Factory.java
Sun Nov 7 15:40:47 2004
@@ -29,7 +29,7 @@
import org.apache.cocoon.kernel.description.Module;
import org.apache.cocoon.kernel.description.Block;
import org.apache.cocoon.kernel.description.Descriptor;
-import org.apache.cocoon.kernel.description.Interface;
+import org.apache.cocoon.kernel.description.Contract;
import org.apache.cocoon.kernel.description.Library;
/**
@@ -68,8 +68,8 @@
library.add(new Module(descriptor));
} else if (Descriptor.NAMES[Descriptor.BLOCK].equals(name)) {
library.add(new Block(descriptor));
- } else if (Descriptor.NAMES[Descriptor.INTERFACE].equals(name)) {
- library.add(new Interface(descriptor));
+ } else if (Descriptor.NAMES[Descriptor.CONTRACT].equals(name)) {
+ library.add(new Contract(descriptor));
} else if (Descriptor.NAMES[Descriptor.EXTENSION].equals(name)) {
library.add(new Extension(descriptor));
} else {
Modified:
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/deployment/Instance.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/deployment/Instance.java
(original)
+++
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/deployment/Instance.java
Sun Nov 7 15:40:47 2004
@@ -22,7 +22,7 @@
import org.apache.cocoon.kernel.description.Descriptor;
import org.apache.cocoon.kernel.description.ExtendingDescriptor;
import org.apache.cocoon.kernel.description.Identifier;
-import org.apache.cocoon.kernel.description.Interface;
+import org.apache.cocoon.kernel.description.Contract;
import org.apache.cocoon.kernel.description.Library;
/**
@@ -60,13 +60,13 @@
this.block = block;
this.name = name;
- /* Process all interfaces, all extended blocks and all modules */
+ /* Process all contracts, all extended blocks and all modules */
Dependencies dependencies = new Dependencies();
dependencies.push(block);
Set interfaces = new HashSet();
- this.process(deployer.getLibrary(), block.getImplementedInterfaces(),
- dependencies, interfaces, Descriptor.INTERFACE);
+ this.process(deployer.getLibrary(), block.getImplementedContracts(),
+ dependencies, interfaces, Descriptor.CONTRACT);
this.process(deployer.getLibrary(), block.getExtendedDescriptors(),
dependencies, interfaces, Descriptor.BLOCK);
this.process(deployer.getLibrary(), block.getRequiredModules(),
@@ -174,7 +174,7 @@
/* Dependencies check */
dependencies.push(identifier);
- /* Analyse current interface */
+ /* Analyse current identifier */
Descriptor desc = library.get(identifier);
if (desc == null) {
throw dependencies.fail("Descriptor " + identifier + " unknonwn");
@@ -187,9 +187,9 @@
+ Descriptor.NAMES[desc.getType()] + "\"");
}
- /* Add java interfaces exposed by interface blocks */
- if (type == Descriptor.INTERFACE) {
- String clazz = ((Interface) desc).getInterfaceName();
+ /* Add java interfaces exposed by contracts */
+ if (type == Descriptor.CONTRACT) {
+ String clazz = ((Contract) desc).getInterfaceName();
try {
/* Load in the parent classloader, the runtime */
interfaces.add(this.getParent().loadClass(clazz));
@@ -216,8 +216,8 @@
if (type == Descriptor.BLOCK) {
Block block = (Block) desc;
- identifiers = block.getImplementedInterfaces();
- type = Descriptor.INTERFACE;
+ identifiers = block.getImplementedContracts();
+ type = Descriptor.CONTRACT;
this.process(library, identifiers, dependencies, interfaces, type);
identifiers = block.getRequiredModules();
Modified:
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/description/Block.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/description/Block.java
(original)
+++
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/description/Block.java
Sun Nov 7 15:40:47 2004
@@ -33,7 +33,7 @@
private String destroyer = null;
/** <p>Whether the component is a singleton or not.</p> */
private boolean singleton = true;
- /** <p>The array of identifiers of all implemented interfaces.</p> */
+ /** <p>The array of identifiers of all implemented contracts.</p> */
private Identifier[] implementations = null;
/** <p>The array of identifiers of all required modules.</p> */
private Identifier[] requirements = null;
@@ -57,9 +57,9 @@
+ " descriptor at " + configuration.location());
}
- /* Interface implementations and module requirements */
+ /* Contract implementations and module requirements */
this.implementations = super.collectIdentifiers(configuration,
- "implementations", "implements", NAMES[INTERFACE]);
+ "implementations", "implements", NAMES[CONTRACT]);
this.requirements = super.collectIdentifiers(configuration,
"requirements", "requires", NAMES[MODULE]);
@@ -123,9 +123,9 @@
}
/**
- * <p>Return an array of all implemented interface identifers.</p>
+ * <p>Return an array of all implemented contract identifers.</p>
*/
- public Identifier[] getImplementedInterfaces() {
+ public Identifier[] getImplementedContracts() {
return(this.implementations);
}
Modified:
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/description/Contract.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/description/Contract.java
(original)
+++
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/description/Contract.java
Sun Nov 7 15:40:47 2004
@@ -16,32 +16,32 @@
import org.apache.cocoon.kernel.deployment.DeployerException;
/**
- * <p>An [EMAIL PROTECTED] Interface} is a specialized implementation of a
[EMAIL PROTECTED] Descriptor}
- * enclosing an kernel interface descriptor in a bean-like object.</p>
+ * <p>An [EMAIL PROTECTED] Contract} is a specialized implementation of a
[EMAIL PROTECTED] Descriptor}
+ * enclosing an kernel contract descriptor in a bean-like object.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pier Fumagalli</a>
* @author Copyright © 2000-2004 <a href="http://www.apache.org/";>The
Apache
* Software Foundation</a>. All rights reserved.
*/
-public class Interface extends ExtendingDescriptor {
+public class Contract extends ExtendingDescriptor {
/** <p>The name of the exposed Java interface.</p> */
private String clazz = null;
/**
- * <p>Create a new [EMAIL PROTECTED] Interface} instance.</p>
+ * <p>Create a new [EMAIL PROTECTED] Contract} instance.</p>
*
* @param configuration A [EMAIL PROTECTED] Configuration} object
enclosing the XML data.
* @throws DeployerException If an error occurred processing the XML data.
*/
- public Interface(Configuration configuration)
+ public Contract(Configuration configuration)
throws DeployerException {
/* Parse all generic stuff */
super(configuration);
- /* Specific interface stuff */
- if (! NAMES[INTERFACE].equals(configuration.name())) {
- throw new DeployerException("Invalid root element name for
interface "
+ /* Specific contract stuff */
+ if (! NAMES[CONTRACT].equals(configuration.name())) {
+ throw new DeployerException("Invalid root element name for
contract "
+ " descriptor at " + configuration.location());
}
@@ -65,6 +65,6 @@
* <p>Return the type of this descriptor.</p>
*/
public int getType() {
- return Descriptor.INTERFACE;
+ return Descriptor.CONTRACT;
}
}
Modified:
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/description/Descriptor.java
==============================================================================
---
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/description/Descriptor.java
(original)
+++
cocoon/whiteboard/kernel/sources/runtime/org/apache/cocoon/kernel/description/Descriptor.java
Sun Nov 7 15:40:47 2004
@@ -38,14 +38,14 @@
public static final int MODULE = 0;
/** <p>The type identifying a block descriptor.</p> */
public static final int BLOCK = 1;
- /** <p>The type identifying an interface descriptor.</p> */
- public static final int INTERFACE = 2;
+ /** <p>The type identifying an contract descriptor.</p> */
+ public static final int CONTRACT = 2;
/** <p>The type identifying an plugin descriptor.</p> */
public static final int EXTENSION = 3;
/** <p>The names associated with each descriptor type.</p> */
public static final String NAMES[] = new String [] {
- "module", "block", "interface", "extension",
+ "module", "block", "contract", "extension",
};
/** <p>The array of libraries associated with this descriptor.</p> */
Modified: cocoon/whiteboard/kernel/sources/webapp/WEB-INF/configuration.xml
==============================================================================
--- cocoon/whiteboard/kernel/sources/webapp/WEB-INF/configuration.xml
(original)
+++ cocoon/whiteboard/kernel/sources/webapp/WEB-INF/configuration.xml Sun Nov
7 15:40:47 2004
@@ -7,10 +7,10 @@
<library href="kernel/cocoon-kernel-runtime-0.1.jar"/>
</classpath>
- <!-- The interface descriptors available to this kernel -->
- <descriptor href="kernel/interfaces/datasource/cocoon.xml"/>
- <descriptor href="kernel/interfaces/servlet/cocoon.xml"/>
- <descriptor href="kernel/interfaces/jaxp/cocoon.xml"/>
+ <!-- The contract descriptors available to this kernel -->
+ <descriptor href="kernel/contracts/datasource/cocoon.xml"/>
+ <descriptor href="kernel/contracts/servlet/cocoon.xml"/>
+ <descriptor href="kernel/contracts/jaxp/cocoon.xml"/>
<!-- The extension descriptors available to this kernel -->
<descriptor href="kernel/extensions/logging/cocoon.xml"/>
