1.1 --- a/dew4nb/nbproject/project.xml Mon Feb 10 17:26:26 2014 +0100
1.2 +++ b/dew4nb/nbproject/project.xml Mon Feb 10 22:05:19 2014 +0100
1.3 @@ -95,6 +95,14 @@
1.4 </run-dependency>
1.5 </dependency>
1.6 <dependency>
1.7 + <code-name-base>org.netbeans.modules.java.preprocessorbridge</code-name-base>
1.8 + <build-prerequisite/>
1.9 + <compile-dependency/>
1.10 + <run-dependency>
1.11 + <specification-version>1.34</specification-version>
1.12 + </run-dependency>
1.13 + </dependency>
1.14 + <dependency>
1.15 <code-name-base>org.netbeans.modules.java.project</code-name-base>
1.16 <build-prerequisite/>
1.17 <compile-dependency/>
1.18 @@ -108,7 +116,7 @@
1.19 <build-prerequisite/>
1.20 <compile-dependency/>
1.21 <run-dependency>
1.22 - <specification-version>0.130</specification-version>
1.23 + <specification-version>0.134</specification-version>
1.24 </run-dependency>
1.25 </dependency>
1.26 <dependency>
2.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/api/Server.java Mon Feb 10 17:26:26 2014 +0100
2.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/api/Server.java Mon Feb 10 22:05:19 2014 +0100
2.3 @@ -49,6 +49,8 @@
2.4 import java.nio.charset.Charset;
2.5 import java.util.ArrayList;
2.6 import java.util.Collection;
2.7 +import java.util.logging.Level;
2.8 +import java.util.logging.Logger;
2.9 import org.glassfish.grizzly.PortRange;
2.10 import org.glassfish.grizzly.http.server.HttpServer;
2.11 import org.glassfish.grizzly.http.server.NetworkListener;
2.12 @@ -73,6 +75,7 @@
2.13 */
2.14 public final class Server {
2.15
2.16 + private static final Logger LOG = Logger.getLogger(Server.class.getName());
2.17 private static final Charset UTF8 = Charset.forName("UTF-8"); //NOI18N
2.18 private static final int MAX_CHANNEL_LEN = 256;
2.19 private static final char CHANNEL_SEPARATOR = '|'; //NOI18N
2.20 @@ -198,6 +201,14 @@
2.21 final String channel = text.substring(0, index);
2.22 final String message = text.substring(index+1);
2.23 final EndPoint<?,?> ep = registry.getEndPoint(channel);
2.24 + LOG.log(
2.25 + Level.FINE,
2.26 + "Message: {0} to: {1} served by: {2}",
2.27 + new Object[]{
2.28 + message,
2.29 + channel,
2.30 + ep
2.31 + });
2.32 if (ep != null) {
2.33 try {
2.34 status = ep.handle(socket, message);
3.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/endpoint/EndPoint.java Mon Feb 10 17:26:26 2014 +0100
3.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/endpoint/EndPoint.java Mon Feb 10 22:05:19 2014 +0100
3.3 @@ -89,6 +89,8 @@
3.4 import java.util.HashMap;
3.5 import java.util.Map;
3.6 import java.util.concurrent.ConcurrentHashMap;
3.7 +import java.util.logging.Level;
3.8 +import java.util.logging.Logger;
3.9 import net.java.html.json.Models;
3.10 import org.glassfish.grizzly.websockets.WebSocket;
3.11 import org.netbeans.api.annotations.common.CheckForNull;
3.12 @@ -103,6 +105,8 @@
3.13 */
3.14 public abstract class EndPoint<Request, RequestKind extends Enum<RequestKind>> {
3.15
3.16 + private static final Logger LOG = Logger.getLogger(EndPoint.class.getName());
3.17 +
3.18 private static final Object handlersCacheLock = new Object();
3.19 //@GuardedBy("handlersCacheLock")
3.20 private static Map<String,Collection<RequestHandler<?,?>>> handlersCache;
3.21 @@ -232,6 +236,13 @@
3.22 if (closed) {
3.23 throw new IllegalStateException("Env already closed"); //NOI18N
3.24 }
3.25 + LOG.log(
3.26 + Level.FINE,
3.27 + "Sending: {0} from: {1}", //NOI18N
3.28 + new Object[]{
3.29 + message,
3.30 + endPointName
3.31 + });
3.32 if (measuringEnabled && message!=null && message.startsWith("{\"status\":\"done\",\"type\":\"autocomplete\"")) { //NOI18N
3.33 long timeinside=Utilities.getMeasuredTime(System.currentTimeMillis(), ws.hashCode());
3.34 ws.send(message.replace("}]}", "},{\"text\":\"Duration: @#$ms Browser->Tomcat: @#$ms \",\"displayName\":null,\"extraText\":\"Tomcat->IDE: @#$ms\",\"rightText\":\"IDE: @#$"+timeinside+"@#$ms\",\"className\":\"MTV\"}]}")); //NOI18N
4.1 --- a/dew4nb/src/org/netbeans/modules/dew4nb/services/debugger/ActiveSessions.java Mon Feb 10 17:26:26 2014 +0100
4.2 +++ b/dew4nb/src/org/netbeans/modules/dew4nb/services/debugger/ActiveSessions.java Mon Feb 10 22:05:19 2014 +0100
4.3 @@ -109,7 +109,15 @@
4.4 Parameters.notNull("context", context); //NOI18N
4.5 Parameters.notNull("env", env); //NOI18N
4.6 final int id = sequencer.incrementAndGet();
4.7 - final Session session = findSession();
4.8 + Session session;
4.9 + try {
4.10 + for (session = findSession(); session == null; session = findSession()) {
4.11 + LOG.info("Wating for debugger...."); //NOI18N
4.12 + Thread.sleep(1000);
4.13 + }
4.14 + } catch (InterruptedException ie) {
4.15 + return -1;
4.16 + }
4.17 if (session != null) {
4.18 if (active.putIfAbsent(id, new Data(id, context, env, session)) != null) {
4.19 throw new IllegalStateException("Trying to reuse active session"); //NOI18N