Author: reinhard
Date: Fri Mar 25 06:27:56 2005
New Revision: 159024
URL: http://svn.apache.org/viewcvs?view=rev&rev=159024
Log:
simplify deployment descriptor
Modified:
cocoon/whiteboard/block-deployer/test/sample-descriptors/sample-deploy.xml
Modified:
cocoon/whiteboard/block-deployer/test/sample-descriptors/sample-deploy.xml
URL:
http://svn.apache.org/viewcvs/cocoon/whiteboard/block-deployer/test/sample-descriptors/sample-deploy.xml?view=diff&r1=159023&r2=159024
==============================================================================
--- cocoon/whiteboard/block-deployer/test/sample-descriptors/sample-deploy.xml
(original)
+++ cocoon/whiteboard/block-deployer/test/sample-descriptors/sample-deploy.xml
Fri Mar 25 06:27:56 2005
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 1999-2004 The Apache Software Foundation
@@ -16,24 +16,18 @@
-->
<deploy xmlns="http://cocoon.apache.org/cob-deployment/1.0";>
<locators>
- <locator uri="C:/myDirectory" add-unavailable-blocks="true"/>
- <locator uri="F:/anotherDirectory"/>
+ <locator uri="C:\myDirectory" add-unavailable-blocks="true"/>
+ <locator uri="F:\anotherDirectory"/>
<locator uri="http://cocoon.apache.org/block-repository/"/>
</locators>
- <install default-system="localhost">
- <cocoon version="2.2">
- <system name="localhost" uri="D:/local"/>
- <system name="production" uri="E:/myCocoonServer"/>
- </cocoon>
+ <install default-system="production">
+ <cocoon version="2.2" uri="d:\"/>
<block id="http://mycompany.com/webmail/1.3.43"; auto-resolve="true">
- <parameter name="mailserver">
- <system name="localhost" value="xyz"/>
- <system name="production" value="abc"/>
- </parameter>
+ <property name="mailserver" value="xyz"/>
</block>
<block id="http://mycompany.com/myblock/1.3.43"; auto-resolve="false">
- <parameter name="driver" value="myDriver.class"/>
+ <property name="driver" value="myDriver.class"/>
</block>
- <block id="http://mycompany.com/myOtherBlock/1.3.43"; auto-resolve="false"
path="E:/myDevDir"/>
+ <block id="http://mycompany.com/myOtherBlock/1.3.43"; auto-resolve="false"
path="E:\myBlockDevDir"/>
</install>
</deploy>
