1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
|
From: Ole Streicher <olebole@debian.org>
Date: Mon, 19 Dec 2016 09:17:57 +0100
Subject: Don't build StiltsServer
The server depends on org.mortbay, which is an outdated servlet engine.
Mortbay is not in Debian. If needed these files should be rewritten for
a recent servlet engine.
---
build.xml | 4 ++++
src/docs/sun256.xml | 8 +++-----
src/main/uk/ac/starlink/ttools/Stilts.java | 1 -
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/build.xml b/build.xml
index 0cad65f..83b1313 100644
--- a/build.xml
+++ b/build.xml
@@ -464,6 +464,8 @@
<include name="**/*.java"/>
<exclude name="${src.excludes}"/>
<exclude name="uk/ac/starlink/ttools/cone/HtmTiling.java"/>
+ <exclude name="uk/ac/starlink/ttools/task/StiltsServer.java"/>
+ <exclude name="uk/ac/starlink/ttools/server/*.java"/>
</javac>
<!-- Copy extra files that should live with packages classes
@@ -1152,6 +1154,8 @@
<include name="**"/>
<exclude name="uk/ac/starlink/ttools/build"/>
<exclude name="uk/ac/starlink/ttools/cone/HtmTiling.java"/>
+ <exclude name="uk/ac/starlink/ttools/task/StiltsServer.java"/>
+ <exclude name="uk/ac/starlink/ttools/server/*.java"/>
</packageset>
<!-- Link to the full Java API at SUNs website -->
diff --git a/src/docs/sun256.xml b/src/docs/sun256.xml
index 5dd4302..52b7abf 100644
--- a/src/docs/sun256.xml
+++ b/src/docs/sun256.xml
@@ -99,7 +99,6 @@
<!ENTITY plot3d-summary SYSTEM 'plot3d-summary.xml'>
<!ENTITY plothist-summary SYSTEM 'plothist-summary.xml'>
<!ENTITY regquery-summary SYSTEM 'regquery-summary.xml'>
- <!ENTITY server-summary SYSTEM 'server-summary.xml'>
<!ENTITY sqlclient-summary SYSTEM 'sqlclient-summary.xml'>
<!ENTITY sqlskymatch-summary SYSTEM 'sqlskymatch-summary.xml'>
<!ENTITY sqlupdate-summary SYSTEM 'sqlupdate-summary.xml'>
@@ -339,9 +338,6 @@ same ground as the STIL and TOPCAT user documents
<dd><p>
<ref id="calc" plaintextref="yes"><code>calc</code></ref>,
<ref id="funcs" plaintextref="yes"><code>funcs</code></ref>,
- <ref id="parqlint" plaintextref="yes"><code>parqlint</code></ref>,
- <ref id="parqlook" plaintextref="yes"><code>parqlook</code></ref>,
- <ref id="server" plaintextref="yes"><code>server</code></ref> and
<ref id="xsdvalidate" plaintextref="yes"><code>xsdvalidate</code></ref>.
</p></dd>
</dl>
@@ -8082,7 +8078,9 @@ If you have requirements which are not currently provided, please
contact the author for discussion.
</p>
-&server-summary;
+<p><strong>Note:</strong>
+The <code>server</code> command is not available in the Debian package yet.
+</p>
<subsubsect>
<subhead><title>Examples</title></subhead>
diff --git a/src/main/uk/ac/starlink/ttools/Stilts.java b/src/main/uk/ac/starlink/ttools/Stilts.java
index 7ae5f77..45d05b5 100644
--- a/src/main/uk/ac/starlink/ttools/Stilts.java
+++ b/src/main/uk/ac/starlink/ttools/Stilts.java
@@ -186,7 +186,6 @@ public class Stilts {
taskFactory_.register( "plot3d", taskPkg + "TablePlot3D" );
taskFactory_.register( "plothist", taskPkg + "TableHistogram" );
taskFactory_.register( "regquery", taskPkg + "RegQuery" );
- taskFactory_.register( "server", taskPkg + "StiltsServer" );
taskFactory_.register( "sqlclient", taskPkg + "SqlClient" );
taskFactory_.register( "sqlskymatch", taskPkg + "SqlCone" );
taskFactory_.register( "sqlupdate", taskPkg + "SqlUpdate" );
|
