You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by si...@apache.org on 2010/11/18 16:42:08 UTC
svn commit: r1036495 - in /incubator/river/jtsk/trunk: build.xml
src/com/sun/jini/tool/ClassServer.java
Author: sijskes
Date: Thu Nov 18 15:42:08 2010
New Revision: 1036495
URL: http://svn.apache.org/viewvc?rev=1036495&view=rev
Log:
reordered dependencies
Modified:
incubator/river/jtsk/trunk/build.xml
incubator/river/jtsk/trunk/src/com/sun/jini/tool/ClassServer.java
Modified: incubator/river/jtsk/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/build.xml?rev=1036495&r1=1036494&r2=1036495&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/build.xml (original)
+++ incubator/river/jtsk/trunk/build.xml Thu Nov 18 15:42:08 2010
@@ -45,10 +45,19 @@
<target name="hudson-qa" description="hudson QA build target" depends="diagnostics,all.clean,pre-qa-run,qa.run" />
- <target name="pre-qa-run" depends="configentry,jars" >
+ <target name="pre-qa-run" depends="river-runtime" >
<ant dir="qa" target="build" inheritall="false" />
</target>
+ <target name="river-runtime" description="results in complete river, without release archives"
+ depends="configentry,jars"
+ />
+
+ <target name="build" description="for compatibility" depends="river-runtime,test,river-doc"/>
+
+
+
+
<target name="copy-resources"
description="Copies various resources directories to the classes dir."
depends="start.copy-resources, tools.copy-resources">
@@ -209,7 +218,7 @@
<!-- =========== documentation related ============ -->
- <target name="doc" depends="doc-init,javadoc-api,javadoc-spec,javadoc-internals" />
+ <target name="river-doc" depends="doc-init,javadoc-api,javadoc-spec,javadoc-internals" />
<target name="doc-clean" depends="-doc-settings" >
<delete dir="${doc.dir}" quiet="true"/>
@@ -2065,9 +2074,7 @@
<ant dir="qa" target="run" inheritall="false"/>
</target>
- <target name="build" depends="configentry,test,jars,doc"/>
-
- <target name="all.build" depends="build"
+ <target name="all.build" depends="river-runtime"
description="Build all, including subcomponents">
<!-- Call qa subcomponent build -->
<ant dir="qa" target="build" inheritall="false" />
@@ -2091,7 +2098,7 @@
<ant dir="examples/hello" target="compile" inheritall="false" />
</target>
- <target name="all.doc" depends="jars,doc"
+ <target name="all.doc" depends="jars,river-doc"
description="Generate javadoc for all, including subcomponents">
<!-- Call qa subcomponent build -->
<ant dir="qa" target="doc" inheritall="false" />
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/tool/ClassServer.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/tool/ClassServer.java?rev=1036495&r1=1036494&r2=1036495&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/tool/ClassServer.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/tool/ClassServer.java Thu Nov 18 15:42:08 2010
@@ -28,6 +28,7 @@ import java.io.FileNotFoundException;
import java.io.FilePermission;
import java.io.IOException;
import java.io.InputStream;
+import java.net.BindException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
@@ -258,7 +259,11 @@ public class ClassServer extends Thread
this.lifeCycle = lifeCycle;
server = new ServerSocket();
server.setReuseAddress(true);
- server.bind(new InetSocketAddress(port));
+ try {
+ server.bind(new InetSocketAddress(port));
+ } catch( BindException be ) {
+ throw new IOException( "failure to bind to "+port, be );
+ }
// server = new ServerSocket(port);
if (!trees)
return;