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:04:59 UTC
cvs commit: jakarta-avalon-apps/xcommander/src/manifest xcommander.mf
hammant 02/05/22 14:04:59
Modified: xcommander build.xml
xcommander/src/java/org/apache/avalon/xcommander
XCommanderServer.java
Removed: xcommander/src/java/org/apache/avalon/xcommander
XCommanderServer.xinfo
xcommander/src/manifest xcommander.mf
Log:
.xinfo and manifests now autogenerated
Revision Changes Path
1.10 +26 -4 jakarta-avalon-apps/xcommander/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 18 May 2002 10:52:14 -0000 1.9
+++ build.xml 22 May 2002 21:04:59 -0000 1.10
@@ -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"/>
@@ -122,18 +123,39 @@
</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}/xcommander.jar"
- manifest="${manifest.dir}/xcommander.mf">
+ manifest="${build.xdoclet}/manifest.mf">
<fileset dir="${build.classes}">
<include name="org/apache/avalon/xcommander/**"/>
</fileset>
- <fileset dir="${java.dir}">
- <include name="org/apache/avalon/xcommander/**/*.xinfo"/>
+ <fileset dir="${build.xdoclet}">
+ <include name="**/*.xinfo"/>
</fileset>
</jar>
1.8 +8 -1 jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/XCommanderServer.java
Index: XCommanderServer.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/xcommander/src/java/org/apache/avalon/xcommander/XCommanderServer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XCommanderServer.java 18 May 2002 09:49:01 -0000 1.7
+++ XCommanderServer.java 22 May 2002 21:04:59 -0000 1.8
@@ -37,6 +37,8 @@
* for XCommander. It listens on a port specified in the block's configuration,
* and delegates incoming requests to an {@link XCommanderHandler XCommanderHandler}.
*
+ * @phoenix:block
+ *
* @author <a href="mailto:mail@leosimons.com">Leo Simons</a>
*/
public class XCommanderServer
@@ -52,7 +54,12 @@
protected ArrayList m_clients;
protected HashMap m_xcommands;
- // BLOCK METHODS
+ /**
+ *
+ * @phoenix:dependency name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
+ * @phoenix:dependency name="org.apache.avalon.cornerstone.services.sockets.SocketManager"
+ *
+ */
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>