August 2011 - Wikitty-commits - mailman.cloud.codelutin.com

r1135 - trunk/wikitty-publication-ui/src/main/resources/i18n
by tchemit＠users.nuiton.org 12 Aug '11

12 Aug '11

Author: tchemit Date: 2011-08-12 16:09:06 +0200 (Fri, 12 Aug 2011) New Revision: 1135 Url: http://nuiton.org/repositories/revision/wikitty/1135 Log: fix i18n bundles Added: trunk/wikitty-publication-ui/src/main/resources/i18n/wikitty-publication-ui_en_GB.properties trunk/wikitty-publication-ui/src/main/resources/i18n/wikitty-publication-ui_fr_FR.properties Removed: trunk/wikitty-publication-ui/src/main/resources/i18n/wikitty-publication_en_GB.properties trunk/wikitty-publication-ui/src/main/resources/i18n/wikitty-publication_fr_FR.properties Copied: trunk/wikitty-publication-ui/src/main/resources/i18n/wikitty-publication-ui_en_GB.properties (from rev 1134, trunk/wikitty-publication-ui/src/main/resources/i18n/wikitty-publication_en_GB.properties) =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/i18n/wikitty-publication-ui_en_GB.properties (rev 0) +++ trunk/wikitty-publication-ui/src/main/resources/i18n/wikitty-publication-ui_en_GB.properties 2011-08-12 14:09:06 UTC (rev 1135) @@ -0,0 +1,13 @@ +publication.edit.addExtension=addExtension +publication.edit.delete=Delete +publication.edit.save=Save +publication.login.login=User +publication.login.password=Password +publication.login.repeatPassword=Password +publication.register.submit=Subscribe +publication.view.founds=Wikitty Aviables +publication.view.next=Next +publication.view.previous=Previous +publication.view.search=Search +publication.view.title=Wikitty View +wikitty-publication.config.configFileName.description=Default wikitty publication config Copied: trunk/wikitty-publication-ui/src/main/resources/i18n/wikitty-publication-ui_fr_FR.properties (from rev 1134, trunk/wikitty-publication-ui/src/main/resources/i18n/wikitty-publication_fr_FR.properties) =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/i18n/wikitty-publication-ui_fr_FR.properties (rev 0) +++ trunk/wikitty-publication-ui/src/main/resources/i18n/wikitty-publication-ui_fr_FR.properties 2011-08-12 14:09:06 UTC (rev 1135) @@ -0,0 +1,14 @@ +publication.edit.addExtension=Ajouter Extension +publication.edit.delete=Suppression +publication.edit.save=Sauvegarde +publication.login.login=Utilisateur +publication.login.password=Mot de passe +publication.login.repeatPassword=Mot de passe +publication.login.submit=login +publication.register.submit=Inscription +publication.view.founds=Wikitty Trouvés +publication.view.next=Suivant +publication.view.previous=Précédent +publication.view.search=Recherche +publication.view.title=Vue des wikitty +wikitty-publication.config.configFileName.description=Fichier de configuration pat défault de wikitty Publication Deleted: trunk/wikitty-publication-ui/src/main/resources/i18n/wikitty-publication_en_GB.properties =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/i18n/wikitty-publication_en_GB.properties 2011-08-12 14:06:54 UTC (rev 1134) +++ trunk/wikitty-publication-ui/src/main/resources/i18n/wikitty-publication_en_GB.properties 2011-08-12 14:09:06 UTC (rev 1135) @@ -1,13 +0,0 @@ -publication.edit.addExtension=addExtension -publication.edit.delete=Delete -publication.edit.save=Save -publication.login.login=User -publication.login.password=Password -publication.login.repeatPassword=Password -publication.register.submit=Subscribe -publication.view.founds=Wikitty Aviables -publication.view.next=Next -publication.view.previous=Previous -publication.view.search=Search -publication.view.title=Wikitty View -wikitty-publication.config.configFileName.description=Default wikitty publication config Deleted: trunk/wikitty-publication-ui/src/main/resources/i18n/wikitty-publication_fr_FR.properties =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/i18n/wikitty-publication_fr_FR.properties 2011-08-12 14:06:54 UTC (rev 1134) +++ trunk/wikitty-publication-ui/src/main/resources/i18n/wikitty-publication_fr_FR.properties 2011-08-12 14:09:06 UTC (rev 1135) @@ -1,14 +0,0 @@ -publication.edit.addExtension=Ajouter Extension -publication.edit.delete=Suppression -publication.edit.save=Sauvegarde -publication.login.login=Utilisateur -publication.login.password=Mot de passe -publication.login.repeatPassword=Mot de passe -publication.login.submit=login -publication.register.submit=Inscription -publication.view.founds=Wikitty Trouvés -publication.view.next=Suivant -publication.view.previous=Précédent -publication.view.search=Recherche -publication.view.title=Vue des wikitty -wikitty-publication.config.configFileName.description=Fichier de configuration pat défault de wikitty Publication

1 0

12 Aug '11

Author: tchemit Date: 2011-08-12 16:06:54 +0200 (Fri, 12 Aug 2011) New Revision: 1134 Url: http://nuiton.org/repositories/revision/wikitty/1134 Log: create new module wikitty-publication-ui + fix third-parties and svn:ignores Added: trunk/wikitty-publication-ui/LICENSE.txt trunk/wikitty-publication-ui/README.txt trunk/wikitty-publication-ui/changelog.txt trunk/wikitty-publication-ui/pom.xml trunk/wikitty-publication-ui/src/license/THIRD-PARTY.properties trunk/wikitty-publication-ui/src/main/i18n/ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/ trunk/wikitty-publication-ui/src/main/license/ trunk/wikitty-publication-ui/src/main/license/THIRD-PARTY.properties trunk/wikitty-publication-ui/src/main/resources/i18n/ trunk/wikitty-publication-ui/src/main/resources/struts.properties trunk/wikitty-publication-ui/src/main/resources/struts.xml trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-codelutin.properties trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-fallback.properties trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-jar.properties trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-light.properties trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-lightfallback.properties trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-test.properties trunk/wikitty-publication-ui/src/main/resources/wikitty-publication.properties trunk/wikitty-publication-ui/src/main/webapp/ trunk/wp-maven-plugin/ trunk/wp-maven-plugin/LICENSE.txt trunk/wp-maven-plugin/README.txt trunk/wp-maven-plugin/changelog.txt trunk/wp-maven-plugin/pom.xml trunk/wp-maven-plugin/src/ trunk/wp-maven-plugin/src/license/ trunk/wp-maven-plugin/src/license/THIRD-PARTY.properties trunk/wp-maven-plugin/src/main/ trunk/wp-maven-plugin/src/main/java/ trunk/wp-maven-plugin/src/main/java/org/ trunk/wp-maven-plugin/src/main/java/org/nuiton/ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/AbstractWPMojo.java trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployJarMojo.java trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployMojo.java trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPInitMojo.java trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPJarMojo.java trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPRunMojo.java trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPUpdateMojo.java trunk/wp-maven-plugin/src/main/resources/ trunk/wp-maven-plugin/src/site/ trunk/wp-maven-plugin/src/site/rst/ trunk/wp-maven-plugin/src/site/rst/en/ trunk/wp-maven-plugin/src/site/rst/en/example.rst trunk/wp-maven-plugin/src/site/rst/en/index.rst trunk/wp-maven-plugin/src/site/rst/en/usage.rst trunk/wp-maven-plugin/src/site/rst/example.rst trunk/wp-maven-plugin/src/site/rst/index.rst trunk/wp-maven-plugin/src/site/rst/usage.rst trunk/wp-maven-plugin/src/site/site_en.xml trunk/wp-maven-plugin/src/site/site_fr.xml Removed: trunk/wikitty-publication/src/main/i18n/ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/ trunk/wikitty-publication/src/main/resources/i18n/ trunk/wikitty-publication/src/main/resources/struts.properties trunk/wikitty-publication/src/main/resources/struts.xml trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-codelutin.properties trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-fallback.properties trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-jar.properties trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-test.properties trunk/wikitty-publication/src/main/resources/wikitty-publication.properties trunk/wikitty-publication/src/main/webapp/ Modified: trunk/pom.xml trunk/wikitty-api/ trunk/wikitty-api/src/license/THIRD-PARTY.properties trunk/wikitty-dto/ trunk/wikitty-dto/src/license/THIRD-PARTY.properties trunk/wikitty-generators/src/license/THIRD-PARTY.properties trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties trunk/wikitty-jdbc/ trunk/wikitty-jdbc/src/license/THIRD-PARTY.properties trunk/wikitty-perf-test/src/license/THIRD-PARTY.properties trunk/wikitty-publication/pom.xml trunk/wikitty-publication/src/license/THIRD-PARTY.properties trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackServiceTest.java trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronizeTest.java trunk/wikitty-solr/ trunk/wikitty-solr/src/license/THIRD-PARTY.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/pom.xml 2011-08-12 14:06:54 UTC (rev 1134) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0</version> + <version>3.0.1-SNAPSHOT</version> </parent>  @@ -24,6 +24,9 @@ <module>wikitty-dto</module> <module>wikitty-solr</module> <module>wikitty-jdbc</module> + <module>wikitty-publication</module> + <module>wp-maven-plugin</module> + <module>wikitty-publication-ui</module> <module>wikitty-hessian-client</module> <module>wikitty-hessian-server</module> @@ -379,7 +382,130 @@ <artifactId>jsp-api</artifactId> <version>${jspapiversion}</version> </dependency> - + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>${helperPluginVersion}</version> + <exclusions> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact-manager</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-dependency-tree</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-profile</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-simple</artifactId> + </exclusion> + + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-api</artifactId> + </exclusion> + + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-javamail</artifactId> + </exclusion> + + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-cipher</artifactId> + </exclusion> + + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-sec-dispatcher</artifactId> + </exclusion> + + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-velocity</artifactId> + </exclusion> + + <exclusion> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>1.5.15</version> + </dependency> + </dependencies> </dependencyManagement> Property changes on: trunk/wikitty-api ___________________________________________________________________ Modified: svn:ignore - .settings target .classpath .project *.iml *.ipr *.iws + ObjectStore .settings target .classpath .project *.iml *.ipr *.iws Modified: trunk/wikitty-api/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-api/src/license/THIRD-PARTY.properties 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-api/src/license/THIRD-PARTY.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -1,7 +1,6 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache 2 # - Apache Software License, version 1.1 # - BSD License # - BSD style @@ -16,15 +15,13 @@ # - Public domain # - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. # - The Apache Software License, Version 2.0 -# - lgpl -# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Jul 01 16:43:22 CEST 2011 -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. -dom4j--dom4j--1.6.1--jar=BSD License -javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 +#Fri Aug 12 16:00:24 CEST 2011 +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.6.1=BSD License +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Property changes on: trunk/wikitty-dto ___________________________________________________________________ Modified: svn:ignore - PutObjectStoreDirHere target *.iml *.ipr *.iws .classpath .project .settings *.log + PutObjectStoreDirHere ObjectStore target *.iml *.ipr *.iws .classpath .project .settings *.log Modified: trunk/wikitty-dto/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-dto/src/license/THIRD-PARTY.properties 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-dto/src/license/THIRD-PARTY.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -1,29 +1,31 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache 2 # - Apache Software License, version 1.1 # - BSD License # - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - LGPL 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License # - Public Domain # - Public domain +# - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. # - The Apache Software License, Version 2.0 # - http://jaxen.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 23 12:30:08 CET 2010 -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. -dom4j--dom4j--1.6.1--jar=BSD License -javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -jaxen--jaxen--1.1.1--jar=http\://jaxen.codehaus.org/license.html -jdom--jdom--1.0--jar=The Apache Software License, Version 2.0 -xalan--xalan--2.6.0--jar=The Apache Software License, Version 2.0 -xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 +#Fri Aug 12 16:00:33 CEST 2011 +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.6.1=BSD License +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html +jdom--jdom--1.0=The Apache Software License, Version 2.0 +xalan--xalan--2.6.0=The Apache Software License, Version 2.0 +xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-generators/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-generators/src/license/THIRD-PARTY.properties 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-generators/src/license/THIRD-PARTY.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -1,20 +1,24 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache Software License, Version 2.0 # - BSD License -# - LGPL +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License # - The Apache Software License, Version 2.0 # - http://jaxen.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Dec 23 12:34:27 CET 2010 -commons-digester--commons-digester--2.0--jar=Apache Software License, Version 2.0 -commons-primitives--commons-primitives--1.0--jar=Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1--jar=BSD License -jaxen--jaxen--1.1.1--jar=http\://jaxen.codehaus.org/license.html -jdom--jdom--1.0--jar=The Apache Software License, Version 2.0 -xalan--xalan--2.6.0--jar=The Apache Software License, Version 2.0 +#Fri Aug 12 16:00:15 CEST 2011 +commons-digester--commons-digester--2.0=Apache Software License, Version 2.0 +commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License +jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html +jdom--jdom--1.0=The Apache Software License, Version 2.0 +xalan--xalan--2.6.0=The Apache Software License, Version 2.0 Modified: trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-hessian-client/src/license/THIRD-PARTY.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -1,14 +1,15 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache 2 # - Apache Software License, version 1.1 # - BSD License # - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - LGPL 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License # - Public Domain # - Public domain # - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. @@ -18,8 +19,8 @@ # Please fill the missing licenses for dependencies : # # -#Thu Dec 23 12:32:55 CET 2010 -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. -javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 +#Fri Aug 12 15:58:55 CEST 2011 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -1,7 +1,6 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache 2 # - Apache Software License - Version 2.0 # - Apache Software License, version 1.1 # - BSD License @@ -10,8 +9,10 @@ # - Common Public License Version 1.0 # - Eclipse Public License - Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - LGPL 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License # - Public Domain # - Public domain # - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. @@ -22,9 +23,9 @@ # Please fill the missing licenses for dependencies : # # -#Tue Apr 26 16:43:05 CEST 2011 -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. -javax.servlet--servlet-api--2.5--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 +#Fri Aug 12 15:58:56 CEST 2011 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. +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 +xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Property changes on: trunk/wikitty-jdbc ___________________________________________________________________ Modified: svn:ignore - .settings target .classpath .project PutObjectStoreDirHere solr *.ipr *.iws *.iml + .settings target .classpath .project PutObjectStoreDirHere ObjectStore solr *.ipr *.iws *.iml Modified: trunk/wikitty-jdbc/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-jdbc/src/license/THIRD-PARTY.properties 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-jdbc/src/license/THIRD-PARTY.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -1,15 +1,17 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache 2 # - Apache License +# - Apache Software License, Version 1.1 # - Apache Software License, version 1.1 # - BSD License +# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - LGPL 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - MIT License # - Public Domain # - Public domain @@ -20,14 +22,14 @@ # Please fill the missing licenses for dependencies : # # -#Tue Apr 26 16:34:59 CEST 2011 -antlr--antlr--2.7.2--jar=BSD License -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. -dom4j--dom4j--1.1--jar=BSD License -jakarta-regexp--jakarta-regexp--1.4--jar=The Apache Software License, Version 2.0 -javax.servlet--servlet-api--2.5--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.apache.zookeeper--zookeeper--3.3.1--jar=The Apache Software License, Version 2.0 -oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 -xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 +#Fri Aug 12 16:00:40 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 +xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-perf-test/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-perf-test/src/license/THIRD-PARTY.properties 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-perf-test/src/license/THIRD-PARTY.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -1,7 +1,6 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache 2 # - Apache Software License, Version 2.0 # - Apache Software License, version 1.1 # - BSD License @@ -9,8 +8,10 @@ # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - LGPL 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License # - Public Domain # - Public domain # - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. @@ -20,8 +21,8 @@ # Please fill the missing licenses for dependencies : # # -#Thu Jan 27 11:01:34 CET 2011 -commons-primitives--commons-primitives--1.0--jar=Apache Software License, Version 2.0 -concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. -javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 +#Fri Aug 12 15:58:59 CEST 2011 +commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 +concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-publication/pom.xml 2011-08-12 14:06:54 UTC (rev 1134) @@ -18,24 +18,24 @@ <groupId>org.nuiton.wikitty</groupId> <artifactId>wikitty-publication</artifactId> - <properties> +  <dependencies> <dependency> - <groupId>org.nuiton.wikitty</groupId> + <groupId>${project.groupId}</groupId> <artifactId>wikitty-api</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.nuiton.wikitty</groupId> + <groupId>${project.groupId}</groupId> <artifactId>wikitty-jdbc</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> - <groupId>org.nuiton.wikitty</groupId> + <groupId>${project.groupId}</groupId> <artifactId>wikitty-solr</artifactId> <version>${project.version}</version> <scope>runtime</scope> @@ -57,11 +57,11 @@ <artifactId>commons-logging</artifactId> </dependency> - <dependency> +  <dependency> <groupId>commons-lang</groupId> @@ -73,7 +73,7 @@ <artifactId>commons-collections</artifactId> </dependency> - <dependency> +  <dependency> <groupId>javassist</groupId> @@ -106,7 +106,7 @@ <artifactId>nuiton-i18n</artifactId> </dependency> - <dependency> +  <dependency> <groupId>org.nuiton.processor</groupId> @@ -145,15 +145,13 @@ <name>Wikitty :: publication</name> - <description>Web publication for Wikitty</description> + <description>Web publication api for Wikitty</description> <inceptionYear>2010</inceptionYear>    - <packaging>war</packaging> - <build> <resources> @@ -172,7 +170,7 @@ </resources> <plugins> - <plugin> +  - <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> Modified: trunk/wikitty-publication/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-publication/src/license/THIRD-PARTY.properties 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-publication/src/license/THIRD-PARTY.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -1,15 +1,17 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache 2 # - Apache License +# - Apache Software License, Version 1.1 # - Apache Software License, version 1.1 # - BSD License +# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - LGPL 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - MIT License # - Public Domain # - Public domain @@ -20,14 +22,15 @@ # Please fill the missing licenses for dependencies : # # -#Tue Apr 26 16:46:25 CEST 2011 -antlr--antlr--2.7.2--jar=BSD License -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. -dom4j--dom4j--1.1--jar=BSD License -jakarta-regexp--jakarta-regexp--1.4--jar=The Apache Software License, Version 2.0 -javax.servlet--servlet-api--2.5--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.apache.zookeeper--zookeeper--3.3.1--jar=The Apache Software License, Version 2.0 -oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 -xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 +#Fri Aug 12 15:57:58 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 +javassist--javassist--3.8.0.GA=Lesser General Public License (LPGL) +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 +xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Deleted: trunk/wikitty-publication/src/main/resources/struts.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.properties 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-publication/src/main/resources/struts.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -1,50 +0,0 @@ -struts.locale=fr_FR -struts.i18n.encoding=UTF-8 - - -struts.objectFactory.spring.autoWire=name - -struts.objectFactory.spring.useClassCache=true - -# struts.multipart.parser=cos -# struts.multipart.parser=pell -struts.multipart.parser=jakarta -# uses javax.servlet.context.tempdir by default -struts.multipart.saveDir= -struts.multipart.maxSize=2097152 - -# struts.custom.properties=application,com/webwork/extension/custom - -struts.mapper.class=org.apache.struts2.dispatcher.mapper.DefaultActionMapper - -struts.action.extension=action - -struts.serve.static=true - -struts.serve.static.browserCache=true - -struts.tag.altSyntax=true - -struts.devMode=true - -struts.i18n.reload=true - -struts.ui.theme=xhtml -struts.ui.templateDir=template -#sets the default template type. Either ftl, vm, or jsp -struts.ui.templateSuffix=ftl - -struts.configuration.xml.reload=false - -struts.url.http.port=80 -struts.url.https.port=443 - -struts.custom.i18n.resources=wikittypublication-i18n - -struts.dispatcher.parametersWorkaround=false - -#struts.freemarker.manager.classname=org.apache.struts2.views.freemarker.FreemarkerManager - -struts.freemarker.wrapper.altMap=true - -struts.xslt.nocache=false Deleted: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-08-12 14:06:54 UTC (rev 1134) @@ -1,158 +0,0 @@ -<?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"> -<struts> - - <bean class="org.nuiton.web.struts2.I18nTextProvider" name="i18nTextProvider" - type="com.opensymphony.xwork2.TextProvider" /> - <constant name="struts.xworkTextProvider" value="i18nTextProvider" /> - - - - <constant name="struts.devMode" value="true" /> - <constant name="struts.ognl.allowStaticMethodAccess" value="true" /> - <constant name="struts.enable.SlashesInActionNames" value="true" /> - - -  - <package name="publicArea" extends="struts-default"> - <interceptors> - <interceptor-stack name="publicAreaStack"> - <interceptor-ref name="defaultStack"> - <param name="fileUpload.maximumSize">104857600</param> - </interceptor-ref> - </interceptor-stack> - </interceptors> - <default-interceptor-ref name="publicAreaStack" /> - </package> - - - -  - <package name="loginArea" extends="publicArea"> - <interceptors> - <interceptor name="logout" - class="org.nuiton.wikitty.publication.ui.interceptor.LogoutInterceptor" /> - <interceptor-stack name="loginAreaStack"> - <interceptor-ref name="logout" /> - <interceptor-ref name="publicAreaStack" /> - </interceptor-stack> - </interceptors> - <default-interceptor-ref name="loginAreaStack" /> - </package> - -  - <package name="restrictedArea" extends="publicArea"> - <interceptors> - <interceptor name="login" - class="org.nuiton.wikitty.publication.ui.interceptor.LoginInterceptor"> - <param name="error">/login_input.action</param> - </interceptor> - <interceptor-stack name="restrictedAreaStack"> - <interceptor-ref name="login" /> - <interceptor-ref name="publicAreaStack" /> - </interceptor-stack> - </interceptors> - <default-interceptor-ref name="restrictedAreaStack" /> - </package> - - <package name="login" extends="loginArea"> - <action name="*/register_*" method="{2}" - class="org.nuiton.wikitty.publication.ui.action.PublicationActionRegister"> - <param name="contextData">{1}</param> - <result name="input">/WEB-INF/jsp/register.jsp</result> - <result type="redirect">${context}/view/.action</result> - </action> - <action name="*/login_*" method="{2}" - class="org.nuiton.wikitty.publication.ui.action.PublicationActionLogin"> - <param name="contextData">{1}</param> - <result name="input">/WEB-INF/jsp/login.jsp</result> - <result name="success" type="redirect">${success}</result> - <result name="error" type="redirect">${error}</result> - </action> - <action name="*/logout" - class="org.nuiton.wikitty.publication.ui.action.PublicationActionLogout"> - <param name="contextData">{1}</param> - <result type="redirect">${success}</result> - </action> - </package> - -  - <package name="publication" extends="publicArea"> - - <action name="*/edit/*" - class="org.nuiton.wikitty.publication.ui.action.PublicationActionEdit"> - <param name="contextData">{1}</param> - <param name="args">{2}</param> - <result>/WEB-INF/jsp/edit.jsp</result> - </action> - - <action name="*/view/*" - class="org.nuiton.wikitty.publication.ui.action.PublicationActionView"> - <param name="contextData">{1}</param> - <param name="args">{2}</param> - <result>/WEB-INF/jsp/view.jsp</result> - </action> - - <action name="*/raw/*" - class="org.nuiton.wikitty.publication.ui.action.PublicationActionRaw"> - <param name="contextData">{1}</param> - <param name="args">{2}</param> - <result type="stream"> - <param name="contentType">${mimeType}</param> - <param name="inputName">inputStream</param> - </result> - </action> - - <action name="*/eval/*" - class="org.nuiton.wikitty.publication.ui.action.PublicationActionEval"> - <param name="contextData">{1}</param> - <param name="args">{2}</param> - <result type="stream"> - <param name="contentType">${contentType}</param> - <param name="inputName">inputStream</param> - </result> - </action> - - <action name="*/*/view/*" - class="org.nuiton.wikitty.publication.ui.action.PublicationActionView"> - <param name="contextData">{1}</param> - <param name="contextApps">{2}</param> - <param name="args">{3}</param> - <result>/WEB-INF/jsp/view.jsp</result> - </action> - - <action name="*/*/raw/*" - class="org.nuiton.wikitty.publication.ui.action.PublicationActionRaw"> - <param name="contextData">{1}</param> - <param name="contextApps">{2}</param> - <param name="args">{3}</param> - <result type="stream"> - <param name="contentType">${mimeType}</param> - <param name="inputName">inputStream</param> - </result> - </action> - - <action name="*/*/eval/*" - class="org.nuiton.wikitty.publication.ui.action.PublicationActionEval"> - <param name="contextData">{1}</param> - <param name="contextApps">{2}</param> - <param name="args">{3}</param> - <result type="stream"> - <param name="contentType">${contentType}</param> - <param name="inputName">inputStream</param> - </result> - </action> - - - </package> - - <package name="fragment" namespace="/fragment" extends="publicArea"> - <action name="wikittyInfo" - class="org.nuiton.wikitty.publication.ui.action.PublicationActionRestoreWikitty"> - <result>/WEB-INF/jsp/wikittyInfo.jsp</result> - </action> - </package> - -</struts> Deleted: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-codelutin.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-codelutin.properties 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-codelutin.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -1,26 +0,0 @@ -### -# #%L -# Wikitty :: publication -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2010 CodeLutin, Benjamin Poussin -# %% -# 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.data.directory=/var/lib/wikitty-publication/codelutin/ -wikitty.service.server.url=http://localhost:2222/wikitty \ No newline at end of file Deleted: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -1,58 +0,0 @@ -### -# #%L -# Wikitty :: publication -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin -# %% -# 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.data.directory=./targetBD1/data -wikitty.service.server.url=http://localhost:1111/wikitty -wikitty.storage.jdbc.queryfile=wikitty-jdbc-query.properties -wikitty.storage.jdbc.driver=org.h2.Driver -wikitty.storage.jdbc.host=jdbc:h2:file:${wikitty.data.directory}/data/db -wikitty.storage.jdbc.login=sa -wikitty.storage.jdbc.password= -wikitty.storage.jdbc.xadatasource=org.h2.jdbcx.JdbcDataSource -wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.URL=${wikitty.storage.jdbc.host} -wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.user=${wikitty.storage.jdbc.login} -wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.password=${wikitty.storage.jdbc.password} -wikitty.searchengine.solr.directory.data=${wikitty.data.directory}/data/solr -wikitty.searchengine.solr.directory.factory=solr.StandardDirectoryFactory -wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceStorage,\ -org.nuiton.wikitty.services.WikittyServiceNotifier,\ -org.nuiton.wikitty.services.WikittyServiceCached,\ -org.nuiton.wikitty.services.WikittyServiceSecurity,\ -org.nuiton.wikitty.services.WikittyServiceAccessStat,\ -org.nuiton.wikitty.services.WikittyServiceCajoServer - -wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ -org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ -org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr -wikitty.service.cache.listenevents=false -wikitty.service.cache.allwaysRestoreCopies=false -wikitty.service.event.propagate=false -wikitty.service.event.listen=false -wikitty.service.accessstat.extensions=WikittyPubText,WikittyPubData -wikitty.addon.export.threadnumber=1 -wikitty.addon.export.directory=${wikitty.data.directory}/export -wikitty.addon.export.publicurl=file://${wikitty.data.directory}/export/ -wikitty.WikittyServiceAccessStat.components=\ -org.nuiton.wikitty.services.WikittyServiceAccessStat$AccessStatStorageLog Deleted: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-fallback.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-fallback.properties 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-fallback.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -1,62 +0,0 @@ -### -# #%L -# Wikitty :: publication -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin -# %% -# 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.data.directory=./targetBD1/data -wikitty.service.server.url=http://localhost:1111/wikitty -wikitty.storage.jdbc.queryfile=wikitty-jdbc-query.properties -wikitty.storage.jdbc.driver=org.h2.Driver -wikitty.storage.jdbc.host=jdbc:h2:file:${wikitty.data.directory}/data/db -wikitty.storage.jdbc.login=sa -wikitty.storage.jdbc.password= -wikitty.storage.jdbc.xadatasource=org.h2.jdbcx.JdbcDataSource -wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.URL=${wikitty.storage.jdbc.host} -wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.user=${wikitty.storage.jdbc.login} -wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.password=${wikitty.storage.jdbc.password} -wikitty.searchengine.solr.directory.data=${wikitty.data.directory}/data/solr -wikitty.searchengine.solr.directory.factory=solr.StandardDirectoryFactory -wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceStorage,\ -org.nuiton.wikitty.publication.WikittyPublicationFallbackService,\ -org.nuiton.wikitty.services.WikittyServiceNotifier,\ -org.nuiton.wikitty.services.WikittyServiceCached,\ -org.nuiton.wikitty.services.WikittyServiceSecurity,\ -org.nuiton.wikitty.services.WikittyServiceAccessStat - -wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ -org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ -org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr -wikitty.service.cache.listenevents=false -wikitty.service.cache.allwaysRestoreCopies=false -wikitty.service.event.propagate=false -wikitty.service.event.listen=false -wikitty.service.accessstat.extensions=WikittyPubText,WikittyPubData -wikitty.addon.export.threadnumber=1 -wikitty.addon.export.directory=${wikitty.data.directory}/export -wikitty.addon.export.publicurl=file://${wikitty.data.directory}/export/ -wikitty.WikittyServiceAccessStat.components=\ -org.nuiton.wikitty.services.WikittyServiceAccessStat$AccessStatStorageLog - -wikitty.fallback.file=wikitty-publication-ws-jar.properties -wikitty.fallback.override=false - Deleted: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-jar.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-jar.properties 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-jar.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -1,29 +0,0 @@ -### -# #%L -# Wikitty :: publication -# -# $Id: wikitty-publication-ws-default.properties 823 2011-04-20 14:45:47Z mfortun $ -# $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-publication/src/main/resour… $ -# %% -# Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin -# %% -# 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.WikittyService.components=org.nuiton.wikitty.publication.externalize.WikittyServiceJarLoader -wikitty.publication.repository.jar=/home/Manou/testWP/pub-externalized.jar - Deleted: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -1,28 +0,0 @@ -### -# #%L -# Wikitty :: publication -# -# $Id: wikitty-publication-ws-default.properties 823 2011-04-20 14:45:47Z mfortun $ -# $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-publication/src/main/resour… $ -# %% -# Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin -# %% -# 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.service.server.url=http://localhost:1111/wikitty -wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceCajoClient Deleted: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -1,28 +0,0 @@ -### -# #%L -# Wikitty :: publication -# -# $Id: wikitty-publication-ws-default.properties 823 2011-04-20 14:45:47Z mfortun $ -# $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-publication/src/main/resour… $ -# %% -# Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin -# %% -# 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.service.server.url=http://localhost:2222/wikitty -wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceCajoClient Deleted: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-test.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-test.properties 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-test.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -1,56 +0,0 @@ -### -# #%L -# Wikitty :: publication -# -# $Id: wikitty-publication-ws-default.properties 823 2011-04-20 14:45:47Z mfortun $ -# $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-publication/src/main/resour… $ -# %% -# Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin -# %% -# 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.storage.jdbc.queryfile=wikitty-jdbc-query.properties -wikitty.storage.jdbc.driver=org.h2.Driver -wikitty.storage.jdbc.host=jdbc:h2:file:${wikitty.data.directory}/data/db -wikitty.storage.jdbc.login=sa -wikitty.storage.jdbc.password= -wikitty.storage.jdbc.xadatasource=org.h2.jdbcx.JdbcDataSource -wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.URL=${wikitty.storage.jdbc.host} -wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.user=${wikitty.storage.jdbc.login} -wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.password=${wikitty.storage.jdbc.password} -wikitty.searchengine.solr.directory.data=${wikitty.data.directory}/data/solr -wikitty.searchengine.solr.directory.factory=solr.StandardDirectoryFactory -wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceStorage,\ -org.nuiton.wikitty.services.WikittyServiceNotifier,\ -org.nuiton.wikitty.services.WikittyServiceCached,\ -org.nuiton.wikitty.services.WikittyServiceSecurity,\ -org.nuiton.wikitty.services.WikittyServiceAccessStat - -wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ -org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ -org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr -wikitty.service.cache.listenevents=false -wikitty.service.cache.allwaysRestoreCopies=false -wikitty.service.event.propagate=false -wikitty.service.event.listen=false -wikitty.service.accessstat.extensions=WikittyPubText,WikittyPubData -wikitty.addon.export.threadnumber=1 -wikitty.addon.export.directory=${wikitty.data.directory}/export -wikitty.addon.export.publicurl=file://${wikitty.data.directory}/export/ -wikitty.WikittyServiceAccessStat.components=\ -org.nuiton.wikitty.services.WikittyServiceAccessStat$AccessStatStorageLog Deleted: trunk/wikitty-publication/src/main/resources/wikitty-publication.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication.properties 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -1,25 +0,0 @@ -### -# #%L -# Wikitty :: publication -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin -# %% -# 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.config.pattern=wikitty-publication-ws-%s.properties 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-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackServiceTest.java 2011-08-12 14:06:54 UTC (rev 1134) @@ -2,7 +2,6 @@ import java.io.File; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -24,8 +23,6 @@ import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.entities.WikittyLabelHelper; import org.nuiton.wikitty.entities.WikittyLabelImpl; -import org.nuiton.wikitty.publication.entities.WikittyPubDataHelper; -import org.nuiton.wikitty.publication.entities.WikittyPubDataImpl; import org.nuiton.wikitty.publication.entities.WikittyPubTextHelper; import org.nuiton.wikitty.publication.entities.WikittyPubTextImpl; import org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem; @@ -81,7 +78,7 @@ configFS.setOption(WikittyConfigOption.WIKITTY_SERVER_URL.getKey(), url); ApplicationConfig configLocal = new ApplicationConfig( - "wikitty-publication-ws-test.properties"); + "wikitty-publication-ui/src/main/resources/wikitty-publication-ws-test.properties"); // configLocal = WikittyPublicationConfig.getConfig(); 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-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-publication/src/test/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronizeTest.java 2011-08-12 14:06:54 UTC (rev 1134) @@ -7,12 +7,9 @@ import java.util.List; import java.util.Map; -import junit.framework.Assert; - import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Before; -import org.junit.Test; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; import org.nuiton.util.FileUtil; @@ -78,7 +75,7 @@ configFS.setOption(WikittyConfigOption.WIKITTY_SERVER_URL.getKey(), url); ApplicationConfig configLocal = new ApplicationConfig( - "wikitty-publication-ws-test.properties"); + "wikitty-publication-ui/src/main/resources/wikitty-publication-ws-test.properties"); // configLocal = WikittyPublicationConfig.getConfig(); Added: trunk/wikitty-publication-ui/LICENSE.txt =================================================================== --- trunk/wikitty-publication-ui/LICENSE.txt (rev 0) +++ trunk/wikitty-publication-ui/LICENSE.txt 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Property changes on: trunk/wikitty-publication-ui/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: trunk/wikitty-publication-ui/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: trunk/wikitty-publication-ui/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/wikitty-publication-ui/pom.xml =================================================================== --- trunk/wikitty-publication-ui/pom.xml (rev 0) +++ trunk/wikitty-publication-ui/pom.xml 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,259 @@ +<?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"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>3.2-SNAPSHOT</version> + </parent> + +  +  +  + + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-publication-ui</artifactId> + + <properties> + <i18n.bundleOutputName>wikitty-publication</i18n.bundleOutputName> + </properties> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-jdbc</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-solr</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-publication</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-plugin</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-struts2</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.processor</groupId> + <artifactId>nuiton-processor</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> + + </dependencies> + +  +  +  + + <name>Wikitty :: publication-ui</name> + + <description>Web publication ui for Wikitty</description> + <inceptionYear>2010</inceptionYear> + +  +  +  + + <packaging>war</packaging> + + <build> + +  + + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${nuitonI18nVersion}</version> + <configuration> + <bundles>fr_FR,en_GB</bundles> + </configuration> + <executions> + <execution> + <id>scan-java-sources</id> + <goals> + <goal>parserJava</goal> + </goals> + </execution> + <execution> + <id>scan-jsp-sources</id> + <goals> + <goal>parserJsp</goal> + </goals> + <configuration> + <userRulesFiles> + <file>${basedir}/src/main/i18n/jsp.rules</file> + </userRulesFiles> + <namespaces> + <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> + <sx>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd + </sx> + <sj>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd + </sj> + <jsp>http://java.sun.com/JSP/Page</jsp> + </namespaces> + </configuration> + </execution> + <execution> + <id>gen-and-make-bundle</id> + <goals> + <goal>gen</goal> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + + +  + </plugins> + </build> + + +</project> Property changes on: trunk/wikitty-publication-ui/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/wikitty-publication-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-publication-ui/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/wikitty-publication-ui/src/license/THIRD-PARTY.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,41 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License +# - Apache Software License, Version 1.1 +# - Apache Software License, version 1.1 +# - BSD License +# - BSD style +# - BSD-style license +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - Public Domain +# - Public domain +# - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. +# - The Apache Software License, Version 1.1 +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Fri Aug 12 16:03:26 CEST 2011 +antlr--antlr--2.7.2=BSD License +asm--asm--3.1=The Apache Software License, Version 2.0 +asm--asm-commons--3.1=The Apache Software License, Version 2.0 +asm--asm-tree--3.1=The Apache Software License, Version 2.0 +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 +javassist--javassist--3.8.0.GA=Lesser General Public License (LPGL) +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 +xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Property changes on: trunk/wikitty-publication-ui/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: trunk/wikitty-publication-ui/src/main/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Copied: trunk/wikitty-publication-ui/src/main/resources/struts.properties (from rev 1132, trunk/wikitty-publication/src/main/resources/struts.properties) =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/struts.properties (rev 0) +++ trunk/wikitty-publication-ui/src/main/resources/struts.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,50 @@ +struts.locale=fr_FR +struts.i18n.encoding=UTF-8 + + +struts.objectFactory.spring.autoWire=name + +struts.objectFactory.spring.useClassCache=true + +# struts.multipart.parser=cos +# struts.multipart.parser=pell +struts.multipart.parser=jakarta +# uses javax.servlet.context.tempdir by default +struts.multipart.saveDir= +struts.multipart.maxSize=2097152 + +# struts.custom.properties=application,com/webwork/extension/custom + +struts.mapper.class=org.apache.struts2.dispatcher.mapper.DefaultActionMapper + +struts.action.extension=action + +struts.serve.static=true + +struts.serve.static.browserCache=true + +struts.tag.altSyntax=true + +struts.devMode=true + +struts.i18n.reload=true + +struts.ui.theme=xhtml +struts.ui.templateDir=template +#sets the default template type. Either ftl, vm, or jsp +struts.ui.templateSuffix=ftl + +struts.configuration.xml.reload=false + +struts.url.http.port=80 +struts.url.https.port=443 + +struts.custom.i18n.resources=wikittypublication-i18n + +struts.dispatcher.parametersWorkaround=false + +#struts.freemarker.manager.classname=org.apache.struts2.views.freemarker.FreemarkerManager + +struts.freemarker.wrapper.altMap=true + +struts.xslt.nocache=false Property changes on: trunk/wikitty-publication-ui/src/main/resources/struts.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Copied: trunk/wikitty-publication-ui/src/main/resources/struts.xml (from rev 1132, trunk/wikitty-publication/src/main/resources/struts.xml) =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/struts.xml (rev 0) +++ trunk/wikitty-publication-ui/src/main/resources/struts.xml 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,158 @@ +<?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"> +<struts> + + <bean class="org.nuiton.web.struts2.I18nTextProvider" name="i18nTextProvider" + type="com.opensymphony.xwork2.TextProvider" /> + <constant name="struts.xworkTextProvider" value="i18nTextProvider" /> + + + + <constant name="struts.devMode" value="true" /> + <constant name="struts.ognl.allowStaticMethodAccess" value="true" /> + <constant name="struts.enable.SlashesInActionNames" value="true" /> + + +  + <package name="publicArea" extends="struts-default"> + <interceptors> + <interceptor-stack name="publicAreaStack"> + <interceptor-ref name="defaultStack"> + <param name="fileUpload.maximumSize">104857600</param> + </interceptor-ref> + </interceptor-stack> + </interceptors> + <default-interceptor-ref name="publicAreaStack" /> + </package> + + + +  + <package name="loginArea" extends="publicArea"> + <interceptors> + <interceptor name="logout" + class="org.nuiton.wikitty.publication.ui.interceptor.LogoutInterceptor" /> + <interceptor-stack name="loginAreaStack"> + <interceptor-ref name="logout" /> + <interceptor-ref name="publicAreaStack" /> + </interceptor-stack> + </interceptors> + <default-interceptor-ref name="loginAreaStack" /> + </package> + +  + <package name="restrictedArea" extends="publicArea"> + <interceptors> + <interceptor name="login" + class="org.nuiton.wikitty.publication.ui.interceptor.LoginInterceptor"> + <param name="error">/login_input.action</param> + </interceptor> + <interceptor-stack name="restrictedAreaStack"> + <interceptor-ref name="login" /> + <interceptor-ref name="publicAreaStack" /> + </interceptor-stack> + </interceptors> + <default-interceptor-ref name="restrictedAreaStack" /> + </package> + + <package name="login" extends="loginArea"> + <action name="*/register_*" method="{2}" + class="org.nuiton.wikitty.publication.ui.action.PublicationActionRegister"> + <param name="contextData">{1}</param> + <result name="input">/WEB-INF/jsp/register.jsp</result> + <result type="redirect">${context}/view/.action</result> + </action> + <action name="*/login_*" method="{2}" + class="org.nuiton.wikitty.publication.ui.action.PublicationActionLogin"> + <param name="contextData">{1}</param> + <result name="input">/WEB-INF/jsp/login.jsp</result> + <result name="success" type="redirect">${success}</result> + <result name="error" type="redirect">${error}</result> + </action> + <action name="*/logout" + class="org.nuiton.wikitty.publication.ui.action.PublicationActionLogout"> + <param name="contextData">{1}</param> + <result type="redirect">${success}</result> + </action> + </package> + +  + <package name="publication" extends="publicArea"> + + <action name="*/edit/*" + class="org.nuiton.wikitty.publication.ui.action.PublicationActionEdit"> + <param name="contextData">{1}</param> + <param name="args">{2}</param> + <result>/WEB-INF/jsp/edit.jsp</result> + </action> + + <action name="*/view/*" + class="org.nuiton.wikitty.publication.ui.action.PublicationActionView"> + <param name="contextData">{1}</param> + <param name="args">{2}</param> + <result>/WEB-INF/jsp/view.jsp</result> + </action> + + <action name="*/raw/*" + class="org.nuiton.wikitty.publication.ui.action.PublicationActionRaw"> + <param name="contextData">{1}</param> + <param name="args">{2}</param> + <result type="stream"> + <param name="contentType">${mimeType}</param> + <param name="inputName">inputStream</param> + </result> + </action> + + <action name="*/eval/*" + class="org.nuiton.wikitty.publication.ui.action.PublicationActionEval"> + <param name="contextData">{1}</param> + <param name="args">{2}</param> + <result type="stream"> + <param name="contentType">${contentType}</param> + <param name="inputName">inputStream</param> + </result> + </action> + + <action name="*/*/view/*" + class="org.nuiton.wikitty.publication.ui.action.PublicationActionView"> + <param name="contextData">{1}</param> + <param name="contextApps">{2}</param> + <param name="args">{3}</param> + <result>/WEB-INF/jsp/view.jsp</result> + </action> + + <action name="*/*/raw/*" + class="org.nuiton.wikitty.publication.ui.action.PublicationActionRaw"> + <param name="contextData">{1}</param> + <param name="contextApps">{2}</param> + <param name="args">{3}</param> + <result type="stream"> + <param name="contentType">${mimeType}</param> + <param name="inputName">inputStream</param> + </result> + </action> + + <action name="*/*/eval/*" + class="org.nuiton.wikitty.publication.ui.action.PublicationActionEval"> + <param name="contextData">{1}</param> + <param name="contextApps">{2}</param> + <param name="args">{3}</param> + <result type="stream"> + <param name="contentType">${contentType}</param> + <param name="inputName">inputStream</param> + </result> + </action> + + + </package> + + <package name="fragment" namespace="/fragment" extends="publicArea"> + <action name="wikittyInfo" + class="org.nuiton.wikitty.publication.ui.action.PublicationActionRestoreWikitty"> + <result>/WEB-INF/jsp/wikittyInfo.jsp</result> + </action> + </package> + +</struts> Property changes on: trunk/wikitty-publication-ui/src/main/resources/struts.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Copied: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-codelutin.properties (from rev 1132, trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-codelutin.properties) =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-codelutin.properties (rev 0) +++ trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-codelutin.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,26 @@ +### +# #%L +# Wikitty :: publication +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2010 CodeLutin, Benjamin Poussin +# %% +# 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.data.directory=/var/lib/wikitty-publication/codelutin/ +wikitty.service.server.url=http://localhost:2222/wikitty \ No newline at end of file Property changes on: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-codelutin.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Copied: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties (from rev 1132, trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties) =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties (rev 0) +++ trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,58 @@ +### +# #%L +# Wikitty :: publication +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin +# %% +# 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.data.directory=./targetBD1/data +wikitty.service.server.url=http://localhost:1111/wikitty +wikitty.storage.jdbc.queryfile=wikitty-jdbc-query.properties +wikitty.storage.jdbc.driver=org.h2.Driver +wikitty.storage.jdbc.host=jdbc:h2:file:${wikitty.data.directory}/data/db +wikitty.storage.jdbc.login=sa +wikitty.storage.jdbc.password= +wikitty.storage.jdbc.xadatasource=org.h2.jdbcx.JdbcDataSource +wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.URL=${wikitty.storage.jdbc.host} +wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.user=${wikitty.storage.jdbc.login} +wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.password=${wikitty.storage.jdbc.password} +wikitty.searchengine.solr.directory.data=${wikitty.data.directory}/data/solr +wikitty.searchengine.solr.directory.factory=solr.StandardDirectoryFactory +wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceStorage,\ +org.nuiton.wikitty.services.WikittyServiceNotifier,\ +org.nuiton.wikitty.services.WikittyServiceCached,\ +org.nuiton.wikitty.services.WikittyServiceSecurity,\ +org.nuiton.wikitty.services.WikittyServiceAccessStat,\ +org.nuiton.wikitty.services.WikittyServiceCajoServer + +wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ +org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ +org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr +wikitty.service.cache.listenevents=false +wikitty.service.cache.allwaysRestoreCopies=false +wikitty.service.event.propagate=false +wikitty.service.event.listen=false +wikitty.service.accessstat.extensions=WikittyPubText,WikittyPubData +wikitty.addon.export.threadnumber=1 +wikitty.addon.export.directory=${wikitty.data.directory}/export +wikitty.addon.export.publicurl=file://${wikitty.data.directory}/export/ +wikitty.WikittyServiceAccessStat.components=\ +org.nuiton.wikitty.services.WikittyServiceAccessStat$AccessStatStorageLog Property changes on: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Copied: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-fallback.properties (from rev 1132, trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-fallback.properties) =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-fallback.properties (rev 0) +++ trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-fallback.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,62 @@ +### +# #%L +# Wikitty :: publication +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin +# %% +# 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.data.directory=./targetBD1/data +wikitty.service.server.url=http://localhost:1111/wikitty +wikitty.storage.jdbc.queryfile=wikitty-jdbc-query.properties +wikitty.storage.jdbc.driver=org.h2.Driver +wikitty.storage.jdbc.host=jdbc:h2:file:${wikitty.data.directory}/data/db +wikitty.storage.jdbc.login=sa +wikitty.storage.jdbc.password= +wikitty.storage.jdbc.xadatasource=org.h2.jdbcx.JdbcDataSource +wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.URL=${wikitty.storage.jdbc.host} +wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.user=${wikitty.storage.jdbc.login} +wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.password=${wikitty.storage.jdbc.password} +wikitty.searchengine.solr.directory.data=${wikitty.data.directory}/data/solr +wikitty.searchengine.solr.directory.factory=solr.StandardDirectoryFactory +wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceStorage,\ +org.nuiton.wikitty.publication.WikittyPublicationFallbackService,\ +org.nuiton.wikitty.services.WikittyServiceNotifier,\ +org.nuiton.wikitty.services.WikittyServiceCached,\ +org.nuiton.wikitty.services.WikittyServiceSecurity,\ +org.nuiton.wikitty.services.WikittyServiceAccessStat + +wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ +org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ +org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr +wikitty.service.cache.listenevents=false +wikitty.service.cache.allwaysRestoreCopies=false +wikitty.service.event.propagate=false +wikitty.service.event.listen=false +wikitty.service.accessstat.extensions=WikittyPubText,WikittyPubData +wikitty.addon.export.threadnumber=1 +wikitty.addon.export.directory=${wikitty.data.directory}/export +wikitty.addon.export.publicurl=file://${wikitty.data.directory}/export/ +wikitty.WikittyServiceAccessStat.components=\ +org.nuiton.wikitty.services.WikittyServiceAccessStat$AccessStatStorageLog + +wikitty.fallback.file=wikitty-publication-ws-jar.properties +wikitty.fallback.override=false + Property changes on: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-fallback.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Copied: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-jar.properties (from rev 1132, trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-jar.properties) =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-jar.properties (rev 0) +++ trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-jar.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,29 @@ +### +# #%L +# Wikitty :: publication +# +# $Id: wikitty-publication-ws-default.properties 823 2011-04-20 14:45:47Z mfortun $ +# $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-publication/src/main/resour… $ +# %% +# Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin +# %% +# 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.WikittyService.components=org.nuiton.wikitty.publication.externalize.WikittyServiceJarLoader +wikitty.publication.repository.jar=/home/Manou/testWP/pub-externalized.jar + Property changes on: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-jar.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-light.properties (from rev 1132, trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties) =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-light.properties (rev 0) +++ trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-light.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,28 @@ +### +# #%L +# Wikitty :: publication +# +# $Id: wikitty-publication-ws-default.properties 823 2011-04-20 14:45:47Z mfortun $ +# $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-publication/src/main/resour… $ +# %% +# Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin +# %% +# 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.service.server.url=http://localhost:1111/wikitty +wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceCajoClient Property changes on: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-light.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-lightfallback.properties (from rev 1132, trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties) =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-lightfallback.properties (rev 0) +++ trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-lightfallback.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,28 @@ +### +# #%L +# Wikitty :: publication +# +# $Id: wikitty-publication-ws-default.properties 823 2011-04-20 14:45:47Z mfortun $ +# $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-publication/src/main/resour… $ +# %% +# Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin +# %% +# 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.service.server.url=http://localhost:2222/wikitty +wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceCajoClient Property changes on: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-lightfallback.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-test.properties (from rev 1132, trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-test.properties) =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-test.properties (rev 0) +++ trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-test.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,56 @@ +### +# #%L +# Wikitty :: publication +# +# $Id: wikitty-publication-ws-default.properties 823 2011-04-20 14:45:47Z mfortun $ +# $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-publication/src/main/resour… $ +# %% +# Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin +# %% +# 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.storage.jdbc.queryfile=wikitty-jdbc-query.properties +wikitty.storage.jdbc.driver=org.h2.Driver +wikitty.storage.jdbc.host=jdbc:h2:file:${wikitty.data.directory}/data/db +wikitty.storage.jdbc.login=sa +wikitty.storage.jdbc.password= +wikitty.storage.jdbc.xadatasource=org.h2.jdbcx.JdbcDataSource +wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.URL=${wikitty.storage.jdbc.host} +wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.user=${wikitty.storage.jdbc.login} +wikitty.storage.jdbc.xadatasource.org.h2.jdbcx.JdbcDataSource.password=${wikitty.storage.jdbc.password} +wikitty.searchengine.solr.directory.data=${wikitty.data.directory}/data/solr +wikitty.searchengine.solr.directory.factory=solr.StandardDirectoryFactory +wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceStorage,\ +org.nuiton.wikitty.services.WikittyServiceNotifier,\ +org.nuiton.wikitty.services.WikittyServiceCached,\ +org.nuiton.wikitty.services.WikittyServiceSecurity,\ +org.nuiton.wikitty.services.WikittyServiceAccessStat + +wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ +org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ +org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr +wikitty.service.cache.listenevents=false +wikitty.service.cache.allwaysRestoreCopies=false +wikitty.service.event.propagate=false +wikitty.service.event.listen=false +wikitty.service.accessstat.extensions=WikittyPubText,WikittyPubData +wikitty.addon.export.threadnumber=1 +wikitty.addon.export.directory=${wikitty.data.directory}/export +wikitty.addon.export.publicurl=file://${wikitty.data.directory}/export/ +wikitty.WikittyServiceAccessStat.components=\ +org.nuiton.wikitty.services.WikittyServiceAccessStat$AccessStatStorageLog Copied: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication.properties (from rev 1132, trunk/wikitty-publication/src/main/resources/wikitty-publication.properties) =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/wikitty-publication.properties (rev 0) +++ trunk/wikitty-publication-ui/src/main/resources/wikitty-publication.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,25 @@ +### +# #%L +# Wikitty :: publication +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin +# %% +# 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.config.pattern=wikitty-publication-ws-%s.properties Property changes on: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr ___________________________________________________________________ Modified: svn:ignore - .settings target .classpath .project PutObjectStoreDirHere solr *.ipr *.iml *.iws + .settings target .classpath .project PutObjectStoreDirHere ObjectStore solr *.ipr *.iml *.iws Modified: trunk/wikitty-solr/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2011-08-12 13:27:31 UTC (rev 1133) +++ trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -1,14 +1,12 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache 2 # - Apache License # - Apache Software License, Version 1.1 # - Apache Software License, version 1.1 # - BSD License # - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 @@ -19,20 +17,19 @@ # - Public domain # - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. # - The Apache Software License, Version 2.0 -# - lgpl #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Jul 01 16:52:09 CEST 2011 -antlr--antlr--2.7.2--jar=BSD License -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. -dom4j--dom4j--1.1--jar=BSD License -dom4j--dom4j--1.6.1--jar=BSD License -jakarta-regexp--jakarta-regexp--1.4--jar=The Apache Software License, Version 2.0 -javax.servlet--servlet-api--2.5--jar=Common Development and Distribution License (CDDL) v1.0 -javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.apache.zookeeper--zookeeper--3.3.1--jar=The Apache Software License, Version 2.0 -oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 -xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 +#Fri Aug 12 16:00:37 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 +dom4j--dom4j--1.6.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) v1.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 +xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Property changes on: trunk/wp-maven-plugin ___________________________________________________________________ Added: svn:ignore + target .classpath .project .settings *.iml *.ipr *.iws *.log Added: trunk/wp-maven-plugin/LICENSE.txt =================================================================== --- trunk/wp-maven-plugin/LICENSE.txt (rev 0) +++ trunk/wp-maven-plugin/LICENSE.txt 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Property changes on: trunk/wp-maven-plugin/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wp-maven-plugin/README.txt =================================================================== --- trunk/wp-maven-plugin/README.txt (rev 0) +++ trunk/wp-maven-plugin/README.txt 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install Property changes on: trunk/wp-maven-plugin/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wp-maven-plugin/changelog.txt =================================================================== --- trunk/wp-maven-plugin/changelog.txt (rev 0) +++ trunk/wp-maven-plugin/changelog.txt 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,2 @@ +Changelog file is not any longer maintained, please refer to the release note : +http://maven-site.nuiton.org/wikitty/changes-report.html Property changes on: trunk/wp-maven-plugin/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wp-maven-plugin/pom.xml =================================================================== --- trunk/wp-maven-plugin/pom.xml (rev 0) +++ trunk/wp-maven-plugin/pom.xml 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,214 @@ +<?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"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>3.2-SNAPSHOT</version> + </parent> + + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wp-maven-plugin</artifactId> + +  + <dependencies> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-publication</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + </dependency> + + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> + + </dependencies> + +  +  +  + <name>Wikitty :: publication Maven plugin</name> + <inceptionYear>2011</inceptionYear> + <description> + Maven plugin to execute wikitty publication maintenance tasks + </description> + +  +  +  + <packaging>maven-plugin</packaging> + + <build> + + <plugins> + +  + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-metadata</artifactId> + <executions> + <execution> + <goals> + <goal>generate-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + + <profiles> + +  + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + + <plugins> + +  + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>helpmojo</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + </profile> + +  + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> +  + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <version>2.5.1</version> + </plugin> + + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-maven-plugin</artifactId> + <version>1.3.8</version> + </plugin> + </plugins> + </reporting> + + </profile> + + <profile> + <id>run-its</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>integration-test</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <configuration> + <postBuildHookScript>verify</postBuildHookScript> + <localRepositoryPath>${basedir}/target/local-repo + </localRepositoryPath> + <settingsFile>src/it/settings.xml</settingsFile> + <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> + <debug>${maven.verbose}</debug> + </configuration> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>install</goal> + <goal>run</goal> + </goals> + <phase>integration-test</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project> + Property changes on: trunk/wp-maven-plugin/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wp-maven-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wp-maven-plugin/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/wp-maven-plugin/src/license/THIRD-PARTY.properties 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,39 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License +# - Apache Software License, Version 1.1 +# - Apache Software License, version 1.1 +# - BSD License +# - BSD style +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - Public Domain +# - Public domain +# - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +# - http://classworlds.codehaus.org/license.html +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Fri Aug 12 15:54:57 CEST 2011 +antlr--antlr--2.7.2=BSD License +classworlds--classworlds--1.1-alpha-2=http\://classworlds.codehaus.org/license.html +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 +javassist--javassist--3.8.0.GA=Lesser General Public License (LPGL) +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 +org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 +oro--oro--2.0.8=The Apache Software License, Version 2.0 +xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Property changes on: trunk/wp-maven-plugin/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/AbstractWPMojo.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/AbstractWPMojo.java (rev 0) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/AbstractWPMojo.java 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,75 @@ +/* + * #%L + * Wikitty :: publication Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 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.plugin; + +import org.apache.maven.project.MavenProject; +import org.nuiton.plugin.AbstractPlugin; + +/** + * Abstract mojo for all mojos of the WP module. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 3.2 + */ +public abstract class AbstractWPMojo extends AbstractPlugin { + + /** + * Project. + * + * @parameter default-value="${project}" + * @required + * @readonly + * @since 3.2 + */ + protected MavenProject project; + + /** + * A flag to activate verbose mode. + * + * @parameter expression="${wp.verbose}" default-value="${maven.verbose}" + * @since 1.2.5 + */ + protected boolean verbose; + + @Override + public MavenProject getProject() { + return project; + } + + @Override + public void setProject(MavenProject project) { + this.project = project; + } + + @Override + public boolean isVerbose() { + return verbose; + } + + @Override + public void setVerbose(boolean verbose) { + this.verbose = verbose; + } +} Property changes on: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/AbstractWPMojo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployJarMojo.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployJarMojo.java (rev 0) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployJarMojo.java 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,52 @@ +/* + * #%L + * Wikitty :: publication Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 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.plugin; + +/** + * To deploy a wikitty publication jar. + * + * @author tchemit <chemit(a)codelutin.com> + * @version $Id$ + * @goal deploy-jar + * @requiresProject true + * @requiresOnline true + * @requiresDependencyResolution runtime + * @since 3.2 + */ +public class WPDeployJarMojo extends AbstractWPMojo { + + @Override + protected void init() throws Exception { + //TODO + } + + @Override + protected void doAction() throws Exception { + + //TODO + + } + +} Property changes on: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployJarMojo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployMojo.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployMojo.java (rev 0) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployMojo.java 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,52 @@ +/* + * #%L + * Wikitty :: publication Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 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.plugin; + +/** + * To deploy a wikitty publication. + * + * @author tchemit <chemit(a)codelutin.com> + * @version $Id$ + * @goal deploy + * @requiresProject true + * @requiresOnline true + * @requiresDependencyResolution runtime + * @since 3.2 + */ +public class WPDeployMojo extends AbstractWPMojo { + + @Override + protected void init() throws Exception { + //TODO + } + + @Override + protected void doAction() throws Exception { + + //TODO + + } + +} Property changes on: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployMojo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPInitMojo.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPInitMojo.java (rev 0) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPInitMojo.java 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,50 @@ +/* + * #%L + * Wikitty :: publication Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 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.plugin; + +/** + * To init a wikitty publication project. + * + * @author tchemit <chemit(a)codelutin.com> + * @version $Id$ + * @goal init + * @requiresProject true + * @requiresOnline true + * @requiresDependencyResolution runtime + * @since 3.2 + */ +public class WPInitMojo extends AbstractWPMojo { + + @Override + protected void init() throws Exception { + //TODO + } + + @Override + protected void doAction() throws Exception { + //TODO + } + +} Property changes on: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPInitMojo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPJarMojo.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPJarMojo.java (rev 0) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPJarMojo.java 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,52 @@ +/* + * #%L + * Wikitty :: publication Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 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.plugin; + +/** + * To create a wikitty publication jar. + * + * @author tchemit <chemit(a)codelutin.com> + * @version $Id$ + * @goal jar + * @requiresProject true + * @requiresOnline true + * @requiresDependencyResolution runtime + * @since 3.2 + */ +public class WPJarMojo extends AbstractWPMojo { + + @Override + protected void init() throws Exception { + //TODO + } + + @Override + protected void doAction() throws Exception { + + //TODO + + } + +} Property changes on: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPJarMojo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPRunMojo.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPRunMojo.java (rev 0) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPRunMojo.java 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,52 @@ +/* + * #%L + * Wikitty :: publication Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 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.plugin; + +/** + * To run a wikitty publication project. + * + * @author tchemit <chemit(a)codelutin.com> + * @version $Id$ + * @goal run + * @requiresProject true + * @requiresOnline true + * @requiresDependencyResolution runtime + * @since 3.2 + */ +public class WPRunMojo extends AbstractWPMojo { + + @Override + protected void init() throws Exception { + //TODO + } + + @Override + protected void doAction() throws Exception { + + //TODO + + } + +} Property changes on: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPRunMojo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPUpdateMojo.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPUpdateMojo.java (rev 0) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPUpdateMojo.java 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,52 @@ +/* + * #%L + * Wikitty :: publication Maven plugin + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 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.plugin; + +/** + * To update a wikitty publication project. + * + * @author tchemit <chemit(a)codelutin.com> + * @version $Id$ + * @goal update + * @requiresProject true + * @requiresOnline true + * @requiresDependencyResolution runtime + * @since 3.2 + */ +public class WPUpdateMojo extends AbstractWPMojo { + + @Override + protected void init() throws Exception { + //TODO + } + + @Override + protected void doAction() throws Exception { + + //TODO + + } + +} Property changes on: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPUpdateMojo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wp-maven-plugin/src/site/rst/en/example.rst =================================================================== --- trunk/wp-maven-plugin/src/site/rst/en/example.rst (rev 0) +++ trunk/wp-maven-plugin/src/site/rst/en/example.rst 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,24 @@ +.. - +.. * #%L +.. * Wikitty :: publication Maven plugin +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 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% +.. - Property changes on: trunk/wp-maven-plugin/src/site/rst/en/example.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wp-maven-plugin/src/site/rst/en/index.rst =================================================================== --- trunk/wp-maven-plugin/src/site/rst/en/index.rst (rev 0) +++ trunk/wp-maven-plugin/src/site/rst/en/index.rst 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,44 @@ +.. - +.. * #%L +.. * Wikitty :: publication Maven plugin +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 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% +.. - +=============== +wp-maven-plugin +=============== + +.. contents:: + + +Abstract +-------- + +The *wp-maven-plugin* offers some maintenance tasks for a wikitty +publication system.... + +Usage in your pom.xml +--------------------- + +See the `details`_ page of goal or the `usage`_ page. + +.. _details: plugin-info.html +.. _usage: usage.html Property changes on: trunk/wp-maven-plugin/src/site/rst/en/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wp-maven-plugin/src/site/rst/en/usage.rst =================================================================== --- trunk/wp-maven-plugin/src/site/rst/en/usage.rst (rev 0) +++ trunk/wp-maven-plugin/src/site/rst/en/usage.rst 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,24 @@ +.. - +.. * #%L +.. * Wikitty :: publication Maven plugin +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 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% +.. - Property changes on: trunk/wp-maven-plugin/src/site/rst/en/usage.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wp-maven-plugin/src/site/rst/example.rst =================================================================== --- trunk/wp-maven-plugin/src/site/rst/example.rst (rev 0) +++ trunk/wp-maven-plugin/src/site/rst/example.rst 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,24 @@ +.. - +.. * #%L +.. * Wikitty :: publication Maven plugin +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 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% +.. - Property changes on: trunk/wp-maven-plugin/src/site/rst/example.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wp-maven-plugin/src/site/rst/index.rst =================================================================== --- trunk/wp-maven-plugin/src/site/rst/index.rst (rev 0) +++ trunk/wp-maven-plugin/src/site/rst/index.rst 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,44 @@ +.. - +.. * #%L +.. * Wikitty :: publication Maven plugin +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 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% +.. - +=============== +wp-maven-plugin +=============== + +.. contents:: + + +Présentation +------------ + +Le plugin *wp-maven-plugin* permet d'effectuer des tâches de maintenance sur +un système wikitty publication. + +Utilisation dans le pom.xml +--------------------------- + +Voir la `page`_ de détail des goals ou bien la page d'`usage`_ des goals. + +.. _page: plugin-info.html +.. _usage: usage.html Property changes on: trunk/wp-maven-plugin/src/site/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wp-maven-plugin/src/site/rst/usage.rst =================================================================== --- trunk/wp-maven-plugin/src/site/rst/usage.rst (rev 0) +++ trunk/wp-maven-plugin/src/site/rst/usage.rst 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,24 @@ +.. - +.. * #%L +.. * Wikitty :: publication Maven plugin +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 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% +.. - Property changes on: trunk/wp-maven-plugin/src/site/rst/usage.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wp-maven-plugin/src/site/site_en.xml =================================================================== --- trunk/wp-maven-plugin/src/site/site_en.xml (rev 0) +++ trunk/wp-maven-plugin/src/site/site_en.xml 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> + + <body> + <links> + <item name="[fr" href="fr/index.html"/> + <item name="en]" href="index.html"/> + </links> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="User"> + <item href="index.html" name="Index"/> + <item href="usage.html" name="Usage"/> + <item href="example.html" name="Examples"/> + <item name="Goals" href="plugin-info.html"> + <item name="init" href="init-mojo.html"/> + <item name="run" href="run-mojo.html"/> + <item name="deploy" href="deploy-mojo.html"/> + <item name="update" href="update-mojo.html"/> + <item name="jar" href="jar-mojo.html"/> + <item name="deploy-jar" href="deploy-jar-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </item> + </menu> + + <menu ref="reports"/> + + </body> +</project> Property changes on: trunk/wp-maven-plugin/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/wp-maven-plugin/src/site/site_fr.xml =================================================================== --- trunk/wp-maven-plugin/src/site/site_fr.xml (rev 0) +++ trunk/wp-maven-plugin/src/site/site_fr.xml 2011-08-12 14:06:54 UTC (rev 1134) @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + </bannerLeft> + + <body> + <links> + <item name="[fr" href="index.html"/> + <item name="en]" href="../index.html"/> + </links> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item href="index.html" name="Index"/> + <item href="usage.html" name="Usage"/> + <item href="example.html" name="Examples"/> + <item name="Goals" href="plugin-info.html"> + <item name="init" href="init-mojo.html"/> + <item name="run" href="run-mojo.html"/> + <item name="deploy" href="deploy-mojo.html"/> + <item name="update" href="update-mojo.html"/> + <item name="jar" href="jar-mojo.html"/> + <item name="deploy-jar" href="deploy-jar-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </item> + </menu> + + <menu ref="reports"/> + + </body> +</project> Property changes on: trunk/wp-maven-plugin/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

12 Aug '11

Author: tchemit Date: 2011-08-12 15:27:31 +0200 (Fri, 12 Aug 2011) New Revision: 1133 Url: http://nuiton.org/repositories/revision/wikitty/1133 Log: skeleton of the wikitty-publication-ui module Added: trunk/wikitty-publication-ui/ trunk/wikitty-publication-ui/src/ trunk/wikitty-publication-ui/src/license/ trunk/wikitty-publication-ui/src/main/ trunk/wikitty-publication-ui/src/main/java/ trunk/wikitty-publication-ui/src/main/java/org/ trunk/wikitty-publication-ui/src/main/java/org/nuiton/ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ trunk/wikitty-publication-ui/src/main/resources/ trunk/wikitty-publication-ui/src/site/ trunk/wikitty-publication-ui/src/site/en/ trunk/wikitty-publication-ui/src/site/en/rst/ trunk/wikitty-publication-ui/src/site/rst/ trunk/wikitty-publication-ui/src/test/ trunk/wikitty-publication-ui/src/test/java/ trunk/wikitty-publication-ui/src/test/java/org/ trunk/wikitty-publication-ui/src/test/java/org/nuiton/ trunk/wikitty-publication-ui/src/test/java/org/nuiton/wikitty/ trunk/wikitty-publication-ui/src/test/java/org/nuiton/wikitty/publication/ trunk/wikitty-publication-ui/src/test/resources/ Property changes on: trunk/wikitty-publication-ui ___________________________________________________________________ Added: svn:ignore + target *.iml *.ipr *.iws .classpath .project .settings PutObjectStoreDirHere ObjectStore

1 0

r1132 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication java/org/nuiton/wikitty/publication/ui java/org/nuiton/wikitty/publication/ui/action java/org/nuiton/wikitty/publication/ui/interceptor resources webapp/WEB-INF webapp/WEB-INF/jsp
by mfortun＠users.nuiton.org 12 Aug '11

12 Aug '11

Author: mfortun Date: 2011-08-12 15:13:53 +0200 (Fri, 12 Aug 2011) New Revision: 1132 Url: http://nuiton.org/repositories/revision/wikitty/1132 Log: *move ui specific class to ui package Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/ApplicationListener.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/CodeMirrorWrapper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/SelectOption.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationConfig.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationProxy.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/ Removed: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ApplicationListener.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/SelectOption.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/interceptor/ Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogout.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRegister.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRestoreWikitty.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionView.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationContext.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/LoginInterceptor.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/LogoutInterceptor.java trunk/wikitty-publication/src/main/resources/struts.xml trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/login.jsp trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp trunk/wikitty-publication/src/main/webapp/WEB-INF/web.xml Deleted: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ApplicationListener.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ApplicationListener.java 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ApplicationListener.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,40 +0,0 @@ -package org.nuiton.wikitty.publication; - -import java.util.Locale; - -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.i18n.I18n; -import org.nuiton.i18n.init.DefaultI18nInitializer; -import org.nuiton.i18n.init.I18nInitializer; - -public class ApplicationListener implements ServletContextListener { - - private static final Log log = LogFactory.getLog(ApplicationListener.class); - - @Override - public void contextInitialized(ServletContextEvent sce) { - - - if (log.isInfoEnabled()) { - log.info("Initializing I18n..."); - } - - I18nInitializer initializer = new DefaultI18nInitializer( - "wikitty-publication"); - - initializer.setMissingKeyReturnNull(true); - - I18n.init(initializer, Locale.FRENCH); - - } - - @Override - public void contextDestroyed(ServletContextEvent sce) { - - } - -} Deleted: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,157 +0,0 @@ -package org.nuiton.wikitty.publication; - -import java.util.LinkedList; -import java.util.List; - -/** - * class used as a collection of option and param to fill edit page with - * -codemirror css and script and supported langages - * - * @author mfortun - * - */ -public class CodeMirrorWrapper { - - // /wikitty-publication/js/codemirror-ui/lib/CodeMirror-2.0/mode - - protected String servContext; - protected String pathToCodeMirrorModeDir; - protected String pathToCodeMirorUi; - protected List<String> codeMirrorCssImport = new LinkedList<String>(); - protected List<String> codeMirrorScriptImport = new LinkedList<String>(); - - protected List<SelectOption> langages = new LinkedList<SelectOption>(); - - public CodeMirrorWrapper(String servContext, String pathToCodeMirorUi, - String pathToCodeMirrorModeDire) { - this.servContext = servContext; - this.pathToCodeMirorUi = pathToCodeMirorUi; - pathToCodeMirrorModeDir = pathToCodeMirorUi - + pathToCodeMirrorModeDire; - // TODO mfortun-2011-05-30 maybe change this - - codeMirrorScriptImport.add(servContext + pathToCodeMirorUi - + "lib/CodeMirror-2.0/lib/codemirror.js"); - codeMirrorScriptImport.add(servContext + pathToCodeMirorUi - + "js/codemirror-ui.js"); - - codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir - + "/javascript/javascript.js"); - codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir - + "/clike/clike.js"); - codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir - + "/css/css.js"); - codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir - + "/diff/diff.js"); - codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir - + "/haskell/haskell.js"); - codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir - + "/htmlmixed/htmlmixed.js"); - codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir - + "/php/php.js"); - codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir - + "/stex/stex.js"); - - codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir - + "/xml/xml.js"); - - codeMirrorCssImport.add(servContext + pathToCodeMirorUi - + "css/codemirror-ui.css"); - - codeMirrorCssImport.add(servContext + pathToCodeMirorUi - + "lib/CodeMirror-2.0/lib/codemirror.css"); - - codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir - + "/diff/diff.css"); - codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir - + "/stex/stex.css"); - codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir - + "/haskell/haskell.css"); - codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir - + "/css/css.css"); - codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir + "" - + "/clike/clike.css"); - codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir - + "/javascript/javascript.css"); - codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir - + "/xml/xml.css"); - - langages.add(new SelectOption("clike", "clike", false)); - langages.add(new SelectOption("javascript", "javascript", false)); - langages.add(new SelectOption("css", "css", false)); - langages.add(new SelectOption("diff", "diff", false)); - langages.add(new SelectOption("haskell", "haskell", false)); - langages.add(new SelectOption("htmlmixed", "htmlmixed", false)); - langages.add(new SelectOption("stex", "stex", false)); - langages.add(new SelectOption("php", "php", false)); - langages.add(new SelectOption("xml", "xml", false)); - } - - public String modeForMime(String mime) { - // TODO mfortun-2011-05-30 really implements this - if (mime != null) { - for (SelectOption opt : langages) { - if (mime.endsWith(opt.value)) { - return opt.value; - } - - } - } - return "javascript"; - } - - public String getPathToCodeMirorUiJs() { - return servContext + pathToCodeMirorUi + "/js/"; - } - - public String getPathToCodeMirorUi() { - return pathToCodeMirorUi; - } - - public void setPathToCodeMirorUi(String pathToCodeMirorUi) { - this.pathToCodeMirorUi = pathToCodeMirorUi; - } - - public String getServContext() { - return servContext; - } - - public void setServContext(String servContext) { - this.servContext = servContext; - } - - public String getPathToCodeMirrorModeDir() { - return pathToCodeMirrorModeDir; - } - - public void setPathToCodeMirrorModeDir(String pathToCodeMirrorModeDir) { - this.pathToCodeMirrorModeDir = pathToCodeMirrorModeDir; - } - - public List<String> getCodeMirrorCssImport() { - return codeMirrorCssImport; - } - - public void setCodeMirrorCssImport(List<String> codeMirrorCssImport) { - this.codeMirrorCssImport = codeMirrorCssImport; - } - - public List<String> getCodeMirrorScriptImport() { - return codeMirrorScriptImport; - } - - public void setCodeMirrorScriptImport(List<String> codeMirrorScriptImport) { - this.codeMirrorScriptImport = codeMirrorScriptImport; - } - - public List<SelectOption> getLangages() { - return langages; - } - - public void setLangages(List<SelectOption> langages) { - this.langages = langages; - } - - - -} Deleted: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/SelectOption.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/SelectOption.java 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/SelectOption.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,45 +0,0 @@ -package org.nuiton.wikitty.publication; - -/** - * Class used inside view page to load langage supported by code mirror - * @author mfortun - * - */ -public class SelectOption { - - protected String value; - protected String desc; - - protected boolean isSelected; - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - public String getDesc() { - return desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } - - public boolean isSelected() { - return isSelected; - } - - public void setSelected(boolean isSelected) { - this.isSelected = isSelected; - } - - public SelectOption(String value, String desc, boolean isSelected) { - this.value = value; - this.desc = desc; - this.isSelected = isSelected; - } - -} Deleted: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,151 +0,0 @@ -package org.nuiton.wikitty.publication; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ArgumentsParserException; -import org.nuiton.wikitty.WikittyConfig; -import org.nuiton.wikitty.WikittyConfigOption; - -import java.io.File; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -import static org.nuiton.i18n.I18n._; - -public class WikittyPublicationConfig { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(WikittyPublicationConfig.class); - - static final public String CONFIG_FILE_KEY = "wikitty.publication.config.pattern"; - static final public String DEFAULT_FILE_COMPLEMENT = "default"; - static protected Map<String, ApplicationConfig> instanceMap = new HashMap<String, ApplicationConfig>(); - - private WikittyPublicationConfig() { - - } - - static public ApplicationConfig getConfig(String Context) { - return getConfig(null, null, Context); - } - - static public ApplicationConfig getConfig(Properties props, - String configFilename, String wsContext, String... args) { - - ApplicationConfig conf = new ApplicationConfig(Option.class, null, - props, configFilename); - try { - conf.parse(); - } catch (ArgumentsParserException e) { - e.printStackTrace(); - } - - String patternConfigFilename = conf.getOption(CONFIG_FILE_KEY); - - // load default configuration for all wikitty service - String filename = String.format(patternConfigFilename, - DEFAULT_FILE_COMPLEMENT); - log.info(String.format("Try to load config file '%s'", filename)); - ApplicationConfig wsConfigDefault; - - wsConfigDefault = WikittyConfig.getConfig(filename); - - // change just data dir with context path - String dataDir = wsConfigDefault - .getOption(WikittyConfigOption.WIKITTY_DATA_DIR.getKey()); - wsConfigDefault.setOption( - WikittyConfigOption.WIKITTY_DATA_DIR.getKey(), dataDir - + File.separator + wsContext); - - // read specific configuration with default config as default properties - filename = String.format(patternConfigFilename, wsContext); - log.info(String.format("Try to load config file '%s'", filename)); - ApplicationConfig wsConfig = null; - try { - wsConfig = new ApplicationConfig( - wsConfigDefault.getFlatOptions(false)); - wsConfig.setConfigFileName(filename); - wsConfig.parse(null); - } catch (ArgumentsParserException eee) { - if (log.isErrorEnabled()) { - log.error("Can't load Wikitty Publication configuration", eee); - } - } - - return wsConfig; - } - - public static ApplicationConfig getInstance(String context) { - if (!instanceMap.containsKey(context)) { - synchronized (WikittyPublicationConfig.class) { - if (!instanceMap.containsKey(context)) { - instanceMap.put(context, - getConfig(context)); - } - } - } - return instanceMap.get(context); - } - - public enum Option implements ApplicationConfig.OptionDef { - CONFIG_FILE(ApplicationConfig.CONFIG_FILE_NAME, - _("wikitty-publication.config.configFileName.description"), - "wikitty-publication.properties", String.class, false, false); - - public final String key; - public final String description; - public String defaultValue; - public final Class<?> type; - public boolean isTransient; - public boolean isFinal; - - Option(String key, String description, String defaultValue, - Class<?> type, boolean isTransient, boolean isFinal) { - this.key = key; - this.description = description; - this.defaultValue = defaultValue; - this.type = type; - this.isFinal = isFinal; - this.isTransient = isTransient; - } - - public String getKey() { - return key; - } - - public Class<?> getType() { - return type; - } - - public String getDescription() { - return description; - } - - public String getDefaultValue() { - return defaultValue; - } - - public boolean isTransient() { - return isTransient; - } - - public boolean isFinal() { - return isFinal; - } - - public void setDefaultValue(String defaultValue) { - this.defaultValue = defaultValue; - } - - public void setTransient(boolean isTransient) { - this.isTransient = isTransient; - } - - public void setFinal(boolean isFinal) { - this.isFinal = isFinal; - } - } - -} Deleted: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,56 +0,0 @@ -package org.nuiton.wikitty.publication; - -import java.util.HashMap; -import java.util.Map; - -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.WikittyServiceFactory; - -/** - * Proxy implementation for wikitty publication, that handle instance of the - * wikitty service - * - * @author mfortun - * - */ -public class WikittyPublicationProxy extends WikittyProxy { - - /** - * - */ - private static final long serialVersionUID = -568462410130999972L; - - static protected Map<String, WikittyService> mapService = new HashMap<String, WikittyService>(); - - private WikittyPublicationProxy(ApplicationConfig config, WikittyService ws) { - super(config, ws); - - } - - static public WikittyPublicationProxy getInstance(String token, - String context) { - ApplicationConfig config = WikittyPublicationConfig - .getInstance(context); - WikittyService ws = getWikittyService(config, context); - WikittyPublicationProxy result = new WikittyPublicationProxy(config, ws); - result.setSecurityToken(token); - - return result; - } - - static protected WikittyService getWikittyService(ApplicationConfig config, - String context) { - if (!mapService.containsKey(context)) { - synchronized (WikittyPublicationProxy.class) { - if (!mapService.containsKey(context)) { - mapService.put(context, - WikittyServiceFactory.buildWikittyService(config)); - } - } - } - return mapService.get(context); - } - -} Deleted: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,114 +0,0 @@ -package org.nuiton.wikitty.publication; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.wikitty.entities.WikittyUser; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import java.io.Serializable; -import java.util.Map; - -public class WikittyPublicationSession implements Serializable { - - /** - * - */ - private static final long serialVersionUID = -3092501094068386098L; - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(WikittyPublicationSession.class); - - static final private String WIKITTY_PUBLICATION_SESSION_KEY = WikittyPublicationSession.class - .getSimpleName(); - - static final private String WIKITTY_PUBLICATION_SESSION_SEP = "_"; - - protected String securityToken = null; - transient protected WikittyUser user; - transient protected WikittyPublicationProxy proxy; - transient protected String context; - - public WikittyPublicationSession(String context) { - this.context = context; - proxy = WikittyPublicationProxy.getInstance(null, context); - } - - /** - * remove wikittypublicationSession from the httpsession - * - * @param session - */ - static public void invalidate(Map<String, Object> session, - String contextData) { - session.remove(WIKITTY_PUBLICATION_SESSION_KEY - + WIKITTY_PUBLICATION_SESSION_SEP + contextData); - } - - static public WikittyPublicationSession getWikittyPublicationSession( - HttpServletRequest request, String context) { - HttpSession session = request.getSession(); - WikittyPublicationSession result = getWikittyPublicationSession( - session, context); - return result; - } - - static public WikittyPublicationSession getWikittyPublicationSession( - HttpSession httpSession, String contextData) { - WikittyPublicationSession result = (WikittyPublicationSession) httpSession - .getAttribute(WIKITTY_PUBLICATION_SESSION_KEY - + WIKITTY_PUBLICATION_SESSION_SEP + contextData); - if (result == null || !result.getContext().equals(contextData)) { - result = new WikittyPublicationSession(contextData); - httpSession.setAttribute(WIKITTY_PUBLICATION_SESSION_KEY - + WIKITTY_PUBLICATION_SESSION_SEP + contextData, result); - } - return result; - } - - static public WikittyPublicationSession getWikittyPublicationSession( - Map<String, Object> session, String contextData) { - WikittyPublicationSession result = (WikittyPublicationSession) session - .get(WIKITTY_PUBLICATION_SESSION_KEY - + WIKITTY_PUBLICATION_SESSION_SEP + contextData); - if (result == null || !result.getContext().equals(contextData)) { - result = new WikittyPublicationSession(contextData); - session.put(WIKITTY_PUBLICATION_SESSION_KEY - + WIKITTY_PUBLICATION_SESSION_SEP + contextData, result); - } - return result; - } - - public void login(String context, String login, String password) { - WikittyPublicationProxy proxy = getProxy(context); - proxy.login(login, password); - securityToken = proxy.getSecurityToken(); - user = proxy.getUser(); - - } - - public WikittyPublicationProxy getProxy(String context) { - if (proxy == null) { - proxy = WikittyPublicationProxy.getInstance(securityToken, context); - } - return proxy; - - } - - public WikittyUser getUser() { - return user; - } - - public void setUser(WikittyUser user) { - this.user = user; - } - - public String getContext() { - return context; - } - - public void setContext(String context) { - this.context = context; - } - -} Copied: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/ApplicationListener.java (from rev 1130, trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ApplicationListener.java) =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/ApplicationListener.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/ApplicationListener.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -0,0 +1,40 @@ +package org.nuiton.wikitty.publication.ui; + +import java.util.Locale; + +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.DefaultI18nInitializer; +import org.nuiton.i18n.init.I18nInitializer; + +public class ApplicationListener implements ServletContextListener { + + private static final Log log = LogFactory.getLog(ApplicationListener.class); + + @Override + public void contextInitialized(ServletContextEvent sce) { + + + if (log.isInfoEnabled()) { + log.info("Initializing I18n..."); + } + + I18nInitializer initializer = new DefaultI18nInitializer( + "wikitty-publication"); + + initializer.setMissingKeyReturnNull(true); + + I18n.init(initializer, Locale.FRENCH); + + } + + @Override + public void contextDestroyed(ServletContextEvent sce) { + + } + +} Copied: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/CodeMirrorWrapper.java (from rev 1130, trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java) =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/CodeMirrorWrapper.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/CodeMirrorWrapper.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -0,0 +1,157 @@ +package org.nuiton.wikitty.publication.ui; + +import java.util.LinkedList; +import java.util.List; + +/** + * class used as a collection of option and param to fill edit page with + * -codemirror css and script and supported langages + * + * @author mfortun + * + */ +public class CodeMirrorWrapper { + + // /wikitty-publication/js/codemirror-ui/lib/CodeMirror-2.0/mode + + protected String servContext; + protected String pathToCodeMirrorModeDir; + protected String pathToCodeMirorUi; + protected List<String> codeMirrorCssImport = new LinkedList<String>(); + protected List<String> codeMirrorScriptImport = new LinkedList<String>(); + + protected List<SelectOption> langages = new LinkedList<SelectOption>(); + + public CodeMirrorWrapper(String servContext, String pathToCodeMirorUi, + String pathToCodeMirrorModeDire) { + this.servContext = servContext; + this.pathToCodeMirorUi = pathToCodeMirorUi; + pathToCodeMirrorModeDir = pathToCodeMirorUi + + pathToCodeMirrorModeDire; + // TODO mfortun-2011-05-30 maybe change this + + codeMirrorScriptImport.add(servContext + pathToCodeMirorUi + + "lib/CodeMirror-2.0/lib/codemirror.js"); + codeMirrorScriptImport.add(servContext + pathToCodeMirorUi + + "js/codemirror-ui.js"); + + codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir + + "/javascript/javascript.js"); + codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir + + "/clike/clike.js"); + codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir + + "/css/css.js"); + codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir + + "/diff/diff.js"); + codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir + + "/haskell/haskell.js"); + codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir + + "/htmlmixed/htmlmixed.js"); + codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir + + "/php/php.js"); + codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir + + "/stex/stex.js"); + + codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir + + "/xml/xml.js"); + + codeMirrorCssImport.add(servContext + pathToCodeMirorUi + + "css/codemirror-ui.css"); + + codeMirrorCssImport.add(servContext + pathToCodeMirorUi + + "lib/CodeMirror-2.0/lib/codemirror.css"); + + codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir + + "/diff/diff.css"); + codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir + + "/stex/stex.css"); + codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir + + "/haskell/haskell.css"); + codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir + + "/css/css.css"); + codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir + "" + + "/clike/clike.css"); + codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir + + "/javascript/javascript.css"); + codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir + + "/xml/xml.css"); + + langages.add(new SelectOption("clike", "clike", false)); + langages.add(new SelectOption("javascript", "javascript", false)); + langages.add(new SelectOption("css", "css", false)); + langages.add(new SelectOption("diff", "diff", false)); + langages.add(new SelectOption("haskell", "haskell", false)); + langages.add(new SelectOption("htmlmixed", "htmlmixed", false)); + langages.add(new SelectOption("stex", "stex", false)); + langages.add(new SelectOption("php", "php", false)); + langages.add(new SelectOption("xml", "xml", false)); + } + + public String modeForMime(String mime) { + // TODO mfortun-2011-05-30 really implements this + if (mime != null) { + for (SelectOption opt : langages) { + if (mime.endsWith(opt.value)) { + return opt.value; + } + + } + } + return "javascript"; + } + + public String getPathToCodeMirorUiJs() { + return servContext + pathToCodeMirorUi + "/js/"; + } + + public String getPathToCodeMirorUi() { + return pathToCodeMirorUi; + } + + public void setPathToCodeMirorUi(String pathToCodeMirorUi) { + this.pathToCodeMirorUi = pathToCodeMirorUi; + } + + public String getServContext() { + return servContext; + } + + public void setServContext(String servContext) { + this.servContext = servContext; + } + + public String getPathToCodeMirrorModeDir() { + return pathToCodeMirrorModeDir; + } + + public void setPathToCodeMirrorModeDir(String pathToCodeMirrorModeDir) { + this.pathToCodeMirrorModeDir = pathToCodeMirrorModeDir; + } + + public List<String> getCodeMirrorCssImport() { + return codeMirrorCssImport; + } + + public void setCodeMirrorCssImport(List<String> codeMirrorCssImport) { + this.codeMirrorCssImport = codeMirrorCssImport; + } + + public List<String> getCodeMirrorScriptImport() { + return codeMirrorScriptImport; + } + + public void setCodeMirrorScriptImport(List<String> codeMirrorScriptImport) { + this.codeMirrorScriptImport = codeMirrorScriptImport; + } + + public List<SelectOption> getLangages() { + return langages; + } + + public void setLangages(List<SelectOption> langages) { + this.langages = langages; + } + + + +} Copied: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/SelectOption.java (from rev 1130, trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/SelectOption.java) =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/SelectOption.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/SelectOption.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -0,0 +1,45 @@ +package org.nuiton.wikitty.publication.ui; + +/** + * Class used inside view page to load langage supported by code mirror + * @author mfortun + * + */ +public class SelectOption { + + protected String value; + protected String desc; + + protected boolean isSelected; + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + + public boolean isSelected() { + return isSelected; + } + + public void setSelected(boolean isSelected) { + this.isSelected = isSelected; + } + + public SelectOption(String value, String desc, boolean isSelected) { + this.value = value; + this.desc = desc; + this.isSelected = isSelected; + } + +} Copied: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationConfig.java (from rev 1130, trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java) =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationConfig.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationConfig.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -0,0 +1,151 @@ +package org.nuiton.wikitty.publication.ui; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.ArgumentsParserException; +import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyConfigOption; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import static org.nuiton.i18n.I18n._; + +public class WikittyPublicationConfig { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyPublicationConfig.class); + + static final public String CONFIG_FILE_KEY = "wikitty.publication.config.pattern"; + static final public String DEFAULT_FILE_COMPLEMENT = "default"; + static protected Map<String, ApplicationConfig> instanceMap = new HashMap<String, ApplicationConfig>(); + + private WikittyPublicationConfig() { + + } + + static public ApplicationConfig getConfig(String Context) { + return getConfig(null, null, Context); + } + + static public ApplicationConfig getConfig(Properties props, + String configFilename, String wsContext, String... args) { + + ApplicationConfig conf = new ApplicationConfig(Option.class, null, + props, configFilename); + try { + conf.parse(); + } catch (ArgumentsParserException e) { + e.printStackTrace(); + } + + String patternConfigFilename = conf.getOption(CONFIG_FILE_KEY); + + // load default configuration for all wikitty service + String filename = String.format(patternConfigFilename, + DEFAULT_FILE_COMPLEMENT); + log.info(String.format("Try to load config file '%s'", filename)); + ApplicationConfig wsConfigDefault; + + wsConfigDefault = WikittyConfig.getConfig(filename); + + // change just data dir with context path + String dataDir = wsConfigDefault + .getOption(WikittyConfigOption.WIKITTY_DATA_DIR.getKey()); + wsConfigDefault.setOption( + WikittyConfigOption.WIKITTY_DATA_DIR.getKey(), dataDir + + File.separator + wsContext); + + // read specific configuration with default config as default properties + filename = String.format(patternConfigFilename, wsContext); + log.info(String.format("Try to load config file '%s'", filename)); + ApplicationConfig wsConfig = null; + try { + wsConfig = new ApplicationConfig( + wsConfigDefault.getFlatOptions(false)); + wsConfig.setConfigFileName(filename); + wsConfig.parse(null); + } catch (ArgumentsParserException eee) { + if (log.isErrorEnabled()) { + log.error("Can't load Wikitty Publication configuration", eee); + } + } + + return wsConfig; + } + + public static ApplicationConfig getInstance(String context) { + if (!instanceMap.containsKey(context)) { + synchronized (WikittyPublicationConfig.class) { + if (!instanceMap.containsKey(context)) { + instanceMap.put(context, + getConfig(context)); + } + } + } + return instanceMap.get(context); + } + + public enum Option implements ApplicationConfig.OptionDef { + CONFIG_FILE(ApplicationConfig.CONFIG_FILE_NAME, + _("wikitty-publication.config.configFileName.description"), + "wikitty-publication.properties", String.class, false, false); + + public final String key; + public final String description; + public String defaultValue; + public final Class<?> type; + public boolean isTransient; + public boolean isFinal; + + Option(String key, String description, String defaultValue, + Class<?> type, boolean isTransient, boolean isFinal) { + this.key = key; + this.description = description; + this.defaultValue = defaultValue; + this.type = type; + this.isFinal = isFinal; + this.isTransient = isTransient; + } + + public String getKey() { + return key; + } + + public Class<?> getType() { + return type; + } + + public String getDescription() { + return description; + } + + public String getDefaultValue() { + return defaultValue; + } + + public boolean isTransient() { + return isTransient; + } + + public boolean isFinal() { + return isFinal; + } + + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } + + public void setTransient(boolean isTransient) { + this.isTransient = isTransient; + } + + public void setFinal(boolean isFinal) { + this.isFinal = isFinal; + } + } + +} Copied: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationProxy.java (from rev 1130, trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java) =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationProxy.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationProxy.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -0,0 +1,56 @@ +package org.nuiton.wikitty.publication.ui; + +import java.util.HashMap; +import java.util.Map; + +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.WikittyServiceFactory; + +/** + * Proxy implementation for wikitty publication, that handle instance of the + * wikitty service + * + * @author mfortun + * + */ +public class WikittyPublicationProxy extends WikittyProxy { + + /** + * + */ + private static final long serialVersionUID = -568462410130999972L; + + static protected Map<String, WikittyService> mapService = new HashMap<String, WikittyService>(); + + private WikittyPublicationProxy(ApplicationConfig config, WikittyService ws) { + super(config, ws); + + } + + static public WikittyPublicationProxy getInstance(String token, + String context) { + ApplicationConfig config = WikittyPublicationConfig + .getInstance(context); + WikittyService ws = getWikittyService(config, context); + WikittyPublicationProxy result = new WikittyPublicationProxy(config, ws); + result.setSecurityToken(token); + + return result; + } + + static protected WikittyService getWikittyService(ApplicationConfig config, + String context) { + if (!mapService.containsKey(context)) { + synchronized (WikittyPublicationProxy.class) { + if (!mapService.containsKey(context)) { + mapService.put(context, + WikittyServiceFactory.buildWikittyService(config)); + } + } + } + return mapService.get(context); + } + +} Copied: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java (from rev 1130, trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java) =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -0,0 +1,114 @@ +package org.nuiton.wikitty.publication.ui; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.wikitty.entities.WikittyUser; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import java.io.Serializable; +import java.util.Map; + +public class WikittyPublicationSession implements Serializable { + + /** + * + */ + private static final long serialVersionUID = -3092501094068386098L; + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyPublicationSession.class); + + static final private String WIKITTY_PUBLICATION_SESSION_KEY = WikittyPublicationSession.class + .getSimpleName(); + + static final private String WIKITTY_PUBLICATION_SESSION_SEP = "_"; + + protected String securityToken = null; + transient protected WikittyUser user; + transient protected WikittyPublicationProxy proxy; + transient protected String context; + + public WikittyPublicationSession(String context) { + this.context = context; + proxy = WikittyPublicationProxy.getInstance(null, context); + } + + /** + * remove wikittypublicationSession from the httpsession + * + * @param session + */ + static public void invalidate(Map<String, Object> session, + String contextData) { + session.remove(WIKITTY_PUBLICATION_SESSION_KEY + + WIKITTY_PUBLICATION_SESSION_SEP + contextData); + } + + static public WikittyPublicationSession getWikittyPublicationSession( + HttpServletRequest request, String context) { + HttpSession session = request.getSession(); + WikittyPublicationSession result = getWikittyPublicationSession( + session, context); + return result; + } + + static public WikittyPublicationSession getWikittyPublicationSession( + HttpSession httpSession, String contextData) { + WikittyPublicationSession result = (WikittyPublicationSession) httpSession + .getAttribute(WIKITTY_PUBLICATION_SESSION_KEY + + WIKITTY_PUBLICATION_SESSION_SEP + contextData); + if (result == null || !result.getContext().equals(contextData)) { + result = new WikittyPublicationSession(contextData); + httpSession.setAttribute(WIKITTY_PUBLICATION_SESSION_KEY + + WIKITTY_PUBLICATION_SESSION_SEP + contextData, result); + } + return result; + } + + static public WikittyPublicationSession getWikittyPublicationSession( + Map<String, Object> session, String contextData) { + WikittyPublicationSession result = (WikittyPublicationSession) session + .get(WIKITTY_PUBLICATION_SESSION_KEY + + WIKITTY_PUBLICATION_SESSION_SEP + contextData); + if (result == null || !result.getContext().equals(contextData)) { + result = new WikittyPublicationSession(contextData); + session.put(WIKITTY_PUBLICATION_SESSION_KEY + + WIKITTY_PUBLICATION_SESSION_SEP + contextData, result); + } + return result; + } + + public void login(String context, String login, String password) { + WikittyPublicationProxy proxy = getProxy(context); + proxy.login(login, password); + securityToken = proxy.getSecurityToken(); + user = proxy.getUser(); + + } + + public WikittyPublicationProxy getProxy(String context) { + if (proxy == null) { + proxy = WikittyPublicationProxy.getInstance(securityToken, context); + } + return proxy; + + } + + public WikittyUser getUser() { + return user; + } + + public void setUser(WikittyUser user) { + this.user = user; + } + + public String getContext() { + return context; + } + + public void setContext(String context) { + this.context = context; + } + +} Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,4 +1,4 @@ -package org.nuiton.wikitty.publication.action; +package org.nuiton.wikitty.publication.ui.action; import com.opensymphony.xwork2.ActionContext; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,4 +1,4 @@ -package org.nuiton.wikitty.publication.action; +package org.nuiton.wikitty.publication.ui.action; import com.opensymphony.xwork2.ActionContext; import org.apache.commons.logging.Log; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogin.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -22,7 +22,7 @@ * #L% */ -package org.nuiton.wikitty.publication.action; +package org.nuiton.wikitty.publication.ui.action; import org.nuiton.util.StringUtil; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogout.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogout.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogout.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -21,9 +21,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package org.nuiton.wikitty.publication.action; +package org.nuiton.wikitty.publication.ui.action; -import org.nuiton.wikitty.publication.WikittyPublicationSession; +import org.nuiton.wikitty.publication.ui.WikittyPublicationSession; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRaw.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,11 +1,10 @@ -package org.nuiton.wikitty.publication.action; +package org.nuiton.wikitty.publication.ui.action; - import com.opensymphony.xwork2.ActionContext; import org.apache.struts2.interceptor.ServletResponseAware; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.publication.WikittyPublicationProxy; +import org.nuiton.wikitty.publication.ui.WikittyPublicationProxy; import org.nuiton.wikitty.publication.entities.WikittyPubData; import org.nuiton.wikitty.publication.entities.WikittyPubDataHelper; import org.nuiton.wikitty.publication.entities.WikittyPubText; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRegister.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRegister.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRegister.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,4 +1,4 @@ -package org.nuiton.wikitty.publication.action; +package org.nuiton.wikitty.publication.ui.action; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyProxy; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRestoreWikitty.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRestoreWikitty.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRestoreWikitty.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,4 +1,4 @@ -package org.nuiton.wikitty.publication.action; +package org.nuiton.wikitty.publication.ui.action; import org.nuiton.wikitty.entities.Wikitty; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionView.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionView.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,10 +1,10 @@ -package org.nuiton.wikitty.publication.action; +package org.nuiton.wikitty.publication.ui.action; import com.opensymphony.xwork2.ActionContext; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyLabel; -import org.nuiton.wikitty.publication.WikittyPublicationProxy; +import org.nuiton.wikitty.publication.ui.WikittyPublicationProxy; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,13 +1,13 @@ -package org.nuiton.wikitty.publication.action; +package org.nuiton.wikitty.publication.ui.action; import com.opensymphony.xwork2.ActionContext; import org.apache.struts2.interceptor.SessionAware; import org.nuiton.web.struts2.BaseAction; import org.nuiton.wikitty.entities.WikittyLabel; -import org.nuiton.wikitty.publication.WikittyPublicationProxy; -import org.nuiton.wikitty.publication.WikittyPublicationSession; import org.nuiton.wikitty.publication.entities.WikittyPubData; import org.nuiton.wikitty.publication.entities.WikittyPubText; +import org.nuiton.wikitty.publication.ui.WikittyPublicationProxy; +import org.nuiton.wikitty.publication.ui.WikittyPublicationSession; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.Search; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationContext.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationContext.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,4 +1,4 @@ -package org.nuiton.wikitty.publication.action; +package org.nuiton.wikitty.publication.ui.action; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/LoginInterceptor.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/interceptor/LoginInterceptor.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/LoginInterceptor.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -21,14 +21,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package org.nuiton.wikitty.publication.interceptor; +package org.nuiton.wikitty.publication.ui.interceptor; import java.util.Map; import javax.servlet.http.HttpServletRequest; import org.apache.struts2.ServletActionContext; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.WikittyUser; -import org.nuiton.wikitty.publication.WikittyPublicationSession; +import org.nuiton.wikitty.publication.ui.WikittyPublicationSession; import com.opensymphony.xwork2.ActionContext; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/LogoutInterceptor.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/interceptor/LogoutInterceptor.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ui/interceptor/LogoutInterceptor.java 2011-08-12 13:13:53 UTC (rev 1132) @@ -21,12 +21,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package org.nuiton.wikitty.publication.interceptor; +package org.nuiton.wikitty.publication.ui.interceptor; import java.util.Map; import org.nuiton.util.StringUtil; -import org.nuiton.wikitty.publication.WikittyPublicationSession; +import org.nuiton.wikitty.publication.ui.WikittyPublicationSession; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-08-12 13:13:53 UTC (rev 1132) @@ -33,7 +33,7 @@ <package name="loginArea" extends="publicArea"> <interceptors> <interceptor name="logout" - class="org.nuiton.wikitty.publication.interceptor.LogoutInterceptor" /> + class="org.nuiton.wikitty.publication.ui.interceptor.LogoutInterceptor" /> <interceptor-stack name="loginAreaStack"> <interceptor-ref name="logout" /> <interceptor-ref name="publicAreaStack" /> @@ -46,7 +46,7 @@ <package name="restrictedArea" extends="publicArea"> <interceptors> <interceptor name="login" - class="org.nuiton.wikitty.publication.interceptor.LoginInterceptor"> + class="org.nuiton.wikitty.publication.ui.interceptor.LoginInterceptor"> <param name="error">/login_input.action</param> </interceptor> <interceptor-stack name="restrictedAreaStack"> @@ -59,20 +59,20 @@ <package name="login" extends="loginArea"> <action name="*/register_*" method="{2}" - class="org.nuiton.wikitty.publication.action.PublicationActionRegister"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionRegister"> <param name="contextData">{1}</param> <result name="input">/WEB-INF/jsp/register.jsp</result> <result type="redirect">${context}/view/.action</result> </action> <action name="*/login_*" method="{2}" - class="org.nuiton.wikitty.publication.action.PublicationActionLogin"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionLogin"> <param name="contextData">{1}</param> <result name="input">/WEB-INF/jsp/login.jsp</result> <result name="success" type="redirect">${success}</result> <result name="error" type="redirect">${error}</result> </action> <action name="*/logout" - class="org.nuiton.wikitty.publication.action.PublicationActionLogout"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionLogout"> <param name="contextData">{1}</param> <result type="redirect">${success}</result> </action> @@ -82,21 +82,21 @@ <package name="publication" extends="publicArea"> <action name="*/edit/*" - class="org.nuiton.wikitty.publication.action.PublicationActionEdit"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionEdit"> <param name="contextData">{1}</param> <param name="args">{2}</param> <result>/WEB-INF/jsp/edit.jsp</result> </action> <action name="*/view/*" - class="org.nuiton.wikitty.publication.action.PublicationActionView"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionView"> <param name="contextData">{1}</param> <param name="args">{2}</param> <result>/WEB-INF/jsp/view.jsp</result> </action> <action name="*/raw/*" - class="org.nuiton.wikitty.publication.action.PublicationActionRaw"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionRaw"> <param name="contextData">{1}</param> <param name="args">{2}</param> <result type="stream"> @@ -106,7 +106,7 @@ </action> <action name="*/eval/*" - class="org.nuiton.wikitty.publication.action.PublicationActionEval"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionEval"> <param name="contextData">{1}</param> <param name="args">{2}</param> <result type="stream"> @@ -116,7 +116,7 @@ </action> <action name="*/*/view/*" - class="org.nuiton.wikitty.publication.action.PublicationActionView"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionView"> <param name="contextData">{1}</param> <param name="contextApps">{2}</param> <param name="args">{3}</param> @@ -124,7 +124,7 @@ </action> <action name="*/*/raw/*" - class="org.nuiton.wikitty.publication.action.PublicationActionRaw"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionRaw"> <param name="contextData">{1}</param> <param name="contextApps">{2}</param> <param name="args">{3}</param> @@ -135,7 +135,7 @@ </action> <action name="*/*/eval/*" - class="org.nuiton.wikitty.publication.action.PublicationActionEval"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionEval"> <param name="contextData">{1}</param> <param name="contextApps">{2}</param> <param name="args">{3}</param> @@ -150,7 +150,7 @@ <package name="fragment" namespace="/fragment" extends="publicArea"> <action name="wikittyInfo" - class="org.nuiton.wikitty.publication.action.PublicationActionRestoreWikitty"> + class="org.nuiton.wikitty.publication.ui.action.PublicationActionRestoreWikitty"> <result>/WEB-INF/jsp/wikittyInfo.jsp</result> </action> </package> Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-08-12 13:13:53 UTC (rev 1132) @@ -29,9 +29,9 @@ --%> <%@page import="org.nuiton.i18n.I18n"%> -<%@page import="org.nuiton.wikitty.publication.CodeMirrorWrapper"%> -<%@page import="org.nuiton.wikitty.publication.SelectOption"%> -<%@page import="org.nuiton.wikitty.publication.action.PublicationActionEdit"%> +<%@page import="org.nuiton.wikitty.publication.ui.CodeMirrorWrapper"%> +<%@page import="org.nuiton.wikitty.publication.ui.SelectOption"%> +<%@page import="org.nuiton.wikitty.publication.ui.action.PublicationActionEdit"%> <%@page import="org.apache.commons.lang.StringEscapeUtils"%> <%@page import="org.nuiton.wikitty.entities.FieldType"%> <%@page import="java.util.Collection"%> Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/login.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/login.jsp 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/login.jsp 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,5 +1,5 @@ <%@page - import="org.nuiton.wikitty.publication.action.PublicationActionLogin"%> + import="org.nuiton.wikitty.publication.action.ui.PublicationActionLogin"%> <%@ taglib prefix="s" uri="/struts-tags"%> Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-08-12 13:13:53 UTC (rev 1132) @@ -30,12 +30,12 @@ <%@page import="org.apache.commons.lang.StringEscapeUtils"%> <%@page - import="org.nuiton.wikitty.publication.action.PublicationActionView"%> + import="org.nuiton.wikitty.publication.ui.action.PublicationActionView"%> <%@page import="org.nuiton.util.StringUtil"%> <%@page import="org.nuiton.wikitty.search.Criteria"%> <%@page import="org.nuiton.wikitty.search.Search"%> <%@page - import="org.nuiton.wikitty.publication.WikittyPublicationSession"%> + 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"%> Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp 2011-08-12 13:13:53 UTC (rev 1132) @@ -1,7 +1,7 @@ <%@page import="org.apache.commons.lang.StringEscapeUtils"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> <%@page - import="org.nuiton.wikitty.publication.action.PublicationActionRestoreWikitty"%> + import="org.nuiton.wikitty.publication.ui.action.PublicationActionRestoreWikitty"%> <%@taglib prefix="s" uri="/struts-tags"%> <% Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/web.xml 2011-08-12 12:54:07 UTC (rev 1131) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/web.xml 2011-08-12 13:13:53 UTC (rev 1132) @@ -24,7 +24,7 @@ <listener> <description>Init</description> - <listener-class>org.nuiton.wikitty.publication.ApplicationListener</listener-class> + <listener-class>org.nuiton.wikitty.publication.ui.ApplicationListener</listener-class> </listener>

1 0

r1131 - in trunk/wikitty-publication/src: main/java/org/nuiton/wikitty/publication/externalize site/rst
by mfortun＠users.nuiton.org 12 Aug '11

12 Aug '11

Author: mfortun Date: 2011-08-12 14:54:07 +0200 (Fri, 12 Aug 2011) New Revision: 1131 Url: http://nuiton.org/repositories/revision/wikitty/1131 Log: *change exception handling Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java trunk/wikitty-publication/src/site/rst/wp-application.rst Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java 2011-08-12 12:54:07 UTC (rev 1131) @@ -10,6 +10,9 @@ import java.util.Properties; import java.util.jar.JarEntry; import java.util.jar.JarFile; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.Wikitty; @@ -46,6 +49,9 @@ public static String JAR_LOCATION_KEY = "wikitty.publication.repository.jar"; + /** Class logger. */ + private static Log log = LogFactory.getLog(WikittyServiceJarLoader.class); + protected JarFile wikittyJarRepository; protected Properties wikittyIndex; @@ -98,8 +104,10 @@ mimeHelper = new MimeTypePubHelper(); } catch (IOException e) { - // TODO mfortun-2011-07-11 realy handle exception - e.printStackTrace(); + // TODO mfortun-2011-08-12 Exception not really handled + if (log.isErrorEnabled()){ + log.error("Error while reading jar:"+wikittyJarRepository.getName(), e ); + } } } @@ -334,44 +342,42 @@ protected Wikitty restore(String wikittyId) { Wikitty wikit = null; - try { - if (!exists(wikittyId)) { - return null; - } - - String mime = wikittyMetadata.getProperty(wikittyId - + WikittyPublicationExternalize.MIME_SUFFIX); - String fileExtension = mimeHelper.getExtensionForMime(mime); - String path = wikittyIndex.getProperty(wikittyId); - String version = wikittyMetadata.getProperty(wikittyId - + WikittyPublicationExternalize.VERSION_SUFFIX); - JarEntry wikittyJared = wikittyJarRepository.getJarEntry(path + "." - + fileExtension); + if (!exists(wikittyId)) { + return null; + } - + String mime = wikittyMetadata.getProperty(wikittyId + + WikittyPublicationExternalize.MIME_SUFFIX); + String fileExtension = mimeHelper.getExtensionForMime(mime); + String path = wikittyIndex.getProperty(wikittyId); + String version = wikittyMetadata.getProperty(wikittyId + + WikittyPublicationExternalize.VERSION_SUFFIX); - wikit = new WikittyImpl(wikittyId); - wikit.setVersion(version); + JarEntry wikittyJared = wikittyJarRepository.getJarEntry(path + "." + + fileExtension); - wikit.addExtension(WikittyLabelImpl.extensionWikittyLabel); + wikit = new WikittyImpl(wikittyId); + wikit.setVersion(version); - // set labels computate name - String sep = wikittyMetadata - .getProperty(WikittyPublicationExternalize.PATH_SEPARATOR_PROPERTIE_KEY); - String[] namPath = StringUtil.split(path, sep); - String wikittyName = namPath[namPath.length - 1]; + wikit.addExtension(WikittyLabelImpl.extensionWikittyLabel); - String label = ""; - for (int i = 0; i < namPath.length - 1; i++) { - label += namPath[i]; - if (i < namPath.length - 2) { - label += WikittyPublicationFileSystem.WIKITTYLABEL_SEPARATOR; - } + // set labels computate name + String sep = wikittyMetadata + .getProperty(WikittyPublicationExternalize.PATH_SEPARATOR_PROPERTIE_KEY); + String[] namPath = StringUtil.split(path, sep); + String wikittyName = namPath[namPath.length - 1]; + + String label = ""; + for (int i = 0; i < namPath.length - 1; i++) { + label += namPath[i]; + if (i < namPath.length - 2) { + label += WikittyPublicationFileSystem.WIKITTYLABEL_SEPARATOR; } + } - WikittyLabelHelper.addLabels(wikit, label); - + WikittyLabelHelper.addLabels(wikit, label); + try { if (mimeHelper.isPubTextMime(mime)) { // wikitty pub text compiled wikit.addExtension(WikittyPubTextImpl.extensions); @@ -393,18 +399,20 @@ } else { // wikitty pub data wikit.addExtension(WikittyPubDataImpl.extensionWikittyPubData); - WikittyPubDataHelper.setMimeType(wikit,mime); + WikittyPubDataHelper.setMimeType(wikit, mime); WikittyPubDataHelper.setName(wikit, wikittyName); WikittyPubDataHelper.setContent(wikit, JarUtil.getByteContent( wikittyJarRepository, wikittyJared)); } - - } catch (Exception e) { - // TODO mfortun-2011-07-11 really handle exception - e.printStackTrace(); + } catch (IOException e) { + // TODO mfortun-2011-08-12 Exception not really handled + if (log.isErrorEnabled()){ + log.error("Error while reading jar:"+wikittyJarRepository.getName(), e ); + } } + return wikit; } Modified: trunk/wikitty-publication/src/site/rst/wp-application.rst =================================================================== --- trunk/wikitty-publication/src/site/rst/wp-application.rst 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/site/rst/wp-application.rst 2011-08-12 12:54:07 UTC (rev 1131) @@ -2,6 +2,10 @@ =============================== :Authors: Manoël Fortun +But +*** + + Specifications diverse sur l'utilisation de wikitty publication

1 0

r1130 - in trunk/wikitty-publication: . src/main/java/org/nuiton/wikitty/publication src/main/java/org/nuiton/wikitty/publication/action src/main/java/org/nuiton/wikitty/publication/externalize src/main/java/org/nuiton/wikitty/publication/synchro
by tchemit＠users.nuiton.org 12 Aug '11

12 Aug '11

Author: tchemit Date: 2011-08-12 14:16:04 +0200 (Fri, 12 Aug 2011) New Revision: 1130 Url: http://nuiton.org/repositories/revision/wikitty/1130 Log: - reformat pom - fix some basic code conventions (remove redundant stuff, ...) Modified: trunk/wikitty-publication/ trunk/wikitty-publication/pom.xml trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PropertiesExtended.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyFileUtil.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRaw.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.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/synchro/FileSystemWIkittyId.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronize.java Property changes on: trunk/wikitty-publication ___________________________________________________________________ Modified: svn:ignore - target *.iml *.ipr *.iws .classpath .project .settings + target *.iml *.ipr *.iws .classpath .project .settings PutObjectStoreDirHere ObjectStore Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/pom.xml 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,243 +1,253 @@ <?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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>3.2-SNAPSHOT</version> + </parent> -  -  -  +  +  +  - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-publication</artifactId> - - <properties> - <i18n.bundleOutputName>wikitty-publication</i18n.bundleOutputName> - </properties> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-publication</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> + <properties> + <i18n.bundleOutputName>wikitty-publication</i18n.bundleOutputName> + </properties> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>runtime</scope> - </dependency> + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-core</artifactId> - </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-sitemesh-plugin</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + </dependency> - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-plugin</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <scope>runtime</scope> + </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-plugin</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-struts2</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.processor</groupId> - <artifactId>nuiton-processor</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> - </dependency> - - - </dependencies> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> -  -  -  + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> - <name>Wikitty :: publication</name> + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-struts2</artifactId> + </dependency> - <description>Web publication for Wikitty</description> - <inceptionYear>2010</inceptionYear> + <dependency> + <groupId>org.nuiton.processor</groupId> + <artifactId>nuiton-processor</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> -  -  -  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>runtime</scope> + </dependency> - <packaging>war</packaging> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> - <build> + </dependencies> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>${project.build.directory}/generated-sources/models</directory> - <includes> - <include>*.objectmodel</include> - <include>*.properties</include> - </includes> - </resource> - </resources> +  +  +  - <plugins> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>${nuitonI18nVersion}</version> - <configuration> - <bundles>fr_FR,en_GB</bundles> - </configuration> - <executions> - <execution> - <id>scan-java-sources</id> - <goals> - <goal>parserJava</goal> - </goals> - </execution> - <execution> - <id>scan-jsp-sources</id> - <goals> - <goal>parserJsp</goal> - </goals> - <configuration> - <userRulesFiles> - <file>${basedir}/src/main/i18n/jsp.rules</file> - </userRulesFiles> - <namespaces> - <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> - <sx>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</sx> - <sj>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</sj> - <jsp>http://java.sun.com/JSP/Page</jsp> - </namespaces> - </configuration> - </execution> - <execution> - <id>gen-and-make-bundle</id> - <goals> - <goal>gen</goal> - <goal>bundle</goal> - </goals> - </execution> - </executions> - </plugin> + <name>Wikitty :: publication</name> - - - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <executions> - <execution> - <id>api-generation</id> - <phase>generate-sources</phase> - <configuration> - <inputs> - <input>zargo</input> - </inputs> - <fullPackagePath>org.nuiton.wikitty.publication.entities</fullPackagePath> - <defaultPackage>org.nuiton.wikitty.publication.entities</defaultPackage> - <extractedPackages>org.nuiton.wikitty.publication.entities</extractedPackages> - <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator</templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <description>Web publication for Wikitty</description> + <inceptionYear>2010</inceptionYear> - +  +  +  + + <packaging>war</packaging> + + <build> + + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory> + ${project.build.directory}/generated-sources/models + </directory> + <includes> + <include>*.objectmodel</include> + <include>*.properties</include> + </includes> + </resource> + </resources> + + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${nuitonI18nVersion}</version> + <configuration> + <bundles>fr_FR,en_GB</bundles> + </configuration> + <executions> + <execution> + <id>scan-java-sources</id> + <goals> + <goal>parserJava</goal> + </goals> + </execution> + <execution> + <id>scan-jsp-sources</id> + <goals> + <goal>parserJsp</goal> + </goals> + <configuration> + <userRulesFiles> + <file>${basedir}/src/main/i18n/jsp.rules</file> + </userRulesFiles> + <namespaces> + <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> + <sx>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd + </sx> + <sj>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd + </sj> + <jsp>http://java.sun.com/JSP/Page</jsp> + </namespaces> + </configuration> + </execution> + <execution> + <id>gen-and-make-bundle</id> + <goals> + <goal>gen</goal> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <id>api-generation</id> + <phase>generate-sources</phase> + <configuration> + <inputs> + <input>zargo</input> + </inputs> + <fullPackagePath> + org.nuiton.wikitty.publication.entities + </fullPackagePath> + <defaultPackage> + org.nuiton.wikitty.publication.entities + </defaultPackage> + <extractedPackages> + org.nuiton.wikitty.publication.entities + </extractedPackages> + <templates> + org.nuiton.wikitty.generator.WikittyMetaGenerator + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + </project> Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,16 +1,6 @@ package org.nuiton.wikitty.publication; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.WikittyException; @@ -36,8 +26,20 @@ import org.nuiton.wikitty.search.operators.Restriction; import org.nuiton.wikitty.search.operators.RestrictionName; import org.nuiton.wikitty.search.operators.True; +import org.nuiton.wikitty.storage.WikittySearchEngineInMemory; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + /** * This service must be extends by wikitty service that are over file system * directly or this kind of storage for wikitty. @@ -53,7 +55,6 @@ final static Log log = LogFactory.getLog(AbstractWikittyFileService.class); public AbstractWikittyFileService() { - super(); } /** @@ -69,7 +70,7 @@ /** * Write by jcouteau, used to check if a wikitty check a restriction * - * @see org.nuiton.wikitty.storage.WikittySearchEngineInMemory#checkRestriction + * @see WikittySearchEngineInMemory#checkRestriction * * @param restriction * the restriction @@ -257,10 +258,10 @@ switch (nullRes.getName()) { case IS_NULL: - checked = (o == null); + checked = o == null; break; case IS_NOT_NULL: - checked = (o != null); + checked = o != null; break; } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -24,10 +24,9 @@ public CodeMirrorWrapper(String servContext, String pathToCodeMirorUi, String pathToCodeMirrorModeDire) { - super(); this.servContext = servContext; this.pathToCodeMirorUi = pathToCodeMirorUi; - this.pathToCodeMirrorModeDir = pathToCodeMirorUi + pathToCodeMirrorModeDir = pathToCodeMirorUi + pathToCodeMirrorModeDire; // TODO mfortun-2011-05-30 maybe change this 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-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -24,6 +24,12 @@ */ package org.nuiton.wikitty.publication; +import org.apache.commons.collections.BidiMap; +import org.apache.commons.collections.bidimap.DualHashBidiMap; +import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.ScriptEvaluator; + +import javax.script.ScriptEngineManager; import java.io.IOException; import java.io.InputStream; import java.util.LinkedList; @@ -31,13 +37,6 @@ import java.util.Map; import java.util.Properties; -import javax.script.ScriptEngineManager; -import org.apache.commons.collections.BidiMap; -import org.apache.commons.collections.bidimap.DualHashBidiMap; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.StringUtil; -import org.nuiton.wikitty.ScriptEvaluator; - /** * Class used to determine mimetype for an extension, used to determine type of * wikittypub (data or text) with the extension and the mime type @@ -79,7 +78,7 @@ public MimeTypePubHelper() { decorator = new UiCodeDecorator(); - this.compilable = new LinkedList<String>(); + compilable = new LinkedList<String>(); bidiMap = new DualHashBidiMap(); manager = ScriptEvaluator.getScriptEnginManager(null); compilable.add("text/java"); @@ -163,7 +162,7 @@ public boolean isPubTextMime(String mimeType) { // will check if there is an engine for the mimetype - boolean result = false; + boolean result; // check if mimetype startwith the PUbtext prefix result = mimeType.startsWith(PREFIX_MIME_PUB_TEXT); Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PropertiesExtended.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PropertiesExtended.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PropertiesExtended.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -74,10 +74,8 @@ * @throws FileNotFoundException * if file not found */ - public PropertiesExtended(File origin) throws FileNotFoundException, - IOException { - super(); - this.load(origin); + public PropertiesExtended(File origin) throws IOException { + load(origin); } @@ -93,11 +91,14 @@ * @throws FileNotFoundException * if file not found */ - public void load(File file) throws FileNotFoundException, IOException { - this.origin = file; + public void load(File file) throws IOException { + origin = file; FileReader fr = new FileReader(origin); - this.load(fr); - fr.close(); + try { + load(fr); + } finally { + fr.close(); + } } /** @@ -112,9 +113,12 @@ */ public void store() throws IOException { FileWriter fs = new FileWriter(origin); - this.store(fs, ""); - fs.close(); - + try { + store(fs, ""); + } finally { + fs.close(); + } + } } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/UiCodeDecorator.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -4,9 +4,7 @@ import java.io.StringReader; import java.io.StringWriter; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.Set; import org.apache.commons.lang.StringUtils; import org.nuiton.processor.Processor; @@ -14,7 +12,6 @@ import org.nuiton.processor.filters.GeneratorTemplatesFilterIn; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.publication.entities.WikittyPubData; import org.nuiton.wikitty.publication.entities.WikittyPubText; import org.nuiton.wikitty.publication.entities.WikittyPubTextHelper; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyFileUtil.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyFileUtil.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyFileUtil.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,12 +1,12 @@ package org.nuiton.wikitty.publication; -import java.io.File; -import java.io.IOException; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; import org.nuiton.util.StringUtil; + +import java.io.File; +import java.io.IOException; /** * * Class that containt utils method when handle wikitty store as file. @@ -59,8 +59,8 @@ * Creates all the file system require from a label path in the working * directory * - * @param label - * the path string + * @param homeFile + * @param label the path string * @return if all the path was created * @throws IOException */ Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,9 +1,5 @@ package org.nuiton.wikitty.publication; -import java.io.File; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; @@ -11,6 +7,11 @@ import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyConfigOption; +import java.io.File; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + import static org.nuiton.i18n.I18n._; public class WikittyPublicationConfig { @@ -36,7 +37,7 @@ ApplicationConfig conf = new ApplicationConfig(Option.class, null, props, configFilename); try { - conf.parse(null); + conf.parse(); } catch (ArgumentsParserException e) { e.printStackTrace(); } @@ -81,7 +82,7 @@ synchronized (WikittyPublicationConfig.class) { if (!instanceMap.containsKey(context)) { instanceMap.put(context, - WikittyPublicationConfig.getConfig(context)); + getConfig(context)); } } } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,9 +1,5 @@ package org.nuiton.wikitty.publication; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; @@ -19,6 +15,11 @@ import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.services.WikittyListener; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; + /** * class meant to handle multicontext for wikitty publication. If want to use * this, you must declare in your properties file the WIKITTY_FALLBACK_FILE_KEY @@ -50,13 +51,13 @@ public WikittyPublicationFallbackService(WikittyService serv, ApplicationConfig config) throws ArgumentsParserException { - this.mainService = serv; + mainService = serv; if(config != null){ boolean isOverriding = config.getOptionAsBoolean(WIKITTY_FALLBACK_OVERRIDE); String fileName = config.getOption(WIKITTY_FALLBACK_FILE_KEY); if (fileName!=null){ - ApplicationConfig confFallBack=null; + ApplicationConfig confFallBack; if (isOverriding){ confFallBack= new ApplicationConfig(null, null,config.getFlatOptions(), fileName); @@ -456,7 +457,7 @@ */ protected Criteria idNotInCriteriaConstructor(Criteria origin, List<String> toExclude) { - Criteria result = null; + Criteria result; Search search = Search.query(origin); Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,13 +1,14 @@ package org.nuiton.wikitty.publication; -import java.io.Serializable; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.entities.WikittyUser; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import java.io.Serializable; +import java.util.Map; + public class WikittyPublicationSession implements Serializable { /** @@ -25,7 +26,7 @@ protected String securityToken = null; transient protected WikittyUser user; - transient protected WikittyPublicationProxy proxy = null; + transient protected WikittyPublicationProxy proxy; transient protected String context; public WikittyPublicationSession(String context) { Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,13 +1,6 @@ package org.nuiton.wikitty.publication.action; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; +import com.opensymphony.xwork2.ActionContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -16,10 +9,10 @@ import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.FieldType; +import org.nuiton.wikitty.entities.FieldType.TYPE; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyImpl; -import org.nuiton.wikitty.entities.FieldType.TYPE; import org.nuiton.wikitty.publication.entities.WikittyPubData; import org.nuiton.wikitty.publication.entities.WikittyPubDataHelper; import org.nuiton.wikitty.publication.entities.WikittyPubText; @@ -27,7 +20,15 @@ import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.operators.Element; -import com.opensymphony.xwork2.ActionContext; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; public class PublicationActionEdit extends PublicationBaseAction { @@ -43,8 +44,8 @@ protected WikittyProxy proxy; - protected boolean isDelete = false; - protected boolean isStore = false; + protected boolean isDelete; + protected boolean isStore; protected String wikittyId = ""; protected String version = ""; @@ -68,7 +69,7 @@ proxy = getWikittyPublicationProxy(); Map<String, Object> param = ActionContext.getContext().getParameters(); - this.formatArgs(param); + formatArgs(param); @@ -93,7 +94,7 @@ // on nous demande supprimer le wikitty, on l'efface et on // affichera un wikitty vide - String id = this.wikittyId; + String id = wikittyId; proxy.delete(id); // apres un effacement on reprend l'edition d'un tout nouveau @@ -108,9 +109,7 @@ .get(ARGS_KEY).toString(); String[] argsTab = StringUtil.split(args, SEPARATOR); - for (String arg : argsTab) { - argsString.add(arg); - } + Collections.addAll(argsString, argsTab); // recherche du Wikitty a editer ou creation d'un nouveau si // necessaire Criteria criteria = searchCriteria(argsString); @@ -127,7 +126,7 @@ if (wikitty == null && wikittyId !=null) { // c'est un nouvel objet, il n'a pas encore ete sauve, mais on // veut le faire - String id = this.wikittyId; + String id = wikittyId; wikitty = new WikittyImpl(id); } @@ -269,7 +268,7 @@ } public void setFile(File upload) { - this.uploadedFile = upload; + uploadedFile = upload; } public String getFileContentType() { @@ -298,7 +297,7 @@ public String getPostUrl() { - return this.getArgument(ARGS_KEY, "") + ".action"; + return getArgument(ARGS_KEY, "") + ".action"; } protected Map<String, Object> formatArgs(Map<String, Object> args) { Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,15 +1,6 @@ package org.nuiton.wikitty.publication.action; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.opensymphony.xwork2.ActionContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.interceptor.ServletRequestAware; @@ -30,8 +21,19 @@ import org.nuiton.wikitty.publication.externalize.AbstractDecoredClass; import org.nuiton.wikitty.publication.externalize.WikittyPublicationClassLoader; import org.nuiton.wikitty.search.Criteria; -import com.opensymphony.xwork2.ActionContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class PublicationActionEval extends PublicationBaseAction implements ServletResponseAware, ServletRequestAware, PublicationContext { @@ -49,12 +51,12 @@ @Override public void setServletResponse(HttpServletResponse arg0) { - this.response = arg0; + response = arg0; } @Override public void setServletRequest(HttpServletRequest arg0) { - this.request = arg0; + request = arg0; } @@ -220,7 +222,7 @@ } public void setMimeType(String mimeType) { - this.contentType = mimeType; + contentType = mimeType; } public HttpServletResponse getResponse() { @@ -276,9 +278,7 @@ .toString(); String[] argsTab = StringUtil.split(args, SEPARATOR); - for (String arg : argsTab) { - argsString.add(arg); - } + Collections.addAll(argsString, argsTab); return argsString; } @@ -301,7 +301,7 @@ for (String argElm : ActionContext.getContext().getParameters() .keySet()) { - result.put(argElm, this.getArgument(argElm, "")); + result.put(argElm, getArgument(argElm, "")); } return result; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRaw.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRaw.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRaw.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,11 +1,7 @@ package org.nuiton.wikitty.publication.action; -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import javax.servlet.http.HttpServletResponse; +import com.opensymphony.xwork2.ActionContext; import org.apache.struts2.interceptor.ServletResponseAware; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.Wikitty; @@ -16,7 +12,12 @@ import org.nuiton.wikitty.publication.entities.WikittyPubTextHelper; import org.nuiton.wikitty.search.Criteria; -import com.opensymphony.xwork2.ActionContext; +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; public class PublicationActionRaw extends PublicationBaseAction implements ServletResponseAware { @@ -42,9 +43,7 @@ .toString(); String[] argsTab = StringUtil.split(args, SEPARATOR); - for (String arg : argsTab) { - argsString.add(arg); - } + Collections.addAll(argsString, argsTab); Criteria criteria = searchCriteria(argsString); @@ -85,7 +84,7 @@ @Override public void setServletResponse(HttpServletResponse arg0) { - this.response = arg0; + response = arg0; } public InputStream getInputStream() { Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,8 +1,6 @@ package org.nuiton.wikitty.publication.action; -import java.util.ArrayList; -import java.util.List; - +import com.opensymphony.xwork2.ActionContext; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyLabel; @@ -10,8 +8,11 @@ import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; -import com.opensymphony.xwork2.ActionContext; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class PublicationActionView extends PublicationBaseAction { protected PagedResult<Wikitty> pagedResult; @@ -116,9 +117,7 @@ String[] argsTab = StringUtil.split(args, SEPARATOR); - for (String arg : argsTab) { - argsString.add(arg); - } + Collections.addAll(argsString, argsTab); Criteria criteriaWikitty = searchCriteria(argsString); Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,7 +1,6 @@ package org.nuiton.wikitty.publication.action; -import java.util.List; -import java.util.Map; +import com.opensymphony.xwork2.ActionContext; import org.apache.struts2.interceptor.SessionAware; import org.nuiton.web.struts2.BaseAction; import org.nuiton.wikitty.entities.WikittyLabel; @@ -11,9 +10,11 @@ import org.nuiton.wikitty.publication.entities.WikittyPubText; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.Search; -import com.opensymphony.xwork2.ActionContext; +import java.util.List; +import java.util.Map; + /** * Base action that wikitty publication will extend, needed to work within a * struts architecture. @@ -79,7 +80,7 @@ @Override public void setSession(Map<String, Object> sess) { - this.session = sess; + session = sess; } /** @@ -87,7 +88,7 @@ * nom du critere doit etre convenablement positionné avec la chaine qui a * permit la recherche * - * @param contextvar + * @param subContext * @return */ protected Criteria searchCriteria(List<String> subContext) { Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,15 +1,13 @@ package org.nuiton.wikitty.publication.action; -import java.util.List; -import java.util.Map; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyService; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.WikittyService; - /** * Interface for eval action. * @@ -18,44 +16,31 @@ */ public interface PublicationContext { - - /** - * set attributes: - * <li> req - * <li> wsContext - * <li> actionName - * <li> mandatoryArguments - * <li> arguments - * - * @param req - */ - + HttpServletRequest getRequest(); - public HttpServletRequest getRequest(); - - public HttpServletResponse getResponse(); + HttpServletResponse getResponse(); - public WikittyProxy getWikittyProxy(); + WikittyProxy getWikittyProxy(); /** * add context to the url and parameter if necessary * @param url * @return */ - public String makeUrl(String url); + String makeUrl(String url); - public WikittyService getWikittyService(); + WikittyService getWikittyService(); - public List<String> getMandatoryArguments(); + List<String> getMandatoryArguments(); - public String getArgument(String name, String defaultValue); + String getArgument(String name, String defaultValue); - public String getContentType(); + String getContentType(); - public void setContentType(String contentType); + void setContentType(String contentType); - public String toString(); + String toString(); - public abstract Map<String,String> getArguments(); + Map<String,String> getArguments(); } \ No newline at end of file Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/CompileHelper.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/CompileHelper.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/CompileHelper.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -1,27 +1,23 @@ package org.nuiton.wikitty.publication.externalize; -import static org.nuiton.i18n.I18n._; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.FileUtil; +import javax.tools.JavaCompiler; +import javax.tools.JavaFileObject; +import javax.tools.StandardJavaFileManager; +import javax.tools.ToolProvider; import java.io.File; import java.io.PrintWriter; - import java.net.URL; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Enumeration; import java.util.List; -import javax.tools.JavaCompiler; -import javax.tools.JavaFileObject; -import javax.tools.StandardJavaFileManager; - -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.FileUtil; - /** * Class reuse from the isis fish project. * @@ -122,10 +118,13 @@ /** * Compile un fichier java. * + * @param classpath * @param src * les fichiers java source * @param dest * le repertoire destination + * @param out + * @return */ protected static int compile(List<File> classpath, Collection<File> src, File dest, PrintWriter out) { @@ -133,8 +132,7 @@ int result = -1000; try { - JavaCompiler compiler = javax.tools.ToolProvider - .getSystemJavaCompiler(); + JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); // Use system compiler // JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); StandardJavaFileManager fileManager = compiler @@ -202,7 +200,7 @@ if (log.isDebugEnabled()) { log.debug("Found manifest : " + url); } - if ((url != null) && url.getFile().startsWith("file:/")) { + if (url != null && url.getFile().startsWith("file:/")) { String jarName = url.getPath().substring(5, url.getPath().indexOf("!")); if (!result.contains(jarName)) { Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/JarUtil.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/JarUtil.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/JarUtil.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -391,9 +391,8 @@ List<String> newFiles, List<String> existingFiles, FileFilter excludeFilter, String renameFrom, String renameTo) throws IOException { - JarFile jar = null; + JarFile jar = new JarFile(jarFile); try { - jar = new JarFile(jarFile); boolean findExisting = targetDir != null && targetDir.exists(); boolean filter = findExisting && excludeFilter != null; boolean rename = renameFrom != null && renameTo != null; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationClassLoader.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationClassLoader.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationClassLoader.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -23,7 +23,7 @@ int off = 0; int len = b.length; - return super.defineClass(name, b, off, len); + return defineClass(name, b, off, len); } } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/FileSystemWIkittyId.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/FileSystemWIkittyId.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/FileSystemWIkittyId.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -53,9 +53,8 @@ } public FileSystemWIkittyId(String fileName, String path) { - super(); - this.setFileName(fileName); - this.setPath(path); + setFileName(fileName); + setPath(path); } @Override @@ -63,8 +62,8 @@ final int prime = 31; int result = 1; result = prime * result - + ((fileName == null) ? 0 : fileName.hashCode()); - result = prime * result + ((path == null) ? 0 : path.hashCode()); + + (fileName == null ? 0 : fileName.hashCode()); + result = prime * result + (path == null ? 0 : path.hashCode()); return result; } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -24,21 +24,6 @@ */ package org.nuiton.wikitty.publication.synchro; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileReader; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; import org.apache.commons.collections.BidiMap; import org.apache.commons.collections.bidimap.DualHashBidiMap; import org.apache.commons.logging.Log; @@ -71,6 +56,22 @@ import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.services.WikittyListener; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + public class WikittyPublicationFileSystem extends AbstractWikittyFileService { /** to use log facility, just put in your code: log.info(\"...\"); */ @@ -161,20 +162,20 @@ public WikittyPublicationFileSystem(ApplicationConfig app) throws URISyntaxException, IOException { - this.mimeHelper = new MimeTypePubHelper(); + mimeHelper = new MimeTypePubHelper(); String url = app.getOption(WikittyConfigOption.WIKITTY_SERVER_URL .getKey()); URI uri = new URI(url); - this.homeFile = new File(uri.getPath()); + homeFile = new File(uri.getPath()); - if (homeFile == null || !homeFile.exists()) { + if (!homeFile.exists()) { File cur = FileUtil.getCurrentDirectory(); homeFile = new File(cur.getAbsolutePath()); } - this.label = uri.getFragment(); + label = uri.getFragment(); if (label == null) { label = homeFile.getName(); @@ -199,7 +200,7 @@ log.debug("Writing home property label" + propertyWikittyService.getOrigin()); propertyWikittyService.setProperty( - WikittyPublicationSynchronize.LABEL_KEY, this.label); + WikittyPublicationSynchronize.LABEL_KEY, label); } // the service use to update or commit String uriService = app @@ -220,12 +221,12 @@ if (app.getOptions().containsKey( WikittyPublicationSynchronize.IS_RECURSION_OPTION)) { - this.recursion = app + recursion = app .getOptionAsBoolean(WikittyPublicationSynchronize.IS_RECURSION_OPTION); } // TODO mfotun-2011-04-28 add a support for filtered file with a // property file - this.directoryNameBlackList = new ArrayList<String>(); + directoryNameBlackList = new ArrayList<String>(); directoryNameBlackList.add(".svn"); directoryNameBlackList.add(".git"); @@ -411,17 +412,17 @@ File wikittyParenFile = new File(path); // create the propertie directory if necessary File propertieDirectory = new File(path + File.separator - + WikittyPublicationFileSystem.PROPERTY_DIRECTORY); + + PROPERTY_DIRECTORY); if (!propertieDirectory.exists() || !propertieDirectory.isDirectory()) { propertieDirectory.mkdir(); } - String name = ""; - String extension = ""; + String name; + String extension; - File wikittyFile = null; + File wikittyFile; // construct the file differently if wikittyPubData or // wikittyPubText if (w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { @@ -471,7 +472,7 @@ // update metaProperties .setProperty( - WikittyPublicationFileSystem.META_CURRENT_LABEL, + META_CURRENT_LABEL, ourDir); metaProperties.store(); @@ -572,7 +573,7 @@ if (value != null) { FileSystemWIkittyId localisation = (FileSystemWIkittyId) value; - result.add(this.restore(wikid, localisation)); + result.add(restore(wikid, localisation)); } } @@ -738,7 +739,7 @@ && child.getName().equals(PROPERTY_DIRECTORY)) { result.add(child); } else if (child.isDirectory() && recursivly - && !this.directoryNameBlackList.contains(child.getName())) { + && !directoryNameBlackList.contains(child.getName())) { result.addAll(harvestPropertyDirectory(child, recursivly)); } } @@ -785,7 +786,7 @@ log.debug("ID:" + id + " fileInformation:" + value); - result.put((String) id, value); + result.put(id, value); } } @@ -822,7 +823,7 @@ + starts); File propertieDirectory = new File(starts.getCanonicalPath() + File.separator - + WikittyPublicationFileSystem.PROPERTY_DIRECTORY); + + PROPERTY_DIRECTORY); // load/create meta propertie file File propertieFile = new File(propertieDirectory.getCanonicalPath() @@ -883,7 +884,7 @@ // set the current label WikittyLabelHelper.addLabels(result, props - .getProperty(WikittyPublicationFileSystem.META_CURRENT_LABEL)); + .getProperty(META_CURRENT_LABEL)); // create the correct wikittypubxxx if (mimeHelper.isPubTextMime(mimeType)) { @@ -907,7 +908,7 @@ // re set the version (re set the version now allow the version to be // not altered by operation on the wikitty to restore it result.setVersion(props - .getProperty(WikittyPublicationFileSystem.META_PREFIX_KEY_VERSION + .getProperty(META_PREFIX_KEY_VERSION + completeName)); return result; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronize.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronize.java 2011-08-12 12:04:16 UTC (rev 1129) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronize.java 2011-08-12 12:16:04 UTC (rev 1130) @@ -24,15 +24,6 @@ */ package org.nuiton.wikitty.publication.synchro; -import java.io.File; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map.Entry; -import java.util.Set; - import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -53,6 +44,15 @@ import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.Search; +import java.io.File; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map.Entry; +import java.util.Set; + /** * Main class of the sync part of wikitty publication, this class is the entry * point for sync operation. Existing, delete and update. @@ -144,7 +144,7 @@ // allias for norecursion applicationConfig.addAlias("--norecursion", "--option", - WikittyPublicationSynchronize.IS_RECURSION_OPTION, "false"); + IS_RECURSION_OPTION, "false"); applicationConfig.addAlias("--delete", "--option", IS_DELETE_OPTION, "true"); @@ -569,7 +569,7 @@ String wikittyServiceInter = StringUtils.EMPTY; String wikittyServiceFileSystem = StringUtils.EMPTY; - String labelInitial = StringUtils.EMPTY; + String labelInitial; PropertiesExtended homeProperty = null; // Check number of argument switch (uriFileSystem.length) {

1 0

r1129 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action
by mfortun＠users.nuiton.org 12 Aug '11

12 Aug '11

Author: mfortun Date: 2011-08-12 14:04:16 +0200 (Fri, 12 Aug 2011) New Revision: 1129 Url: http://nuiton.org/repositories/revision/wikitty/1129 Log: *unwanted abstract key word Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java 2011-08-12 11:08:22 UTC (rev 1128) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java 2011-08-12 12:04:16 UTC (rev 1129) @@ -31,30 +31,30 @@ */ - public abstract HttpServletRequest getRequest(); + public HttpServletRequest getRequest(); - public abstract HttpServletResponse getResponse(); + public HttpServletResponse getResponse(); - public abstract WikittyProxy getWikittyProxy(); + public WikittyProxy getWikittyProxy(); /** * add context to the url and parameter if necessary * @param url * @return */ - public abstract String makeUrl(String url); + public String makeUrl(String url); - public abstract WikittyService getWikittyService(); + public WikittyService getWikittyService(); - public abstract List<String> getMandatoryArguments(); + public List<String> getMandatoryArguments(); - public abstract String getArgument(String name, String defaultValue); + public String getArgument(String name, String defaultValue); - public abstract String getContentType(); + public String getContentType(); - public abstract void setContentType(String contentType); + public void setContentType(String contentType); - public abstract String toString(); + public String toString(); public abstract Map<String,String> getArguments();

1 0

r1128 - trunk/wikitty-publication/src/main/resources
by mfortun＠users.nuiton.org 12 Aug '11

12 Aug '11

Author: mfortun Date: 2011-08-12 13:08:22 +0200 (Fri, 12 Aug 2011) New Revision: 1128 Url: http://nuiton.org/repositories/revision/wikitty/1128 Log: *restore log4j properties Modified: trunk/wikitty-publication/src/main/resources/log4j.properties Modified: trunk/wikitty-publication/src/main/resources/log4j.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/log4j.properties 2011-08-12 11:07:56 UTC (rev 1127) +++ trunk/wikitty-publication/src/main/resources/log4j.properties 2011-08-12 11:08:22 UTC (rev 1128) @@ -1,12 +1,12 @@ # Global logging configuration -#log4j.rootLogger=FATAL, stdout +log4j.rootLogger=FATAL, stdout # Console output... -#log4j.appender.stdout=org.apache.log4j.ConsoleAppender -#log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -#log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n # package level -#log4j.logger.org.nuiton.wikitty.publication=DEBUG +log4j.logger.org.nuiton.wikitty.publication=DEBUG #log4j.logger.org.nuiton.util.TimeLog=WARN -#log4j.logger.org.apache.struts2.dispatcher.mapper=DEBUG +log4j.logger.org.apache.struts2.dispatcher.mapper=DEBUG

1 0

r1127 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication java/org/nuiton/wikitty/publication/action java/org/nuiton/wikitty/publication/interceptor resources webapp/WEB-INF/jsp
by mfortun＠users.nuiton.org 12 Aug '11

12 Aug '11

Author: mfortun Date: 2011-08-12 13:07:56 +0200 (Fri, 12 Aug 2011) New Revision: 1127 Url: http://nuiton.org/repositories/revision/wikitty/1127 Log: *add new kind of url with context for application, allow to find wikittyPubText/pubData by name and label example/fall/chorem/view/wiki.action will search for wikittypub that have the name=wiki and a label starting with chorem Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogout.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/interceptor/LogoutInterceptor.java trunk/wikitty-publication/src/main/resources/log4j.properties trunk/wikitty-publication/src/main/resources/mimetype.properties trunk/wikitty-publication/src/main/resources/struts.xml trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/login.jsp trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/register.jsp Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-08-12 08:31:22 UTC (rev 1126) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-08-12 11:07:56 UTC (rev 1127) @@ -21,15 +21,15 @@ static final private String WIKITTY_PUBLICATION_SESSION_KEY = WikittyPublicationSession.class .getSimpleName(); + static final private String WIKITTY_PUBLICATION_SESSION_SEP = "_"; + protected String securityToken = null; transient protected WikittyUser user; transient protected WikittyPublicationProxy proxy = null; transient protected String context; - - public WikittyPublicationSession(String context) { - this.context=context; + this.context = context; proxy = WikittyPublicationProxy.getInstance(null, context); } @@ -38,40 +38,47 @@ * * @param session */ - static public void invalidate(Map<String, Object> session) { - session.remove(WIKITTY_PUBLICATION_SESSION_KEY); + static public void invalidate(Map<String, Object> session, + String contextData) { + session.remove(WIKITTY_PUBLICATION_SESSION_KEY + + WIKITTY_PUBLICATION_SESSION_SEP + contextData); } static public WikittyPublicationSession getWikittyPublicationSession( HttpServletRequest request, String context) { HttpSession session = request.getSession(); - WikittyPublicationSession result = getWikittyPublicationSession(session, context); + WikittyPublicationSession result = getWikittyPublicationSession( + session, context); return result; } static public WikittyPublicationSession getWikittyPublicationSession( - HttpSession httpSession, String context) { + HttpSession httpSession, String contextData) { WikittyPublicationSession result = (WikittyPublicationSession) httpSession - .getAttribute(WIKITTY_PUBLICATION_SESSION_KEY); - if (result == null || !result.getContext().equals(context)) { - result = new WikittyPublicationSession(context); - httpSession.setAttribute(WIKITTY_PUBLICATION_SESSION_KEY, result); + .getAttribute(WIKITTY_PUBLICATION_SESSION_KEY + + WIKITTY_PUBLICATION_SESSION_SEP + contextData); + if (result == null || !result.getContext().equals(contextData)) { + result = new WikittyPublicationSession(contextData); + httpSession.setAttribute(WIKITTY_PUBLICATION_SESSION_KEY + + WIKITTY_PUBLICATION_SESSION_SEP + contextData, result); } return result; } static public WikittyPublicationSession getWikittyPublicationSession( - Map<String, Object> session, String context) { + Map<String, Object> session, String contextData) { WikittyPublicationSession result = (WikittyPublicationSession) session - .get(WIKITTY_PUBLICATION_SESSION_KEY); - if (result == null || !result.getContext().equals(context)) { - result = new WikittyPublicationSession(context); - session.put(WIKITTY_PUBLICATION_SESSION_KEY, result); + .get(WIKITTY_PUBLICATION_SESSION_KEY + + WIKITTY_PUBLICATION_SESSION_SEP + contextData); + if (result == null || !result.getContext().equals(contextData)) { + result = new WikittyPublicationSession(contextData); + session.put(WIKITTY_PUBLICATION_SESSION_KEY + + WIKITTY_PUBLICATION_SESSION_SEP + contextData, result); } return result; } - public void login(String context ,String login, String password) { + public void login(String context, String login, String password) { WikittyPublicationProxy proxy = getProxy(context); proxy.login(login, password); securityToken = proxy.getSecurityToken(); @@ -87,7 +94,6 @@ } - public WikittyUser getUser() { return user; } @@ -103,6 +109,5 @@ public void setContext(String context) { this.context = context; } - - + } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-08-12 08:31:22 UTC (rev 1126) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-08-12 11:07:56 UTC (rev 1127) @@ -8,6 +8,9 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyProxy; @@ -32,7 +35,8 @@ * */ private static final long serialVersionUID = -590087371230933701L; - + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(PublicationActionEdit.class); protected Wikitty wikitty; protected HashMap<String, Object> wikittyFieldMap; @@ -83,15 +87,19 @@ } public void doAction() { - if (isDelete) { + log.info("delete requested"); + log.debug(wikitty); + // on nous demande supprimer le wikitty, on l'efface et on // affichera un wikitty vide String id = this.wikittyId; proxy.delete(id); + // apres un effacement on reprend l'edition d'un tout nouveau // wikitty wikitty = new WikittyImpl(); + wikittyId = wikitty.getId(); } else { @@ -106,8 +114,9 @@ // recherche du Wikitty a editer ou creation d'un nouveau si // necessaire Criteria criteria = searchCriteria(argsString); + //System.out.println(criteria); + if (criteria == null) { - if (criteria == null) { wikitty = new WikittyImpl(); } else { wikitty = proxy.findByCriteria(criteria); @@ -115,7 +124,7 @@ // si on ne retrouve pas le wikitty, mais qu'il vient d'etre cree // pour l'edition, on recree un wikitty avec ce meme identifiant - if (wikitty == null && "0.0".equals(version)) { + if (wikitty == null && wikittyId !=null) { // c'est un nouvel objet, il n'a pas encore ete sauve, mais on // veut le faire String id = this.wikittyId; @@ -123,11 +132,13 @@ } if (wikitty == null) { + System.out.println("ici"); // si le wikitty est null, et qu'on etait pas en edition // cela signifie qu'on ne retrouve pas le wikitty a editer // on creer un nouveau wikitty vide que l'on editera wikitty = new WikittyImpl(); } else { + System.out.println("on passe en set"); // on met a jour le wikitty avec les infos trouvees dans les // arguments @@ -234,16 +245,27 @@ } } } - } + } + + + } - + System.out.println("tehre" + isStore); if (isStore) { + log.info("store requested"); + log.debug(wikitty); // on nous demande la sauvegarde - proxy.store(wikitty); + wikitty = proxy.store(wikitty); } + } + + + + } + } public void setFile(File upload) { Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 2011-08-12 08:31:22 UTC (rev 1126) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 2011-08-12 11:07:56 UTC (rev 1127) @@ -254,7 +254,7 @@ // TODO mforun-2011-05-09 rework on this method finalUrl = getRequest().getContextPath() + "/" - + getArgument(CONTEXT_KEY, "") + finalUrl; + + getArgument(CONTEXT_DATA_KEY, "") + finalUrl; finalUrl = getResponse().encodeURL(finalUrl) + ".action"; if (log.isInfoEnabled()) { log.info(String.format("transforme url from '%s' to '%s'", url, Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogout.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogout.java 2011-08-12 08:31:22 UTC (rev 1126) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogout.java 2011-08-12 11:07:56 UTC (rev 1127) @@ -49,7 +49,7 @@ } public String execute() { - WikittyPublicationSession.invalidate(session); + WikittyPublicationSession.invalidate(session, contextData); return SUCCESS; } } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-08-12 08:31:22 UTC (rev 1126) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-08-12 11:07:56 UTC (rev 1127) @@ -5,6 +5,7 @@ import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyLabel; import org.nuiton.wikitty.publication.WikittyPublicationProxy; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; @@ -112,8 +113,7 @@ List<String> argsString = new ArrayList<String>(); String args = ActionContext.getContext().getParameters().get(ARGS_KEY) .toString(); - - + String[] argsTab = StringUtil.split(args, SEPARATOR); for (String arg : argsTab) { @@ -153,10 +153,18 @@ searchRequest = "*"; } - //wikittyResult = getWikittyPublicationProxy().restore(id); + // wikittyResult = getWikittyPublicationProxy().restore(id); + Criteria criteria; + if (contextApps != null) { + criteria = Search.query().keyword(searchRequest) + .exteq(WikittyLabel.EXT_WIKITTYLABEL) + .sw(WikittyLabel.FQ_FIELD_WIKITTYLABEL_LABELS, contextApps) + .criteria(); + } else { + // search wikitties + criteria = Search.query().keyword(searchRequest).criteria(); + } - // search wikitties - Criteria criteria = Search.query().keyword(searchRequest).criteria(); // criteria starts index at 0 so adjust search indexes criteria.setFirstIndex(first - 1); criteria.setEndIndex(end - 1); Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java 2011-08-12 08:31:22 UTC (rev 1126) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java 2011-08-12 11:07:56 UTC (rev 1127) @@ -4,6 +4,7 @@ import java.util.Map; import org.apache.struts2.interceptor.SessionAware; import org.nuiton.web.struts2.BaseAction; +import org.nuiton.wikitty.entities.WikittyLabel; import org.nuiton.wikitty.publication.WikittyPublicationProxy; import org.nuiton.wikitty.publication.WikittyPublicationSession; import org.nuiton.wikitty.publication.entities.WikittyPubData; @@ -35,22 +36,32 @@ final static protected String CONTEXT_ACTION_KEY = "action"; static public String SEPARATOR = "/"; - static public String CONTEXT_KEY = "context"; + static public String CONTEXT_DATA_KEY = "contextData"; + static public String CONTEXT_APPS_KEY = "contextApps"; static public String ARGS_KEY = "args"; protected Map<String, Object> session; - protected String context; + protected String contextData; + protected String contextApps; - public String getContext() { - return context; + public String getContextApps() { + return contextApps; } - public void setContext(String context) { - this.context = context; + public void setContextApps(String contextApps) { + this.contextApps = contextApps; } + + public String getContextData() { + return contextData; + } + + public void setContextData(String context) { + this.contextData = context; + } @@ -93,13 +104,35 @@ } else { // on a pas le champs, alors par defaut on recherche dans // WikittyPubText.name et WikittyPubData.name - result = Search - .query() - .or() - .eq(WikittyPubText.FQ_FIELD_WIKITTYPUBTEXT_NAME, - searchString) - .eq(WikittyPubData.FQ_FIELD_WIKITTYPUBDATA_NAME, - searchString).criteria(searchString); + + if (contextApps != null){ + + // Search for wikitty pubdata or pub text with the name + // and their + result = Search + .query() + .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); + + + }else{ + + result = Search + .query() + .or() + .eq(WikittyPubText.FQ_FIELD_WIKITTYPUBTEXT_NAME, + searchString) + .eq(WikittyPubData.FQ_FIELD_WIKITTYPUBDATA_NAME, + searchString).criteria(searchString); + + } + } } return result; @@ -134,7 +167,7 @@ public String getContextArgs() { return (String) ActionContext.getContext().getParameters() - .get(CONTEXT_KEY); + .get(CONTEXT_DATA_KEY); } public String getArgs() { Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/interceptor/LogoutInterceptor.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/interceptor/LogoutInterceptor.java 2011-08-12 08:31:22 UTC (rev 1126) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/interceptor/LogoutInterceptor.java 2011-08-12 11:07:56 UTC (rev 1127) @@ -25,6 +25,7 @@ import java.util.Map; +import org.nuiton.util.StringUtil; import org.nuiton.wikitty.publication.WikittyPublicationSession; import com.opensymphony.xwork2.ActionContext; @@ -41,12 +42,13 @@ */ private static final long serialVersionUID = -66045004020326043L; - - @Override - public String intercept(ActionInvocation invocation) throws Exception { + public String intercept(ActionInvocation invocation) throws Exception { Map<String, Object> session = ActionContext.getContext().getSession(); - WikittyPublicationSession.invalidate(session); + // get wikittypublication context + String contextData = StringUtil.split(invocation.getProxy() + .getActionName(), "/")[0]; + WikittyPublicationSession.invalidate(session, contextData); String result = invocation.invoke(); return result; } Modified: trunk/wikitty-publication/src/main/resources/log4j.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/log4j.properties 2011-08-12 08:31:22 UTC (rev 1126) +++ trunk/wikitty-publication/src/main/resources/log4j.properties 2011-08-12 11:07:56 UTC (rev 1127) @@ -1,12 +1,12 @@ # Global logging configuration -log4j.rootLogger=FATAL, stdout +#log4j.rootLogger=FATAL, stdout # Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n +#log4j.appender.stdout=org.apache.log4j.ConsoleAppender +#log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +#log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.org.nuiton.wikitty.publication=DEBUG +#log4j.logger.org.nuiton.wikitty.publication=DEBUG #log4j.logger.org.nuiton.util.TimeLog=WARN -log4j.logger.org.apache.struts2.dispatcher.mapper=DEBUG +#log4j.logger.org.apache.struts2.dispatcher.mapper=DEBUG Modified: trunk/wikitty-publication/src/main/resources/mimetype.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/mimetype.properties 2011-08-12 08:31:22 UTC (rev 1126) +++ trunk/wikitty-publication/src/main/resources/mimetype.properties 2011-08-12 11:07:56 UTC (rev 1127) @@ -13,4 +13,6 @@ text/html.javascript=htmljs image/jpeg=jpg image/png=png -text/java=java \ No newline at end of file +text/java=java +application/jar=jar +application/uml.jar=zargo Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-08-12 08:31:22 UTC (rev 1126) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-08-12 11:07:56 UTC (rev 1127) @@ -60,19 +60,20 @@ <package name="login" extends="loginArea"> <action name="*/register_*" method="{2}" class="org.nuiton.wikitty.publication.action.PublicationActionRegister"> - <param name="context">{1}</param> + <param name="contextData">{1}</param> <result name="input">/WEB-INF/jsp/register.jsp</result> <result type="redirect">${context}/view/.action</result> </action> <action name="*/login_*" method="{2}" class="org.nuiton.wikitty.publication.action.PublicationActionLogin"> - <param name="context">{1}</param> + <param name="contextData">{1}</param> <result name="input">/WEB-INF/jsp/login.jsp</result> <result name="success" type="redirect">${success}</result> <result name="error" type="redirect">${error}</result> </action> <action name="*/logout" class="org.nuiton.wikitty.publication.action.PublicationActionLogout"> + <param name="contextData">{1}</param> <result type="redirect">${success}</result> </action> </package> @@ -82,21 +83,21 @@ <action name="*/edit/*" class="org.nuiton.wikitty.publication.action.PublicationActionEdit"> - <param name="context">{1}</param> + <param name="contextData">{1}</param> <param name="args">{2}</param> <result>/WEB-INF/jsp/edit.jsp</result> </action> <action name="*/view/*" class="org.nuiton.wikitty.publication.action.PublicationActionView"> - <param name="context">{1}</param> + <param name="contextData">{1}</param> <param name="args">{2}</param> <result>/WEB-INF/jsp/view.jsp</result> </action> <action name="*/raw/*" class="org.nuiton.wikitty.publication.action.PublicationActionRaw"> - <param name="context">{1}</param> + <param name="contextData">{1}</param> <param name="args">{2}</param> <result type="stream"> <param name="contentType">${mimeType}</param> @@ -106,13 +107,45 @@ <action name="*/eval/*" class="org.nuiton.wikitty.publication.action.PublicationActionEval"> - <param name="context">{1}</param> + <param name="contextData">{1}</param> <param name="args">{2}</param> <result type="stream"> <param name="contentType">${contentType}</param> <param name="inputName">inputStream</param> </result> </action> + + <action name="*/*/view/*" + class="org.nuiton.wikitty.publication.action.PublicationActionView"> + <param name="contextData">{1}</param> + <param name="contextApps">{2}</param> + <param name="args">{3}</param> + <result>/WEB-INF/jsp/view.jsp</result> + </action> + + <action name="*/*/raw/*" + class="org.nuiton.wikitty.publication.action.PublicationActionRaw"> + <param name="contextData">{1}</param> + <param name="contextApps">{2}</param> + <param name="args">{3}</param> + <result type="stream"> + <param name="contentType">${mimeType}</param> + <param name="inputName">inputStream</param> + </result> + </action> + + <action name="*/*/eval/*" + class="org.nuiton.wikitty.publication.action.PublicationActionEval"> + <param name="contextData">{1}</param> + <param name="contextApps">{2}</param> + <param name="args">{3}</param> + <result type="stream"> + <param name="contentType">${contentType}</param> + <param name="inputName">inputStream</param> + </result> + </action> + + </package> <package name="fragment" namespace="/fragment" extends="publicArea"> Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-08-12 08:31:22 UTC (rev 1126) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-08-12 11:07:56 UTC (rev 1127) @@ -46,7 +46,6 @@ PublicationActionEdit action = PublicationActionEdit.getAction(); Wikitty wikitty = action.getWikitty(); -I18n.init(null, null); CodeMirrorWrapper wrapper = new CodeMirrorWrapper(request.getContextPath(),"/js/codemirror-ui/", "lib/CodeMirror-2.0/mode"); Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/login.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/login.jsp 2011-08-12 08:31:22 UTC (rev 1126) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/login.jsp 2011-08-12 11:07:56 UTC (rev 1127) @@ -21,7 +21,7 @@ } %> - <s:url var="urlLogin" action="login" namespace="/%{context}" /> + <s:url var="urlLogin" action="login" namespace="/%{contextData}" /> <s:form action="%{urlLogin}"> <p> <s:set id="publication.login.login"> Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/register.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/register.jsp 2011-08-12 08:31:22 UTC (rev 1126) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/register.jsp 2011-08-12 11:07:56 UTC (rev 1127) @@ -5,7 +5,7 @@ <h1> <s:text name="Register" /> </h1> - <s:url var="urlRegister" action="register" namespace="/%{context}" /> + <s:url var="urlRegister" action="register" namespace="/%{contextData}" /> <s:form action="%{urlRegister}"> <s:actionerror />

1 0

r1126 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org 12 Aug '11

12 Aug '11

Author: mfortun Date: 2011-08-12 10:31:22 +0200 (Fri, 12 Aug 2011) New Revision: 1126 Url: http://nuiton.org/repositories/revision/wikitty/1126 Log: *mimetype/file extension maping handled within properties file Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java 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-11 16:30:05 UTC (rev 1125) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java 2011-08-12 08:31:22 UTC (rev 1126) @@ -24,8 +24,13 @@ */ package org.nuiton.wikitty.publication; +import java.io.IOException; +import java.io.InputStream; import java.util.LinkedList; import java.util.List; +import java.util.Map; +import java.util.Properties; + import javax.script.ScriptEngineManager; import org.apache.commons.collections.BidiMap; import org.apache.commons.collections.bidimap.DualHashBidiMap; @@ -76,20 +81,25 @@ decorator = new UiCodeDecorator(); this.compilable = new LinkedList<String>(); bidiMap = new DualHashBidiMap(); - - manager = ScriptEvaluator.getScriptEnginManager(null); + compilable.add("text/java"); - // TODO mfortun-2011-08-11 need to load thos properties from the file + InputStream input = MimeTypePubHelper.class.getResourceAsStream("/mimetype.properties"); - bidiMap.put("wp", "text/javascript"); - bidiMap.put("htmljs", "text/html.javascript"); - bidiMap.put("jpg", "image/jpeg"); - bidiMap.put("png", "image/png"); - bidiMap.put("java", "text/java"); - compilable.add("application/java"); + Properties mimeProps = new Properties(); + try { + mimeProps.load(input); + + } catch (IOException e) { + // TODO mfortun-2011-08-12 handle exception ? + e.printStackTrace(); + } + for ( Map.Entry<Object, Object> en : mimeProps.entrySet()){ + bidiMap.put(en.getValue(), en.getKey()); + } + /* * * si type commence par text alors -> pubtext @@ -98,6 +108,8 @@ * * */ + + }

1 0