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

[reinhard]

Author: reinhard
Date: Mon Oct  4 06:04:38 2004
New Revision: 51884

Added:
   
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/descriptor/
   
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/descriptor/BlockPropertyImpl.java
      - copied, changed from rev 47196, 
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/BlockPropertyImpl.java
   
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/descriptor/RealBlockDescriptor.java
      - copied, changed from rev 47196, 
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/RealBlockDescriptor.java
   
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/descriptor/RealBlockRequirement.java
Log:
- work on XML mappings
- some refactoring

Copied: 
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/descriptor/BlockPropertyImpl.java
 (from rev 47196, 
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/BlockPropertyImpl.java)
==============================================================================
--- 
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/BlockPropertyImpl.java
      (original)
+++ 
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/descriptor/BlockPropertyImpl.java
   Mon Oct  4 06:04:38 2004
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.blockdeployer.block;
+package org.apache.cocoon.blockdeployer.block.descriptor;
+
+import org.apache.cocoon.blockdeployer.block.descriptor.BlockProperty;
 
 /**
  * @since 0.1

Copied: 
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/descriptor/RealBlockDescriptor.java
 (from rev 47196, 
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/RealBlockDescriptor.java)
==============================================================================
--- 
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/RealBlockDescriptor.java
    (original)
+++ 
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/descriptor/RealBlockDescriptor.java
 Mon Oct  4 06:04:38 2004
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.blockdeployer.block;
+package org.apache.cocoon.blockdeployer.block.descriptor;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -21,7 +21,9 @@
 import java.util.List;
 import java.util.ArrayList;
 
-import org.apache.cocoon.blockdeployer.block.BlockDescriptor;
+import org.apache.cocoon.blockdeployer.block.descriptor.BlockDescriptor;
+import org.apache.cocoon.blockdeployer.block.descriptor.BlockProperty;
+
 import java.util.Map;
 
 /**
@@ -41,6 +43,7 @@
     private List dependencies;
     private Collection properties = new ArrayList();
     private Map propertiesMap = new HashMap();
+    private Collection requirements = new ArrayList();
 
     // **************** base meta information ********************    
     
@@ -151,6 +154,10 @@
     
     public Iterator getRequiredBlockURIs() {
         return null;
+    }
+    
+    public Collection getRequirements() {
+        return this.requirements;
     }
 
     

Added: 
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/descriptor/RealBlockRequirement.java
==============================================================================
--- (empty file)
+++ 
cocoon/whiteboard/block-deployer/src/impl/org/apache/cocoon/blockdeployer/block/descriptor/RealBlockRequirement.java
        Mon Oct  4 06:04:38 2004
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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.blockdeployer.block.descriptor;
+
+/**
+ * @since 0.1
+ */
+public class RealBlockRequirement implements BlockRequirement {
+
+    private String name;
+    private String blockId;
+    
+    public String getBlockId() {
+        return blockId;
+    }
+    public void setBlockId(String blockId) {
+        this.blockId = blockId;
+    }
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    
+}