Mercurial Hosting > luan

comparison web/src/luan/modules/web/HttpServicer.java @ 313:1f6d828986b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replace Http.request.servlet_path with Http.request.path; rename Http.request.current_url to Http.request.url; Web_server now loads welcome_file in init() for initialization; fix cmd_line -e; fix install for luan args; git-svn-id: https://luan-java.googlecode.com/svn/trunk@314 21e917c8-12df-6dd8-5cb6-c86387c605b9
author fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
date Thu, 25 Dec 2014 06:14:59 +0000
parents b669cdaf54b7
children 78a6a71afbfd
comparison
equal deleted inserted replaced
312:d34be4588556 313:1f6d828986b9
109 @Override Object get(String name) { 109 @Override Object get(String name) {
110 return request.getParameter(name); 110 return request.getParameter(name);
111 } 111 }
112 112
113 @Override Iterator<String> names() { 113 @Override Iterator<String> names() {
114 return new EnumerationIterator(request.getParameterNames()); 114 return new EnumerationIterator<String>(request.getParameterNames());
115 } 115 }
116 116
117 @Override protected String type() { 117 @Override protected String type() {
118 return "request.parameters-table"; 118 return "request.parameters-table";
119 } 119 }
125 @Override Object get(String name) { 125 @Override Object get(String name) {
126 return request.getHeader(name); 126 return request.getHeader(name);
127 } 127 }
128 128
129 @Override Iterator<String> names() { 129 @Override Iterator<String> names() {
130 return new EnumerationIterator(request.getHeaderNames()); 130 return new EnumerationIterator<String>(request.getHeaderNames());
131 } 131 }
132 132
133 @Override protected String type() { 133 @Override protected String type() {
134 return "request.headers-table"; 134 return "request.headers-table";
135 } 135 }
136 }; 136 };
137 tbl.put( "headers", headers ); 137 tbl.put( "headers", headers );
138 tbl.put( "method", new LuanProperty() { public Object get() { 138 tbl.put( "method", new LuanProperty() { public Object get() {
139 return request.getMethod(); 139 return request.getMethod();
140 } } ); 140 } } );
141 /*
141 tbl.put( "servlet_path", new LuanProperty() { public Object get() { 142 tbl.put( "servlet_path", new LuanProperty() { public Object get() {
142 return request.getServletPath(); 143 return request.getServletPath();
143 } } ); 144 } } );
145 */
146 tbl.put( "path", new LuanProperty() { public Object get() {
147 return request.getRequestURI();
148 } } );
144 tbl.put( "server_name", new LuanProperty() { public Object get() { 149 tbl.put( "server_name", new LuanProperty() { public Object get() {
145 return request.getServerName(); 150 return request.getServerName();
146 } } ); 151 } } );
147 tbl.put( "current_url", new LuanProperty() { public Object get() { 152 tbl.put( "url", new LuanProperty() { public Object get() {
148 return getCurrentURL(request); 153 return getURL(request);
149 } } ); 154 } } );
150 tbl.put( "query_string", new LuanProperty() { public Object get() { 155 tbl.put( "query_string", new LuanProperty() { public Object get() {
151 return getQueryString(request); 156 return getQueryString(request);
152 } } ); 157 } } );
153 tbl.put( "remote_address", new LuanProperty() { public Object get() { 158 tbl.put( "remote_address", new LuanProperty() { public Object get() {
255 @Override Object get(String name) { 260 @Override Object get(String name) {
256 return request.getSession().getAttribute(name); 261 return request.getSession().getAttribute(name);
257 } 262 }
258 263
259 @Override Iterator<String> names() { 264 @Override Iterator<String> names() {
260 return new EnumerationIterator(request.getSession().getAttributeNames()); 265 return new EnumerationIterator<String>(request.getSession().getAttributeNames());
261 } 266 }
262 267
263 @Override public void put(Object key,Object val) { 268 @Override public void put(Object key,Object val) {
264 if( !(key instanceof String) ) 269 if( !(key instanceof String) )
265 throw new IllegalArgumentException("key must be string for session attributes table"); 270 throw new IllegalArgumentException("key must be string for session attributes table");
350 } while( en.hasMoreElements() ); 355 } while( en.hasMoreElements() );
351 queryBuf.deleteCharAt(queryBuf.length() - 1); 356 queryBuf.deleteCharAt(queryBuf.length() - 1);
352 return queryBuf.toString(); 357 return queryBuf.toString();
353 } 358 }
354 359
355 public static String getCurrentURL(HttpServletRequest request) { 360 public static String getURL(HttpServletRequest request) {
356 return getCurrentURL(request,0); 361 return getURL(request,0);
357 } 362 }
358 363
359 public static String getCurrentURL(HttpServletRequest request,int maxValueLen) { 364 public static String getURL(HttpServletRequest request,int maxValueLen) {
360 // StringBuffer buf = HttpUtils.getRequestURL(request); 365 // StringBuffer buf = HttpUtils.getRequestURL(request);
361 StringBuffer buf = request.getRequestURL(); 366 StringBuffer buf = request.getRequestURL();
362 String qStr = getQueryString(request,maxValueLen); 367 String qStr = getQueryString(request,maxValueLen);
363 if(qStr != null && qStr.length() > 0) { 368 if(qStr != null && qStr.length() > 0) {
364 buf.append('?'); 369 buf.append('?');