svn commit: rev 51885 - cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block

[reinhard]

Author: reinhard
Date: Mon Oct  4 06:05:25 2004
New Revision: 51885

Modified:
   
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/RealRemoteBlock.java
   
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/RemoteBlockFactory.java
Log:
- work on XML mappings
- some refactorings

Modified: 
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/RealRemoteBlock.java
==============================================================================
--- 
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/RealRemoteBlock.java
        (original)
+++ 
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/RealRemoteBlock.java
        Mon Oct  4 06:05:25 2004
@@ -16,8 +16,8 @@
 package org.apache.cocoon.blockdeployer.block;
 
 import org.apache.cocoon.blockdeployer.block.Block;
-import org.apache.cocoon.blockdeployer.block.BlockDescriptor;
 import org.apache.cocoon.blockdeployer.block.RemoteBlock;
+import org.apache.cocoon.blockdeployer.block.descriptor.BlockDescriptor;
 import org.apache.cocoon.blockdeployer.repository.Locator;
 
 /**

Modified: 
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/RemoteBlockFactory.java
==============================================================================
--- 
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/RemoteBlockFactory.java
     (original)
+++ 
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/RemoteBlockFactory.java
     Mon Oct  4 06:05:25 2004
@@ -18,6 +18,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
+import org.apache.cocoon.blockdeployer.block.descriptor.RealBlockDescriptor;
 import org.apache.cocoon.blockdeployer.repository.Locator;
 import org.exolab.castor.mapping.Mapping;
 import org.exolab.castor.xml.Unmarshaller;
@@ -64,7 +65,7 @@
         unmarshaller.setMapping(mapping);
         unmarshaller.setIgnoreExtraAttributes(true);
         unmarshaller.setIgnoreExtraElements(true);
-//        unmarshaller.setDebug(true);
+        // unmarshaller.setDebug(true);
         RealBlockDescriptor realBlockDescriptor = 
(RealBlockDescriptor)unmarshaller.unmarshal(new InputStreamReader(descriptor));
         return realBlockDescriptor;
     }