antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions
3435 commits 10 branches 49 tags 53 MiB
Commit graph

3435 commits

This branch
This branch
All branches
Author SHA1 Message Date
Simon Oberhammer
226552bc24 Merge remote-tracking branch 'modules/master' into subtree 
this merges the master head of https://github.com/helma-org/apps-modules-mirror into helma
 2012-03-27 11:46:35 +02:00
Tobi Schäfer
e28ad52e80 Merge branch 'master' of github.com:p3k/helma 2012-03-22 18:23:09 +01:00
Tobi Schäfer
964fcc1e54 Added .gitignore file and debian directory 2012-03-22 18:21:29 +01:00
Tobi Schäfer
9310ccd2f8 Merge remote-tracking branch 'oberhamsi/jetty7' 2012-03-22 17:28:50 +01:00
Simon Oberhammer
bb4e494ec6 removed extra code for 'org.mortbay' loggers 
seems to me this just logs less; let's not do that in code - we can control
loglevel of org.eclipse with -D options just fine.
 2012-03-22 17:21:18 +01:00
Simon Oberhammer
503005eac8 switch ContextHandler -> ServletContextHandler 
I tried to do what RingoJs does...
 2012-03-22 17:21:18 +01:00
Simon Oberhammer
892078eb4e to fix the illegal state exception 
i switched the order of app-binding and jetty-server-starting; now it
gets a bit farther but throws another exception:

2012-03-20 10:25:35.550:WARN:oejuc.AbstractLifeCycle:FAILED org.eclipse.jetty.servlet.ServletHandler@177f409c: java.lang.ClassCastException: org.eclipse.jetty.server.handler.ContextHandler cannot be cast to org.eclipse.jetty.servlet.ServletContextHandler
java.lang.ClassCastException: org.eclipse.jetty.server.handler.ContextHandler cannot be cast to org.eclipse.jetty.servlet.ServletContextHandler
	at org.eclipse.jetty.servlet.ServletHandler.doStart(ServletHandler.java:147)
	at org.eclipse.jetty.util.component.AbstractLifeCycle.start(AbstractLifeCycle.java:59)
	at org.eclipse.jetty.server.handler.HandlerWrapper.doStart(HandlerWrapper.java:90)
	at org.eclipse.jetty.server.handler.ScopedHandler.doStart(ScopedHandler.java:97)
	at org.eclipse.jetty.server.handler.ContextHandler.startContext(ContextHandler.java:722)
	at org.eclipse.jetty.server.handler.ContextHandler.doStart(ContextHandler.java:676)
	at org.eclipse.jetty.util.component.AbstractLifeCycle.start(AbstractLifeCycle.java:59)
	at helma.main.ApplicationManager$AppDescriptor.bind(ApplicationManager.java:550)
	at helma.main.ApplicationManager.startAll(ApplicationManager.java:168)
	at helma.main.Server.run(Server.java:602)
	at java.lang.Thread.run(Thread.java:662)
 2012-03-22 17:21:18 +01:00
Simon Oberhammer
aff951c964 replace jar files and jar loading 
helma compiles & starts now, but throws this exception:

    java.lang.IllegalStateException: STARTED
  	at org.eclipse.jetty.server.handler.HandlerWrapper.setHandler(HandlerWrapper.java:71)
  	at helma.main.ApplicationManager$AppDescriptor.bind(ApplicationManager.java:482)
	at helma.main.ApplicationManager.startAll(ApplicationManager.java:168)
	at helma.main.Server.run(Server.java:611)
	at java.lang.Thread.run(Thread.java:662)
 2012-03-22 17:21:17 +01:00
Simon Oberhammer
56871c7072 autochanges by jetty6to7 tool 2012-03-22 17:21:17 +01:00
Simon Oberhammer
c7e9f4c6cb update rhino to 8ba9619bc53a3a61e9e026ef86b6ad698a850d38 2012-03-22 17:21:17 +01:00
Simon Oberhammer
1db31dc405 case-sensitivity-switch implemented by kmfdm 2012-03-22 17:21:17 +01:00
Simon Oberhammer
d8757f6aa3 removed extra code for 'org.mortbay' loggers 
seems to me this just logs less; let's not do that in code - we can control
loglevel of org.eclipse with -D options just fine.
 2012-03-20 14:05:33 +01:00
Simon Oberhammer
578c654541 switch ContextHandler -> ServletContextHandler 
I tried to do what RingoJs does...
 2012-03-20 14:00:30 +01:00
Simon Oberhammer
786a5e86bd to fix the illegal state exception 
i switched the order of app-binding and jetty-server-starting; now it
gets a bit farther but throws another exception:

2012-03-20 10:25:35.550:WARN:oejuc.AbstractLifeCycle:FAILED org.eclipse.jetty.servlet.ServletHandler@177f409c: java.lang.ClassCastException: org.eclipse.jetty.server.handler.ContextHandler cannot be cast to org.eclipse.jetty.servlet.ServletContextHandler
java.lang.ClassCastException: org.eclipse.jetty.server.handler.ContextHandler cannot be cast to org.eclipse.jetty.servlet.ServletContextHandler
	at org.eclipse.jetty.servlet.ServletHandler.doStart(ServletHandler.java:147)
	at org.eclipse.jetty.util.component.AbstractLifeCycle.start(AbstractLifeCycle.java:59)
	at org.eclipse.jetty.server.handler.HandlerWrapper.doStart(HandlerWrapper.java:90)
	at org.eclipse.jetty.server.handler.ScopedHandler.doStart(ScopedHandler.java:97)
	at org.eclipse.jetty.server.handler.ContextHandler.startContext(ContextHandler.java:722)
	at org.eclipse.jetty.server.handler.ContextHandler.doStart(ContextHandler.java:676)
	at org.eclipse.jetty.util.component.AbstractLifeCycle.start(AbstractLifeCycle.java:59)
	at helma.main.ApplicationManager$AppDescriptor.bind(ApplicationManager.java:550)
	at helma.main.ApplicationManager.startAll(ApplicationManager.java:168)
	at helma.main.Server.run(Server.java:602)
	at java.lang.Thread.run(Thread.java:662)
 2012-03-20 10:26:19 +01:00
Simon Oberhammer
bb8aba7adc replace jar files and jar loading 
helma compiles & starts now, but throws this exception:

    java.lang.IllegalStateException: STARTED
  	at org.eclipse.jetty.server.handler.HandlerWrapper.setHandler(HandlerWrapper.java:71)
  	at helma.main.ApplicationManager$AppDescriptor.bind(ApplicationManager.java:482)
	at helma.main.ApplicationManager.startAll(ApplicationManager.java:168)
	at helma.main.Server.run(Server.java:611)
	at java.lang.Thread.run(Thread.java:662)
 2012-03-20 10:24:02 +01:00
Simon Oberhammer
d0c555e62a autochanges by jetty6to7 tool 2012-03-20 10:14:13 +01:00
Simon Oberhammer
d26bc06459 update rhino to 8ba9619bc53a3a61e9e026ef86b6ad698a850d38 2012-03-14 10:22:46 +01:00
Simon Oberhammer
425350c39a case-sensitivity-switch implemented by kmfdm 2012-03-14 10:19:23 +01:00
Tobi Schäfer
a094f59a28 Fixed bug in decodeHttpAuth() causing colons in a password (and everything afterwards) to be swallowed. Note: RFC 2617 explicitely allows colons in passwords, just not in usernames. 2011-01-28 23:16:44 +01:00
hns
3906964d6a Remove indexOf and lastIndexOf from Array.prototype as they're part of JS 1.5. Simplify Array.prototype.contains. 2010-02-22 15:14:24 +00:00
hns
5774b583eb Undo last commit, this is supposed to be done by debian patch. 2010-02-05 17:29:06 +00:00
hns
19e6f596c0 Add helmaswarm build targets (used by debian build scripts) 2010-02-05 17:13:35 +00:00
hns
4f99d04c0a Add svn externals for debian and helmaswarm 2010-02-05 16:50:25 +00:00
hns
6bd0a80a02 Do not use child collection timestamp as cache guard for object references. 
Proper fix for bug 697 <http://dev.helma.org/bugs/show_bug.cgi?id=697>
 2010-01-26 16:18:58 +00:00
hns
3cf88a3a25 Add test case for HopObject references 2010-01-26 15:56:18 +00:00
hns
ea87601291 More null pointer guards. 2010-01-26 15:52:48 +00:00
hns
842d4fd92b Avoid NullPointerException in getLastSubnodeChange(). 
Preliminary fix for bug 697 <http://dev.helma.org/bugs/show_bug.cgi?id=697>
 2010-01-26 15:49:41 +00:00
hns
7a2e89f4bd Remove object from db after testEquality() 2010-01-26 15:34:34 +00:00
hns
b072860a45 Update to jetty-ajp jar from Jetty 6.1.22 with patch for jetty issue 1163 (response header/cookie encoding) 
http://jira.codehaus.org/browse/JETTY-1163
 2010-01-25 20:19:37 +00:00
hns
12a87c17ff Undo last two commits. The change had some side effects, leave db connection handling as is. 2009-12-17 10:55:26 +00:00
hns
edbeb4d8b2 Fix isEmail()/isUrl() using better/stricter RegExp patterns. 
Fixes bug 690 - http://dev.helma.org/bugs/show_bug.cgi?id=690
 2009-12-01 11:05:25 +00:00
hns
dece309fce Add check for closed connections in DbConnection.isValid() 2009-11-30 14:47:56 +00:00
hns
44e6dc30b4 Do not cache connection in helma.Database as it is cached and validated already by helma.objectmodel.db code. 2009-11-30 14:42:24 +00:00
hns
0227e1bce6 Refactor db connection pooling: Use connection names instead of connection properties as has keys, introduce new DbConnection wrapper class and a serial-id flag in DbSource to validate connections. 2009-11-30 10:58:34 +00:00
hns
5a95d1730a Update jetty to version 6.1.22 2009-11-27 15:17:33 +00:00
hns
9ddc2a6f83 Don't try to generate error page if the response has already been committed. 2009-11-26 10:24:15 +00:00
hns
3cd206effc Make symbolic keys case sensitive, following the general change between from 1.6 to 1.7. 2009-11-25 13:25:11 +00:00
hns
291e00bc6c Code cleanup 2009-11-25 13:22:07 +00:00
hns
36c1557c99 Make sure event-log logging level is set according to debug property. 
Fixes bug 696 http://dev.helma.org/bugs/show_bug.cgi?id=696
 2009-11-25 10:55:51 +00:00
hns
16ead75851 Revert back to using TransientNode as HopObject cache node and as placeholder for invalidated/deleted nodes. Some cleanup and modifier tweaking in HopObject. 2009-11-25 09:33:28 +00:00
hns
62db24a43c Remove transient modifiers from Node.java 2009-11-24 15:06:07 +00:00
hns
e14f335253 Revert to old style, unsegmented collection loading as default and only do segmented loading when collection.loadmode = lazy is set. 2009-11-24 10:34:50 +00:00
hns
3250ba7c00 Undo commit 9990 - not calling loadNodes() in addNode() breaks two unit tests involving grouped collections. 2009-11-24 10:25:31 +00:00
hns
9323574f0f Do not load subnodes in addNode(). The subnode list is created a few lines later anyway, and using a faux list shouldn't affect relational collections. 2009-11-18 14:21:00 +00:00
lehni
17047f9cfc Fix IllegalStateException when saving as GIF, see bug 683. 2009-11-16 13:47:46 +00:00
hns
807cd5c80d Patch from Jürg Lehni to add timeout argument to global getURL() function. 
Fixes bug #692 - http://dev.helma.org/bugs/show_bug.cgi?id=692
 2009-11-10 08:47:01 +00:00
hns
784e374f78 Better fix for bug #684: Retrieve ScriptingEngine if necessary in Application.getDataRoot(), and make sure root objects set via Application.setDataRoot() are actually used. 2009-11-05 10:15:53 +00:00
hns
989ce36da0 Another NPE fix for bug #689 
http://dev.helma.org/bugs/show_bug.cgi?id=689
 2009-11-05 08:11:53 +00:00
hns
9b7af555df Readd zero argument Application.getDataRoot() 2009-11-05 08:03:29 +00:00
hns
0a9d8ff99b Add skin introspection patch from Tobi Schäfer for bug #688 
http://dev.helma.org/bugs/show_bug.cgi?id=688
 2009-11-04 11:31:10 +00:00