Author: reinhard
Date: Fri Mar 11 08:42:54 2005
New Revision: 157108
URL: http://svn.apache.org/viewcvs?view=rev&rev=157108
Log:
more renaming
Added:
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/BlockWiring10-mapping.xml
- copied, changed from r157101,
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/RealBlockWiring10-mapping.xml
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/BlockWiring10.java
- copied, changed from r126205,
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/RealBlockWiring.java
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredBlockConnection10.java
- copied, changed from r126205,
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredRealBlockConnection.java
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredBlockDescriptor10.java
- copied, changed from r126205,
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredRealBlockDescriptor.java
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredBlockProperty10.java
- copied, changed from r126205,
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredRealBlockProperty.java
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/Wiring10Builder.java
- copied, changed from r157101,
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiringBuilder.java
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/Wiring10Writer.java
- copied, changed from r126205,
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiringWriter.java
Removed:
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/RealBlockWiring.java
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/RealBlockWiring10-mapping.xml
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredRealBlockConnection.java
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredRealBlockDescriptor.java
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredRealBlockProperty.java
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiringBuilder.java
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiringWriter.java
Modified:
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/repository/ApplicationServer22Locator.java
Modified:
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/repository/ApplicationServer22Locator.java
URL:
http://svn.apache.org/viewcvs/cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/repository/ApplicationServer22Locator.java?view=diff&r1=157107&r2=157108
==============================================================================
---
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/repository/ApplicationServer22Locator.java
(original)
+++
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/repository/ApplicationServer22Locator.java
Fri Mar 11 08:42:54 2005
@@ -34,7 +34,7 @@
import org.apache.cocoon.blockdeployer.repository.Lockable;
import org.apache.cocoon.blockdeployer.utils.CommonsTransactionLogger;
import org.apache.cocoon.blockdeployer.utils.LocatorUtils;
-import org.apache.cocoon.blockdeployer.wiring.WiredRealBlockDescriptor;
+import org.apache.cocoon.blockdeployer.wiring.WiredBlockDescriptor10;
import org.apache.cocoon.blockdeployer.wiring.Wiring;
import org.apache.commons.transaction.file.FileResourceManager;
import org.apache.commons.transaction.file.ResourceManagerException;
@@ -209,11 +209,11 @@
* Create a wiring descriptor out of the block descriptor
*
* @param Block
- * @return returns a WiredRealBlockDescriptor object containing
+ * @return returns a WiredBlockDescriptor10 object containing
*/
- protected static WiredRealBlockDescriptor createBlockWiringDescriptor(
+ protected static WiredBlockDescriptor10 createBlockWiringDescriptor(
RemoteBlock block) {
- WiredRealBlockDescriptor wrbd = new WiredRealBlockDescriptor();
+ WiredBlockDescriptor10 wrbd = new WiredBlockDescriptor10();
BlockDescriptor rbd = block.getBlockDescriptor();
wrbd.setId(rbd.getBlockId());
return wrbd;
Copied:
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/BlockWiring10-mapping.xml
(from r157101,
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/RealBlockWiring10-mapping.xml)
URL:
http://svn.apache.org/viewcvs/cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/BlockWiring10-mapping.xml?view=diff&rev=157108&p1=cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/RealBlockWiring10-mapping.xml&r1=157101&p2=cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/BlockWiring10-mapping.xml&r2=157108
==============================================================================
---
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/RealBlockWiring10-mapping.xml
(original)
+++
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/BlockWiring10-mapping.xml
Fri Mar 11 08:42:54 2005
@@ -17,14 +17,14 @@
<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Mapping DTD Version 1.0//EN"
"http://castor.exolab.org/mapping.dtd";>
<mapping>
- <class name="org.apache.cocoon.blockdeployer.wiring.RealBlockWiring">
+ <class name="org.apache.cocoon.blockdeployer.wiring.BlockWiring10">
<map-to xml="wiring"
ns-uri="http://apache.org/cocoon/blocks/wiring/1.0"/>
<field name="blockDescriptors"
-
type="org.apache.cocoon.blockdeployer.wiring.WiredRealBlockDescriptor"
collection="collection">
+
type="org.apache.cocoon.blockdeployer.wiring.WiredBlockDescriptor10"
collection="collection">
<bind-xml name="block" node="element"/>
</field>
</class>
- <class
name="org.apache.cocoon.blockdeployer.wiring.WiredRealBlockDescriptor">
+ <class
name="org.apache.cocoon.blockdeployer.wiring.WiredBlockDescriptor10">
<map-to ns-uri="http://apache.org/cocoon/blocks/wiring/1.0"/>
<field name="id" type="string">
<bind-xml name="id" node="attribute"/>
@@ -36,15 +36,15 @@
<bind-xml name="mount" node="element"/>
</field>
<field name="properties"
-
type="org.apache.cocoon.blockdeployer.wiring.WiredRealBlockProperty"
collection="collection">
+ type="org.apache.cocoon.blockdeployer.wiring.WiredBlockProperty10"
collection="collection">
<bind-xml name="property" node="element" location="properties" />
</field>
<field name="connections"
-
type="org.apache.cocoon.blockdeployer.wiring.WiredRealBlockConnection"
collection="collection">
+
type="org.apache.cocoon.blockdeployer.wiring.WiredBlockConnection10"
collection="collection">
<bind-xml name="connection" node="element" location="connections"/>
</field>
</class>
- <class
name="org.apache.cocoon.blockdeployer.wiring.WiredRealBlockProperty">
+ <class name="org.apache.cocoon.blockdeployer.wiring.WiredBlockProperty10">
<map-to ns-uri="http://apache.org/cocoon/blocks/cob/1.0"/>
<field name="name" type="string">
<bind-xml name="name" node="attribute"/>
@@ -53,7 +53,7 @@
<bind-xml node="text"/>
</field>
</class>
- <class
name="org.apache.cocoon.blockdeployer.wiring.WiredRealBlockConnection">
+ <class
name="org.apache.cocoon.blockdeployer.wiring.WiredBlockConnection10">
<map-to ns-uri="http://apache.org/cocoon/blocks/cob/1.0"/>
<field name="name" type="string">
<bind-xml name="name" node="attribute"/>
Copied:
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/BlockWiring10.java
(from r126205,
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/RealBlockWiring.java)
URL:
http://svn.apache.org/viewcvs/cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/BlockWiring10.java?view=diff&rev=157108&p1=cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/RealBlockWiring.java&r1=126205&p2=cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/BlockWiring10.java&r2=157108
==============================================================================
---
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/RealBlockWiring.java
(original)
+++
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/BlockWiring10.java
Fri Mar 11 08:42:54 2005
@@ -21,18 +21,18 @@
/**
* @since 0.1
*/
-public class RealBlockWiring implements Wiring {
+public class BlockWiring10 implements Wiring {
private Collection blockDescriptors = new ArrayList();
// default constructor
- public RealBlockWiring() {};
+ public BlockWiring10() {};
public Collection getBlockDescriptors() {
return this.blockDescriptors;
}
- public void addBlockDescriptor(WiredRealBlockDescriptor descriptor) {
+ public void addBlockDescriptor(WiredBlockDescriptor10 descriptor) {
blockDescriptors.add(descriptor);
}
}
Copied:
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredBlockConnection10.java
(from r126205,
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredRealBlockConnection.java)
URL:
http://svn.apache.org/viewcvs/cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredBlockConnection10.java?view=diff&rev=157108&p1=cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredRealBlockConnection.java&r1=126205&p2=cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredBlockConnection10.java&r2=157108
==============================================================================
---
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredRealBlockConnection.java
(original)
+++
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredBlockConnection10.java
Fri Mar 11 08:42:54 2005
@@ -18,7 +18,7 @@
/**
* @since 03.10.2004
*/
-public class WiredRealBlockConnection implements WiredBlockConnection {
+public class WiredBlockConnection10 implements WiredBlockConnection {
private String name;
private String connectedBlockId;
Copied:
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredBlockDescriptor10.java
(from r126205,
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredRealBlockDescriptor.java)
URL:
http://svn.apache.org/viewcvs/cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredBlockDescriptor10.java?view=diff&rev=157108&p1=cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredRealBlockDescriptor.java&r1=126205&p2=cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredBlockDescriptor10.java&r2=157108
==============================================================================
---
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredRealBlockDescriptor.java
(original)
+++
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredBlockDescriptor10.java
Fri Mar 11 08:42:54 2005
@@ -21,7 +21,7 @@
/**
* @since 0.1
*/
-public class WiredRealBlockDescriptor implements WiredBlockDescriptor {
+public class WiredBlockDescriptor10 implements WiredBlockDescriptor {
private String id;
private String location;
@@ -30,7 +30,7 @@
private Collection connections = new ArrayList();
// default constructor
- public WiredRealBlockDescriptor() {};
+ public WiredBlockDescriptor10() {};
public String getLocation() {
return location;
Copied:
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredBlockProperty10.java
(from r126205,
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredRealBlockProperty.java)
URL:
http://svn.apache.org/viewcvs/cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredBlockProperty10.java?view=diff&rev=157108&p1=cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredRealBlockProperty.java&r1=126205&p2=cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredBlockProperty10.java&r2=157108
==============================================================================
---
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredRealBlockProperty.java
(original)
+++
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiredBlockProperty10.java
Fri Mar 11 08:42:54 2005
@@ -18,7 +18,7 @@
/**
* @since 03.10.2004
*/
-public class WiredRealBlockProperty implements WiredBlockProperty {
+public class WiredBlockProperty10 implements WiredBlockProperty {
private String name;
private String value;
Copied:
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/Wiring10Builder.java
(from r157101,
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiringBuilder.java)
URL:
http://svn.apache.org/viewcvs/cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/Wiring10Builder.java?view=diff&rev=157108&p1=cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiringBuilder.java&r1=157101&p2=cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/Wiring10Builder.java&r2=157108
==============================================================================
---
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiringBuilder.java
(original)
+++
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/Wiring10Builder.java
Fri Mar 11 08:42:54 2005
@@ -27,16 +27,16 @@
/**
* @since 0.1
*/
-public class WiringBuilder {
+public class Wiring10Builder {
public static Wiring build(File descriptorFile) throws Exception {
// create an object out of the descriptor file
Mapping mapping = new Mapping();
- mapping.loadMapping(Cob10Descriptor.class.getClassLoader().
-
getResource("org/apache/cocoon/blockdeployer/wiring/RealBlockWiring10-mapping.xml"));
+ mapping.loadMapping(Wiring10Builder.class.getClassLoader().
+
getResource("org/apache/cocoon/blockdeployer/wiring/BlockWiring10-mapping.xml"));
- Unmarshaller unmarshaller = new Unmarshaller(RealBlockWiring.class);
+ Unmarshaller unmarshaller = new Unmarshaller(BlockWiring10.class);
unmarshaller.setMapping(mapping);
unmarshaller.setIgnoreExtraAttributes(true);
unmarshaller.setIgnoreExtraElements(true);
@@ -44,7 +44,7 @@
InputStream is = new FileInputStream(descriptorFile);
- RealBlockWiring realblockWiring =
(RealBlockWiring)unmarshaller.unmarshal(new InputStreamReader(is));
+ BlockWiring10 realblockWiring =
(BlockWiring10)unmarshaller.unmarshal(new InputStreamReader(is));
return realblockWiring;
}
Copied:
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/Wiring10Writer.java
(from r126205,
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiringWriter.java)
URL:
http://svn.apache.org/viewcvs/cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/Wiring10Writer.java?view=diff&rev=157108&p1=cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiringWriter.java&r1=126205&p2=cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/Wiring10Writer.java&r2=157108
==============================================================================
---
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/WiringWriter.java
(original)
+++
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/wiring/Wiring10Writer.java
Fri Mar 11 08:42:54 2005
@@ -19,6 +19,6 @@
/**
* @since 0.1
*/
-public class WiringWriter {
+public class Wiring10Writer {
}
