Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 33077 invoked from network); 7 Nov 2004 23:40:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 7 Nov 2004 23:40:52 -0000 Received: (qmail 14821 invoked by uid 500); 7 Nov 2004 23:40:51 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 14753 invoked by uid 500); 7 Nov 2004 23:40:50 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 14741 invoked by uid 99); 7 Nov 2004 23:40:50 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sun, 07 Nov 2004 15:40:49 -0800 Received: (qmail 33001 invoked by uid 65534); 7 Nov 2004 23:40:48 -0000 Date: 7 Nov 2004 23:40:48 -0000 Message-ID: <20041107234048.32988.qmail@minotaur.apache.org> From: pier@apache.org To: cvs@cocoon.apache.org Subject: svn commit: rev 56879 - in cocoon/whiteboard/kernel: . sources/blocks/commons-dbcp sources/blocks/jasper sources/blocks/saxon sources/contracts/datasource sources/contracts/jaxp sources/contracts/jaxp/src/org/apache/cocoon/contracts/jaxp sources/contracts/servlet sources/extensions/jaxp/src/org/apache/cocoon/kernel/plugins sources/runtime/org/apache/cocoon/kernel/deployment sources/runtime/org/apache/cocoon/kernel/description sources/webapp/WEB-INF X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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 @@ - - - + + + 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 @@ - + 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"> - + 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"> - + - + 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 @@ - + - \ No newline at end of file + \ 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 @@ - + - + - \ No newline at end of file + \ 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; /** *

The default base implementation of all instances of {@link JaxpProvider}.

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; /** *

The {@link 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; /** *

A {@link JaxpProvider} gives access to the several parts of the JAXP API.

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 @@ - + - \ No newline at end of file + \ 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; /** *

A kernel plugin interoperating with the {@link 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 @@ /**

The {@link KernelLoader} loading our instance.

*/ private KernelLoader loader = null; - /**

The {@link Library} of all {@link Block}s and {@link Interface}s.

*/ + /**

The {@link Library} of all {@link Block}s and {@link Contract}s.

*/ private Library library = null; /**

A {@link Set} containing all components being initialized.

*/ 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; /**

Whether the component is a singleton or not.

*/ private boolean singleton = true; - /**

The array of identifiers of all implemented interfaces.

*/ + /**

The array of identifiers of all implemented contracts.

*/ private Identifier[] implementations = null; /**

The array of identifiers of all required modules.

*/ 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 @@ } /** - *

Return an array of all implemented interface identifers.

+ *

Return an array of all implemented contract identifers.

*/ - 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; /** - *

An {@link Interface} is a specialized implementation of a {@link Descriptor} - * enclosing an kernel interface descriptor in a bean-like object.

+ *

An {@link Contract} is a specialized implementation of a {@link Descriptor} + * enclosing an kernel contract descriptor in a bean-like object.

* * @author Pier Fumagalli * @author Copyright © 2000-2004 The Apache * Software Foundation. All rights reserved. */ -public class Interface extends ExtendingDescriptor { +public class Contract extends ExtendingDescriptor { /**

The name of the exposed Java interface.

*/ private String clazz = null; /** - *

Create a new {@link Interface} instance.

+ *

Create a new {@link Contract} instance.

* * @param configuration A {@link 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 @@ *

Return the type of this descriptor.

*/ 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; /**

The type identifying a block descriptor.

*/ public static final int BLOCK = 1; - /**

The type identifying an interface descriptor.

*/ - public static final int INTERFACE = 2; + /**

The type identifying an contract descriptor.

*/ + public static final int CONTRACT = 2; /**

The type identifying an plugin descriptor.

*/ public static final int EXTENSION = 3; /**

The names associated with each descriptor type.

*/ public static final String NAMES[] = new String [] { - "module", "block", "interface", "extension", + "module", "block", "contract", "extension", }; /**

The array of libraries associated with this descriptor.

*/ 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 @@ - - - - + + + +