second pass at upgrade to JVB2

config/src/main/java/org/igniterealtime/openfire/plugin/ofmeet/config/OFMeetConfig.java

@@ -402,6 +402,36 @@ public void resetLipSync()
         JiveGlobals.deleteProperty( "ofmeet.lipSync.enabled" );
     }
 
+    public void setJvbName (String name )
+    {
+        JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.jvb.user.name", name );
+    }
+
+    public String getJvbName()
+    {
+        return JiveGlobals.getProperty( "org.jitsi.videobridge.ofmeet.jvb.user.name", "jvb" );
+    }
+
+    public void resetJvbName()
+    {
+        JiveGlobals.deleteProperty( "org.jitsi.videobridge.ofmeet.jvb.user.name" );
+    }
+
+    public void setJvbPassword( String password )
+    {
+        JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.jvb.user.password", password );
+    }
+
+    public String getJvbPassword()
+    {
+        return JiveGlobals.getProperty( "org.jitsi.videobridge.ofmeet.jvb.user.password" );
+    }
+
+    public void resetJvbPassword()
+    {
+        JiveGlobals.deleteProperty( "org.jitsi.videobridge.ofmeet.jvb.user.password" );
+    }
+
     public void setFocusPassword( String password )
     {
         JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.focus.user.password", password );

offocus/src/java/de/mxro/process/internal/Engine.java

@@ -15,169 +15,172 @@
 
 public class Engine {
 
-	public static XProcess startProcess(final String[] command,
-			final ProcessListener listener, final File folder) {
+    public static XProcess startProcess(final String[] command,
+            final ProcessListener listener, final File folder) {
 
-		final ProcessBuilder pb;
-		final Process process;
+        final ProcessBuilder pb;
+        final Process process;
 
-		try {
+        try {
 
-			pb = new ProcessBuilder(command);
-			pb.directory(folder);
-			pb.redirectOutput(Redirect.PIPE);
-			pb.redirectInput(Redirect.PIPE);
-			process = pb.start();
-		} catch (final IOException e) {
-			throw new RuntimeException(e);
-		}
+            pb = new ProcessBuilder(command);
+            pb.directory(folder);
+            pb.redirectOutput(Redirect.PIPE);
+            pb.redirectInput(Redirect.PIPE);
+            process = pb.start();
+        } catch (final IOException e) {
+            throw new RuntimeException(e);
+        }
 
-		final AtomicLong lastOutput = new AtomicLong();
-		final long startTime = new Date().getTime();
-		lastOutput.set(0);
+        final AtomicLong lastOutput = new AtomicLong();
+        final long startTime = new Date().getTime();
+        lastOutput.set(0);
 
 
 
-		final OutputStream outputStream = process.getOutputStream();
-		final InputStream inputStream = process.getInputStream();
-		final InputStream errorStream = process.getErrorStream();
+        final OutputStream outputStream = process.getOutputStream();
+        final InputStream inputStream = process.getInputStream();
+        final InputStream errorStream = process.getErrorStream();
 
 
-		//BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
+        //BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
 
 
-//		String line;
-//		try {
-//			line = reader.readLine();
-//			while (line != null && !line.trim().equals("--EOF--")) {
-//	             listener.onOutputLine(line);
-//	             line = reader.readLine();
-//	         }
-//		} catch (IOException e1) {
-//			// TODO Auto-generated catch block
-//			e1.printStackTrace();
-//		}
+//      String line;
+//      try {
+//          line = reader.readLine();
+//          while (line != null && !line.trim().equals("--EOF--")) {
+//               listener.onOutputLine(line);
+//               line = reader.readLine();
+//           }
+//      } catch (IOException e1) {
+//          // TODO Auto-generated catch block
+//          e1.printStackTrace();
+//      }
 
 
-		final StreamReader streamReader = new StreamReader(inputStream,
-				new StreamListener() {
+        final StreamReader streamReader = new StreamReader(inputStream,
+                new StreamListener() {
 
-					@Override
-					public void onOutputLine(final String line) {
-						//System.out.println("Receiving line");
-						lastOutput.set(new Date().getTime());
-						listener.onOutputLine(line);
-					}
+                    @Override
+                    public void onOutputLine(final String line) {
+                        //System.out.println("Receiving line");
+                        lastOutput.set(new Date().getTime());
+                        listener.onOutputLine(line);
+                    }
 
-					@Override
-					public void onError(final Throwable t) {
-						listener.onError(new Exception(
-								"Error while reading standard output", t));
-					}
+                    @Override
+                    public void onError(final Throwable t) {
+                        listener.onError(new Exception(
+                                "Error while reading standard output", t));
+                    }
 
-					@Override
-					public void onClosed() {
+                    @Override
+                    public void onClosed() {
 
-					}
-				});
+                    }
+                });
 
 
 
-		final StreamReader errorStreamReader = new StreamReader(errorStream,
-				new StreamListener() {
+        final StreamReader errorStreamReader = new StreamReader(errorStream,
+                new StreamListener() {
 
-					@Override
-					public void onOutputLine(final String line) {
-						lastOutput.set(new Date().getTime());
-						listener.onErrorLine(line);
-					}
+                    @Override
+                    public void onOutputLine(final String line) {
+                        lastOutput.set(new Date().getTime());
+                        listener.onErrorLine(line);
+                    }
 
-					@Override
-					public void onError(final Throwable t) {
-						listener.onError(new Exception(
-								"Error while reading error output", t));
-					}
+                    @Override
+                    public void onError(final Throwable t) {
+                        listener.onError(new Exception(
+                                "Error while reading error output", t));
+                    }
 
-					@Override
-					public void onClosed() {
+                    @Override
+                    public void onClosed() {
 
-					}
-				});
+                    }
+                });
 
-		new Thread() {
+        new Thread() {
 
-			@Override
-			public void run() {
-				errorStreamReader.read();
-			}
+            @Override
+            public void run() {
+                errorStreamReader.read();
+            }
 
-		}.start();
+        }.start();
 
-		new Thread() {
+        new Thread() {
 
-			@Override
-			public void run() {
-				try {
-					streamReader.read();
+            @Override
+            public void run() {
+                try {
+                    streamReader.read();
 
-					final int returnValue = process.waitFor();
+                    final int returnValue = process.waitFor();
 
-					//while (lastOutput.get() == 0 && new Date().getTime() - startTime < 500) {
-					//	Thread.sleep(10);
-					//}
+                    //while (lastOutput.get() == 0 && new Date().getTime() - startTime < 500) {
+                    //  Thread.sleep(10);
+                    //}
 
-					//while ( new Date().getTime() - lastOutput.get() < 1000) {
-					//	System.out.println("DELAY ... "+(new Date().getTime() - lastOutput.get()));
-					//	Thread.sleep(500);
-					//}
-					//System.out.println("processes finished with "+returnValue);
+                    //while ( new Date().getTime() - lastOutput.get() < 1000) {
+                    //  System.out.println("DELAY ... "+(new Date().getTime() - lastOutput.get()));
+                    //  Thread.sleep(500);
+                    //}
+                    //System.out.println("processes finished with "+returnValue);
 
-					listener.onProcessQuit(returnValue);
-				} catch (final InterruptedException e) {
-					listener.onError(e);
-					return;
-				}
+                    listener.onProcessQuit(returnValue);
+                } catch (final InterruptedException e) {
+                    listener.onError(e);
+                    return;
+                }
 
-			}
+            }
 
-		}.start();
+        }.start();
 
-		return new XProcess() {
+        return new XProcess() {
+
+            @Override
+            public synchronized void sendLine(final String line) {
+                final BufferedWriter writer = new BufferedWriter(
+                        new OutputStreamWriter(outputStream));
+                try {
+                    writer.append(line);
+                } catch (final IOException e) {
+                    listener.onError(e);
+                }
+            }
+
+            @Override
+            public void destory() {
+                process.destroy();
+                try {
+                    process.waitFor();
+                } catch (final InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+
+                try {
+                    errorStreamReader.stop();
+
+                    outputStream.close();
+                    inputStream.close();
+                    errorStream.close();
+
+                } catch (final IOException e) {
+                    listener.onError(e);
+                }
+                //process.descendants().forEach(ph -> {
+                //    ph.destroy();
+                //});
+                process.destroyForcibly();
+            }
+        };
 
-			@Override
-			public synchronized void sendLine(final String line) {
-				final BufferedWriter writer = new BufferedWriter(
-						new OutputStreamWriter(outputStream));
-				try {
-					writer.append(line);
-				} catch (final IOException e) {
-					listener.onError(e);
-				}
-			}
-
-			@Override
-			public void destory() {
-				process.destroy();
-				try {
-					process.waitFor();
-				} catch (final InterruptedException e) {
-					throw new RuntimeException(e);
-				}
-
-				try {
-					errorStreamReader.stop();
-
-					outputStream.close();
-					inputStream.close();
-					errorStream.close();
-
-				} catch (final IOException e) {
-					listener.onError(e);
-				}
-
-			}
-		};
-
-	}
+    }
 
 }

offocus/src/java/org/jivesoftware/openfire/plugin/ofmeet/FocusPlugin.java

@@ -62,7 +62,7 @@ public void run()
                 boolean running = true;
                 while ( running )
                 {
-                    if ( pluginManager.getPlugin( "ofmeet" ) != null && isAcceptingClientConnections() )
+                    if ( isAcceptingClientConnections() )
                     {
                         try
                         {