Skip to content

Commit b7b5851

Browse files
author
dmitriy
committed
switching to Jasper 8
1 parent 59e4e73 commit b7b5851

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

bee-build.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<!ENTITY android_sdk "/home/dmitriy/Android/Sdk">
55
<!ENTITY jdk_root "">
66
<!ENTITY tjws_src "/home/dmitriy/projects/TJWS2/1.x">
7-
<!ENTITY jasper "/home/dmitriy/projects/jasper-7.0.109">
7+
<!ENTITY jasper "/home/dmitriy/projects/jasper-8.5.78">
88
<!ENTITY websoketx "no">
99
<!ENTITY fast_scanner "/home/dmitriy/projects/fast-classpath-scanner/lib">
1010
<!ENTITY keystore "/home/dmitriy/Documents/android-publish.keystore">
@@ -403,6 +403,7 @@
403403
<parameter>./*.xsd</parameter>
404404
<parameter>./*.MF</parameter>
405405
<parameter>./*Configurator</parameter> <!-- /resources/META-INF/services/javax.websocket.server.ServerEndpointConfig$Configurator -->
406+
<parameter>./javax.*</parameter>
406407
</function>
407408
</block>
408409
</for>

bee-dexwar.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!DOCTYPE bee PUBLIC "-//Dmitriy Rogatkin//DTD Bee Project Builder 1.0//EN"
33
"https://raw.githubusercontent.com/drogatkin/7Bee/master/bee.dtd" [
44
<!ENTITY android_sdk "/home/dmitriy/Android/Sdk">
5-
<!ENTITY jasper_lib "/home/dmitriy/projects/jasper-7.0.109/build/jasper.jar">
5+
<!ENTITY jasper_lib "/home/dmitriy/projects/jasper-8.5.78/build/jasper.jar">
66
<!ENTITY websoketx "no">
77
<!ENTITY tjws_wskt_lib "/home/dmitriy/projects/TJWS2/1.x/lib/wskt.jar">
88
<!ENTITY fast_scan_lib "/home/dmitriy/projects/fast-classpath-scanner/lib/class-scanner.jar">
56 Bytes
Binary file not shown.

src/rogatkin/mobile/web/TJWSServ.java

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ private void startForegroundNew() {
178178
.setContentTitle("Atjeews server")
179179
.setPriority(NotificationManager.IMPORTANCE_MIN)
180180
.setCategory(Notification.CATEGORY_SERVICE)
181+
//.addAction(R.drawable.button_onoff_indicator_on, getString(R.string.srv_ctrl), startStopIntent);
181182
.build();
182183
startForeground(2, notification);
183184
}
@@ -196,6 +197,8 @@ private void startServ() {
196197
public void run() {
197198
status = ST_RUN;
198199
int code = 0;
200+
if (logStream == null)
201+
initLogging();
199202
if (wifiLock == null) {
200203
WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
201204
wifiLock = wifiManager.createWifiLock(SERVICE_NAME);
@@ -212,6 +215,8 @@ public void run() {
212215
if (wifiLock != null && wifiLock.isHeld())
213216
wifiLock.release();
214217
status = code == 0 ? ST_STOP : ST_ERR;
218+
logStream.close();
219+
logStream = null;
215220
// TODO find out how notify client
216221
}
217222
}
@@ -261,8 +266,10 @@ protected void initServ() {
261266
}
262267

263268
@SuppressLint("NewApi") protected void initLogging() {
264-
if (logStream != null)
265-
return;
269+
if (logStream != null) {
270+
logStream.close();
271+
logStream = null;
272+
}
266273
File logDir = new File(protectedFS ? getExternalCacheDir()
267274
: Environment.getExternalStorageDirectory(), LOGDIR);
268275
if (Main.DEBUG)
@@ -278,8 +285,11 @@ protected void initServ() {
278285
}
279286
if (logStream == null)
280287
logStream = System.out;
281-
else
288+
else {
282289
System.setErr(logStream);
290+
System.setOut(logStream);
291+
}
292+
283293
}
284294

285295
protected void initDeployDirectory() {

0 commit comments

Comments
 (0)