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/19 11:28:59 UTC
cvs commit: jakarta-avalon-apps/hsql/src/manifest hsql.mf
hammant 02/05/19 02:28:59
Modified: hsql build.xml
hsql/src/java/org/apache/avalon/hsql/blocks
DefaultHypersonicSQL.java
Removed: hsql/src/java/org/apache/avalon/hsql/blocks
DefaultHypersonicSQL.xinfo
hsql/src/java/org/apache/avalon/hsql/services
HypersonicSQL.java
hsql/src/manifest hsql.mf
Log:
.xinfo and manifest now automatic
Revision Changes Path
1.19 +25 -22 jakarta-avalon-apps/hsql/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/hsql/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.xml 18 May 2002 12:26:33 -0000 1.18
+++ build.xml 19 May 2002 09:28:59 -0000 1.19
@@ -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"/>
@@ -131,17 +132,38 @@
</target>
+ <!-- Make .xinfo and manifest automatically for blocks -->
+ <target name="phoenix-xdoclet" depends="compile" if="hsql.present">
+
+ <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" if="hsql.present">
+ <target name="jars" depends="phoenix-xdoclet" if="hsql.present">
<mkdir dir="${build.lib}"/>
<jar jarfile="${build.lib}/hsql.jar"
- manifest="${manifest.dir}/hsql.mf">
+ manifest="${build.xdoclet}/manifest.mf">
<fileset dir="${build.classes}">
<include name="org/apache/avalon/hsql/**"/>
</fileset>
- <fileset dir="${java.dir}">
+ <fileset dir="${build.xdoclet}">
<include name="org/apache/avalon/hsql/**/*.xinfo"/>
</fileset>
</jar>
@@ -179,25 +201,6 @@
<include name="**"/>
</fileset>
</copy>
-
- </target>
-
- <target name="phoenix-xdoclet">
-
- <taskdef name="phoenix-blocks"
- classname="org.apache.avalon.phoenix.tools.xdoclet.PhoenixXDoclet"
- classpathref="project.class.path"/>
-
- <mkdir dir="build/gen"/>
- <phoenix-blocks
- destdir="build/gen"
- classpathref="project.class.path">
- <fileset dir="${java.dir}">
- <include name="**/*.java" />
- </fileset>
- <blockinfo/>
- <manifest manifestFile="manifest.mf" />
- </phoenix-blocks>
</target>
1.11 +17 -2 jakarta-avalon-apps/hsql/src/java/org/apache/avalon/hsql/blocks/DefaultHypersonicSQL.java
Index: DefaultHypersonicSQL.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/hsql/src/java/org/apache/avalon/hsql/blocks/DefaultHypersonicSQL.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultHypersonicSQL.java 18 May 2002 12:26:33 -0000 1.10
+++ DefaultHypersonicSQL.java 19 May 2002 09:28:59 -0000 1.11
@@ -27,12 +27,21 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.hsql.services.HypersonicSQL;
import org.apache.avalon.phoenix.BlockContext;
import org.hsqldb.HsqlServerFactory;
import org.hsqldb.HsqlSocketRequestHandler;
/**
+ * This block is a wrapper for the HypersonicSQL server hosted at SourceForge
+ * This allows the server comp to be started inside Phoenix and to use Cornerstone's
+ * connection manager for incoming TCP/IP / JDBC connections.
+ *
+ * The wrapped server writes : 'server.properties not found, using command line or default properties'
+ * to the console.
+ *
+ *
+ * @see <a href="http://hsqldb.sourceforge.net">HSQLDB Project Page</a>
+ * @phoenix:block
*
* @author Paul Hammant <Pa...@yahoo.com>
* @version 1.0
@@ -56,6 +65,9 @@
m_context = (BlockContext)context;
}
+ /**
+ * The block is configured with port, type and name information.
+ */
public void configure( final Configuration configuration )
throws ConfigurationException
{
@@ -94,6 +106,8 @@
}
}
/**
+ * @see org.apache.avalon.framework.service.Serviceable
+ *
* @phoenix:dependency name="org.apache.avalon.cornerstone.services.sockets.SocketManager"
* @phoenix:dependency name="org.apache.avalon.cornerstone.services.connection.ConnectionManager"
*
@@ -132,7 +146,8 @@
}
/**
- * Release a previously created ConnectionHandler e.g. for spooling.
+ * Release a previously created ConnectionHandler.
+ * e.g. for spooling.
*/
public void releaseConnectionHandler( ConnectionHandler connectionHandler )
{
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>