Commit graph

3114 commits

Author SHA1 Message Date
69adddafed Updated Jala module 2015-04-07 16:39:02 +02:00
0d31d25d7b Merge remote-tracking branch 'origin/master' 2015-04-07 16:11:57 +02:00
4c9114fac4 Updated Git URL for Jala submodule 2015-04-07 16:11:22 +02:00
22a23c45a2 Converted to MarkDown 2015-02-11 20:46:14 +01:00
8a6c58ad74 Fixed module URL 2015-01-28 20:57:55 +01:00
e9e8a4aa34 Moved some exclusion patterns from .git/info/exclude to .gitignore 2015-01-28 20:47:57 +01:00
48d77455f8 Ignore log directory 2015-01-28 20:36:17 +01:00
96a037d508 Added Jala as submodule 2015-01-28 20:36:07 +01:00
921b074e6b Refactored replace_filter to use JS regular expression 2015-01-28 20:14:08 +01:00
2acff557d0 Removed default size from form fields 2015-01-28 20:13:27 +01:00
e2fe90126b Removed submodules 2015-01-28 20:13:01 +01:00
a7dd487d3e Merge remote-tracking branch 'helma/master' 2015-01-28 19:23:10 +01:00
Simon Oberhammer
dd8f8b6caa bump version 2014-03-12 09:56:29 +01:00
Robert Gaggl
61bafb72d6 partly reverted 5f18e3ae2d:
switched back to using DbSources as Map keys, as using strings breaks switching databases
using DbSource.switchProperties (which is used in jala.Test)
2013-04-09 16:05:07 +02:00
Robert Gaggl
5f18e3ae2d Modified Transactor to store sqlConnections internally using the name of the DbSource
as Map key, not the DbSource instance. Using the instance as key is both inefficient and
error prone (see fd0b77bc11).

Additional changes:
- modified getConnection() to check if the DB is oracle. "SELECT 1" is invalid
for Oracle DBs and lead to Helma dropping in-use connections every minute.
- set DbSource name final
2013-04-09 12:52:06 +02:00
Robert Gaggl
8d9bc3afb1 Next attempt to fix the deadlock issue that lead to fd0b77bc11:
The source of the deadlock problem seems that during DbSource.getConnection() ResourceProperties instances are compared using their equals() method, which is synchronized in Hashtable and can/does lead to deadlocks (see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6582568).

This commit overwrites equals with an unsynchronized version. Note that this implementation might return a wrong result if one of the two instances is modified during this method call, but at least doesn't throw a ConcurrentModificationException.
2013-04-08 17:30:31 +02:00
f6f6475908 Remoted symlink 2013-04-07 17:32:22 +02:00
b5adad0eaa Removed swarm submodule 2013-04-07 17:28:35 +02:00
59d127e089 Merged with helma/master 2013-04-07 17:27:18 +02:00
ff7bba76cf Merge remote-tracking branch 'helma/master'
Conflicts:
	.gitignore
	apps
	modules
2013-04-07 17:18:29 +02:00
Simon Oberhammer
826987d3a2 new interface method ObjectCache.getStatistics
the statistics of a cache instance for an application can be retrieved
by calling `app.__app__.getCacheStatistics()`. That's not very useful for the 
default `ObjectCache` but essential for looking into what more complex cache
impls like `SwarmCache` do

we could remove all the other cache statistics methods like `getCacheUsage` 
and output that info in the map returned by `getCacheStatistics()`

i had to bump java to 1.5 for the generics.. if that's a problem we can
remove the generics
2013-04-04 11:24:56 +02:00
Robert Gaggl
fd0b77bc11 synchronized various methods to avoid deadlock
one of our apps was stuck in a deadlock in ResourceProperties.size(),
see excerpt of the stack trace below. this fix synchronizes various overriding
methods since they are synchronized in Hashtable as well.

removed superfluous toString method too.

```
"app-230":
        at java.util.Hashtable.size(Hashtable.java:206)
        - waiting to lock <0xa13f8548> (a helma.util.ResourceProperties)
        at helma.util.ResourceProperties.size(ResourceProperties.java:529)
        at java.util.Hashtable.equals(Hashtable.java:742)
        - locked <0xa1065708> (a helma.util.ResourceProperties)
        at helma.objectmodel.db.DbSource.equals(DbSource.java:292)
        ...
"app-439":
        at java.util.Hashtable.size(Hashtable.java:206)
        - waiting to lock <0xa1065708> (a helma.util.ResourceProperties)
        at helma.util.ResourceProperties.size(ResourceProperties.java:529)
        at java.util.Hashtable.equals(Hashtable.java:742)
        - locked <0xa13f8548> (a helma.util.ResourceProperties)
        at helma.objectmodel.db.DbSource.equals(DbSource.java:292)
        ...
```
2013-03-06 10:09:50 +01:00
f808a7b7f7 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. 2012-11-29 09:39:24 +01:00
a9a6b0d753 Added submodules for apps, modules and swarm 2012-04-22 18:39:08 +02:00
Simon Oberhammer
4c6e405e06 adding .gitignore
ignore everything created by `ant jar`
2012-03-27 14:23:07 +02:00
Simon Oberhammer
67080b75c8 Merge branch 'object-clone-fix' into helma-1.8 2012-03-27 14:18:36 +02:00
Simon Oberhammer
e1869189cf fix Object.clone for null properties
unknown author
2012-03-27 14:18:10 +02:00
Simon Oberhammer
26cf7c9779 Merge branch 'subtree-manage-and-modules' into helma-1.8 2012-03-27 14:05:58 +02:00
Simon Oberhammer
ca2b08a5df Merge remote-tracking branch 'manage/master' into subtree
this merges master branch of https://github.com/helma-org/apps-manage-mirror into helma
2012-03-27 11:47:36 +02:00
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
e28ad52e80 Merge branch 'master' of github.com:p3k/helma 2012-03-22 18:23:09 +01:00
964fcc1e54 Added .gitignore file and debian directory 2012-03-22 18:21:29 +01:00
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
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