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
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
|
--- build.xml.old 2004-11-22 15:00:33.000000000 +0100
+++ build.xml 2004-11-23 09:46:06.000000000 +0100
@@ -13,7 +13,6 @@
<property name="optimize" value="true" />
<property name="deprecation" value="true" />
- <property name="nntprss-start.jar" value="${basedir}/nntprss-start.jar"/>
<property name="nntprss.jar" value="${basedir}/nntprss.jar"/>
<property file="build.properties" />
@@ -21,7 +20,37 @@
<!-- ==================================================================== -->
<target name="classpath">
<path id="extpath">
- <fileset dir="${ext}\lib">
+ <fileset dir="/opt/jetty/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="/opt/jetty/extra/lib/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="/usr/share/hsqldb/lib/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="/usr/share/log4j/lib/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="/usr/share/crimson-1/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="/usr/share/commons-httpclient/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="/usr/share/xmlrpc/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="/opt/sun-j2ee-1.3.1/lib/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="/usr/share/commons-dbcp/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="/usr/share/commons-pool/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="/usr/share/jdbm-1/lib/">
<include name="*.jar"/>
</fileset>
</path>
@@ -40,7 +69,6 @@
<!-- ==================================================================== -->
<target name="clean" description="Remove generated files">
<delete dir="${bin}" quiet="true"/>
- <delete file="${nntprss-start.jar}" quiet="true"/>
<delete file="${nntprss.jar}" quiet="true"/>
</target>
@@ -59,24 +87,14 @@
</target>
<!-- ==================================================================== -->
- <target name="nntprss-start.jar" depends="classes">
- <jar jarfile="${nntprss-start.jar}" basedir="${bin}"
- manifest="${etc}/MANIFEST.MF" >
- <include name="org/methodize/nntprss/Startup.class" />
- </jar>
- </target>
-
- <!-- ==================================================================== -->
<target name="nntprss.jar" depends="classes">
<jar jarfile="${nntprss.jar}" basedir="${bin}" >
<include name="org/methodize/nntprss/**" />
- <exclude name="org/methodize/nntprss/Startup.class" />
- <include name="xml/**" />
</jar>
</target>
<!-- ==================================================================== -->
- <target name="jars" depends="nntprss-start.jar,nntprss.jar"
+ <target name="jars" depends="nntprss.jar"
description="Build the jar files" >
</target>
@@ -88,27 +106,8 @@
<target name="package-bin" depends="all" description="Build archives for distribution">
- <zip destfile="${basedir}/../nntprss-${version}.zip">
- <zipfileset dir="ext/lib" includes="*" prefix="nntprss/ext/lib" />
- <zipfileset dir="src/xml" includes="*" prefix="nntprss/xml" />
- <zipfileset dir="." prefix="nntprss">
- <include name="CHANGELOG"/>
- <include name="LICENSE.TXT"/>
- <include name="log4j.properties"/>
- <include name="nntprss.exe"/>
- <include name="nntprss.jar"/>
- <include name="nntprss-config.xml"/>
- <include name="nntprss-start.jar"/>
- <include name="README.TXT"/>
- <include name="users.properties.sample"/>
- <include name="WINDOWS-SERVICE.TXT"/>
- <include name="nntprss.ico"/>
- <include name="systray4j.dll"/>
- </zipfileset>
- </zip>
<tar destfile="${basedir}/../nntprss-${version}.tar">
- <tarfileset dir="ext/lib" includes="*" prefix="nntprss/ext/lib" />
<tarfileset dir="src/xml" includes="*" prefix="xml" />
<tarfileset dir="." prefix="nntprss">
<include name="CHANGELOG"/>
@@ -116,12 +115,9 @@
<include name="log4j.properties"/>
<include name="nntprss.jar"/>
<include name="nntprss-config.xml"/>
- <include name="nntprss-start.jar"/>
<include name="README.TXT"/>
<include name="users.properties.sample"/>
- <include name="WINDOWS-SERVICE.TXT"/>
<include name="nntprss.ico"/>
- <include name="systray4j.dll"/>
</tarfileset>
</tar>
@@ -131,19 +127,6 @@
</target>
<target name="package-src" depends="all" description="Build archives for distribution">
- <zip destfile="${basedir}/../nntprss-src-${version}.zip">
- <zipfileset dir="src" includes="**/*.java" prefix="nntprss/src"/>
- <zipfileset dir="etc" includes="MANIFEST.MF" prefix="nntprss/etc" />
- <zipfileset dir="src/xml" includes="*" prefix="nntprss/src/xml" />
- <zipfileset dir="." prefix="nntprss">
- <include name="build.xml"/>
- <include name="build.properties"/>
- <include name="CHANGELOG"/>
- <include name="LICENSE.TXT"/>
- <include name="README.TXT"/>
- </zipfileset>
- </zip>
-
<tar destfile="${basedir}/../nntprss-src-${version}.tar">
<tarfileset dir="src" includes="**/*.java" prefix="nntprss/src"/>
<tarfileset dir="etc" includes="MANIFEST.MF" prefix="nntprss/etc" />
--- etc/MANIFEST.MF.old 2004-11-22 14:59:45.000000000 +0100
+++ etc/MANIFEST.MF 2004-11-22 16:23:46.000000000 +0100
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
-Main-Class: org.methodize.nntprss.Startup
+Main-Class: org.methodize.nntprss.Main
Created-By: Jason Brome
-Name: org.methodize.nntprss.Startup.class
+Name: org.methodize.nntprss.Main.class
--- src/org/methodize/nntprss/Main.java.old 2004-11-22 15:38:57.000000000 +0100
+++ src/org/methodize/nntprss/Main.java 2004-11-22 15:39:44.000000000 +0100
@@ -59,7 +59,6 @@
private ChannelManager channelManager = null;
private PublishManager publishManager = null;
private AdminServer adminServer = null;
- private WindowsSysTray windowsSysTray = null;
private class ShutdownHook extends Thread {
@@ -72,10 +71,6 @@
log.info("Shutting down nntp//rss...");
}
- if (windowsSysTray != null) {
- windowsSysTray.shutdown();
- }
-
adminServer.shutdown();
nntpServer.shutdown();
@@ -117,13 +112,6 @@
log.warn("JSSE not found - HTTPS support not available");
}
- if (System
- .getProperty("os.name")
- .toLowerCase()
- .startsWith("windows")) {
- windowsSysTray = new WindowsSysTray();
- }
-
// Load configuration
Document config = loadConfiguration();
@@ -151,13 +139,6 @@
nntpServer.start();
channelManager.start();
- if (windowsSysTray != null) {
- windowsSysTray.setAdminURL(
- "http://127.0.0.1:" + adminServer.getPort() + "/");
- windowsSysTray.setChannelManager(channelManager);
- windowsSysTray.showStarted();
- }
-
} catch (Exception e) {
log.error("Exception thrown during startup", e);
e.printStackTrace();
|
GitWeb