Commit graph

3137 commits

Author SHA1 Message Date
5c0e36e48b add: experimental support for commonjs modules
activated rhino’s require() method and module.exports object; both work, but the default implementation cannot load packages which in turn require modules in relative subdirs.

a new property called commonjs.dir can be used to define an additional search directory. the app dir is added automatically.
2016-12-17 10:36:13 +01:00
c468e8e865 add: support for httponly and secure cookies 2016-12-09 23:49:23 +01:00
2a41085419 Merge branch 'feature/hello-gradle' into helma-🐜 2016-12-04 22:15:23 +01:00
5f0ff9f635 add: gradle files
still using ant targets via importBuild except for dependency management
2016-12-04 22:15:08 +01:00
4ebc1182f1 Merge branch 'feature/hello-gradle' into helma-🐜 2016-12-04 16:05:07 +01:00
e322fb80dd Merge branch 'feature/goodbye-jimi' into helma-🐜 2016-12-04 16:03:37 +01:00
6e196e857f del: support for Jimi image processing library 2016-12-04 15:59:29 +01:00
ecb0003a37 add: gradle files
still using ant targets via importBuild except for dependency management
2016-12-04 15:55:19 +01:00
dd822d4e24 fix: reference to Base64 is ambiguous, both class java.util.Base64 in java.util and class helma.util.Base64 in helma.util match (Java 8) 2015-12-22 19:36:40 +01:00
948dc9a76b fix: removed encoding of valid unicode characters to html entities 2015-12-13 12:36:37 +01:00
735de0bbf6 fix: re-enabled output of <br> elements in format() method with additional class attribute to signify where it comes from 2015-08-14 14:23:22 +02:00
80dfe53204 chg: removed transformation of linebreaks to <br> or <p> elements in format() method 2015-08-10 14:19:57 +02:00
ed8f6ce9b6 chg: removed transformation to HTML entities, basically only supporting Unicode output (it’s 2015, I think it’s alright) 2015-08-10 14:16:01 +02:00
fc51cb398b chg: bumped Java source and target version to 1.7 2015-08-10 14:10:29 +02:00
835c56afcf Ignore anything starting with db 2015-05-23 18:25:47 +02:00
2cfb7e4b15 Ignore anything starting with apps and the passwd file created by the manage app 2015-05-23 18:19:00 +02:00
f763a0896e Update and rename README.txt to README.md 2015-04-08 19:02:12 +02:00
60b31e6133 Update and rename README.txt to README.md 2015-04-08 19:00:36 +02:00
af2c37bda6 Update and rename readme.txt to README.md 2015-04-08 18:53:05 +02:00
6ca7261976 Delete summary.txt 2015-04-08 18:48:15 +02:00
7e6c6c6d5b Update README.md 2015-04-08 18:48:02 +02:00
32eb71677e Update README.md 2015-04-08 18:47:29 +02:00
b0eb4ecba3 Update and rename README to README.md 2015-04-08 18:45:09 +02:00
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