Merge branch '3.3' into develop

Conflicts: railo-cfml/railo-admin/admin/development.debugging.cfm railo-java/railo-core/src/railo/runtime/Info.ini railo-java/railo-core/src/railo/runtime/PageContextImpl.java railo-java/railo-core/src/railo/runtime/config/ConfigImpl.java railo-java/railo-core/src/railo/runtime/config/ConfigWebAdmin.java railo-java/railo-core/src/railo/runtime/config/ConfigWebFactory.java railo-java/railo-core/src/railo/runtime/config/ConfigWebImpl.java railo-java/railo-core/src/railo/runtime/debug/DebuggerImpl.java railo-java/railo-core/src/railo/runtime/net/http/ReqRspUtil.java railo-java/railo-core/src/railo/runtime/tag/Admin.java railo-java/railo-core/src/railo/runtime/type/scope/ScopeContext.java railo-java/railo-core/src/railo/runtime/type/util/QueryUtil.java railo-java/railo-core/src/resource/context/railo-context.ra
getrailo · Nov 11, 2011 · 95ad8e6 · 95ad8e6
1 parent 0e521a5
commit 95ad8e6
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 25 deletions.
diff --git a/railo-java/railo-core/src/railo/commons/net/CookieUtil.java b/railo-java/railo-core/src/railo/commons/net/CookieUtil.java
@@ -2,7 +2,6 @@
 
 import org.apache.commons.httpclient.Cookie;
 
-import railo.commons.lang.StringUtil;
 import railo.runtime.net.http.ReqRspUtil;
 
 public class CookieUtil {

diff --git a/railo-java/railo-core/src/railo/commons/net/URLEncoder.java b/railo-java/railo-core/src/railo/commons/net/URLEncoder.java
@@ -2,10 +2,7 @@
 
 import java.io.UnsupportedEncodingException;
 
-import org.apache.commons.codec.net.URLCodec;
-
 import railo.commons.lang.StringUtil;
-import railo.runtime.net.http.ReqRspUtil;
 
 /**
  * Utility class for HTML form encoding. This class contains static methods

diff --git a/railo-java/railo-core/src/railo/runtime/PageContextImpl.java b/railo-java/railo-core/src/railo/runtime/PageContextImpl.java
@@ -82,7 +82,7 @@
 import railo.runtime.interpreter.CFMLExpressionInterpreter;
 import railo.runtime.interpreter.VariableInterpreter;
 import railo.runtime.listener.AppListenerSupport;
-import railo.runtime.listener.ApplicationContextPro;
+import railo.runtime.listener.ApplicationContext;
 import railo.runtime.listener.ApplicationListener;
 import railo.runtime.listener.ClassicApplicationContext;
 import railo.runtime.listener.ModernAppListenerException;

diff --git a/railo-java/railo-core/src/railo/runtime/config/ConfigServerImpl.java b/railo-java/railo-core/src/railo/runtime/config/ConfigServerImpl.java
@@ -1,6 +1,5 @@
 package railo.runtime.config;
 
-import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashMap;

diff --git a/railo-java/railo-core/src/railo/runtime/config/ConfigWebFactory.java b/railo-java/railo-core/src/railo/runtime/config/ConfigWebFactory.java
@@ -3543,11 +3543,12 @@ private static void loadDebug(ConfigServerImpl configServer, ConfigImpl config,
       	if(hasAccess && !StringUtil.isEmpty(strMax)) {
       	    config.setDebugMaxRecordsLogged(toInt(strMax,10));
       	}
-      	else if(hasCS)config.setDebugMaxRecordsLogged(((ConfigServerImpl)configServer).getDebugMaxRecordsLogged());
+      	else if(hasCS)config.setDebugMaxRecordsLogged(configServer.getDebugMaxRecordsLogged());
 
 
      // show-usage
       	Boolean showUsage = Caster.toBoolean(debugging.getAttribute("show-query-usage"),null);
+      	showUsage=Boolean.TRUE;
       	if(showUsage!=null && hasAccess) {
       	    config.setDebugShowQueryUsage(showUsage.booleanValue());
       	}

diff --git a/railo-java/railo-core/src/railo/runtime/debug/DebuggerImpl.java b/railo-java/railo-core/src/railo/runtime/debug/DebuggerImpl.java
@@ -15,8 +15,8 @@
 import railo.runtime.PageContext;
 import railo.runtime.PageSource;
 import railo.runtime.config.Config;
+import railo.runtime.config.ConfigImpl;
 import railo.runtime.config.ConfigWebImpl;
-
 import railo.runtime.db.SQL;
 import railo.runtime.dump.DumpData;
 import railo.runtime.dump.DumpProperties;
@@ -150,7 +150,7 @@ public DumpData toDumpData(PageContext pageContext, int maxlevel, DumpProperties
         int tApp=0;
         int tCount=0;
         for(int i=0;i<len;i++) {
-            DebugEntry de=(DebugEntry) arrPages.get(i);
+            DebugEntry de=arrPages.get(i);
             tLoad+=de.getFileLoadTime();
             tQuery+=de.getQueryTime();
             tApp+=de.getExeTime();
@@ -217,7 +217,7 @@ public DumpData toDumpData(PageContext pageContext, int maxlevel, DumpProperties
 	        	Iterator<DebugTimerImpl> it = timers.iterator();
 	        	DebugTimer timer;
 	        	while(it.hasNext()) {
-	        		timer=(DebugTimer) it.next();
+	        		timer= it.next();
 	        		tableTimer.appendRow(0, new SimpleDumpData(timer.getLabel()),new SimpleDumpData(timer.getTime()),new SimpleDumpData(timer.getTemplate())) ;
 	        	}
 		}
@@ -246,7 +246,7 @@ public DumpData toDumpData(PageContext pageContext, int maxlevel, DumpProperties
 	        	DebugTraceImpl trace;
 	        	int total=0;
 	        	while(it.hasNext()) {
-	        		trace=(DebugTraceImpl) it.next();
+	        		trace=it.next();
 	        		total+=trace.getTime();
 	        		DumpTable tableVar=new DumpTable("#cccccc","#ffffff","#000000");
 	        		SimpleDumpData varValue = new SimpleDumpData(toString(trace.getVarValue()));
@@ -473,7 +473,7 @@ public Struct getDebuggingData(PageContext pc, boolean addAddionalInfo) {
 		try {
 		    while(qryIt.hasNext()) {
 		        row++;
-		        QueryEntry qe=(QueryEntry) qryIt.next();
+		        QueryEntry qe=qryIt.next();
 				qryQueries.setAt(KeyImpl.NAME,row,qe.getName()==null?"":qe.getName());
 		        qryQueries.setAt(KeyImpl.TIME,row,Integer.valueOf(qe.getExe()));
 		        qryQueries.setAt(SQL,row,qe.getSQL().toString());
@@ -509,7 +509,7 @@ public Struct getDebuggingData(PageContext pc, boolean addAddionalInfo) {
             //PageSource ps;
 		    for(int i=0;i<len;i++) {
 		        row++;
-		        de=(DebugEntry) arrPages.get(i);
+		        de=arrPages.get(i);
                 //ps = de.getPageSource();
 
 		        qryPage.setAt("id",row,de.getId());
@@ -550,7 +550,7 @@ public Struct getDebuggingData(PageContext pc, boolean addAddionalInfo) {
 	        	DebugTimer timer;
 	        	row=0;
 	        	while(it.hasNext()) {
-	        		timer=(DebugTimer) it.next();
+	        		timer=it.next();
 	        		row++;
 	        		qryTimers.setAt(KeyImpl.LABEL,row,timer.getLabel()); 
 	        		qryTimers.setAt(KeyImpl.TEMPLATE,row,timer.getTemplate()); 

diff --git a/railo-java/railo-core/src/railo/runtime/exp/PageRuntimeException.java b/railo-java/railo-core/src/railo/runtime/exp/PageRuntimeException.java
@@ -5,7 +5,6 @@
 import railo.runtime.config.Config;
 import railo.runtime.dump.DumpData;
 import railo.runtime.dump.DumpProperties;
-import railo.runtime.engine.ThreadLocalConfig;
 import railo.runtime.engine.ThreadLocalPageContext;
 import railo.runtime.err.ErrorPage;
 import railo.runtime.type.Struct;

diff --git a/railo-java/railo-core/src/railo/runtime/listener/ModernAppListenerException.java b/railo-java/railo-core/src/railo/runtime/listener/ModernAppListenerException.java
@@ -8,7 +8,6 @@
 import railo.runtime.config.Config;
 import railo.runtime.dump.DumpData;
 import railo.runtime.dump.DumpProperties;
-import railo.runtime.engine.ThreadLocalConfig;
 import railo.runtime.engine.ThreadLocalPageContext;
 import railo.runtime.err.ErrorPage;
 import railo.runtime.exp.CatchBlock;

diff --git a/railo-java/railo-core/src/railo/runtime/net/http/ReqRspUtil.java b/railo-java/railo-core/src/railo/runtime/net/http/ReqRspUtil.java
@@ -170,7 +170,7 @@ private static boolean isHex(char c) {
 	}
 
 
-	private static String dec(String str, String charset, boolean force) throws UnsupportedEncodingException {
+	private static String dec(String str, String charset, boolean force) {
 		str=str.trim();
 		if(StringUtil.startsWith(str, '"') && StringUtil.endsWith(str, '"'))
 			str=str.substring(1,str.length()-1);

diff --git a/railo-java/railo-core/src/railo/runtime/orm/hibernate/HibernateRuntimeException.java b/railo-java/railo-core/src/railo/runtime/orm/hibernate/HibernateRuntimeException.java
@@ -7,7 +7,6 @@
 import railo.runtime.config.Config;
 import railo.runtime.dump.DumpData;
 import railo.runtime.dump.DumpProperties;
-import railo.runtime.engine.ThreadLocalConfig;
 import railo.runtime.engine.ThreadLocalPageContext;
 import railo.runtime.err.ErrorPage;
 import railo.runtime.exp.CatchBlock;

diff --git a/railo-java/railo-core/src/railo/runtime/tag/StoredProc.java b/railo-java/railo-core/src/railo/runtime/tag/StoredProc.java
@@ -25,7 +25,6 @@
 import railo.runtime.db.SQLCaster;
 import railo.runtime.db.SQLImpl;
 import railo.runtime.db.SQLItemImpl;
-import railo.runtime.debug.Debugger;
 import railo.runtime.exp.ApplicationException;
 import railo.runtime.exp.DatabaseException;
 import railo.runtime.exp.PageException;

diff --git a/railo-java/railo-core/src/railo/runtime/type/QueryColumnImpl.java b/railo-java/railo-core/src/railo/runtime/type/QueryColumnImpl.java
@@ -7,7 +7,6 @@
 
 import railo.commons.lang.SizeOf;
 import railo.runtime.PageContext;
-import railo.runtime.config.Config;
 import railo.runtime.dump.DumpData;
 import railo.runtime.dump.DumpProperties;
 import railo.runtime.dump.DumpUtil;

diff --git a/railo-java/railo-core/src/railo/runtime/type/QueryImpl.java b/railo-java/railo-core/src/railo/runtime/type/QueryImpl.java
@@ -49,7 +49,6 @@
 import railo.runtime.db.SQL;
 import railo.runtime.db.SQLCaster;
 import railo.runtime.db.SQLItem;
-import railo.runtime.debug.DebuggerImpl;
 import railo.runtime.dump.DumpData;
 import railo.runtime.dump.DumpProperties;
 import railo.runtime.dump.DumpRow;

diff --git a/railo-java/railo-core/src/railo/runtime/type/scope/ScopeContext.java b/railo-java/railo-core/src/railo/runtime/type/scope/ScopeContext.java
@@ -18,7 +18,6 @@
 import railo.commons.lang.types.RefBoolean;
 import railo.runtime.CFMLFactoryImpl;
 import railo.runtime.PageContext;
-import railo.runtime.PageContextImpl;
 import railo.runtime.cache.CacheConnection;
 import railo.runtime.config.Config;
 import railo.runtime.config.ConfigImpl;
@@ -440,7 +439,7 @@ public Session getSessionScope(PageContext pc,RefBoolean isNew) throws PageExcep
 	}
 
 	public boolean hasExistingSessionScope(PageContext pc) {
-        if((pc.getSessionType()==Config.SESSION_TYPE_CFML)return hasExistingCFSessionScope(pc);
+        if(pc.getSessionType()==Config.SESSION_TYPE_CFML)return hasExistingCFSessionScope(pc);
 		return hasExistingJSessionScope(pc);
 	}
 

diff --git a/railo-java/railo-core/src/railo/runtime/type/util/QueryUtil.java b/railo-java/railo-core/src/railo/runtime/type/util/QueryUtil.java
@@ -6,12 +6,13 @@
 import railo.runtime.type.KeyImpl;
 import railo.runtime.type.Query;
 import railo.runtime.type.QueryColumn;
+import railo.runtime.type.QueryColumnImpl;
 
 public class QueryUtil {
 
 	public static long sizeOf(QueryColumn column) {
-		if(column instanceof QueryColumn){
-			return ((QueryColumn)column).sizeOf();
+		if(column instanceof QueryColumnImpl){
+			return ((QueryColumnImpl)column).sizeOf();
 		}
 		int len = column.size();
 		long size=0;

diff --git a/railo-java/railo-loader/src/railo/runtime/PageContext.java b/railo-java/railo-loader/src/railo/runtime/PageContext.java
@@ -1051,5 +1051,7 @@ public abstract Object setVariable(String var, Object value)
 
 	public abstract void setTimeZone(TimeZone timeZone);
 
+	public abstract short getSessionType();
+
 
 }