You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ha...@apache.org on 2002/05/22 23:17:50 UTC
cvs commit: jakarta-avalon-apps/overlord/src/manifest overlord.mf
hammant 02/05/22 14:17:50
Modified: overlord build.xml
overlord/src/conf overlord-assembly.xml
overlord/src/java/org/apache/avalon/overlord Overlord.java
overlord/src/java/org/apache/avalon/overlord/collectors
SocketCollector.java
Removed: overlord/src/java/org/apache/avalon/overlord Overlord.xinfo
overlord/src/manifest overlord.mf
Log:
.xinfo and manifests autogenerated now
Revision Changes Path
1.11 +27 -3 jakarta-avalon-apps/overlord/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/overlord/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 18 May 2002 10:52:14 -0000 1.10
+++ build.xml 22 May 2002 21:17:50 -0000 1.11
@@ -25,6 +25,7 @@
<!-- Set the properties for intermediate directory -->
<property name="build.dir" value="build"/>
<property name="build.lib" value="${build.dir}/lib"/>
+ <property name="build.xdoclet" value="${build.dir}/xdoclet"/>
<property name="build.src" value="${build.dir}/src"/>
<property name="build.classes" value="${build.dir}/classes"/>
<property name="build.xdocs" value="${build.dir}/xdocs"/>
@@ -123,19 +124,42 @@
</target>
+ <!-- Make .xinfo and manifest automatically for blocks -->
+ <target name="phoenix-xdoclet" depends="compile">
+
+ <mkdir dir="${build.xdoclet}"/>
+
+ <taskdef name="phoenix-blocks"
+ classname="org.apache.avalon.phoenix.tools.xdoclet.PhoenixXDoclet"
+ classpathref="project.class.path"/>
+
+ <phoenix-blocks
+ destdir="${build.xdoclet}"
+ classpathref="project.class.path">
+ <fileset dir="${java.dir}">
+ <include name="**/*.java" />
+ </fileset>
+ <blockinfo/>
+ <manifest manifestFile="manifest.mf" />
+ </phoenix-blocks>
+
+ </target>
+
<!-- Jars up project -->
- <target name="jars" depends="compile">
+ <target name="jars" depends="phoenix-xdoclet">
<mkdir dir="${build.lib}"/>
<jar jarfile="${build.lib}/overlord.jar"
- manifest="${manifest.dir}/overlord.mf">
+ manifest="${build.xdoclet}/manifest.mf">
<fileset dir="${build.classes}">
<include name="org/apache/avalon/overlord/**"/>
</fileset>
<fileset dir="${java.dir}">
<include name="org/apache/avalon/overlord/**/*.properties"/>
- <include name="org/apache/avalon/overlord/**/*.xinfo"/>
+ </fileset>
+ <fileset dir="${build.xdoclet}">
+ <include name="**/*.xinfo"/>
</fileset>
</jar>
1.3 +0 -2 jakarta-avalon-apps/overlord/src/conf/overlord-assembly.xml
Index: overlord-assembly.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/overlord/src/conf/overlord-assembly.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- overlord-assembly.xml 12 May 2002 06:09:09 -0000 1.2
+++ overlord-assembly.xml 22 May 2002 21:17:50 -0000 1.3
@@ -9,8 +9,6 @@
name="scheduler"/>
<provide role="org.apache.avalon.cornerstone.services.sockets.SocketManager"
name="sockets"/>
- <provide role="org.apache.avalon.cornerstone.services.datasource.DataSourceSelector"
- name="datasources"/>
</block>
<!-- -->
1.13 +10 -0 jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/Overlord.java
Index: Overlord.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/Overlord.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Overlord.java 18 May 2002 09:49:01 -0000 1.12
+++ Overlord.java 22 May 2002 21:17:50 -0000 1.13
@@ -36,6 +36,10 @@
* Control the collectors.
*
* @author <a href="mailto:colus@apache.org">Eung-ju Park</a>
+ *
+ * @phoenix:block
+ * @phoenix:service name="org.apache.avalon.overlord.GatheringServer"
+ *
*/
public class Overlord
extends AbstractLogEnabled
@@ -57,6 +61,12 @@
m_context = (BlockContext)context;
}
+ /**
+ *
+ * @phoenix:dependency name="org.apache.avalon.cornerstone.services.scheduler.TimeScheduler"
+ * @phoenix:dependency name="org.apache.avalon.cornerstone.services.sockets.SocketManager"
+ *
+ */
public void service( final ServiceManager serviceManager )
throws ServiceException
{
1.7 +1 -0 jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/collectors/SocketCollector.java
Index: SocketCollector.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/overlord/src/java/org/apache/avalon/overlord/collectors/SocketCollector.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SocketCollector.java 15 May 2002 14:54:03 -0000 1.6
+++ SocketCollector.java 22 May 2002 21:17:50 -0000 1.7
@@ -38,6 +38,7 @@
private int m_port;
private String m_socketType;
+ // this is not a block
public void service( final ServiceManager serviceManager )
throws ServiceException
{
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>