mcconnell 2003/08/24 05:54:51
Modified: . maven.xml
connection-impl/conf block.xml
datasources-impl/conf block.xml
scheduler-impl/conf block.xml
sockets-impl/conf block.xml
store-impl/conf block.xml
threads-impl/conf block.xml
threads-tutorial/conf block.xml
Log:
Update embedded block descriptors to use 1.0.
Revision Changes Path
1.5 +11 -0 avalon-components/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-components/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 10 Aug 2003 20:50:11 -0000 1.4
+++ maven.xml 24 Aug 2003 12:54:51 -0000 1.5
@@ -18,6 +18,17 @@
ignoreFailures="false" />
</goal>
+ <goal name="do-install-release"
+ description="Install the sub-project jars." >
+ <maven:reactor
+ basedir="${basedir}"
+ includes="*/project.xml"
+ excludes="site/*"
+ goals="jar:install"
+ banner="Installing:"
+ ignoreFailures="false" />
+ </goal>
+
<goal name="do-site"
description="Build the project site." >
<maven:reactor
1.5 +21 -32 avalon-components/connection-impl/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-components/connection-impl/conf/block.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- block.xml 12 Aug 2003 11:57:58 -0000 1.4
+++ block.xml 24 Aug 2003 12:54:51 -0000 1.5
@@ -3,11 +3,7 @@
Thread Block deployment directive.
-->
-<block>
-
- <info>
- <name>connection</name>
- </info>
+<container name="connection">
<services>
<service
type="org.apache.avalon.cornerstone.services.connection.ConnectionManager">
@@ -15,33 +11,26 @@
</service>
</services>
- <dependencies>
- <dependency
type="org.apache.avalon.cornerstone.services.threads.ThreadManager:1.0"/>
- </dependencies>
-
- <implementation>
+ <classloader>
+ <classpath>
+ <repository>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
+ <resource id="excalibur-thread:excalibur-thread" version="1.1.1"/>
+ <resource id="cornerstone-threads:cornerstone-threads-api" version="1.0"/>
+ <resource id="cornerstone-sockets:cornerstone-sockets-api" version="1.0"/>
+ <resource id="cornerstone-connection:cornerstone-connection-api"
version="1.0"/>
+ <resource id="cornerstone-connection:cornerstone-connection-impl"
version="1.0"/>
+ </repository>
+ </classpath>
+ </classloader>
- <classloader>
- <classpath>
- <repository>
- <resource id="avalon-framework:avalon-framework-impl"
version="SNAPSHOT"/>
- <resource id="cornerstone-threads:cornerstone-threads-api"
version="SNAPSHOT"/>
- <resource id="cornerstone-sockets:cornerstone-sockets-api"
version="SNAPSHOT"/>
- <resource id="cornerstone-connection:cornerstone-connection-api"
version="SNAPSHOT"/>
- <resource id="excalibur-thread:excalibur-thread" version="1.1.1"/>
- </repository>
- </classpath>
- </classloader>
-
- <component name="manager"
+ <component name="manager"
class="org.apache.avalon.cornerstone.blocks.connection.DefaultConnectionManager"
- activation="true">
- <configuration>
- <idle-timeout>300000</idle-timeout>
- <max-connections>30</max-connections>
- </configuration>
- </component>
-
- </implementation>
+ activation="startup">
+ <configuration>
+ <idle-timeout>300000</idle-timeout>
+ <max-connections>30</max-connections>
+ </configuration>
+ </component>
-</block>
+</container>
1.6 +15 -23 avalon-components/datasources-impl/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-components/datasources-impl/conf/block.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- block.xml 12 Aug 2003 11:57:58 -0000 1.5
+++ block.xml 24 Aug 2003 12:54:51 -0000 1.6
@@ -3,11 +3,7 @@
Thread Block deployment directive.
-->
-<block>
-
- <info>
- <name>threads</name>
- </info>
+<container name="threads">
<services>
<service
type="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector">
@@ -15,25 +11,21 @@
</service>
</services>
- <implementation>
-
- <classloader>
- <classpath>
- <repository>
- <resource id="avalon-framework:avalon-framework-impl"
version="SNAPSHOT"/>
- <resource id="excalibur-pool:excalibur-pool" version="1.2"/>
- <resource id="excalibur-datasource:excalibur-datasource"
version="1.1.1"/>
- <resource id="cornerstone-datasources:cornerstone-datasources-api"
version="SNAPSHOT"/>
- <resource id="cornerstone-datasources:cornerstone-datasources-impl"
version="SNAPSHOT"/>
- </repository>
- </classpath>
- </classloader>
+ <classloader>
+ <classpath>
+ <repository>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
+ <resource id="excalibur-pool:excalibur-pool" version="1.2"/>
+ <resource id="excalibur-datasource:excalibur-datasource" version="1.1.1"/>
+ <resource id="cornerstone-datasources:cornerstone-datasources-api"
version="1.0"/>
+ <resource id="cornerstone-datasources:cornerstone-datasources-impl"
version="1.0"/>
+ </repository>
+ </classpath>
+ </classloader>
- <component name="manager"
+ <component name="manager"
class="org.apache.avalon.cornerstone.blocks.datasources.DefaultDataSourceSelector"
activation="true">
- </component>
-
- </implementation>
+ </component>
-</block>
+</container>
1.5 +14 -26 avalon-components/scheduler-impl/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-components/scheduler-impl/conf/block.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- block.xml 12 Aug 2003 11:57:58 -0000 1.4
+++ block.xml 24 Aug 2003 12:54:51 -0000 1.5
@@ -3,11 +3,7 @@
Thread Block deployment directive.
-->
-<block>
-
- <info>
- <name>scheduler</name>
- </info>
+<container name="scheduler">
<services>
<service type="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler">
@@ -15,28 +11,20 @@
</service>
</services>
- <dependencies>
- <dependency
type="org.apache.avalon.cornerstone.services.threads.ThreadManager:1.0"/>
- </dependencies>
-
- <implementation>
+ <classloader>
+ <classpath>
+ <repository>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
+ <resource id="cornerstone-scheduler:cornerstone-scheduler-api"
version="1.0"/>
+ <resource id="cornerstone-threads:cornerstone-threads-api" version="1.0"/>
+ <resource id="excalibur-thread:excalibur-thread" version="1.1.1"/>
+ </repository>
+ </classpath>
+ </classloader>
- <classloader>
- <classpath>
- <repository>
- <resource id="avalon-framework:avalon-framework-impl"
version="SNAPSHOT"/>
- <resource id="cornerstone-scheduler:cornerstone-scheduler-api"
version="SNAPSHOT"/>
- <resource id="cornerstone-threads:cornerstone-threads-api"
version="SNAPSHOT"/>
- <resource id="excalibur-thread:excalibur-thread" version="1.1.1"/>
- </repository>
- </classpath>
- </classloader>
-
- <component name="manager"
+ <component name="manager"
class="org.apache.avalon.cornerstone.blocks.scheduler.DefaultTimeScheduler"
activation="true">
- </component>
-
- </implementation>
+ </component>
-</block>
+</container>
1.5 +23 -31 avalon-components/sockets-impl/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-components/sockets-impl/conf/block.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- block.xml 12 Aug 2003 11:57:58 -0000 1.4
+++ block.xml 24 Aug 2003 12:54:51 -0000 1.5
@@ -3,11 +3,7 @@
Thread Block deployment directive.
-->
-<block>
-
- <info>
- <name>sockets</name>
- </info>
+<container name="sockets">
<services>
<service type="org.apache.avalon.cornerstone.services.sockets.SocketManager">
@@ -15,33 +11,29 @@
</service>
</services>
- <implementation>
-
- <classloader>
- <classpath>
- <repository>
- <resource id="avalon-framework:avalon-framework-impl"
version="SNAPSHOT"/>
- <resource id="cornerstone-sockets:cornerstone-sockets-api"
version="SNAPSHOT"/>
- <resource id="cornerstone-sockets:cornerstone-sockets-impl"
version="SNAPSHOT"/>
- </repository>
- </classpath>
- </classloader>
+ <classloader>
+ <classpath>
+ <repository>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
+ <resource id="cornerstone-sockets:cornerstone-sockets-api" version="1.0"/>
+ <resource id="cornerstone-sockets:cornerstone-sockets-impl" version="1.0"/>
+ </repository>
+ </classpath>
+ </classloader>
- <component name="manager"
+ <component name="manager"
class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketManager"
activation="true">
- <configuration>
- <server-sockets>
- <factory name="plain"
-
class="org.apache.avalon.cornerstone.blocks.sockets.DefaultServerSocketFactory"/>
- </server-sockets>
- <client-sockets>
- <factory name="plain"
-
class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketFactory"/>
- </client-sockets>
- </configuration>
- </component>
-
- </implementation>
+ <configuration>
+ <server-sockets>
+ <factory name="plain"
+
class="org.apache.avalon.cornerstone.blocks.sockets.DefaultServerSocketFactory"/>
+ </server-sockets>
+ <client-sockets>
+ <factory name="plain"
+
class="org.apache.avalon.cornerstone.blocks.sockets.DefaultSocketFactory"/>
+ </client-sockets>
+ </configuration>
+ </component>
-</block>
+</container>
1.4 +13 -21 avalon-components/store-impl/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-components/store-impl/conf/block.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- block.xml 12 Aug 2003 11:57:58 -0000 1.3
+++ block.xml 24 Aug 2003 12:54:51 -0000 1.4
@@ -3,11 +3,7 @@
Thread Block deployment directive.
-->
-<block>
-
- <info>
- <name>sockets</name>
- </info>
+<container name="sockets">
<services>
<service type="org.apache.avalon.cornerstone.services.store.Store">
@@ -15,24 +11,20 @@
</service>
</services>
- <implementation>
-
- <classloader>
- <classpath>
- <repository>
- <resource id="avalon-framework:avalon-framework-impl"
version="SNAPSHOT"/>
- <resource id="cornerstone-store:cornerstone-store-api"
version="SNAPSHOT"/>
- <resource id="cornerstone-store:cornerstone-store-impl"
version="SNAPSHOT"/>
- </repository>
- </classpath>
- </classloader>
+ <classloader>
+ <classpath>
+ <repository>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
+ <resource id="cornerstone-store:cornerstone-store-api" version="1.0"/>
+ <resource id="cornerstone-store:cornerstone-store-impl" version="1.0"/>
+ </repository>
+ </classpath>
+ </classloader>
- <component name="manager"
+ <component name="manager"
class="org.apache.avalon.cornerstone.blocks.masterstore.RepositoryManager"
activation="true">
<!-- configuration must be supplied -->
- </component>
-
- </implementation>
+ </component>
-</block>
+</container>
1.4 +27 -35 avalon-components/threads-impl/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-components/threads-impl/conf/block.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- block.xml 12 Aug 2003 11:57:58 -0000 1.3
+++ block.xml 24 Aug 2003 12:54:51 -0000 1.4
@@ -3,11 +3,7 @@
Thread Block deployment directive.
-->
-<block>
-
- <info>
- <name>threads</name>
- </info>
+<container name="threads">
<services>
<service type="org.apache.avalon.cornerstone.services.threads.ThreadManager">
@@ -15,37 +11,33 @@
</service>
</services>
- <implementation>
-
- <classloader>
- <classpath>
- <repository>
- <resource id="avalon-framework:avalon-framework-api" version="SNAPSHOT"/>
- <resource id="avalon-framework:avalon-framework-impl"
version="SNAPSHOT"/>
- <resource id="excalibur-thread:excalibur-thread" version="1.1.1"/>
- <resource id="excalibur-event:excalibur-event" version="1.0.3"/>
- <resource id="cornerstone-threads:cornerstone-threads-api"
version="SNAPSHOT"/>
- <resource id="cornerstone-threads:cornerstone-threads-impl"
version="SNAPSHOT"/>
- <resource id="commons-collections:commons-collections" version="2.1"/>
- </repository>
- </classpath>
- </classloader>
+ <classloader>
+ <classpath>
+ <repository>
+ <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
+ <resource id="commons-collections:commons-collections" version="2.1"/>
+ <resource id="excalibur-thread:excalibur-thread" version="1.1.1"/>
+ <resource id="excalibur-event:excalibur-event" version="1.0.3"/>
+ <resource id="cornerstone-threads:cornerstone-threads-api" version="1.0"/>
+ <resource id="cornerstone-threads:cornerstone-threads-impl" version="1.0"/>
+ </repository>
+ </classpath>
+ </classloader>
- <component name="manager"
+ <component name="manager"
class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager"
activation="true">
- <configuration>
- <thread-group>
- <name>default</name>
- <priority>5</priority>
- <is-daemon>false</is-daemon>
- <max-threads>100</max-threads>
- <min-threads>20</min-threads>
- <min-spare-threads>20</min-spare-threads>
- </thread-group>
- </configuration>
- </component>
-
- </implementation>
+ <configuration>
+ <thread-group>
+ <name>default</name>
+ <priority>5</priority>
+ <is-daemon>false</is-daemon>
+ <max-threads>100</max-threads>
+ <min-threads>20</min-threads>
+ <min-spare-threads>20</min-spare-threads>
+ </thread-group>
+ </configuration>
+ </component>
-</block>
+</container>
1.5 +5 -11 avalon-components/threads-tutorial/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-components/threads-tutorial/conf/block.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- block.xml 12 Aug 2003 11:57:58 -0000 1.4
+++ block.xml 24 Aug 2003 12:54:51 -0000 1.5
@@ -3,26 +3,20 @@
Thread Tutorial.
-->
-<block>
-
- <info>
- <name>threads-tutorial</name>
- </info>
-
- <implementation>
+<container name="thread-tutorial">
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-impl"
version="SNAPSHOT"/>
- <resource id="cornerstone-threads:cornerstone-threads-api"
version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
+ <resource id="cornerstone-threads:cornerstone-threads-api"
version="1.0"/>
<resource id="excalibur-thread:excalibur-thread" version="1.1.1"/>
<resource id="excalibur-event:excalibur-event" version="1.0.3"/>
</repository>
</classpath>
</classloader>
- <include name="threads" id="cornerstone-threads:cornerstone-threads-impl"
version="SNAPSHOT"/>
+ <include name="threads" id="cornerstone-threads:cornerstone-threads-impl"
version="1.0"/>
<component name="test"
class="org.apache.avalon.cornerstone.threads.tutorial.ThreadConsumer"
@@ -30,4 +24,4 @@
</implementation>
-</block>
+</container>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
