* Added missing source field to skin table in H2 database

* Added Admin.purgeReferrers() method for AntClick to overrule the original code with appropriate SQL for H2 database
 * Removed outdated bookmarklet.txt and Skin.java.patch files (the latter is in Helma trunk)
 * Added license headers where missing
This commit is contained in:
Tobi Schäfer 2010-01-19 21:46:54 +00:00
parent f7fcc73342
commit 499e8d97b9
10 changed files with 151 additions and 79 deletions

2
.gitattributes vendored
View file

@ -1,8 +1,8 @@
* text=auto !eol * text=auto !eol
build/build.properties svneol=native#text/plain build/build.properties svneol=native#text/plain
build/extra/MessageParser.js svneol=native#text/plain build/extra/MessageParser.js svneol=native#text/plain
build/extra/Skin.java.patch -text
build/extra/antclick/Archive/Archive.properties svneol=native#text/plain build/extra/antclick/Archive/Archive.properties svneol=native#text/plain
build/extra/antclick/Global/Admin.js svneol=native#text/plain
build/extra/antville.h2.db -text build/extra/antville.h2.db -text
build/extra/h2.jar -text svneol=unset#application/x-compressed build/extra/h2.jar -text svneol=unset#application/x-compressed
build/extra/helma.jar -text build/extra/helma.jar -text

View file

@ -1,70 +0,0 @@
Index: src/helma/framework/core/Skin.java
===================================================================
--- src/helma/framework/core/Skin.java (revision 9979)
+++ src/helma/framework/core/Skin.java (working copy)
@@ -183,6 +183,14 @@
}
subskins.put(name, subskin);
}
+
+ /**
+ * Return the list of macros found by the parser
+ * @return the list of macros
+ */
+ public Macro[] getMacros() {
+ return macros;
+ }
/**
* Check if this skin has a main skin, as opposed to consisting just of subskins
@@ -340,8 +348,8 @@
}
}
- class Macro {
- final int start, end;
+ public class Macro {
+ public final int start, end;
String name;
String[] path;
int handlerType = HANDLER_OTHER;
@@ -1006,9 +1014,38 @@
* Return the full name of the macro in handler.name notation
* @return the macro name
*/
- String getName() {
+ public String getName() {
return name;
}
+
+ /**
+ * Return the numeric type of the macro handler
+ * @return the handler type
+ */
+ public int getHandlerType() {
+ return handlerType;
+ }
+
+ /**
+ * Return the list of named parameters
+ * @return the list of named parameters
+ */
+ public Map getNamedParams() {
+ return namedParams;
+ }
+
+ /**
+ * Return the list of positional parameters
+ * @return the list of positional parameters
+ */
+ public List getPositionalParams() {
+ return positionalParams;
+ }
+
+ public boolean hasNestedMacros() {
+ return hasNestedMacros;
+ }
+
}
class StandardParams {

View file

@ -1,2 +1,26 @@
##
## The Antville Project
## http://code.google.com/p/antville
##
## Copyright 2001-2007 by The Antville People
##
## Licensed under the Apache License, Version 2.0 (the ``License'');
## you may not use this file except in compliance with the License.
## You may obtain a copy of the License at
##
## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an ``AS IS'' BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
##
## $Revision:3333 $
## $LastChangedBy:piefke3000 $
## $LastChangedDate:2007-09-15 01:25:23 +0200 (Sat, 15 Sep 2007) $
## $URL$
##
_children.group = formatdatetime(created, 'yyyyMMdd') _children.group = formatdatetime(created, 'yyyyMMdd')
_children.group.order = formatdatetime(created, 'yyyyMMdd') desc _children.group.order = formatdatetime(created, 'yyyyMMdd') desc

View file

@ -0,0 +1,30 @@
//
// The Antville Project
// http://code.google.com/p/antville
//
// Copyright 2001-2007 by The Antville People
//
// Licensed under the Apache License, Version 2.0 (the ``License'');
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an ``AS IS'' BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
// $Revision:3333 $
// $LastChangedBy:piefke3000 $
// $LastChangedDate:2007-09-15 01:25:23 +0200 (Sat, 15 Sep 2007) $
// $URL$
//
Admin.purgeReferrers = function() {
var sql = new Sql;
var result = sql.execute("delete from log where action = 'main' and " +
"created < dateadd('day', -2, current_date())");
return result;
}

Binary file not shown.

View file

@ -1,3 +1,27 @@
##
## The Antville Project
## http://code.google.com/p/antville
##
## Copyright 2001-2007 by The Antville People
##
## Licensed under the Apache License, Version 2.0 (the ``License'');
## you may not use this file except in compliance with the License.
## You may obtain a copy of the License at
##
## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an ``AS IS'' BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
##
## $Revision:3333 $
## $LastChangedBy:piefke3000 $
## $LastChangedDate:2007-09-15 01:25:23 +0200 (Sat, 15 Sep 2007) $
## $URL$
##
manage manage
manage.mountpoint = /manage manage.mountpoint = /manage

View file

@ -1,8 +0,0 @@
javascript:posturl='http://help.antville.org/stories/create';str='';if(top.frames.length==0)str=document.selection?document.selection.createRange().text:document.getSelection();void(location.href=posturl+'?content_text='+escape('<a href=\"'+location.href+'\">'+document.title+'</a>: '+str));
javascript:posturl='http://help.antville.org/stories/create';str='';if(top.frames.length==0)str=document.selection?document.selection.createRange().text:document.getSelection();void(pmentry=window.open(posturl+'?content_text='+escape('<a href=\"'+location.href+'\">'+document.title+'</a>: '+str),'antville','width=775,height=600,toolbar=0,status=1,location=0,scrollbars=1,menubar=0,resizable=1'));
javascript:posturl='http://help.antville.org/stories/create';str='';if(top.frames.length==0)str=document.selection?document.selection.createRange().text:document.getSelection();void(location.href=posturl+'?content_text='+escape(str+' [via <a href=\"'+window.location.href+'\">'+document.title+'</a>]'));
javascript:posturl='http://help.antville.org/stories/create';str='';if(top.frames.length==0)str=document.selection?document.selection.createRange().text:document.getSelection();void(pmentry=window.open(posturl+'?content_text='+escape(str+' [via <a href=\"'+window.location.href+'\">'+document.title+'</a>]'),'antville','width=775,height=600,toolbar=0,status=1,location=0,scrollbars=1,menubar=0,resizable=1'));

View file

@ -1,3 +1,27 @@
##
## The Antville Project
## http://code.google.com/p/antville
##
## Copyright 2001-2007 by The Antville People
##
## Licensed under the Apache License, Version 2.0 (the ``License'');
## you may not use this file except in compliance with the License.
## You may obtain a copy of the License at
##
## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an ``AS IS'' BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
##
## $Revision:3333 $
## $LastChangedBy:piefke3000 $
## $LastChangedDate:2007-09-15 01:25:23 +0200 (Sat, 15 Sep 2007) $
## $URL$
##
country = AT country = AT
language = en language = en
smtp = localhost smtp = localhost

View file

@ -1,3 +1,27 @@
::
:: The Antville Project
:: http://code.google.com/p/antville
::
:: Copyright 2001-2007 by The Antville People
::
:: Licensed under the Apache License, Version 2.0 (the ``License'');
:: you may not use this file except in compliance with the License.
:: You may obtain a copy of the License at
::
:: http://www.apache.org/licenses/LICENSE-2.0
::
:: Unless required by applicable law or agreed to in writing, software
:: distributed under the License is distributed on an ``AS IS'' BASIS,
:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
:: See the License for the specific language governing permissions and
:: limitations under the License.
::
:: $Revision:3333 $
:: $LastChangedBy:piefke3000 $
:: $LastChangedDate:2007-09-15 01:25:23 +0200 (Sat, 15 Sep 2007) $
:: $URL$
::
@echo off @echo off
set JAVA_HOME= set JAVA_HOME=

View file

@ -1,3 +1,27 @@
##
## The Antville Project
## http://code.google.com/p/antville
##
## Copyright 2001-2007 by The Antville People
##
## Licensed under the Apache License, Version 2.0 (the ``License'');
## you may not use this file except in compliance with the License.
## You may obtain a copy of the License at
##
## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an ``AS IS'' BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
##
## $Revision:3333 $
## $LastChangedBy:piefke3000 $
## $LastChangedDate:2007-09-15 01:25:23 +0200 (Sat, 15 Sep 2007) $
## $URL$
##
#!/bin/sh #!/bin/sh
HTTP_PORT=8080 HTTP_PORT=8080