Author: reinhard
Date: Fri Mar 11 08:25:37 2005
New Revision: 157103
URL: http://svn.apache.org/viewcvs?view=rev&rev=157103
Log:
more consisten naming; moving descriptor samples into test dir
Added:
cocoon/whiteboard/block-deployer/test/sample-descriptors/
- copied from r157101, cocoon/whiteboard/block-deployer/test/mapping/
cocoon/whiteboard/block-deployer/test/sample-descriptors/sample-block.xml
cocoon/whiteboard/block-deployer/test/sample-descriptors/sample-deploy.xml
cocoon/whiteboard/block-deployer/test/sample-descriptors/sample-wiring.xml
Removed:
cocoon/whiteboard/block-deployer/test/mapping/
Added: cocoon/whiteboard/block-deployer/test/sample-descriptors/sample-block.xml
URL:
http://svn.apache.org/viewcvs/cocoon/whiteboard/block-deployer/test/sample-descriptors/sample-block.xml?view=auto&rev=157103
==============================================================================
--- cocoon/whiteboard/block-deployer/test/sample-descriptors/sample-block.xml
(added)
+++ cocoon/whiteboard/block-deployer/test/sample-descriptors/sample-block.xml
Fri Mar 11 08:25:37 2005
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 1999-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.
+-->
+<block xmlns="http://apache.org/cocoon/blocks/cob/1.0";
+ id="http://mycompany.com/webmail/1.3.43";>
+
+ <!-- sample block.xml -->
+
+ <!-- MANDATORY -->
+
+ <name>Super Webmail</name>
+ <description href="http://www.mycompany.com/products/webmail/";>This is a
super webmail block with amazing functionalities</description>
+ <license href="http://www.mycompany.com/license/1.3";>BSD License</license>
+ <author href="http://www.mycompany.com/";>MyCompany Inc.</author>
+ <sitemap src="/webmail.xmap"/>
+
+ <!-- OPTIONAL -->
+
+ <requirements>
+ <requires
+ block="http://mycompany.com/skin";
+ name="external-skin"
+ />
+ <requires
+ block="http://mycompany.com/skin/2.0";
+ name="internal-skin"
+ />
+ <requires
+ block="http://anothercompany.com/MailRepository/2.0";
+ name="repository">
+ <uses component="com.anothercompany.repository.Repository"
+ name="repository"
+ />
+ </requires>
+ </requirements>
+
+ <properties>
+ <property name="database.user">
+ <default>saa</default>
+ <description>the database user Ã</description>
+ <test>test</test>
+ </property>
+
+ <property name="database.user1">
+ <default>sa1</default>
+ <description>the database user</description>
+ <test>test</test>
+ </property>
+
+ </properties>
+
+ <implements block="http://mycompany.com/skin/1.2"/>
+
+ <extends block="http://yetanothercompany.com/skins/fancy/1.2.2"/>
+
+ <provides component="http://anothercompany.repository.Repository"/>
+
+</block>
Added:
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=auto&rev=157103
==============================================================================
--- cocoon/whiteboard/block-deployer/test/sample-descriptors/sample-deploy.xml
(added)
+++ cocoon/whiteboard/block-deployer/test/sample-descriptors/sample-deploy.xml
Fri Mar 11 08:25:37 2005
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 1999-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.
+-->
+<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="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>
+ <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>
+ </block>
+ <block id="http://mycompany.com/myblock/1.3.43"; auto-resolve="false">
+ <parameter name="driver" value="myDriver.class"/>
+ </block>
+ <block id="http://mycompany.com/myOtherBlock/1.3.43"; auto-resolve="false"
path="E:/myDevDir"/>
+ </install>
+</deploy>
\ No newline at end of file
Added:
cocoon/whiteboard/block-deployer/test/sample-descriptors/sample-wiring.xml
URL:
http://svn.apache.org/viewcvs/cocoon/whiteboard/block-deployer/test/sample-descriptors/sample-wiring.xml?view=auto&rev=157103
==============================================================================
--- cocoon/whiteboard/block-deployer/test/sample-descriptors/sample-wiring.xml
(added)
+++ cocoon/whiteboard/block-deployer/test/sample-descriptors/sample-wiring.xml
Fri Mar 11 08:25:37 2005
@@ -0,0 +1,49 @@
+<!--
+ Copyright 1999-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.
+-->
+<!-- in Stefan's example "blocks" instead of "wiring" is used -->
+<wiring xmlns="http://apache.org/cocoon/blocks/wiring/1.0";>
+
+ <block id="http://mycompany.com/webmail/1.3.43";
+ location="WEB-INF/blocks/384938958499">
+ <mount>/mail/</mount>
+ <connections>
+ <connection
+
name="external-skin">http://yetanothercompany.com/skins/fancy/1.2.2</connection>
+ <connection
+
name="internal-skin">http://mycompany.com/skins/corporate/34.3.345</connection>
+ <connection
+
name="repository">http://mycompany.com/repositories/email/exchange/3.2.1</connection>
+ </connections>
+ <properties>
+ <property name="user">guest</property>
+ <property name="password">sj3u493</property>
+ </properties>
+ </block>
+
+ <block id="http://mycompany.com/repositories/email/exchange/3.2.1";
+ location="WEB-INF/blocks/394781274834">
+ <properties>
+ <property name="host">mail.blah.org</property>
+ </properties>
+ </block>
+
+ <block id="http://yetanothercompany.com/skins/fancy/1.2.2";
+ location="WEB-INF/blocks/947384127832"/>
+
+ <block id="http://mycompany.com/skins/corporate/34.3.345";
+ location="WEB-INF/blocks/746394782637"/>
+
+</wiring>
\ No newline at end of file
