Author: sletellier Date: 2011-05-17 17:01:13 +0200 (Tue, 17 May 2011) New Revision: 291 Url: http://chorem.org/repositories/revision/bow/291 Log: - Fix third party - Update headers - Fix svn:keywords - Change javaassist to scope runtime - Up to wikitty 3.1.2 Modified: trunk/bow-ui/pom.xml trunk/bow-ui/src/license/THIRD-PARTY.properties trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java trunk/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/LogoutInterceptor.java trunk/bow-ui/src/main/webapp/css/images/ui-bg_flat_0_aaaaaa_40x100.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_flat_75_dbdbdb_40x100.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_55_fbf9ee_1x400.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_65_ffffff_1x400.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_75_dadada_1x400.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_75_e6e6e6_1x400.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_highlight-soft_75_bf8a9c_1x100.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png trunk/bow-ui/src/main/webapp/css/images/ui-icons_222222_256x240.png trunk/bow-ui/src/main/webapp/css/images/ui-icons_2e83ff_256x240.png trunk/bow-ui/src/main/webapp/css/images/ui-icons_454545_256x240.png trunk/bow-ui/src/main/webapp/css/images/ui-icons_888888_256x240.png trunk/bow-ui/src/main/webapp/css/images/ui-icons_cd0a0a_256x240.png trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css trunk/bow-ui/src/main/webapp/img/add.png trunk/bow-ui/src/main/webapp/js/jquery-1.5.2.min.js trunk/bow-ui/src/main/webapp/js/jquery-ui-1.8.11.custom.min.js trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp trunk/pom.xml Modified: trunk/bow-ui/pom.xml =================================================================== --- trunk/bow-ui/pom.xml 2011-05-17 09:01:05 UTC (rev 290) +++ trunk/bow-ui/pom.xml 2011-05-17 15:01:13 UTC (rev 291) @@ -63,6 +63,7 @@ <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> + <scope>runtime</scope> </dependency> <dependency> Modified: trunk/bow-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/bow-ui/src/license/THIRD-PARTY.properties 2011-05-17 09:01:05 UTC (rev 290) +++ trunk/bow-ui/src/license/THIRD-PARTY.properties 2011-05-17 15:01:13 UTC (rev 291) @@ -3,6 +3,7 @@ # Already used licenses in project : # - Apache 2 # - Apache License +# - Apache Software License, Version 1.1 # - Apache Software License, version 1.1 # - BSD License # - BSD style @@ -17,18 +18,22 @@ # - LGPL 2.1 # - Lesser General Public License (LGPL) v 3.0 # - MIT License +# - MPL 1.1 # - Public Domain +# - Public domain # - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 -# - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Apr 26 16:51:54 CEST 2011 +#Tue May 17 16:35:20 CEST 2011 antlr--antlr--2.7.2--jar=BSD License +asm--asm--3.1--jar=http://asm.ow2.org/license.html +asm--asm-commons--3.1--jar=http://asm.ow2.org/license.html +asm--asm-tree--3.1--jar=http://asm.ow2.org/license.html commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. dom4j--dom4j--1.1--jar=BSD License @@ -36,7 +41,6 @@ javax.servlet--jsp-api--2.0--jar=Common Development and Distribution License (CDDL) v1.0 javax.servlet--servlet-api--2.5--jar=Common Development and Distribution License (CDDL) v1.0 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) v1.0 -ognl--ognl--2.7.3--jar=The OpenSymphony Software License 1.1 org.apache.zookeeper--zookeeper--3.3.1--jar=The Apache Software License, Version 2.0 oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java 2011-05-17 09:01:05 UTC (rev 290) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java 2011-05-17 15:01:13 UTC (rev 291) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.bow; import org.nuiton.util.ApplicationConfig; Property changes on: trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/LogoutInterceptor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_flat_0_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_flat_75_dbdbdb_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_55_fbf9ee_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_65_ffffff_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_75_dadada_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_75_e6e6e6_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_highlight-soft_75_bf8a9c_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-icons_222222_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-icons_2e83ff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-icons_454545_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-icons_888888_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-icons_cd0a0a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/img/add.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/js/jquery-1.5.2.min.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/js/jquery-ui-1.8.11.custom.min.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp 2011-05-17 09:01:05 UTC (rev 290) +++ trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp 2011-05-17 15:01:13 UTC (rev 291) @@ -1,25 +1,24 @@ <!-- #%L -bow - -$Id$ -$HeadURL$ -%% -Copyright (C) 2010 - 2011 CodeLutin -%% -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -#L% + bow + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 - 2011 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% --> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@taglib prefix="s" uri="/struts-tags" %> @@ -80,4 +79,4 @@ <s:actionerror /> </span> </div> -</div> \ No newline at end of file +</div> Property changes on: trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-17 09:01:05 UTC (rev 290) +++ trunk/pom.xml 2011-05-17 15:01:13 UTC (rev 291) @@ -122,7 +122,7 @@ <eugenePluginVersion>2.3.2</eugenePluginVersion> <nuitonUtilsVersion>2.1.2</nuitonUtilsVersion> <nuitonI18nVersion>2.3.1</nuitonI18nVersion> - <wikittyVersion>3.1.1</wikittyVersion> + <wikittyVersion>3.1.2</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <struts2Version>2.2.3</struts2Version> <htmlParserVersion>1.6</htmlParserVersion>