Wikitty-commits

Download

wikitty-commits@list.nuiton.org

August 2011

6 participants
125 discussions

r1225 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services
by bpoussin＠users.nuiton.org Aug. 31, 2011

Aug. 31, 2011

Author: bpoussin Date: 2011-08-31 16:21:51 +0200 (Wed, 31 Aug 2011) New Revision: 1225 Url: http://nuiton.org/repositories/revision/wikitty/1225 Log: Anomalie #1727: NPE if bad id in security field Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java 2011-08-30 16:32:20 UTC (rev 1224) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java 2011-08-31 14:21:51 UTC (rev 1225) @@ -505,10 +505,14 @@ boolean result = true; String userId = getUserId(securityToken); Wikitty wikitty = WikittyServiceEnhanced.restore(getDelegate(), securityToken, wikittyId); - for (String extName : wikitty.getExtensionNames()) { - result = result && isReader(securityToken, userId, wikitty, extName); - if (!result) { - break; + if (wikitty == null) { + result = false; + } else { + for (String extName : wikitty.getExtensionNames()) { + result = result && isReader(securityToken, userId, wikitty, extName); + if (!result) { + break; + } } } return result; @@ -744,7 +748,9 @@ if (parentId != null) { Wikitty parent = WikittyServiceEnhanced.restore( getDelegate(), securityToken, parentId); - isMember = isMember(securityToken, userId, parent, fqFieldName); + if (parent != null) { + isMember = isMember(securityToken, userId, parent, fqFieldName); + } } } return isMember; @@ -803,7 +809,8 @@ // dans lequel il faut cherche le user Wikitty groupWikitty = WikittyServiceEnhanced.restore( getDelegate(), securityToken, id); - if (WikittyGroupHelper.hasExtension(groupWikitty)) { + if (groupWikitty != null && + WikittyGroupHelper.hasExtension(groupWikitty)) { Set<String> members = WikittyGroupHelper.getMembers(groupWikitty); return isMember(securityToken, userId, members);

1 0

r1224 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-publication wikitty-publication-ui wikitty-solr wp-maven-plugin
by maven-release＠users.nuiton.org Aug. 30, 2011

Aug. 30, 2011

Author: maven-release Date: 2011-08-30 18:32:20 +0200 (Tue, 30 Aug 2011) New Revision: 1224 Url: http://nuiton.org/repositories/revision/wikitty/1224 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-publication-ui/pom.xml trunk/wikitty-publication/pom.xml trunk/wikitty-solr/pom.xml trunk/wp-maven-plugin/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> <modules> @@ -729,10 +729,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.2 + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.2</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wikitty-api/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wikitty-dto/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wikitty-generators/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wikitty-hessian-client/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wikitty-hessian-server/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wikitty-jdbc/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wikitty-perf-test/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wikitty-publication/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-publication-ui/pom.xml =================================================================== --- trunk/wikitty-publication-ui/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wikitty-publication-ui/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wikitty-solr/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent>  Modified: trunk/wp-maven-plugin/pom.xml =================================================================== --- trunk/wp-maven-plugin/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wp-maven-plugin/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId>

1 0

r1223 - in tags: . wikitty-3.2
by maven-release＠users.nuiton.org Aug. 30, 2011

Aug. 30, 2011

Author: maven-release Date: 2011-08-30 18:32:19 +0200 (Tue, 30 Aug 2011) New Revision: 1223 Url: http://nuiton.org/repositories/revision/wikitty/1223 Log: [maven-release-plugin] copy for tag wikitty-3.2 Added: tags/wikitty-3.2/ Property changes on: tags/wikitty-3.2 ___________________________________________________________________ Added: svn:ignore + .settings .project target *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/2.0-eugene2:164-179

1 0

r1222 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-publication wikitty-publication-ui wikitty-solr wp-maven-plugin
by maven-release＠users.nuiton.org Aug. 30, 2011

Aug. 30, 2011

Author: maven-release Date: 2011-08-30 18:32:18 +0200 (Tue, 30 Aug 2011) New Revision: 1222 Url: http://nuiton.org/repositories/revision/wikitty/1222 Log: [maven-release-plugin] prepare release wikitty-3.2 Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-publication-ui/pom.xml trunk/wikitty-publication/pom.xml trunk/wikitty-solr/pom.xml trunk/wp-maven-plugin/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -17,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> <modules> @@ -731,10 +729,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.2</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.2 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.2</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wikitty-api/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wikitty-dto/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wikitty-generators/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wikitty-hessian-client/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wikitty-hessian-server/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent>  Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wikitty-jdbc/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wikitty-perf-test/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wikitty-publication/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent>  Modified: trunk/wikitty-publication-ui/pom.xml =================================================================== --- trunk/wikitty-publication-ui/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wikitty-publication-ui/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent>  Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wikitty-solr/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent>  Modified: trunk/wp-maven-plugin/pom.xml =================================================================== --- trunk/wp-maven-plugin/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wp-maven-plugin/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -24,9 +24,7 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -36,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.wikitty</groupId>

1 0

r1221 - trunk/wikitty-solr/src/license
by maven-release＠users.nuiton.org Aug. 30, 2011

Aug. 30, 2011

Author: maven-release Date: 2011-08-30 18:30:11 +0200 (Tue, 30 Aug 2011) New Revision: 1221 Url: http://nuiton.org/repositories/revision/wikitty/1221 Log: optimize thrid-parties Modified: trunk/wikitty-solr/src/license/THIRD-PARTY.properties Modified: trunk/wikitty-solr/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2011-08-30 16:26:39 UTC (rev 1220) +++ trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2011-08-30 16:30:11 UTC (rev 1221) @@ -21,12 +21,13 @@ # Please fill the missing licenses for dependencies : # # -#Tue Aug 30 14:05:53 CEST 2011 +#Tue Aug 30 14:22:53 CEST 2011 antlr--antlr--2.7.2=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. dom4j--dom4j--1.1=BSD License jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0 +javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0 oro--oro--2.0.8=The Apache Software License, Version 2.0

1 0

r1220 - trunk/wikitty-publication/src/site/doc
by mfortun＠users.nuiton.org Aug. 30, 2011

Aug. 30, 2011

Author: mfortun Date: 2011-08-30 18:26:39 +0200 (Tue, 30 Aug 2011) New Revision: 1220 Url: http://nuiton.org/repositories/revision/wikitty/1220 Log: correct doc Modified: trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst Modified: trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst =================================================================== --- trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst 2011-08-30 16:10:04 UTC (rev 1219) +++ trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst 2011-08-30 16:26:39 UTC (rev 1220) @@ -79,7 +79,7 @@ Interface d'édition: - * /[contextData]/edit/.action (avec contextData est ce qu'on veut, voir la + * /[contextData]/edit/[mandatory_args].action (avec contextData est ce qu'on veut, voir la partie sur le war pour savoir à quoi cela correspond) Quoi mettre dans les WikittyPubTex ? @@ -119,11 +119,11 @@ Par défaut il y a un certain nombre d'objets disponible en binding: - * wpEval, correspond à l'instance de la classe java qui évalue couramment le WikittyPub, permet d'évaluer - * wpSubContext, correspond à l'instance de collection contenant - * wpPage, nom de la page + * wpEval, objet qui permet d'évaluer d'autre wikitty + * wpSubContext + * wpPage, string correspondant au mandatoy args * wpWikitty, wikitty en cours d'évaluation - * wpContext, correspond à l'instance de la classe java du context (voir interface) + * wpContext, context d'évaluation Interface de wpContext:: @@ -194,7 +194,7 @@ * <img src='<%=wpContext.makeUrl("/raw/wikittypubuml")%>'/> -Intégre le résultat de l'évaluation de Test entre les balises <p> +Intégre le résultat de l'évaluation du wikittyPubText qui possède le nom Test * <p><%=wpEval.doAction(wpContext, "Test")%></p>

1 0

r1219 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-publication/src/main/resources/filters-properties wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action
by mfortun＠users.nuiton.org Aug. 30, 2011

Aug. 30, 2011

Author: mfortun Date: 2011-08-30 18:10:04 +0200 (Tue, 30 Aug 2011) New Revision: 1219 Url: http://nuiton.org/repositories/revision/wikitty/1219 Log: *correct doc *correct criteria for contextapps Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ScriptEvaluator.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java trunk/wikitty-publication/src/main/resources/filters-properties/README.txt trunk/wikitty-publication/src/main/resources/filters-properties/filters-default.properties Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ScriptEvaluator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ScriptEvaluator.java 2011-08-30 15:26:02 UTC (rev 1218) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ScriptEvaluator.java 2011-08-30 16:10:04 UTC (rev 1219) @@ -61,7 +61,7 @@ static public ScriptEngineManager getScriptEnginManager(ClassLoader classLoader) { ScriptEngineManager result; if (classLoader != null) { - result = new ScriptEngineManager(); + result = new ScriptEngineManager(classLoader); } else { if (scriptEnginManager == null) { // create default ScriptEngineManager @@ -84,6 +84,7 @@ String name, String mimetype) { ScriptEngineManager scriptEnginManager = getScriptEnginManager(classLoader); ScriptEngine scriptEngin = scriptEnginManager.getEngineByMimeType(mimetype); + if (scriptEngin == null) { List<ScriptEngineFactory> factories = scriptEnginManager.getEngineFactories(); Modified: trunk/wikitty-publication/src/main/resources/filters-properties/README.txt =================================================================== --- trunk/wikitty-publication/src/main/resources/filters-properties/README.txt 2011-08-30 15:26:02 UTC (rev 1218) +++ trunk/wikitty-publication/src/main/resources/filters-properties/README.txt 2011-08-30 16:10:04 UTC (rev 1219) @@ -16,11 +16,9 @@ ClosingWriterChar: string after write string and before String delim OpeningWriterChar: string after string delim, before ending car ClosingTemplate: string that close the template -MimeType: the mime type of the wikittyPubText after decoration Key: mimetype special usualy originMime.targetMime for example html.javascript -this is linked to mimetype properties -ContentType: content type set for the result of the evaluation of this -wikitty pub text +this is linked to mimetype properties. Pattern [xxx.yyy] + Example : @@ -33,7 +31,7 @@ </html> with template: -wpContext.setContentType("[ContentType]")[EndingCar] +wpContext.setContentType("text/[xxx]")[EndingCar] [OpeningTemplate]<html>[StringDelim][ClosingWriterChar][EndingCar] [WriteString][OpeningWriterChar][StringDelim]bob[StringDelim][ClosingWriterChar][EndingCar] @@ -41,7 +39,7 @@ [WriteString][OpeningWriterChar][StringDelim]</html>[StringDelim][ClosingWriterChar][EndingCar][ClosingTemplate] This filters will be enable when try to evaluate wikittyPubText with mime type: -text/[Key], the mime type of the wikittyPubText after will be: [MimeType] +text/[xxx.yyy], the mime type of the wikittyPubText after will be: text/[yyy] If using the default filters: @@ -68,6 +66,5 @@ ClosingWriterChar= OpeningWriterChar= ClosingTemplate= -MimeType= Key= -ContentType= + Modified: trunk/wikitty-publication/src/main/resources/filters-properties/filters-default.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/filters-properties/filters-default.properties 2011-08-30 15:26:02 UTC (rev 1218) +++ trunk/wikitty-publication/src/main/resources/filters-properties/filters-default.properties 2011-08-30 16:10:04 UTC (rev 1219) @@ -30,6 +30,4 @@ ClosingWriterChar= OpeningWriterChar=+= ClosingTemplate="; -MimeType=application\/javascript Key=html.javascript -ContentType=text\/html; charset=UTF-8 \ No newline at end of file Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java 2011-08-30 15:26:02 UTC (rev 1218) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java 2011-08-30 16:10:04 UTC (rev 1219) @@ -253,7 +253,7 @@ * wikitty is wikitty pub data do the same as raw action */ - if (w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { + if (w != null && w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { contentType = WikittyPubDataHelper.getMimeType(w); Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java 2011-08-30 15:26:02 UTC (rev 1218) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java 2011-08-30 16:10:04 UTC (rev 1219) @@ -132,19 +132,22 @@ // WikittyPubText.name et WikittyPubData.name if (contextApps != null){ + + Search mainRequest = Search.query(); + Search subRoqu = mainRequest.or(); + subRoqu.eq(WikittyPubText.FQ_FIELD_WIKITTYPUBTEXT_NAME, + searchString) + .eq(WikittyPubData.FQ_FIELD_WIKITTYPUBDATA_NAME, + searchString).criteria(searchString); + + // Search for wikitty pubdata or pub text with the name // and their - result = Search - .query() + result = mainRequest .exteq(WikittyLabel.EXT_WIKITTYLABEL) .sw(WikittyLabel.FQ_FIELD_WIKITTYLABEL_LABELS, - contextApps) - .or() - .eq(WikittyPubText.FQ_FIELD_WIKITTYPUBTEXT_NAME, - searchString) - .eq(WikittyPubData.FQ_FIELD_WIKITTYPUBDATA_NAME, - searchString).criteria(searchString); + contextApps).criteria(); }else{

1 0

r1218 - in trunk: wikitty-publication/src/main/java/org/nuiton/wikitty/publication wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize wikitty-publication/src/main/resources/filters-properties wikitty-publication/src/site/doc wikitty-publication-ui/src/main/webapp/WEB-INF wikitty-publication-ui/src/main/webapp/WEB-INF/decorators wikitty-publication-ui/src/main/webapp/WEB-INF/jsp
by mfortun＠users.nuiton.org Aug. 30, 2011

Aug. 30, 2011

Author: mfortun Date: 2011-08-30 17:26:02 +0200 (Tue, 30 Aug 2011) New Revision: 1218 Url: http://nuiton.org/repositories/revision/wikitty/1218 Log: *correct header/footer *correct filters option Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/header.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConstant.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java trunk/wikitty-publication/src/main/resources/filters-properties/filters-java.properties trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java 2011-08-30 15:26:02 UTC (rev 1218) @@ -81,6 +81,10 @@ protected Map<String, FilterOption> filtersOptions; + /** + * Mime type helper used to transform mime + */ + static protected FilterOption defaultFilterOption; static { @@ -119,17 +123,14 @@ .getProperty(FilterOption.OPENING_WRITER_CHAR)); defaultFilterOption.setClosingTemplate(mimeProps .getProperty(FilterOption.CLOSING_TEMPLATE)); - defaultFilterOption.setMimeType(mimeProps - .getProperty(FilterOption.MIME_TYPE)); defaultFilterOption.setKey(mimeProps.getProperty(FilterOption.KEY)); - defaultFilterOption.setContentType(mimeProps - .getProperty(FilterOption.CONTENT_TYPE)); + } public CodeDecorator() { filtersOptions = new HashMap<String, FilterOption>(); - + // add basic value js and htmlp filtersOptions.put(defaultFilterOption.getKey(), defaultFilterOption); try { @@ -159,10 +160,7 @@ .getProperty(FilterOption.OPENING_WRITER_CHAR)); option.setClosingTemplate(props .getProperty(FilterOption.CLOSING_TEMPLATE)); - option.setMimeType(props.getProperty(FilterOption.MIME_TYPE)); option.setKey(props.getProperty(FilterOption.KEY)); - option.setContentType(props - .getProperty(FilterOption.CONTENT_TYPE)); // addfilters options filtersOptions.put(option.getKey(), option); @@ -189,6 +187,10 @@ String mime = WikittyPubTextHelper.getMimeType(wikitty); String initialVersion = wikitty.getVersion(); + + MimeTypePubHelper helper = new MimeTypePubHelper(); + String mimeAfterTransformation = helper.pubUiMimeToTargetMime(mime); + String contentType = helper.uiMimeContentType(mime); /* * changement de mime type changement de @@ -217,7 +219,7 @@ // set default content result (override if wikitty content define it) decoredContent += WikittyPublicationConstant.CONTEXT_VAR - + ".setContentType(\"" + foption.getContentType() + "\")" + + ".setContentType(\"" +contentType + "\")" + foption.getEndingCar(); Processor proc = new Processor(); @@ -238,7 +240,7 @@ // set the content WikittyPubTextHelper.setContent(wikitty, decoredContent); // get associated mimeType and set it - WikittyPubTextHelper.setMimeType(wikitty, foption.getMimeType()); + WikittyPubTextHelper.setMimeType(wikitty, mimeAfterTransformation); // restore version wikitty.setVersion(initialVersion); @@ -260,7 +262,7 @@ public boolean isMimeTypeUi(String mime) { MimeTypePubHelper helper = new MimeTypePubHelper(); - String mimeKeyOption = helper.pubUiMimeToConverterOption(mime); + String mimeKeyOption = helper.uiMimeToFilterOptionKey(mime); return filtersOptions.containsKey(mimeKeyOption); } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java 2011-08-30 15:26:02 UTC (rev 1218) @@ -42,13 +42,9 @@ public static String CLOSING_WRITER_CHAR = "ClosingWriterChar"; public static String OPENING_WRITER_CHAR = "OpeningWriterChar"; public static String CLOSING_TEMPLATE = "ClosingTemplate"; - public static String MIME_TYPE = "MimeType"; public static String KEY = "Key"; - public static String CONTENT_TYPE = "ContentType"; - - protected String writeString; protected String stringDelim; protected String concatChar; @@ -56,28 +52,14 @@ protected String openingTemplate; protected String closingWriterChar; protected String closingTemplate; - protected String mimeType; - protected String contentType; protected String key; - public String getContentType() { - return contentType; - } - public void setContentType(String contentType) { - this.contentType = contentType; - } public String getKey() { return key; } public void setKey(String key) { this.key = key; } - public String getMimeType() { - return mimeType; - } - public void setMimeType(String mimeType) { - this.mimeType = mimeType; - } public String getOpeningTemplate() { return openingTemplate; } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java 2011-08-30 15:26:02 UTC (rev 1218) @@ -62,8 +62,8 @@ // change this to a handler to have specific langage compiler as jython etc protected ScriptEngineManager manager; - protected CodeDecorator decorator; + static public String COMMON_MIME_SEP = "/"; static public String PUBLICATION_MIME_SEP = "."; @@ -84,7 +84,7 @@ public static String DEFAULT_MIME_TYPE = "application/octet-stream"; public MimeTypePubHelper() { - decorator = new CodeDecorator(); + bidiMap = new DualHashBidiMap(); manager = ScriptEvaluator.getScriptEnginManager(null); @@ -166,7 +166,7 @@ // check if mimetype startwith the PUbtext prefix result = mimeType.startsWith(PREFIX_MIME_PUB_TEXT); - + CodeDecorator decorator = new CodeDecorator(); // if mimetype match the regex for wikitty pub text that must be // decorate by uidecorator, if (mimeType.matches(REGEX_PUB_TEXT_TRANSFORM)) { @@ -194,13 +194,23 @@ * @param mime * @return */ - public String pubUiMimeToConverterOption(String mime) { + public String uiMimeToFilterOptionKey(String mime) { String result = mime; if (mime.matches(REGEX_PUB_TEXT_TRANSFORM)) { result = StringUtil.split(mime, COMMON_MIME_SEP)[1]; } return result; } + + public String uiMimeContentType(String mime) { + String result = mime; + if (mime.matches(REGEX_PUB_TEXT_TRANSFORM)) { + result = StringUtil.split(mime, COMMON_MIME_SEP)[0]; + } + return result; + } + + /** * Used to convert uiMime to the mimeType after content decoration @@ -252,4 +262,7 @@ this.manager = manager; } + + + } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConstant.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConstant.java 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConstant.java 2011-08-30 15:26:02 UTC (rev 1218) @@ -23,7 +23,11 @@ * #L% */ package org.nuiton.wikitty.publication; - +/** + * Wikitty Publication Constant use inside wikitty Publication. + * @author mfortun + * + */ public class WikittyPublicationConstant { /* Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-08-30 15:26:02 UTC (rev 1218) @@ -192,10 +192,10 @@ */ static public File externalize(ApplicationConfig conf, Criteria crit, File TargetDir, String jarName) throws ArgumentsParserException, IOException { - + MimeTypePubHelper mimeHelper = new MimeTypePubHelper(); CodeDecorator decorator = new CodeDecorator(); - MimeTypePubHelper mimeHelper = new MimeTypePubHelper(); + WikittyProxy proxy = new WikittyProxy( WikittyServiceFactory.buildWikittyService(conf)); Modified: trunk/wikitty-publication/src/main/resources/filters-properties/filters-java.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/filters-properties/filters-java.properties 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/main/resources/filters-properties/filters-java.properties 2011-08-30 15:26:02 UTC (rev 1218) @@ -30,6 +30,4 @@ ClosingWriterChar= OpeningWriterChar=+= ClosingTemplate="; return wp_result; -MimeType=text\/java Key=html.java -ContentType=text\/html; charset=UTF-8 \ No newline at end of file Modified: trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst =================================================================== --- trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst 2011-08-30 15:26:02 UTC (rev 1218) @@ -73,9 +73,7 @@ * ClosingWriterChar: chaine qui se place avant le caractère de fin et le délimiteur de chaine * OpeningWriterChar: chaine qui se place juste après l'instruction d'écriture et avant le délimiteur de chaine * ClosingTemplate: chaine de fermeture du template - * MimeType: mime type après application du template - * Key: clé du mime type, définition des langages utilisé langageAutourBalise.LangageEntreBalise si le mime type du wikitty pub fini par la clé, ce template sera appliqué. - * ContentType: content type qui sera mit pour le retour de la page + * Key: clé du mime type, définition des langages utilisé langageAutourBalise.LangageEntreBalise si le mime type du wikitty pub fini par la clé, ce template sera appliqué. Key sous forme [xxx.yyy] Un exemple de fonctionnement @@ -90,7 +88,7 @@ Règle de remplacement avec le template:: - wpContext.setContentType("[ContentType]")[EndingCar] + wpContext.setContentType("text/[yyy]")[EndingCar] [OpeningTemplate]<html>[StringDelim][ClosingWriterChar][EndingCar] @@ -102,7 +100,7 @@ [WriteString][OpeningWriterChar][StringDelim]</html>[StringDelim][ClosingWriterChar][EndingCar][ClosingTemplate] ce filtre sera actif quand on le mime type du wikittyPubText sera : -text/[Key], après transformation par le filtre le mimetype sera [MimeType] +text/[xxx.yyy], après transformation par le filtre le mimetype sera text/[xxx] Si on avait utilisé le filtre de base:: Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -36,7 +36,7 @@ xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:decorator="http://www.opensymphony.com/sitemesh/decorator"> <head> - <title>Wikitty Publication : <decorator:title default="Bow" /></title> + <title>Wikitty Publication : <decorator:title default="" /></title> <decorator:head /> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta name="description" content="Bookmarks on the web" /> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml 2011-08-30 15:26:02 UTC (rev 1218) @@ -31,7 +31,7 @@  <excludes> <pattern>/nodecorate/*</pattern> - <pattern>index.jsp</pattern> + <pattern>*/eval/*</pattern> </excludes> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -1,4 +1,4 @@ - + --%> <%-- Document : edit Created on : 6 dï¿½c. 2010, 18:32:18 @@ -225,5 +225,4 @@ <input type="submit" name="store" value="<%=action.getText("publication.edit.save") %>" /> <input type="submit" name="delete" value="<%=action.getText("publication.edit.delete") %>" /> - </form> \ No newline at end of file Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -1,4 +1,4 @@ - + --%> <%-- Document : footer Created on : 6 dï¿½c. 2010, 19:21:22 Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/header.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/header.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/header.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -1,4 +1,4 @@ - + --%> <%-- Document : header Created on : 6 déc. 2010, 19:21:06 Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -25,7 +25,8 @@ <%@page import="org.nuiton.wikitty.publication.action.ui.PublicationActionLogin"%> -<%@ taglib prefix="s" uri="/struts-tags"%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> <% String successValue = request.getParameter("success"); Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -23,7 +23,9 @@ #L% --%> -<%@taglib prefix="s" uri="/struts-tags"%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> + <div id="content"> <div id="formFrame" class="fond"> <h1> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -24,7 +24,7 @@ --> <%-- Document : view - Created on : 7 d�c. 2010, 04:18:13 + Created on : 7 dï¿½c. 2010, 04:18:13 Author : poussin --%> @@ -43,7 +43,8 @@ import="org.nuiton.wikitty.publication.ui.WikittyPublicationSession"%> <%@page import="org.nuiton.wikitty.search.PagedResult"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> -<%@taglib prefix="s" uri="/struts-tags"%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> <%@taglib prefix="sj" uri="/struts-jquery-tags"%> <sj:head jquerytheme="default"/> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -26,7 +26,8 @@ <%@page import="org.nuiton.wikitty.entities.Wikitty"%> <%@page import="org.nuiton.wikitty.publication.ui.action.PublicationActionRestoreWikitty"%> -<%@taglib prefix="s" uri="/struts-tags"%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> <% PublicationActionRestoreWikitty action = PublicationActionRestoreWikitty

1 0

r1217 - trunk/wikitty-publication/src/site/rst
by bpoussin＠users.nuiton.org Aug. 30, 2011

Aug. 30, 2011

Author: bpoussin Date: 2011-08-30 17:01:07 +0200 (Tue, 30 Aug 2011) New Revision: 1217 Url: http://nuiton.org/repositories/revision/wikitty/1217 Log: document expliquant le modele de donnees Added: trunk/wikitty-publication/src/site/rst/wp-model.rst Added: trunk/wikitty-publication/src/site/rst/wp-model.rst =================================================================== --- trunk/wikitty-publication/src/site/rst/wp-model.rst (rev 0) +++ trunk/wikitty-publication/src/site/rst/wp-model.rst 2011-08-30 15:01:07 UTC (rev 1217) @@ -0,0 +1,41 @@ +==================================== +Modèle de données WikittyPublication +==================================== + +WikittyLabel +============ + +Tous les types WikittyPubText et WikittyPubData peuvent avoir en plus cette +extension, cela permet d'indiquer à quelle application l'objet appartient. + +Un objet peut faire parti de plusieurs applications en même temps, par +exemple: une librairie binaire en version N, cela évite d'avoir N fois le binaire +de la même librairie dans le Storage. + +WikittyPubText +============== + +Représentation un contenu textuel qui peut-être évalué + +:name: le nom de l'élément +:mimeType: le type du contenu, ce type est utilisé lors d'un eval pour + retourner au navigateur le type de réponse +:content: le contenu textuel + + +WikittyPubTextCompiled +====================== + +Permet de stocker le résultat de la compilation d'un WikittyPubText, cet +objet est toujours associé à un WikittyPubText. + +WikittyPubData +============== + +Représentation un contenu binaire qui ne peut-être pas évalué + +:name: le nom de l'élément +:mimeType: le type du contenu, ce type est utilisé lors d'un eval/raw pour + retourner au navigateur le type de réponse +:content: le contenu binaire +

1 0

r1216 - in trunk: wikitty-publication wikitty-publication/src/main/java/org/nuiton/wikitty/publication wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize wikitty-publication/src/main/resources wikitty-publication/src/main/resources/filters-properties wikitty-publication/src/site/doc wikitty-publication/src/site/exemple/resourceAppli wikitty-publication/src/site/exemple/resourceAppli/src/main/wp wikitty-publication/src/site/exemple/resourceEntity wikitty-publicatio
by tchemit＠users.nuiton.org Aug. 30, 2011

Aug. 30, 2011

Author: tchemit Date: 2011-08-30 16:51:43 +0200 (Tue, 30 Aug 2011) New Revision: 1216 Url: http://nuiton.org/repositories/revision/wikitty/1216 Log: add svn properties + finalize preparation of release... Modified: trunk/wikitty-publication-ui/pom.xml trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/ApplicationListener.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/CodeMirrorWrapper.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/SelectOption.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationConfig.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationProxy.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogout.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRegister.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRestoreWikitty.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionView.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/LoginInterceptor.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/LogoutInterceptor.java trunk/wikitty-publication-ui/src/main/resources/log4j.properties trunk/wikitty-publication-ui/src/main/resources/struts.properties trunk/wikitty-publication-ui/src/main/resources/struts.xml trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/sitemesh.xml trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/web.xml trunk/wikitty-publication-ui/src/main/webapp/index.jsp trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/css/codemirror-ui-find.css trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/css/codemirror-ui.css trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/index.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/js/codemirror-ui-find.js trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/js/codemirror-ui.js trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/js/find_replace.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/compress.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/css/docs.css trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/css/font.js trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/activeline.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/complete.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/complete.js trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/marker.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/mustache.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/resize.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/search.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/index.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/internals.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/lib/codemirror.css trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/lib/codemirror.js trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/lib/overlay.js trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/manual.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/clike/clike.css trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/clike/clike.js trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/clike/index.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/css/css.css trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/css/css.js trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/css/index.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/diff/diff.css trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/diff/diff.js trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/diff/index.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/haskell.css trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/haskell.js trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/index.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/htmlmixed/htmlmixed.js trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/htmlmixed/index.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/index.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/javascript.css trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/javascript.js trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/php/index.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/php/php.js trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/stex/index.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/stex/stex.css trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/stex/stex.js trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/xml/index.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/xml/xml.css trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/xml/xml.js trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/oldrelease.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/test/index.html trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/test/test.js trunk/wikitty-publication/pom.xml trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractDecoredClass.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/EvalInterface.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PublicationContext.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyFileUtil.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPropertieIndex.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConstant.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/CompileHelper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/JarUtil.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationClassLoader.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java trunk/wikitty-publication/src/main/resources/filters-properties/filters-default.properties trunk/wikitty-publication/src/main/resources/filters-properties/filters-java.properties trunk/wikitty-publication/src/main/resources/log4j.properties trunk/wikitty-publication/src/main/resources/mimetype.properties trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst trunk/wikitty-publication/src/site/doc/Outils_publication.rst trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst trunk/wikitty-publication/src/site/doc/Wikitty_Publication_war.rst trunk/wikitty-publication/src/site/exemple/resourceAppli/pom.xml trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/JavaView.java trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/Test.java trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/clearProxy.java trunk/wikitty-publication/src/site/exemple/resourceEntity/pom.xml trunk/wikitty-publication/src/site/rapport/ressources/pom.xml trunk/wikitty-publication/src/site/rst/publication-ui.rst trunk/wikitty-publication/src/site/rst/site-publication.rst trunk/wikitty-publication/src/site/rst/sync.rst trunk/wikitty-publication/src/site/rst/wp-application.rst trunk/wikitty-publication/src/site/rst/wp-externalize.rst trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/PropertiesExtendedTest.java trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/UiCodeDecoratorTest.java trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/WikittyFileUtilTest.java trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackServiceTest.java trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/externalize/CodeDecoratorCompilerClassTest.java trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalizeTest.java trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoaderTest.java trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystemTest.java trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronizeTest.java Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication/pom.xml 2011-08-30 14:51:43 UTC (rev 1216) @@ -57,11 +57,11 @@ <artifactId>commons-logging</artifactId> </dependency> -  + </dependency> <dependency> <groupId>commons-lang</groupId> @@ -101,10 +101,10 @@ <artifactId>nuiton-utils</artifactId> </dependency> - <dependency> +   + <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> Modified: trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/JavaView.java =================================================================== --- trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/JavaView.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/JavaView.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication + * + * $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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ wpContext.setContentType("text/html; charset=UTF-8"); Modified: trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/Test.java =================================================================== --- trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/Test.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/Test.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication + * + * $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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ WikittyResource tt = new WikittyResourceImpl(); return "yo"; Modified: trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/clearProxy.java =================================================================== --- trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/clearProxy.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/clearProxy.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication + * + * $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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ String result = "Proxy Clear"; wpContext.getWikittyProxy().clear(); Modified: trunk/wikitty-publication/src/site/exemple/resourceEntity/pom.xml =================================================================== --- trunk/wikitty-publication/src/site/exemple/resourceEntity/pom.xml 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication/src/site/exemple/resourceEntity/pom.xml 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> Modified: trunk/wikitty-publication/src/site/rapport/ressources/pom.xml =================================================================== --- trunk/wikitty-publication/src/site/rapport/ressources/pom.xml 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication/src/site/rapport/ressources/pom.xml 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> Modified: trunk/wikitty-publication/src/site/rst/publication-ui.rst =================================================================== --- trunk/wikitty-publication/src/site/rst/publication-ui.rst 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication/src/site/rst/publication-ui.rst 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * Wikitty :: publication +.. * +.. * $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 Lesser 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 Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - Wikitty Publication ui ---------------------- @author: Manoël Fortun Modified: trunk/wikitty-publication/src/site/rst/site-publication.rst =================================================================== --- trunk/wikitty-publication/src/site/rst/site-publication.rst 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication/src/site/rst/site-publication.rst 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * Wikitty :: publication +.. * +.. * $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 Lesser 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 Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - Spécifications wikitty publication site ======================================= :Authors: Manoël Fortun Modified: trunk/wikitty-publication/src/site/rst/sync.rst =================================================================== --- trunk/wikitty-publication/src/site/rst/sync.rst 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication/src/site/rst/sync.rst 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * Wikitty :: publication +.. * +.. * $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 Lesser 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 Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - //TODO mettre que synchro sert aussi pour déplacer Modified: trunk/wikitty-publication/src/site/rst/wp-application.rst =================================================================== --- trunk/wikitty-publication/src/site/rst/wp-application.rst 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication/src/site/rst/wp-application.rst 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * Wikitty :: publication +.. * +.. * $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 Lesser 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 Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - wikitty publication application =============================== :Authors: Benjamin Poussin, Manoël Fortun Modified: trunk/wikitty-publication/src/site/rst/wp-externalize.rst =================================================================== --- trunk/wikitty-publication/src/site/rst/wp-externalize.rst 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication/src/site/rst/wp-externalize.rst 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * Wikitty :: publication +.. * +.. * $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 Lesser 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 Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - wikitty-publication externalize =============================== :Authors: Manoël Fortun Modified: trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/PropertiesExtendedTest.java =================================================================== --- trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/PropertiesExtendedTest.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/PropertiesExtendedTest.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication + * + * $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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication; import java.io.File; Modified: trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/UiCodeDecoratorTest.java =================================================================== --- trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/UiCodeDecoratorTest.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/UiCodeDecoratorTest.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication + * + * $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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication; public class UiCodeDecoratorTest { Modified: trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/WikittyFileUtilTest.java =================================================================== --- trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/WikittyFileUtilTest.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/WikittyFileUtilTest.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication + * + * $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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication; import java.io.File; Modified: trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackServiceTest.java =================================================================== --- trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackServiceTest.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackServiceTest.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication + * + * $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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication; import java.io.File; Modified: trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/externalize/CodeDecoratorCompilerClassTest.java =================================================================== --- trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/externalize/CodeDecoratorCompilerClassTest.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/externalize/CodeDecoratorCompilerClassTest.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication + * + * $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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.externalize; Modified: trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalizeTest.java =================================================================== --- trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalizeTest.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalizeTest.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication + * + * $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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.externalize; import java.io.File; Modified: trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoaderTest.java =================================================================== --- trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoaderTest.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoaderTest.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication + * + * $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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.externalize; public class WikittyServiceJarLoaderTest { Modified: trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystemTest.java =================================================================== --- trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystemTest.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystemTest.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication + * + * $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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.synchro; import java.io.File; Modified: trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronizeTest.java =================================================================== --- trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronizeTest.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronizeTest.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication + * + * $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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.synchro; import java.io.File; Modified: trunk/wikitty-publication-ui/pom.xml =================================================================== --- trunk/wikitty-publication-ui/pom.xml 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/pom.xml 2011-08-30 14:51:43 UTC (rev 1216) @@ -69,7 +69,7 @@ <scope>provided</scope> </dependency> - <dependency> +  <dependency> <groupId>org.apache.struts</groupId> @@ -122,10 +122,10 @@ <artifactId>nuiton-struts2</artifactId> </dependency> - <dependency> +  <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/ApplicationListener.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/ApplicationListener.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/ApplicationListener.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.ui; import java.util.Locale; Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/CodeMirrorWrapper.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/CodeMirrorWrapper.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/CodeMirrorWrapper.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.ui; import java.util.LinkedList; Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/SelectOption.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/SelectOption.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/SelectOption.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.ui; /** Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationConfig.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationConfig.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationConfig.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.ui; import org.apache.commons.logging.Log; Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationProxy.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationProxy.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationProxy.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.ui; import java.util.HashMap; Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.ui; import org.apache.commons.logging.Log; Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.ui.action; import com.opensymphony.xwork2.ActionContext; Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.ui.action; import com.opensymphony.xwork2.ActionContext; Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -8,17 +8,18 @@ * Copyright (C) 2010 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. + * it under the terms of the GNU Lesser 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. + * GNU General Lesser 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/>. + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ @@ -103,4 +104,4 @@ return result; } -} \ No newline at end of file +} Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogout.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogout.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogout.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -8,17 +8,18 @@ * 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. + * it under the terms of the GNU Lesser 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. + * GNU General Lesser 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/>. + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ package org.nuiton.wikitty.publication.ui.action; Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.ui.action; import com.opensymphony.xwork2.ActionContext; Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRegister.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRegister.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRegister.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.ui.action; import org.nuiton.util.StringUtil; Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRestoreWikitty.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRestoreWikitty.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRestoreWikitty.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.ui.action; import org.nuiton.wikitty.entities.Wikitty; Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionView.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionView.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionView.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.ui.action; import com.opensymphony.xwork2.ActionContext; Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.ui.action; import com.opensymphony.xwork2.ActionContext; Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/LoginInterceptor.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/LoginInterceptor.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/LoginInterceptor.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -8,17 +8,18 @@ * 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. + * it under the terms of the GNU Lesser 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. + * GNU General Lesser 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/>. + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ package org.nuiton.wikitty.publication.ui.interceptor; Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/LogoutInterceptor.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/LogoutInterceptor.java 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/LogoutInterceptor.java 2011-08-30 14:51:43 UTC (rev 1216) @@ -8,17 +8,18 @@ * 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. + * it under the terms of the GNU Lesser 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. + * GNU General Lesser 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/>. + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ package org.nuiton.wikitty.publication.ui.interceptor; Modified: trunk/wikitty-publication-ui/src/main/resources/log4j.properties =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/log4j.properties 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/resources/log4j.properties 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +### +# #%L +# Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### # Global logging configuration log4j.rootLogger=FATAL, stdout Modified: trunk/wikitty-publication-ui/src/main/resources/struts.properties =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/struts.properties 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/resources/struts.properties 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +### +# #%L +# Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### struts.locale=fr_FR struts.i18n.encoding=UTF-8 Modified: trunk/wikitty-publication-ui/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/struts.xml 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/resources/struts.xml 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" "http://struts.apache.org/dtds/struts-2.0.dtd"> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp 2011-08-30 14:51:43 UTC (rev 1216) @@ -8,17 +8,18 @@ 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. + it under the terms of the GNU Lesser 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. + GNU General Lesser 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/>. + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,7 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <decorators defaultdir="/WEB-INF/decorators">  <excludes> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +<%-- + #%L + Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --%> <%@page import="org.nuiton.wikitty.publication.action.ui.PublicationActionLogin"%> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +<%-- + #%L + Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --%> <%@taglib prefix="s" uri="/struts-tags"%> <div id="content"> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +<%-- + #%L + Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --%> <%@page import="org.apache.commons.lang.StringEscapeUtils"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> <%@page Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/sitemesh.xml =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/sitemesh.xml 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/sitemesh.xml 2011-08-30 14:51:43 UTC (rev 1216) @@ -9,17 +9,18 @@ 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. + it under the terms of the GNU Lesser 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. + GNU General Lesser 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/>. + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/web.xml 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/web.xml 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,8 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> + + <web-app id="Wikitty-publication" version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> Modified: trunk/wikitty-publication-ui/src/main/webapp/index.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/index.jsp 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/index.jsp 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,7 +1,31 @@ +<%-- + #%L + Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --%> <h1>Bienvenu dans Wikitty Publication</h1> -Voici les adresses permettant d'acc�der au diff�rentes pages/action +Voici les adresses permettant d'acc�der au diff�rentes pages/action * /[contextData]/[contextApps]/[action]/[mandatory_args]?[args key=value] ou Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/css/codemirror-ui-find.css =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/css/codemirror-ui-find.css 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/css/codemirror-ui-find.css 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ #buttons{ float:right; } Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/css/codemirror-ui.css =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/css/codemirror-ui.css 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/css/codemirror-ui.css 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ .codemirror-ui-button-frame{ border:1px solid #ccc; background:#eee; Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/index.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/index.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/index.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en"> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/js/codemirror-ui-find.js =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/js/codemirror-ui-find.js 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/js/codemirror-ui-find.js 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /** * @author jgreen */ Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/js/codemirror-ui.js =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/js/codemirror-ui.js 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/js/codemirror-ui.js 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /* Demonstration of embedding CodeMirror in a bigger application. The * interface defined here is a mess of prompts and confirms, and * should probably not be used in a real project. Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/js/find_replace.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/js/find_replace.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/js/find_replace.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/compress.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/compress.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/compress.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/css/docs.css =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/css/docs.css 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/css/docs.css 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ body { font-family: Arial, sans-serif; line-height: 1.5; Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/css/font.js =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/css/font.js 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/css/font.js 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ function waitForStyles() { for (var i = 0; i < document.styleSheets.length; i++) if (/googleapis/.test(document.styleSheets[i].href)) Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/activeline.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/activeline.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/activeline.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -18,6 +18,31 @@ <form><textarea id="code" name="code"> <?xml version="1.0" encoding="UTF-8"?> + + <rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:georss="http://www.georss.org/georss" xmlns:twitter="http://api.twitter.com"> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/complete.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/complete.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/complete.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/complete.js =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/complete.js 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/complete.js 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ (function () { // Minimal event-handling wrapper. function stopEvent() { Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/marker.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/marker.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/marker.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/mustache.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/mustache.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/mustache.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/resize.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/resize.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/resize.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/search.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/search.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/demo/search.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/index.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/index.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/index.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/internals.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/internals.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/internals.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!doctype html> <html><head> <title>CodeMirror 2: (Re-) Implementing A Syntax-Highlighting Editor in JavaScript</title> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/lib/codemirror.css =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/lib/codemirror.css 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/lib/codemirror.css 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ .CodeMirror { overflow: auto; height: 300px; Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/lib/codemirror.js =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/lib/codemirror.js 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/lib/codemirror.js 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ // All functions that need access to the editor's state live inside // the CodeMirror function. Below that, at the bottom of the file, // some utilities are defined. Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/lib/overlay.js =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/lib/overlay.js 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/lib/overlay.js 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ // Utility function that allows modes to be combined. The mode given // as the base argument takes care of most of the normal mode // functionality, but a second (typically simple) mode is used, which Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/manual.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/manual.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/manual.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/clike/clike.css =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/clike/clike.css 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/clike/clike.css 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ span.c-like-keyword {color: #90b;} span.c-like-number {color: #291;} span.c-like-comment {color: #a70;} Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/clike/clike.js =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/clike/clike.js 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/clike/clike.js 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ CodeMirror.defineMode("clike", function(config, parserConfig) { var indentUnit = config.indentUnit, keywords = parserConfig.keywords, cpp = parserConfig.useCPP, multiLineStrings = parserConfig.multiLineStrings, $vars = parserConfig.$vars; Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/clike/index.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/clike/index.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/clike/index.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/css/css.css =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/css/css.css 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/css/css.css 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ span.css-at {color: #708;} span.css-unit {color: #281;} span.css-value {color: #708;} Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/css/css.js =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/css/css.js 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/css/css.js 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ CodeMirror.defineMode("css", function(config) { var indentUnit = config.indentUnit, type; function ret(style, tp) {type = tp; return style;} Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/css/index.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/css/index.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/css/index.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/diff/diff.css =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/diff/diff.css 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/diff/diff.css 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ span.diff-rangeinfo {color: #a0b;} span.diff-minus {color: #a22;} span.diff-plus {color: #2b2;} Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/diff/diff.js =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/diff/diff.js 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/diff/diff.js 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ CodeMirror.defineMode("diff", function() { return { token: function(stream) { Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/diff/index.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/diff/index.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/diff/index.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/haskell.css =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/haskell.css 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/haskell.css 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ span.hs-char, span.hs-float, span.hs-integer, Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/haskell.js =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/haskell.js 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/haskell.js 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ CodeMirror.defineMode("haskell", function(cmCfg, modeCfg) { function switchState(source, setState, f) { Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/index.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/index.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/index.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/htmlmixed/htmlmixed.js =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/htmlmixed/htmlmixed.js 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/htmlmixed/htmlmixed.js 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) { var htmlMode = CodeMirror.getMode(config, {name: "xml", htmlMode: true}); var jsMode = CodeMirror.getMode(config, "javascript"); Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/htmlmixed/index.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/htmlmixed/index.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/htmlmixed/index.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/index.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/index.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/index.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/javascript.css =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/javascript.css 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/javascript.css 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ span.js-keyword {color: #90b;} span.js-atom {color: #291;} span.js-variabledef {color: #00f;} Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/javascript.js =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/javascript.js 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/javascript.js 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ CodeMirror.defineMode("javascript", function(config, parserConfig) { var indentUnit = config.indentUnit; var jsonMode = parserConfig.json; Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/php/index.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/php/index.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/php/index.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/php/php.js =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/php/php.js 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/php/php.js 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ (function() { function keywords(str) { var obj = {}, words = str.split(" "); Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/stex/index.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/stex/index.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/stex/index.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/stex/stex.css =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/stex/stex.css 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/stex/stex.css 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ span.css-at {color: #708;} span.css-unit {color: #281;} span.css-value {color: #708;} Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/stex/stex.js =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/stex/stex.js 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/stex/stex.js 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,4 +1,28 @@ /* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +/* * Author: Constantin Jucovschi (c.jucovschi(a)jacobs-university.de) * Licence: MIT */ Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/xml/index.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/xml/index.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/xml/index.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/xml/xml.css =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/xml/xml.css 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/xml/xml.css 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ span.xml-tag {color: #a0b;} span.xml-attribute {color: #281;} span.xml-attname {color: #00f;} Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/xml/xml.js =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/xml/xml.js 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/mode/xml/xml.js 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ CodeMirror.defineMode("xml", function(config, parserConfig) { var indentUnit = config.indentUnit; var Kludges = parserConfig.htmlMode ? { Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/oldrelease.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/oldrelease.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/oldrelease.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/test/index.html =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/test/index.html 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/test/index.html 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ + <!doctype html> <html> <head> Modified: trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/test/test.js =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/test/test.js 2011-08-30 14:37:34 UTC (rev 1215) +++ trunk/wikitty-publication-ui/src/main/webapp/js/codemirror-ui/lib/CodeMirror-2.0/test/test.js 2011-08-30 14:51:43 UTC (rev 1216) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication-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 Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ var tests = []; test("fromTextArea", function() {

1 0