You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/06/19 19:05:36 UTC
cvs commit: avalon-components/threads/tutorial/src/java/org/apache/avalon/cornerstone/threads/tutorial Counter.java ThreadConsumer.java ThreadConsumer.xinfo
mcconnell 2003/06/19 10:05:36
Modified: . NEW_STRUCTURE_README.TXT maven.xml
project.properties project.xml
site maven.xml project.xml
site/xdocs/components index.xml
site/xdocs/examples navigation.xml
site/xdocs/examples/merlin navigation.xml
Removed: connection .cvsignore README.TXT maven.xml project.xml
connection/api .cvsignore maven.xml project.xml
connection/api/src/java/org/apache/avalon/cornerstone/services/connection
AbstractHandlerFactory.java AbstractService.java
ConnectionHandler.java
ConnectionHandlerFactory.java
ConnectionManager.java DefaultHandlerFactory.java
package.html
connection/impl .cvsignore maven.xml project.xml
connection/impl/conf block.xml
connection/impl/src/java/org/apache/avalon/cornerstone/blocks/connection
Connection.java DefaultConnectionManager.java
DefaultConnectionManager.xinfo package.html
datasources .cvsignore README.TXT maven.xml project.xml
datasources/api .cvsignore maven.xml project.xml
datasources/api/src/java/org/apache/avalon/cornerstone/services/datasources
DataSourceSelector.java package.html
datasources/impl .cvsignore maven.xml project.xml
datasources/impl/conf block.xml
datasources/impl/src/java/org/apache/avalon/cornerstone/blocks/datasources
DefaultDataSourceSelector-schema.xml
DefaultDataSourceSelector.java
DefaultDataSourceSelector.xinfo package.html
scheduler .cvsignore README.TXT maven.xml project.xml
scheduler/api .cvsignore maven.xml project.xml
scheduler/api/src/java/org/apache/avalon/cornerstone/services/scheduler
CronTimeTrigger.java PeriodicTimeTrigger.java
Target.java TimeScheduler.java TimeTrigger.java
TimeTriggerFactory.java Trigger.java
TriggerFailureListener.java package.html
scheduler/impl .cvsignore maven.xml project.xml
scheduler/impl/conf block.xml
scheduler/impl/src/java/org/apache/avalon/cornerstone/blocks/scheduler
BinaryHeap.java DefaultTimeScheduler.java
DefaultTimeScheduler.xinfo
MonitorableTimeScheduler.java
MonitorableTimeSchedulerMBean.java
PriorityQueue.java SynchronizedPriorityQueue.java
TimeScheduledEntry.java package.html
sockets .cvsignore README.TXT maven.xml project.xml
sockets/api .cvsignore maven.xml project.xml
sockets/api/src/java/org/apache/avalon/cornerstone/services/sockets
ServerSocketFactory.java SocketFactory.java
SocketManager.java package.html
sockets/impl .cvsignore maven.xml project.xml
sockets/impl/conf block.xml
sockets/impl/src/java/org/apache/avalon/cornerstone/blocks/sockets
AbstractTLSSocketFactory.java
DefaultServerSocketFactory.java
DefaultSocketFactory.java
DefaultSocketManager-schema.xml
DefaultSocketManager.java
DefaultSocketManager.xinfo SSLFactoryBuilder.java
TLSServerSocketFactory.java TLSSocketFactory.java
package.html
store .cvsignore README.TXT maven.xml project.xml
store/api .cvsignore maven.xml project.xml
store/api/src/java/org/apache/avalon/cornerstone/services/store
ObjectRepository.java Repository.java Store.java
StreamRepository.java package.html
store/impl .cvsignore maven.xml project.xml
store/impl/conf block.xml
store/impl/src/java/org/apache/avalon/cornerstone/blocks/masterstore
AbstractFileRepository.java
ClassLoaderObjectInputStream.java
ExtensionFileFilter.java
File_Persistent_Object_Repository.java
File_Persistent_Stream_Repository.java IOUtil.java
RepositoryManager.java RepositoryManager.xinfo
ResettableFileInputStream.java package.html
store/impl/src/java/org/apache/avalon/cornerstone/blocks/masterstore/xml
XMLFilePersistentObjectRepository.java
threads .cvsignore README.TXT maven.xml project.xml
threads/api .cvsignore maven.xml project.properties
project.xml
threads/api/src/java/org/apache/avalon/cornerstone/services/threads
ThreadManager.java package.html
threads/impl .cvsignore maven.xml project.xml
threads/impl/conf block.xml
threads/impl/src/java/org/apache/avalon/cornerstone/blocks/threads
AbstractThreadManager.java
DefaultThreadManager-schema.xml
DefaultThreadManager.java
DefaultThreadManager.xinfo
ResourceLimitingThreadManager-schema.xml
ResourceLimitingThreadManager.java
ResourceLimitingThreadManager.xinfo package.html
threads/tutorial .cvsignore maven.xml project.xml
threads/tutorial/conf block.xml
threads/tutorial/src/java/org/apache/avalon/cornerstone/threads/tutorial
Counter.java ThreadConsumer.java
ThreadConsumer.xinfo
Log:
Housekeeping
Revision Changes Path
1.4 +28 -12 avalon-components/NEW_STRUCTURE_README.TXT
Index: NEW_STRUCTURE_README.TXT
===================================================================
RCS file: /home/cvs/avalon-components/NEW_STRUCTURE_README.TXT,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NEW_STRUCTURE_README.TXT 19 Jun 2003 14:05:39 -0000 1.3
+++ NEW_STRUCTURE_README.TXT 19 Jun 2003 17:05:33 -0000 1.4
@@ -1,22 +1,38 @@
The cornerstone repository has been restructured to support the seperation
-of different components under independent sub-projects. Each subproject
-contains an api and impl subproject based on Maven builds.
+of components, and for each component - the seperation of api relative to
+implemetation builds.
Components subprojects include:
- connection
- datasources
- scheduler
- sockets
- store
- threads
+ connection-api
+ connection-impl
-The following example demonstrates the building of a component project
-using the threads package as an example:
+ datasources-api
+ datasources-impl
- $ cd avalon-components\threads
+ scheduler-api
+ scheduler-impl
+
+ sockets-api
+ sockets-impl
+
+ store-api
+ store-impl
+
+ threads-api
+ threads-impl
+ threads-tutorial
+
+The entire suite can be built as follows:
+
+ $ cd avalon-components
$ maven
The default target will build, jar and install the component into
-your local maven repository.
+your local maven repository followind by the generation of the
+project documetation under the following directory:
+
+ avalon-components/site/target/docs
+
+
1.2 +41 -1 avalon-components/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-components/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 4 May 2003 12:19:48 -0000 1.1
+++ maven.xml 19 Jun 2003 17:05:33 -0000 1.2
@@ -1,4 +1,44 @@
-<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
+<project default="build" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
<property file="${basedir}/project.properties"/>
<property file="${basedir}/../project.properties"/>
+
+ <goal name="build">
+ <attainGoal name="project-install"/>
+ <attainGoal name="project-site"/>
+ </goal>
+
+ <goal name="project-install"
+ 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="project-site"
+ description="Build the project site." >
+ <maven:reactor
+ basedir="${basedir}"
+ includes="site/project.xml"
+ goals="site"
+ banner="Building site:"
+ ignoreFailures="false" />
+ </goal>
+
+ <goal name="project-clean"
+ description="Build the distribution." >
+ <maven:reactor
+ basedir="${basedir}"
+ includes="*/project.xml"
+ excludes="site/*.*"
+ goals="clean"
+ banner="Cleaning:"
+ ignoreFailures="false" />
+ <attainGoal name="clean"/>
+ </goal>
+
+
</project>
1.2 +3 -3 avalon-components/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon-components/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 4 May 2003 12:19:48 -0000 1.1
+++ project.properties 19 Jun 2003 17:05:33 -0000 1.2
@@ -5,9 +5,9 @@
maven.ui.banner.background = #fff
maven.ui.banner.foreground = #000
-maven.xdoc.jsl = file:/${basedir}/../src/etc/site.jsl
-maven.javadoc.stylesheet =${basedir}/../src/etc/stylesheet.css
-maven.license.licenseFile = ${basedir}/../src/etc/LICENSE.txt
+maven.xdoc.jsl = file:/${basedir}/../site/etc/site.jsl
+maven.javadoc.stylesheet =${basedir}/../site/etc/stylesheet.css
+maven.license.licenseFile = ${basedir}/../site/etc/LICENSE.txt
maven.checkstyle.format = avalon
pom.organization.identifier = ASF
1.3 +5 -5 avalon-components/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 5 May 2003 20:50:27 -0000 1.2
+++ project.xml 19 Jun 2003 17:05:33 -0000 1.3
@@ -47,11 +47,6 @@
<developers>
<developer>
- <name>Peter Donald</name>
- <email>donaldp@apache.org</email>
- <id>donaldp</id>
- </developer>
- <developer>
<name>Paul Hammant</name>
<email>hammant@apache.org</email>
<id>hammant</id>
@@ -79,6 +74,11 @@
</developers>
<contributors>
+ <contributor>
+ <name>Peter Donald</name>
+ <email>donaldp@apache.org</email>
+ <id>donaldp</id>
+ </contributor>
<contributor>
<name>Mauro Talevi</name>
<email>mauro.talevi@aquilonia.org</email>
1.5 +11 -3 avalon-components/site/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-components/site/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 6 May 2003 22:41:06 -0000 1.4
+++ maven.xml 19 Jun 2003 17:05:34 -0000 1.5
@@ -1,4 +1,4 @@
-<project default="build" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
+<project default="site" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
<preGoal name="site">
<attainGoal name="license"/>
@@ -20,8 +20,16 @@
<j:forEach var="packageGroup" items="${pom.packageGroups}">
<group title="${packageGroup.title}" packages="${packageGroup.packages}"/>
</j:forEach>
- <sourcepath path="${basedir}/../threads/api/src/java"/>
- <sourcepath path="${basedir}/../threads/impl/src/java"/>
+ <sourcepath path="${basedir}/../threads-api/src/java"/>
+ <sourcepath path="${basedir}/../threads-impl/src/java"/>
+ <sourcepath path="${basedir}/../connection-api/src/java"/>
+ <sourcepath path="${basedir}/../connection-impl/src/java"/>
+ <sourcepath path="${basedir}/../datasources-api/src/java"/>
+ <sourcepath path="${basedir}/../datasources-impl/src/java"/>
+ <sourcepath path="${basedir}/../sockets-api/src/java"/>
+ <sourcepath path="${basedir}/../sockets-impl/src/java"/>
+ <sourcepath path="${basedir}/../store-api/src/java"/>
+ <sourcepath path="${basedir}/../store-impl/src/java"/>
<classpath>
<path refid="maven.dependency.classpath"/>
</classpath>
1.2 +34 -8 avalon-components/site/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/site/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 4 May 2003 12:19:49 -0000 1.1
+++ project.xml 19 Jun 2003 17:05:34 -0000 1.2
@@ -14,25 +14,51 @@
<dependencies>
<dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-framework</artifactId>
+ <id>avalon-framework</id>
<version>4.1.4</version>
</dependency>
<!-- excalibur dependencies -->
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-thread</artifactId>
+ <id>excalibur-thread</id>
<version>1.1.1</version>
</dependency>
<dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-event</artifactId>
- <version>2.0</version>
+ <id>excalibur-event</id>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <id>excalibur-datasource</id>
+ <version>1.1.1</version>
</dependency>
<!-- local dependencies -->
<dependency>
- <groupId>cornerstone</groupId>
+ <groupId>cornerstone-threads</groupId>
<artifactId>cornerstone-threads</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>cornerstone-connection</groupId>
+ <artifactId>cornerstone-connection</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>cornerstone-datasources</groupId>
+ <artifactId>cornerstone-datasources</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>cornerstone-scheduler</groupId>
+ <artifactId>cornerstone-scheduler</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>cornerstone-sockets</groupId>
+ <artifactId>cornerstone-sockets</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>cornerstone-store</groupId>
+ <artifactId>cornerstone-store</artifactId>
<version>1.0</version>
</dependency>
1.2 +5 -5 avalon-components/site/xdocs/components/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon-components/site/xdocs/components/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 4 May 2003 12:19:49 -0000 1.1
+++ index.xml 19 Jun 2003 17:05:34 -0000 1.2
@@ -23,7 +23,7 @@
the same thread pool.
</p>
</td>
- <td>IN-PROCESS</td>
+ <td>CANDIDATE</td>
</tr>
<tr><td><a href="datasource.html">Deatsource</a></td>
<td>
@@ -34,7 +34,7 @@
ready to use DataSourceComponents.
</p>
</td>
- <td>IN-PROCESS</td>
+ <td>CANDIDATE</td>
</tr>
<tr><td><a href="scheduler.html">Scheduler</a></td>
<td>
@@ -47,7 +47,7 @@
CronTimeTrigger and PeriodicTimeTigger.
</p>
</td>
- <td>IN-PROCESS</td>
+ <td>CANDIDATE</td>
</tr>
<tr><td><a href="sockets.html">Sockets</a></td>
<td>
@@ -57,7 +57,7 @@
DefaultSocketManager component.
</p>
</td>
- <td>IN-PROCESS</td>
+ <td>CANDIDATE</td>
</tr>
<tr><td><a href="store.html">Store</a></td>
<td>
@@ -70,7 +70,7 @@
local file system for storage.
</p>
</td>
- <td>IN-PROCESS</td>
+ <td>CANDIDATE</td>
</tr>
<tr><td><a href="threads.html">Threads</a></td>
<td>
1.3 +2 -0 avalon-components/site/xdocs/examples/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-components/site/xdocs/examples/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 5 May 2003 20:50:27 -0000 1.2
+++ navigation.xml 19 Jun 2003 17:05:35 -0000 1.3
@@ -18,6 +18,8 @@
<item name="Components" href="/components/index.html"/>
<item name="Examples" href="/examples/index.html">
<item name="Merlin" href="/examples/merlin/index.html"/>
+ <item name="Fortress" href="/examples/fortress.html"/>
+ <item name="Phoenix" href="/examples/phoenix.html"/>
</item>
<item name="Developer Info" href="/notes/index.html"/>
</menu>
1.2 +2 -0 avalon-components/site/xdocs/examples/merlin/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon-components/site/xdocs/examples/merlin/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 5 May 2003 20:50:27 -0000 1.1
+++ navigation.xml 19 Jun 2003 17:05:35 -0000 1.2
@@ -20,6 +20,8 @@
<item name="Merlin" href="/examples/merlin/index.html">
<item name="Threads" href="/examples/merlin/threads.html"/>
</item>
+ <item name="Fortress" href="/examples/fortress.html"/>
+ <item name="Phoenix" href="/examples/phoenix.html"/>
</item>
<item name="Developer Info" href="/notes/index.html"/>
</menu>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org