You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/07/22 15:56:46 UTC
[1/2] git commit: fixed 'the thomas t': †
Updated Branches:
refs/heads/develop ecad38c5f -> f62c7107f
fixed 'the thomas t': †
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/829b6ff9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/829b6ff9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/829b6ff9
Branch: refs/heads/develop
Commit: 829b6ff9a5f15587e7898ce508ab24bc60a50ace
Parents: 6ae301d
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Jul 22 15:55:46 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon Jul 22 15:55:46 2013 +0200
----------------------------------------------------------------------
.../web/public/js/widgets/configurator/configurator.coffee | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/829b6ff9/platform/marmotta-core/src/main/coffeescript/web/public/js/widgets/configurator/configurator.coffee
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/coffeescript/web/public/js/widgets/configurator/configurator.coffee b/platform/marmotta-core/src/main/coffeescript/web/public/js/widgets/configurator/configurator.coffee
index ffd54b7..a8e8a51 100644
--- a/platform/marmotta-core/src/main/coffeescript/web/public/js/widgets/configurator/configurator.coffee
+++ b/platform/marmotta-core/src/main/coffeescript/web/public/js/widgets/configurator/configurator.coffee
@@ -71,8 +71,8 @@ class Model
else if value.type.match /java.lang.String.*/ then clazz = StringProperty
else if value.type.match /java.net.URL.*/ then clazz = URIProperty
else if value.type.match /java.util.List.*/ then clazz = ListProperty
- else if value.type.match /org.marmotta.†ype.Program/ then clazz = ProgramProperty
- else if value.type.match /org.marmotta.†ype.Text/ then clazz = TextProperty
+ else if value.type.match /org.marmotta.type.Program/ then clazz = ProgramProperty
+ else if value.type.match /org.marmotta.type.Text/ then clazz = TextProperty
else clazz = Property
@properties.push new clazz property,value
[2/2] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-marmotta into develop
Posted by wi...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/f62c7107
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/f62c7107
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/f62c7107
Branch: refs/heads/develop
Commit: f62c7107f3cbdb605dcd726e1b8a0ed6db850463
Parents: 829b6ff ecad38c
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Jul 22 15:56:33 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon Jul 22 15:56:33 2013 +0200
----------------------------------------------------------------------
.../kiwi/persistence/KiWiGarbageCollector.java | 30 ++++++++++++++++++++
.../kiwi/persistence/KiWiPersistence.java | 4 +++
.../apache/marmotta/kiwi/sail/KiWiStore.java | 19 +++++++++----
.../kiwi/persistence/h2/create_base_tables.sql | 3 +-
.../persistence/mysql/upgrade_base_001_002.sql | 4 ++-
.../persistence/pgsql/create_base_tables.sql | 5 ++--
.../marmotta/kiwi/test/H2ConcurrencyTest.java | 6 +++-
.../kiwi/test/MySQLConcurrencyTest.java | 6 +++-
.../kiwi/test/PostgreSQLConcurrencyTest.java | 8 +++++-
9 files changed, 73 insertions(+), 12 deletions(-)
----------------------------------------------------------------------