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

30 Aug '11

Author: tchemit Date: 2011-08-30 16:37:34 +0200 (Tue, 30 Aug 2011) New Revision: 1215 Url: http://nuiton.org/repositories/revision/wikitty/1215 Log: - add svn properties - make application releasable Modified: trunk/pom.xml trunk/wikitty-publication-ui/src/main/resources/log4j.properties trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/EvalInterface.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPropertieIndex.java trunk/wikitty-publication/src/main/resources/filters-properties/README.txt trunk/wikitty-publication/src/main/resources/filters-properties/filters-default.properties trunk/wikitty-publication/src/main/resources/filters-properties/filters-java.properties trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst trunk/wikitty-publication/src/site/doc/Outils_publication.rst trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst trunk/wikitty-publication/src/site/doc/Wikitty_Publication_war.rst trunk/wikitty-publication/src/site/doc/multicontext.png trunk/wikitty-publication/src/site/exemple/README.txt trunk/wikitty-publication/src/site/exemple/resourceAppli/pom.xml trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/resources/images/wikittypubuml.png trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/JavaView.java trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/Javahtml.htmlja trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/SelfModify.htmljs trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/Test.java trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/clearProxy.java trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/dummy.htmljs trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/resources.htmljs trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/view.htmljs trunk/wikitty-publication/src/site/exemple/resourceEntity/LICENSE.tx trunk/wikitty-publication/src/site/exemple/resourceEntity/LICENSE.txt trunk/wikitty-publication/src/site/exemple/resourceEntity/README.txt trunk/wikitty-publication/src/site/exemple/resourceEntity/changelog.txt trunk/wikitty-publication/src/site/exemple/resourceEntity/pom.xml trunk/wikitty-publication/src/site/exemple/resourceEntity/src/main/xmi/wp-resource.properties trunk/wikitty-publication/src/site/exemple/resourceEntity/src/main/xmi/wp-resource.zargo trunk/wikitty-publication/src/site/rapport/README.txt trunk/wikitty-publication/src/site/rapport/beamer/codelutinbeamer.tex trunk/wikitty-publication/src/site/rapport/image/explicationTag.graphml trunk/wikitty-publication/src/site/rapport/image/explicationTag.png trunk/wikitty-publication/src/site/rapport/image/externalize.graphml trunk/wikitty-publication/src/site/rapport/image/externalize.png trunk/wikitty-publication/src/site/rapport/image/graphDistrib.graphml trunk/wikitty-publication/src/site/rapport/image/graphDistrib.png trunk/wikitty-publication/src/site/rapport/image/graphestrutstaglib.graphml trunk/wikitty-publication/src/site/rapport/image/howtoopen graphml.txt trunk/wikitty-publication/src/site/rapport/image/logofac.png trunk/wikitty-publication/src/site/rapport/image/logolutin.png trunk/wikitty-publication/src/site/rapport/image/multicontext.graphml trunk/wikitty-publication/src/site/rapport/image/multicontext.png trunk/wikitty-publication/src/site/rapport/image/pileService.graphml trunk/wikitty-publication/src/site/rapport/image/pileService.png trunk/wikitty-publication/src/site/rapport/image/propertiescontext.graphml trunk/wikitty-publication/src/site/rapport/image/propertiescontext.png trunk/wikitty-publication/src/site/rapport/image/schema_wikitty_architecture.svg trunk/wikitty-publication/src/site/rapport/image/strutsexplain.graphml trunk/wikitty-publication/src/site/rapport/image/strutsexplain.png trunk/wikitty-publication/src/site/rapport/image/wikittypubuml.png trunk/wikitty-publication/src/site/rapport/part/annexes.tex trunk/wikitty-publication/src/site/rapport/part/codelutin.tex trunk/wikitty-publication/src/site/rapport/part/conclusion.tex trunk/wikitty-publication/src/site/rapport/part/introduction.tex trunk/wikitty-publication/src/site/rapport/part/organisation.tex trunk/wikitty-publication/src/site/rapport/part/remerciement.tex trunk/wikitty-publication/src/site/rapport/part/resume.tex trunk/wikitty-publication/src/site/rapport/part/wikitty.tex trunk/wikitty-publication/src/site/rapport/part/wikittymavenplugin.tex trunk/wikitty-publication/src/site/rapport/part/wikittypublication.tex trunk/wikitty-publication/src/site/rapport/part/wikittypublicationexternalize.tex trunk/wikitty-publication/src/site/rapport/part/wikittypublicationsite.tex trunk/wikitty-publication/src/site/rapport/part/wikittypublicationsync.tex trunk/wikitty-publication/src/site/rapport/part/wikittystruts.tex trunk/wikitty-publication/src/site/rapport/rapportMain.tex trunk/wikitty-publication/src/site/rapport/rapport_stage_FORTUN_Manoel_2010-2011.pdf trunk/wikitty-publication/src/site/rapport/ressources/planningprev.ods trunk/wikitty-publication/src/site/rapport/ressources/planningprev2.ods trunk/wikitty-publication/src/site/rapport/ressources/planningprev2.pdf trunk/wikitty-publication/src/site/rapport/ressources/pom.xml trunk/wikitty-publication/src/site/rapport/stage-sujet-2011-wikitty-publication lutin.pdf trunk/wikitty-publication/src/test/resources/wikitty-publication-ws-test.properties trunk/wp-maven-plugin/pom.xml trunk/wp-maven-plugin/src/it/deploy-jar/file/invoker.properties trunk/wp-maven-plugin/src/it/deploy-jar/file/pom.xml trunk/wp-maven-plugin/src/it/deploy-jar/file/verify.groovy trunk/wp-maven-plugin/src/it/settings.xml trunk/wp-maven-plugin/src/license/THIRD-PARTY.properties trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/AbstractWPLoadDependencyMojo.java trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/AbstractWPMojo.java trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/CopyDependencyUtil.java trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/JettyUtil.java trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPCleanMojo.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/log4j.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/pom.xml 2011-08-30 14:37:34 UTC (rev 1215) @@ -1,5 +1,7 @@ <?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> @@ -181,14 +183,14 @@ <version>${nuitonUtilsVersion}</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-struts2</artifactId> <version>${nuiton-struts2}</version> </dependency> - + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> @@ -196,11 +198,11 @@ <scope>compile</scope> </dependency> - <dependency> - <groupId>org.nuiton.processor</groupId> - <artifactId>nuiton-processor</artifactId> - <version>${nuitonProcessessorVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.processor</groupId> + <artifactId>nuiton-processor</artifactId> + <version>${nuitonProcessessorVersion}</version> + </dependency> <dependency> <groupId>xpp3</groupId> @@ -222,96 +224,96 @@ <version>4.15.1.Final</version> <scope>compile</scope> <exclusions> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - <exclusion> - <artifactId>jcl-over-slf4j</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-server-manager</artifactId> - <groupId>org.jboss.jbossas</groupId> - </exclusion> - <exclusion> - <artifactId>commons-httpclient</artifactId> - <groupId>commons-httpclient</groupId> - </exclusion> - <exclusion> - <artifactId>emma</artifactId> - <groupId>emma</groupId> - </exclusion> - <exclusion> - <artifactId>emma_ant</artifactId> - <groupId>emma</groupId> - </exclusion> - <exclusion> - <artifactId>jbossws-common</artifactId> - <groupId>org.jboss.ws</groupId> - </exclusion> - <exclusion> - <artifactId>jacorb</artifactId> - <groupId>jacorb</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-ejb-api_3.1_spec</artifactId> - <groupId>org.jboss.spec.javax.ejb</groupId> - </exclusion> - <exclusion> - <artifactId>idl</artifactId> - <groupId>jacorb</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-corba-ots-spi</artifactId> - <groupId>org.jboss.integration</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-remoting</artifactId> - <groupId>org.jboss.remoting</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-servlet-api_3.0_spec</artifactId> - <groupId>org.jboss.spec.javax.servlet</groupId> - </exclusion> - <exclusion> - <artifactId>ironjacamar-spec-api</artifactId> - <groupId>org.jboss.ironjacamar</groupId> - </exclusion> - <exclusion> - <artifactId>netty</artifactId> - <groupId>org.jboss.netty</groupId> - </exclusion> - <exclusion> - <artifactId>dom4j</artifactId> - <groupId>dom4j</groupId> - </exclusion> - <exclusion> - <artifactId>hornetq-core</artifactId> - <groupId>org.hornetq</groupId> - </exclusion> - <exclusion> - <artifactId>wrapper</artifactId> - <groupId>tanukisoft</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-logging-generator</artifactId> - <groupId>org.jboss.logging</groupId> - </exclusion> - <exclusion> - <artifactId>hibernate-jpa-2.0-api</artifactId> - <groupId>org.hibernate.javax.persistence</groupId> - </exclusion> - <exclusion> - <artifactId>jboss-logging-processor</artifactId> - <groupId>org.jboss.logging</groupId> - </exclusion> - <exclusion> - <artifactId> - jboss-transaction-api_1.1_spec - </artifactId> - <groupId>org.jboss.spec.javax.transaction</groupId> - </exclusion> + <exclusion> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + </exclusion> + <exclusion> + <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-server-manager</artifactId> + <groupId>org.jboss.jbossas</groupId> + </exclusion> + <exclusion> + <artifactId>commons-httpclient</artifactId> + <groupId>commons-httpclient</groupId> + </exclusion> + <exclusion> + <artifactId>emma</artifactId> + <groupId>emma</groupId> + </exclusion> + <exclusion> + <artifactId>emma_ant</artifactId> + <groupId>emma</groupId> + </exclusion> + <exclusion> + <artifactId>jbossws-common</artifactId> + <groupId>org.jboss.ws</groupId> + </exclusion> + <exclusion> + <artifactId>jacorb</artifactId> + <groupId>jacorb</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-ejb-api_3.1_spec</artifactId> + <groupId>org.jboss.spec.javax.ejb</groupId> + </exclusion> + <exclusion> + <artifactId>idl</artifactId> + <groupId>jacorb</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-corba-ots-spi</artifactId> + <groupId>org.jboss.integration</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-remoting</artifactId> + <groupId>org.jboss.remoting</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <groupId>org.jboss.spec.javax.servlet</groupId> + </exclusion> + <exclusion> + <artifactId>ironjacamar-spec-api</artifactId> + <groupId>org.jboss.ironjacamar</groupId> + </exclusion> + <exclusion> + <artifactId>netty</artifactId> + <groupId>org.jboss.netty</groupId> + </exclusion> + <exclusion> + <artifactId>dom4j</artifactId> + <groupId>dom4j</groupId> + </exclusion> + <exclusion> + <artifactId>hornetq-core</artifactId> + <groupId>org.hornetq</groupId> + </exclusion> + <exclusion> + <artifactId>wrapper</artifactId> + <groupId>tanukisoft</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-logging-generator</artifactId> + <groupId>org.jboss.logging</groupId> + </exclusion> + <exclusion> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <groupId>org.hibernate.javax.persistence</groupId> + </exclusion> + <exclusion> + <artifactId>jboss-logging-processor</artifactId> + <groupId>org.jboss.logging</groupId> + </exclusion> + <exclusion> + <artifactId> + jboss-transaction-api_1.1_spec + </artifactId> + <groupId>org.jboss.spec.javax.transaction</groupId> + </exclusion> </exclusions> </dependency> @@ -349,7 +351,7 @@ <artifactId>struts2-jquery-plugin</artifactId> <version>${struts2jqueryVersion}</version> </dependency> - + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> @@ -361,22 +363,22 @@ <artifactId>struts2-sitemesh-plugin</artifactId> <version>${struts2Version}</version> <scope>runtime</scope> - </dependency> - + </dependency> + <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> <version>${javassistVersion}</version> <scope>runtime</scope> </dependency> - + <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> <version>${struts2Version}</version> - </dependency> - - + </dependency> + + <dependency> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> @@ -388,19 +390,177 @@ <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> <version>${jettyPluginVersion}</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <version>${dependencyPluginVersion}</version> + <exclusions> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-site-renderer</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-impl</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-sink-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-logging-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-apt</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-xhtml</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-xdoc</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-site-renderer</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-decoration-model</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-exec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-doxia-tools</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-archiver</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-velocity</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-i18n</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + <exclusion> + <groupId>classworlds</groupId> + <artifactId>classworlds</artifactId> + </exclusion> + </exclusions> </dependency> + + <dependency> + <groupId>org.sonatype.sisu</groupId> + <artifactId>sisu-inject-plexus</artifactId> + <version>2.1.1</version> + <scope>provided</scope> + </dependency> <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + <version>1.0-alpha-9-stable-1</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>classworlds</groupId> + <artifactId>classworlds</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> <version>${sitePluginVersion}</version> - </dependency> + <exclusions> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-sink-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-logging-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-apt</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-xhtml</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-fml</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-xdoc</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-site-renderer</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-decoration-model</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-exec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-doxia-tools</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-velocity</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-i18n</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + </exclusion> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -520,11 +680,51 @@ </dependency> <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact-manager</artifactId> + <version>${mavenVersion}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-common-artifact-filters</artifactId> + <version>1.2</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>${maven3Version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings-builder</artifactId> + <version>${maven3Version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-provider-api</artifactId> + <scope>compile</scope> + <version>1.0</version> + </dependency> + + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> <version>1.5.15</version> </dependency> - + </dependencies> </dependencyManagement> @@ -648,7 +848,7 @@ <role>Developer</role> </roles> </developer> - + <developer> <name>Manoel Fortun</name> <id>mfortun</id> @@ -694,6 +894,8 @@ <platform>nuiton.org</platform> <projectId>wikitty</projectId> + <maven3Version>3.0.3</maven3Version> +  <eugeneVersion>2.3.5</eugeneVersion> <nuitonUtilsVersion>2.2</nuitonUtilsVersion> @@ -704,7 +906,7 @@ <struts2Version>2.2.3</struts2Version> <javassistVersion>3.8.0.GA</javassistVersion> <jspapiversion>2.1</jspapiversion> - + <nuitonProcessessorVersion>1.2.2</nuitonProcessessorVersion> <nuiton-struts2>1.3</nuiton-struts2>  @@ -745,9 +947,9 @@ <version>${eugeneVersion}</version> <dependencies> <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-generators</artifactId> - <version>${project.version}</version> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-generators</artifactId> + <version>${project.version}</version> </dependency> </dependencies> </plugin> Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/EvalInterface.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPropertieIndex.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/main/resources/filters-properties/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/main/resources/filters-properties/filters-default.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/main/resources/filters-properties/filters-java.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/doc/Outils_publication.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/doc/Wikitty_Publication_war.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/doc/multicontext.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/site/exemple/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/exemple/resourceAppli/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/resources/images/wikittypubuml.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/JavaView.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/Javahtml.htmlja ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/SelfModify.htmljs ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/Test.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/clearProxy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/dummy.htmljs ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/resources.htmljs ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/view.htmljs ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/exemple/resourceEntity/LICENSE.tx ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/exemple/resourceEntity/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/exemple/resourceEntity/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/exemple/resourceEntity/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/exemple/resourceEntity/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/wikitty-publication/src/site/exemple/resourceEntity/src/main/xmi/wp-resource.properties =================================================================== --- trunk/wikitty-publication/src/site/exemple/resourceEntity/src/main/xmi/wp-resource.properties 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wikitty-publication/src/site/exemple/resourceEntity/src/main/xmi/wp-resource.properties 2011-08-30 14:37:34 UTC (rev 1215) @@ -2,8 +2,8 @@ # #%L # Wikitty :: api # -# $Id: wikitty-publication.properties 1136 2011-08-12 14:24:03Z tchemit $ -# $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-publication/src/main/xmi/wi… $ +# $Id$ +# $HeadURL$ # %% # Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin # %% Property changes on: trunk/wikitty-publication/src/site/exemple/resourceEntity/src/main/xmi/wp-resource.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/exemple/resourceEntity/src/main/xmi/wp-resource.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/site/rapport/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/wikitty-publication/src/site/rapport/beamer/codelutinbeamer.tex =================================================================== --- trunk/wikitty-publication/src/site/rapport/beamer/codelutinbeamer.tex 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wikitty-publication/src/site/rapport/beamer/codelutinbeamer.tex 2011-08-30 14:37:34 UTC (rev 1215) @@ -1,261 +1,261 @@ -% This text is proprietary. -% It's a part of presentation made by myself. -% It may not used commercial. -% The noncommercial use such as private and study is free -% Dec 2007 -% Author: Sascha Frank -% University Freiburg -% www.informatik.uni-freiburg.de/~frank/ -% -% - -\documentclass[12pt,a4paper,utf8x]{beamer} -\setbeamertemplate{navigation symbols}{} - -\usepackage [frenchb]{babel} -\usepackage{color} -% Pour pouvoir utiliser -\usepackage{ucs} -\usepackage[utf8x]{inputenc} - -\usepackage{amsmath} - -\usetheme{Marburg} - -\addtobeamertemplate{footline}{\hfill\insertframenumber/\inserttotalframenumber} - -\beamersetuncovermixins{\opaqueness<1>{25}}{\opaqueness<2->{15}} -\begin{document} -\title{Wikitty Publication} -\author{Manoël Fortun} - -\begin{frame} -\titlepage -\end{frame} - -\begin{frame}\tableofcontents -\end{frame} - - -\section{Wikitty} -\subsection{C'est quoi ?} -\begin{frame}\frametitle{C'est quoi ?} -\begin{itemize} -\item Base de données orientées document. -\item Clé $\to$ Valeur -\item Des extensions -\item Entités générées grace à un modèle UML -\item champ nommé: WikittyPubText.name -\end{itemize} -\end{frame} - -\subsection{Wikitty Service} -\begin{frame} \frametitle{Wikitty Service} -\begin{itemize} -\item Restauration -\item Sauvegarde -\item Recherche -\item Configuré par fichier de propriétés -\item "Complexité" de la base masqué -\end{itemize} -\end{frame} - - -\section{Scripting - JSR 223} -\subsection{Pardon ?} -\begin{frame}\frametitle{Pardon ?} -Concept très simple, la possibilité d'intrepréter un langage de script dans un -autre langage.\\ - -Par exemple, interpréter et éxécuter du \emph{javascript} dans du \emph{java}. -\end{frame} -\subsection{Bindings} -\begin{frame}\frametitle{Bindings} - -Très important: -\begin{itemize} -\item Langage de script peut utiliser le langage qui l'interprète -\item Donc insérer du java dans du javascript -\item Méthode, Objets -\item Map$\textless$String, Object$\textgreater$ -\end{itemize} -\end{frame} - - -\section{Wikitty Publication} -\subsection{Pourquoi faire ?} -\begin{frame}\frametitle{Pourquoi faire ?} -\begin{itemize} -\item Utilise le concept du scripting -\item Intégre un moteur d'évaluation de script -\item Script stocké sous forme de Wikitty -\item Wikitty Service en binding -\item Moteur de script en binding -\item WikittyPubText -\item WikittyPubData -\end{itemize} - -\end{frame} - -\subsection{Nouveau type de wikitty service} -\begin{frame}\frametitle{Nouveau type de wikitty service} -\begin{itemize} -\item wikitty service sur système de fichier -\item wikitty service sur jar -\item wikitty service fallback\pause -\end{itemize}\pause - -\begin{figure} -\includegraphics[scale=0.5]{../image/multicontext.png} -\caption{Service avec fallback} -\end{figure} -\end{frame} - - -\subsection{Nouvelles Fonctionnalités} -\subsubsection*{Synchronisation entre service} -\begin{frame}\frametitle{Synchronisation entre service} -\begin{itemize} -\item Transférer des wikitty d'un service à un autre -\item Basé sur les labels -\item Mise à jour -\item "Suppression" -\item "Déplacement" de wikitty -\end{itemize} -\pause -Exemple de label : -\verb!org.nuiton.wikitty! -\end{frame} - -\begin{frame} -Exemple de synchronisation: -\begin{itemize} -\item cajo://localhost:1111\#com -\item cajo://wwikitty.nuiton.org:2222\#org -\end{itemize} - -Les wikitty sous le label \verb!com! contenu sur le premier service vont -être envoyé sur le second service sous le label org.\\ - -Le label \verb!com.nuiton.wikitty! deviendra \verb!org.nuiton.wikitty! sur -le second service.\\ -\end{frame} - -\subsubsection*{Externalisation} -\begin{frame}\frametitle{Externalisation} -\begin{itemize} -\item "Fixer" les wikitty -\item Compiler les scripts -\item Création d'un jar -\item WikittyPubTextCompiled -\end{itemize} -\end{frame} - -\subsubsection*{Migration vers struts} -\begin{frame}\frametitle{Migration vers struts} -\begin{itemize} -\item Migration depuis une application en jsp "classic/simple" -\item Mécanisme de login/logout -\item action struts/interceptor -\item support struts pour les sessions etc -\end{itemize} -\end{frame} - - - - -\subsubsection*{Moteur d'évaluation} -\begin{frame}\frametitle{Moteur d'évaluation} - -Moteur d'évaluation dans un navigateur à l'adresse:\\ -\verb!/[contextData]/[contextApps]/eval/[mandatory]! - -\begin{itemize} -\item mandatory pour retrouver le wikitty correspondant -\item eval, c'est le nom de l'action -\item contextApps, pour ne pas se tromper de wikitty. -\item contextData, pour trouver le bon wikitty service -\end{itemize} - - - -\end{frame} - -\begin{frame}\frametitle{Moteur d'évaluation} - -Comment ça marche contextData: - -\begin{figure} -\includegraphics[scale=0.5]{../image/propertiescontext.png} -\caption{Surcharge des propriétés} -\end{figure} - -\end{frame} - -\begin{frame}\frametitle{Moteur d'évaluation} -Le mime type des WikittyPub détermine le traitement effectué. -\begin{itemize} -\item text/javascript, passera par l'évaluateur de javascript -\item image/png, renvoyé tel quel en mettant le bon type mime dans la réponse -pour interprétation du navigateur -\item text/html.javascript, passera par un décorateur pour transformer le contenu -en text/javascript pour interprétation -\item text/java, sera compilé pour évaluation -\end{itemize} -\end{frame} - -\begin{frame}\frametitle{Moteur d'évaluation} - -Exemple: -\verb!codelutin/chorem/eval/Menu! - -On va "évaluer" le wikittyPub qui possède le nom "Menu" avec un label qui -commence par "chorem" et qui se trouve dans le service correspondant à Code Lutin. -Le rendu sera déterminé par le mime Type du wikittyPub correspondant. -\end{frame} - - - - - -\section{Wikitty Struts} -\begin{frame}\frametitle{Wikitty Struts} -Création d'une Tag lib struts pour une intégration facilité de wikitty dans des -formulaire. -Deux possibilités d'utilisation -\begin{itemize} -\item Formulaire d'édition de wikitty, avec action pré-construite -\item Intégration des champs de wikitty dans un formulaire, avec choix de la forme -de l'affichage en fonction du tag utilisé. -\end{itemize} - -\end{frame} - - -\section{Plugin Maven} -\subsection{Un plugin?!} -\begin{frame}\frametitle{Un plugin?!} -\begin{itemize} -\item Motivation: Plus simple pour l'utilisateur -\item Clés en mains -\item Intègre de façon ciblée les fonctionnalités (externalize-synchronize) -\end{itemize} -%pom exemple -%liste des goals -\end{frame} - -\subsection{Les goals} -\begin{frame}\frametitle{Les goals} -\begin{itemize} -\item wp:init -\item wp:run -\item wp:deploy -\item wp:update -\item wp:jar -\item wp:jar-deploy -\end{itemize} - -\end{frame} - - -\end{document} +% This text is proprietary. +% It's a part of presentation made by myself. +% It may not used commercial. +% The noncommercial use such as private and study is free +% Dec 2007 +% Author: Sascha Frank +% University Freiburg +% www.informatik.uni-freiburg.de/~frank/ +% +% + +\documentclass[12pt,a4paper,utf8x]{beamer} +\setbeamertemplate{navigation symbols}{} + +\usepackage [frenchb]{babel} +\usepackage{color} +% Pour pouvoir utiliser +\usepackage{ucs} +\usepackage[utf8x]{inputenc} + +\usepackage{amsmath} + +\usetheme{Marburg} + +\addtobeamertemplate{footline}{\hfill\insertframenumber/\inserttotalframenumber} + +\beamersetuncovermixins{\opaqueness<1>{25}}{\opaqueness<2->{15}} +\begin{document} +\title{Wikitty Publication} +\author{Manoël Fortun} + +\begin{frame} +\titlepage +\end{frame} + +\begin{frame}\tableofcontents +\end{frame} + + +\section{Wikitty} +\subsection{C'est quoi ?} +\begin{frame}\frametitle{C'est quoi ?} +\begin{itemize} +\item Base de données orientées document. +\item Clé $\to$ Valeur +\item Des extensions +\item Entités générées grace à un modèle UML +\item champ nommé: WikittyPubText.name +\end{itemize} +\end{frame} + +\subsection{Wikitty Service} +\begin{frame} \frametitle{Wikitty Service} +\begin{itemize} +\item Restauration +\item Sauvegarde +\item Recherche +\item Configuré par fichier de propriétés +\item "Complexité" de la base masqué +\end{itemize} +\end{frame} + + +\section{Scripting - JSR 223} +\subsection{Pardon ?} +\begin{frame}\frametitle{Pardon ?} +Concept très simple, la possibilité d'intrepréter un langage de script dans un +autre langage.\\ + +Par exemple, interpréter et éxécuter du \emph{javascript} dans du \emph{java}. +\end{frame} +\subsection{Bindings} +\begin{frame}\frametitle{Bindings} + +Très important: +\begin{itemize} +\item Langage de script peut utiliser le langage qui l'interprète +\item Donc insérer du java dans du javascript +\item Méthode, Objets +\item Map$\textless$String, Object$\textgreater$ +\end{itemize} +\end{frame} + + +\section{Wikitty Publication} +\subsection{Pourquoi faire ?} +\begin{frame}\frametitle{Pourquoi faire ?} +\begin{itemize} +\item Utilise le concept du scripting +\item Intégre un moteur d'évaluation de script +\item Script stocké sous forme de Wikitty +\item Wikitty Service en binding +\item Moteur de script en binding +\item WikittyPubText +\item WikittyPubData +\end{itemize} + +\end{frame} + +\subsection{Nouveau type de wikitty service} +\begin{frame}\frametitle{Nouveau type de wikitty service} +\begin{itemize} +\item wikitty service sur système de fichier +\item wikitty service sur jar +\item wikitty service fallback\pause +\end{itemize}\pause + +\begin{figure} +\includegraphics[scale=0.5]{../image/multicontext.png} +\caption{Service avec fallback} +\end{figure} +\end{frame} + + +\subsection{Nouvelles Fonctionnalités} +\subsubsection*{Synchronisation entre service} +\begin{frame}\frametitle{Synchronisation entre service} +\begin{itemize} +\item Transférer des wikitty d'un service à un autre +\item Basé sur les labels +\item Mise à jour +\item "Suppression" +\item "Déplacement" de wikitty +\end{itemize} +\pause +Exemple de label : +\verb!org.nuiton.wikitty! +\end{frame} + +\begin{frame} +Exemple de synchronisation: +\begin{itemize} +\item cajo://localhost:1111\#com +\item cajo://wwikitty.nuiton.org:2222\#org +\end{itemize} + +Les wikitty sous le label \verb!com! contenu sur le premier service vont +être envoyé sur le second service sous le label org.\\ + +Le label \verb!com.nuiton.wikitty! deviendra \verb!org.nuiton.wikitty! sur +le second service.\\ +\end{frame} + +\subsubsection*{Externalisation} +\begin{frame}\frametitle{Externalisation} +\begin{itemize} +\item "Fixer" les wikitty +\item Compiler les scripts +\item Création d'un jar +\item WikittyPubTextCompiled +\end{itemize} +\end{frame} + +\subsubsection*{Migration vers struts} +\begin{frame}\frametitle{Migration vers struts} +\begin{itemize} +\item Migration depuis une application en jsp "classic/simple" +\item Mécanisme de login/logout +\item action struts/interceptor +\item support struts pour les sessions etc +\end{itemize} +\end{frame} + + + + +\subsubsection*{Moteur d'évaluation} +\begin{frame}\frametitle{Moteur d'évaluation} + +Moteur d'évaluation dans un navigateur à l'adresse:\\ +\verb!/[contextData]/[contextApps]/eval/[mandatory]! + +\begin{itemize} +\item mandatory pour retrouver le wikitty correspondant +\item eval, c'est le nom de l'action +\item contextApps, pour ne pas se tromper de wikitty. +\item contextData, pour trouver le bon wikitty service +\end{itemize} + + + +\end{frame} + +\begin{frame}\frametitle{Moteur d'évaluation} + +Comment ça marche contextData: + +\begin{figure} +\includegraphics[scale=0.5]{../image/propertiescontext.png} +\caption{Surcharge des propriétés} +\end{figure} + +\end{frame} + +\begin{frame}\frametitle{Moteur d'évaluation} +Le mime type des WikittyPub détermine le traitement effectué. +\begin{itemize} +\item text/javascript, passera par l'évaluateur de javascript +\item image/png, renvoyé tel quel en mettant le bon type mime dans la réponse +pour interprétation du navigateur +\item text/html.javascript, passera par un décorateur pour transformer le contenu +en text/javascript pour interprétation +\item text/java, sera compilé pour évaluation +\end{itemize} +\end{frame} + +\begin{frame}\frametitle{Moteur d'évaluation} + +Exemple: +\verb!codelutin/chorem/eval/Menu! + +On va "évaluer" le wikittyPub qui possède le nom "Menu" avec un label qui +commence par "chorem" et qui se trouve dans le service correspondant à Code Lutin. +Le rendu sera déterminé par le mime Type du wikittyPub correspondant. +\end{frame} + + + + + +\section{Wikitty Struts} +\begin{frame}\frametitle{Wikitty Struts} +Création d'une Tag lib struts pour une intégration facilité de wikitty dans des +formulaire. +Deux possibilités d'utilisation +\begin{itemize} +\item Formulaire d'édition de wikitty, avec action pré-construite +\item Intégration des champs de wikitty dans un formulaire, avec choix de la forme +de l'affichage en fonction du tag utilisé. +\end{itemize} + +\end{frame} + + +\section{Plugin Maven} +\subsection{Un plugin?!} +\begin{frame}\frametitle{Un plugin?!} +\begin{itemize} +\item Motivation: Plus simple pour l'utilisateur +\item Clés en mains +\item Intègre de façon ciblée les fonctionnalités (externalize-synchronize) +\end{itemize} +%pom exemple +%liste des goals +\end{frame} + +\subsection{Les goals} +\begin{frame}\frametitle{Les goals} +\begin{itemize} +\item wp:init +\item wp:run +\item wp:deploy +\item wp:update +\item wp:jar +\item wp:jar-deploy +\end{itemize} + +\end{frame} + + +\end{document} Property changes on: trunk/wikitty-publication/src/site/rapport/beamer/codelutinbeamer.tex ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/image/explicationTag.graphml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/image/explicationTag.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/site/rapport/image/externalize.graphml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/image/externalize.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/site/rapport/image/graphDistrib.graphml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/image/graphDistrib.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/site/rapport/image/graphestrutstaglib.graphml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/image/howtoopen graphml.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/image/logofac.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/site/rapport/image/logolutin.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/site/rapport/image/multicontext.graphml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/image/multicontext.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/site/rapport/image/pileService.graphml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/image/pileService.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/site/rapport/image/propertiescontext.graphml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/image/propertiescontext.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/site/rapport/image/schema_wikitty_architecture.svg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/image/strutsexplain.graphml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/image/strutsexplain.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/site/rapport/image/wikittypubuml.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/site/rapport/part/annexes.tex ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/part/codelutin.tex ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/part/conclusion.tex ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/part/introduction.tex ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/part/organisation.tex ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/part/remerciement.tex ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/part/resume.tex ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/part/wikitty.tex ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/part/wikittymavenplugin.tex ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/part/wikittypublication.tex ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/part/wikittypublicationexternalize.tex ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/part/wikittypublicationsite.tex ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/part/wikittypublicationsync.tex ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/part/wikittystruts.tex ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/rapportMain.tex ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/rapport_stage_FORTUN_Manoel_2010-2011.pdf ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/site/rapport/ressources/planningprev.ods ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/site/rapport/ressources/planningprev2.ods ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/site/rapport/ressources/planningprev2.pdf ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/site/rapport/ressources/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication/src/site/rapport/stage-sujet-2011-wikitty-publication lutin.pdf ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-publication/src/test/resources/wikitty-publication-ws-test.properties =================================================================== --- trunk/wikitty-publication/src/test/resources/wikitty-publication-ws-test.properties 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wikitty-publication/src/test/resources/wikitty-publication-ws-test.properties 2011-08-30 14:37:34 UTC (rev 1215) @@ -2,8 +2,8 @@ # #%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… $ +# $Id$ +# $HeadURL$ # %% # Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin # %% Property changes on: trunk/wikitty-publication/src/test/resources/wikitty-publication-ws-test.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/wikitty-publication-ui/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/wp-maven-plugin/pom.xml =================================================================== --- trunk/wp-maven-plugin/pom.xml 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wp-maven-plugin/pom.xml 2011-08-30 14:37:34 UTC (rev 1215) @@ -47,6 +47,12 @@ <dependency> <groupId>${project.groupId}</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>wikitty-publication</artifactId> <version>${project.version}</version> </dependency> @@ -62,7 +68,59 @@ </dependency> <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact-manager</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings-builder</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-common-artifact-filters</artifactId> + </dependency> + + <dependency> <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.sonatype.sisu</groupId> + <artifactId>sisu-inject-plexus</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-provider-api</artifactId> + </dependency> + + <dependency> + <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> </dependency> @@ -72,26 +130,41 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <scope>runtime</scope> </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> </dependency> <dependency> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - </dependency> - + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-xml</artifactId> + </dependency> + <dependency> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - </dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </dependency> + </dependencies>  Modified: trunk/wp-maven-plugin/src/it/deploy-jar/file/invoker.properties =================================================================== --- trunk/wp-maven-plugin/src/it/deploy-jar/file/invoker.properties 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wp-maven-plugin/src/it/deploy-jar/file/invoker.properties 2011-08-30 14:37:34 UTC (rev 1215) @@ -1,3 +1,27 @@ +### +# #%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% +### # A comma or space separated list of goals/phases to execute, may # specify an empty list to execute the default goal of the IT project Property changes on: trunk/wp-maven-plugin/src/it/deploy-jar/file/invoker.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/wp-maven-plugin/src/it/deploy-jar/file/pom.xml =================================================================== --- trunk/wp-maven-plugin/src/it/deploy-jar/file/pom.xml 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wp-maven-plugin/src/it/deploy-jar/file/pom.xml 2011-08-30 14:37:34 UTC (rev 1215) @@ -1,6 +1,31 @@ <?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/maven-v4_0_0.xsd"> Property changes on: trunk/wp-maven-plugin/src/it/deploy-jar/file/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/wp-maven-plugin/src/it/deploy-jar/file/verify.groovy =================================================================== --- trunk/wp-maven-plugin/src/it/deploy-jar/file/verify.groovy 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wp-maven-plugin/src/it/deploy-jar/file/verify.groovy 2011-08-30 14:37:34 UTC (rev 1215) @@ -1,3 +1,27 @@ +/* + * #%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% + */ file = new File(basedir, 'target/remote/deploy-jar-file-1.0.jar'); Property changes on: trunk/wp-maven-plugin/src/it/deploy-jar/file/verify.groovy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/wp-maven-plugin/src/it/settings.xml =================================================================== --- trunk/wp-maven-plugin/src/it/settings.xml 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wp-maven-plugin/src/it/settings.xml 2011-08-30 14:37:34 UTC (rev 1215) @@ -1,7 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> + + <settings> <servers> Property changes on: trunk/wp-maven-plugin/src/it/settings.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/wp-maven-plugin/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wp-maven-plugin/src/license/THIRD-PARTY.properties 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wp-maven-plugin/src/license/THIRD-PARTY.properties 2011-08-30 14:37:34 UTC (rev 1215) @@ -2,6 +2,7 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache License +# - Apache Public License 2.0 # - Apache Software License - Version 2.0 # - Apache Software License, Version 1.1 # - Apache Software License, version 1.1 @@ -12,8 +13,8 @@ # - Common Public License Version 1.0 # - Eclipse Public License - Version 1.0 # - Eclipse Public License v1.0 +# - Eclipse Public License, Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - JDom appache like license # - Java HTML Tidy License # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) @@ -25,33 +26,24 @@ # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - http://asm.ow2.org/license.html -# - http://classworlds.codehaus.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 08:39:32 CEST 2011 +#Tue Aug 30 16:24:07 CEST 2011 antlr--antlr--2.7.2=BSD License asm--asm--3.0=http\://asm.ow2.org/license.html asm--asm-commons--3.1=http\://asm.ow2.org/license.html asm--asm-tree--3.1=http\://asm.ow2.org/license.html -classworlds--classworlds--1.1=http\://classworlds.codehaus.org/license.html -commons-cli--commons-cli--1.0=The Apache Software License, Version 2.0 -commons-digester--commons-digester--1.6=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. -de.zeigermann.xml--xml-im-exporter--1.1=Lesser General Public License (LPGL) v 2.1 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 -jdom--jdom--1.0=JDom appache like license +org.apache.maven.doxia--doxia-sink-api--1.0-alpha-7=The Apache Software License, Version 2.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 -org.codehaus.plexus--plexus-i18n--1.0-beta-7=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-interactivity-api--1.0-alpha-4=The Apache Software License, Version 2.0 -org.codehaus.plexus--plexus-velocity--1.1.7=The Apache Software License, Version 2.0 oro--oro--2.0.8=The Apache Software License, Version 2.0 -slide--slide-webdavlib--2.1=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/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/AbstractWPLoadDependencyMojo.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/AbstractWPLoadDependencyMojo.java 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/AbstractWPLoadDependencyMojo.java 2011-08-30 14:37:34 UTC (rev 1215) @@ -1,36 +1,58 @@ +/* + * #%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 java.io.File; +import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.installer.ArtifactInstaller; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; +import java.io.File; + /** * This mojo is for init for the goal that need to construct the application * this mojo, with init will read pom file to load dependency declared and so * needed by the wikitty publication application project. This will copy those * needed dependency to the right directory: src/main/resources/jar - * + * * @author mfortun * @requiresProject true */ public abstract class AbstractWPLoadDependencyMojo extends AbstractWPMojo { - /** - * @component - */ + /** @component */ protected ArtifactInstaller installer; - /** - * @component - */ + /** @component */ protected ArtifactRepositoryFactory repositoryFactory; /** * Used to look up Artifacts in the remote repository. - * + * * @component */ - protected org.apache.maven.artifact.factory.ArtifactFactory factory; + protected ArtifactFactory factory; @Override protected void init() throws Exception { @@ -40,9 +62,9 @@ // construct path to jar dir File basedir = getProject().getBasedir(); File jarDir = new File(basedir.getAbsolutePath() + File.separator - + SRC_DIR_NAME + File.separator + MAIN_DIR_NAME - + File.separator + RESOURCES_DIR_NAME + File.separator - + JAR_RESOURCES_DIR_NAME); + + SRC_DIR_NAME + File.separator + MAIN_DIR_NAME + + File.separator + RESOURCES_DIR_NAME + File.separator + + JAR_RESOURCES_DIR_NAME); // initialize param for dependency copy cpDep.setRepositoryFactory(repositoryFactory); Property changes on: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/AbstractWPLoadDependencyMojo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: 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 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/AbstractWPMojo.java 2011-08-30 14:37:34 UTC (rev 1215) @@ -35,12 +35,18 @@ */ public abstract class AbstractWPMojo extends AbstractPlugin { - static public String SRC_DIR_NAME = "src"; - static public String MAIN_DIR_NAME = "main"; - static public String APPLICATION_DIR_NAME = "wp"; - static public String RESOURCES_DIR_NAME = "resources"; - static public String IMAGES_RESOURCES_DIR_NAME = "images"; - static public String JAR_RESOURCES_DIR_NAME = "jar"; + public static final String SRC_DIR_NAME = "src"; + + public static final String MAIN_DIR_NAME = "main"; + + public static final String APPLICATION_DIR_NAME = "wp"; + + public static final String RESOURCES_DIR_NAME = "resources"; + + public static final String IMAGES_RESOURCES_DIR_NAME = "images"; + + public static final String JAR_RESOURCES_DIR_NAME = "jar"; + /** * Project. * Modified: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/CopyDependencyUtil.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/CopyDependencyUtil.java 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/CopyDependencyUtil.java 2011-08-30 14:37:34 UTC (rev 1215) @@ -1,11 +1,29 @@ +/* + * #%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 java.io.File; -import java.net.MalformedURLException; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; - import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.installer.ArtifactInstallationException; import org.apache.maven.artifact.installer.ArtifactInstaller; @@ -20,6 +38,12 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter; +import java.io.File; +import java.net.MalformedURLException; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + public class CopyDependencyUtil extends AbstractFromDependenciesMojo { public ArtifactInstaller getInstaller() { @@ -46,29 +70,23 @@ this.repositoryLayouts = repositoryLayouts; } - /** - * @component - */ + /** @component */ protected ArtifactInstaller installer; - /** - * @component - */ + /** @component */ protected ArtifactRepositoryFactory repositoryFactory; /** * @component role= - * "org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout" + * "org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout" */ private Map repositoryLayouts; /** * Main entry into mojo. Gets the list of dependencies and iterates through * calling copyArtifact. - * - * @throws MojoExecutionException - * with a message if an error occurs. - * + * + * @throws MojoExecutionException with a message if an error occurs. * @see #getDependencies * @see #copyArtifact(Artifact, boolean) */ @@ -77,18 +95,18 @@ Set artifacts = dss.getResolvedDependencies(); if (!useRepositoryLayout) { - for (Iterator i = artifacts.iterator(); i.hasNext();) { + for (Iterator i = artifacts.iterator(); i.hasNext(); ) { copyArtifact((Artifact) i.next(), this.stripVersion, - this.prependGroupId); + this.prependGroupId); } } else { try { ArtifactRepository targetRepository = repositoryFactory .createDeploymentArtifactRepository("local", - outputDirectory.toURI().toURL().toExternalForm(), - (ArtifactRepositoryLayout) repositoryLayouts - .get("default"), false /* uniqueVersion */); - for (Iterator i = artifacts.iterator(); i.hasNext();) { + outputDirectory.toURI().toURL().toExternalForm(), + (ArtifactRepositoryLayout) repositoryLayouts + .get("default"), false /* uniqueVersion */); + for (Iterator i = artifacts.iterator(); i.hasNext(); ) { installArtifact((Artifact) i.next(), targetRepository); } } catch (MalformedURLException e) { @@ -98,45 +116,45 @@ } Set skippedArtifacts = dss.getSkippedDependencies(); - for (Iterator i = skippedArtifacts.iterator(); i.hasNext();) { + for (Iterator i = skippedArtifacts.iterator(); i.hasNext(); ) { Artifact artifact = (Artifact) i.next(); getLog().info( artifact.getFile().getName() - + " already exists in destination."); + + " already exists in destination."); } if (isCopyPom()) { copyPoms(getOutputDirectory(), artifacts, this.stripVersion); copyPoms(getOutputDirectory(), skippedArtifacts, this.stripVersion); // Artifacts - // that - // already - // exist - // may - // not - // already - // have - // poms. + // that + // already + // exist + // may + // not + // already + // have + // poms. } } private void installArtifact(Artifact artifact, - ArtifactRepository targetRepository) { + ArtifactRepository targetRepository) { try { if ("pom".equals(artifact.getType())) { installer.install(artifact.getFile(), artifact, - targetRepository); + targetRepository); installBaseSnapshot(artifact, targetRepository); } else { installer.install(artifact.getFile(), artifact, - targetRepository); + targetRepository); installBaseSnapshot(artifact, targetRepository); if (isCopyPom()) { Artifact pomArtifact = getResolvedPomArtifact(artifact); if (pomArtifact.getFile() != null - && pomArtifact.getFile().exists()) { + && pomArtifact.getFile().exists()) { installer.install(pomArtifact.getFile(), pomArtifact, - targetRepository); + targetRepository); installBaseSnapshot(pomArtifact, targetRepository); } } @@ -147,16 +165,16 @@ } private void installBaseSnapshot(Artifact artifact, - ArtifactRepository targetRepository) + ArtifactRepository targetRepository) throws ArtifactInstallationException { if (artifact.isSnapshot() - && !artifact.getBaseVersion().equals(artifact.getVersion())) { + && !artifact.getBaseVersion().equals(artifact.getVersion())) { Artifact baseArtifact = this.factory.createArtifact( artifact.getGroupId(), artifact.getArtifactId(), artifact.getBaseVersion(), artifact.getScope(), artifact.getType()); installer.install(artifact.getFile(), baseArtifact, - targetRepository); + targetRepository); } } @@ -164,26 +182,21 @@ * Copies the Artifact after building the destination file name if * overridden. This method also checks if the classifier is set and adds it * to the destination file name if needed. - * - * @param artifact - * representing the object to be copied. - * @param removeVersion - * specifies if the version should be removed from the file name - * when copying. - * @param prependGroupId - * specifies if the groupId should be prepend to the file while - * copying. - * @throws MojoExecutionException - * with a message if an error occurs. - * + * + * @param artifact representing the object to be copied. + * @param removeVersion specifies if the version should be removed from the file name + * when copying. + * @param prependGroupId specifies if the groupId should be prepend to the file while + * copying. + * @throws MojoExecutionException with a message if an error occurs. * @see DependencyUtil#copyFile(File, File, Log) * @see DependencyUtil#getFormattedFileName(Artifact, boolean) */ protected void copyArtifact(Artifact artifact, boolean removeVersion, - boolean prependGroupId) throws MojoExecutionException { + boolean prependGroupId) throws MojoExecutionException { String destFileName = DependencyUtil.getFormattedFileName(artifact, - removeVersion, prependGroupId); + removeVersion, prependGroupId); File destDir; destDir = DependencyUtil.getFormattedOutputDirectory( @@ -195,9 +208,7 @@ copyFile(artifact.getFile(), destFile); } - /** - * Copy the pom files associated with the artifacts. - */ + /** Copy the pom files associated with the artifacts. */ public void copyPoms(File destDir, Set artifacts, boolean removeVersion) throws MojoExecutionException @@ -210,8 +221,8 @@ // Copy the pom if (pomArtifact.getFile() != null && pomArtifact.getFile().exists()) { File pomDestFile = new File(destDir, - DependencyUtil.getFormattedFileName(pomArtifact, - removeVersion, prependGroupId)); + DependencyUtil.getFormattedFileName(pomArtifact, + removeVersion, prependGroupId)); if (!pomDestFile.exists()) { copyFile(pomArtifact.getFile(), pomDestFile); } @@ -226,7 +237,7 @@ // Resolve the pom artifact using repos try { this.resolver.resolve(pomArtifact, this.remoteRepos, - this.getLocal()); + this.getLocal()); } catch (Exception e) { getLog().info(e.getMessage()); } @@ -235,10 +246,10 @@ protected ArtifactsFilter getMarkedArtifactFilter() { return new DestFileFilter(this.overWriteReleases, - this.overWriteSnapshots, this.overWriteIfNewer, - this.useSubDirectoryPerArtifact, this.useSubDirectoryPerType, - this.useSubDirectoryPerScope, this.useRepositoryLayout, - this.stripVersion, this.outputDirectory); + this.overWriteSnapshots, this.overWriteIfNewer, + this.useSubDirectoryPerArtifact, this.useSubDirectoryPerType, + this.useSubDirectoryPerScope, this.useRepositoryLayout, + this.stripVersion, this.outputDirectory); } public void setProject(MavenProject pro) { Property changes on: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/CopyDependencyUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/JettyUtil.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/JettyUtil.java 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/JettyUtil.java 2011-08-30 14:37:34 UTC (rev 1215) @@ -1,111 +1,101 @@ +/* + * #%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 java.io.File; -import java.util.ArrayList; -import java.util.List; - import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProject; import org.eclipse.jetty.util.Scanner; import org.eclipse.jetty.xml.XmlConfiguration; import org.mortbay.jetty.plugin.AbstractJettyMojo; +import java.io.File; +import java.util.ArrayList; +import java.util.List; + /** * New definition of the JettyRunWarMojo * to set the protected visibility and getter and setter for the webApp file - * - * @author mfortun <manoel.fortun(a)gmail.com> * + * @author mfortun <manoel.fortun(a)gmail.com> */ -public class JettyUtil extends AbstractJettyMojo -{ +public class JettyUtil extends AbstractJettyMojo { /** * The location of the war file. + * * @parameter expression="${project.build.directory}/${project.build.finalName}.war" * @required */ protected File webApp; - public File getWebApp() { return webApp; } - public void setWebApp(File webApp) { this.webApp = webApp; } - - - /** - * @see org.apache.maven.plugin.Mojo#execute() - */ - public void execute() throws MojoExecutionException, MojoFailureException - { - super.execute(); - } - - - - public void configureWebApplication () throws Exception - { + @Override + public void configureWebApplication() throws Exception { super.configureWebApplication(); - + webAppConfig.setWar(webApp.getCanonicalPath()); } - - - /** - * @see org.mortbay.jetty.plugin.AbstractJettyMojo#checkPomConfiguration() - */ - public void checkPomConfiguration() throws MojoExecutionException - { - return; + @Override + public void checkPomConfiguration() throws MojoExecutionException { + return; } - - - /* (non-Javadoc) - * @see org.eclipse.jetty.server.plugin.AbstractJettyMojo#configureScanner() - */ - public void configureScanner() throws MojoExecutionException - { - final ArrayList scanList = new ArrayList(); + @Override + public void configureScanner() throws MojoExecutionException { + ArrayList scanList = new ArrayList(); scanList.add(getProject().getFile()); scanList.add(webApp); setScanList(scanList); - + ArrayList listeners = new ArrayList(); - listeners.add(new Scanner.BulkListener() - { - public void filesChanged(List changes) - { - try - { + listeners.add(new Scanner.BulkListener() { + public void filesChanged(List changes) { + try { boolean reconfigure = changes.contains(getProject().getFile().getCanonicalPath()); restartWebApp(reconfigure); + } catch (Exception e) { + getLog().error("Error reconfiguring/restarting webapp after change in watched files", e); } - catch (Exception e) - { - getLog().error("Error reconfiguring/restarting webapp after change in watched files",e); - } } }); setScannerListeners(listeners); - + } - - - - public void restartWebApp(boolean reconfigureScanner) throws Exception - { + @Override + public void restartWebApp(boolean reconfigureScanner) throws Exception { getLog().info("Restarting webapp ..."); getLog().debug("Stopping webapp ..."); webAppConfig.stop(); @@ -115,8 +105,7 @@ // check if we need to reconfigure the scanner, // which is if the pom changes - if (reconfigureScanner) - { + if (reconfigureScanner) { getLog().info("Reconfiguring scanner after change to pom.xml ..."); ArrayList scanList = getScanList(); scanList.clear(); @@ -132,32 +121,23 @@ } - /** - * @see org.mortbay.jetty.plugin.AbstractJettyMojo#finishConfigurationBeforeStart() - */ - public void finishConfigurationBeforeStart() - { + @Override + public void finishConfigurationBeforeStart() { return; } - - - - public void applyJettyXml() throws Exception - { + @Override + public void applyJettyXml() throws Exception { if (getJettyXmlFiles() == null) return; - - for ( File xmlFile : getJettyXmlFiles() ) - { - getLog().info( "Configuring Jetty from xml configuration file = " + xmlFile.getCanonicalPath() ); + + for (File xmlFile : getJettyXmlFiles()) { + getLog().info("Configuring Jetty from xml configuration file = " + xmlFile.getCanonicalPath()); XmlConfiguration xmlConfiguration = new XmlConfiguration(xmlFile.toURI().toURL()); - xmlConfiguration.configure(this.server); + xmlConfiguration.configure(server); } } - - public void setProject(MavenProject project) { this.project = project; } Property changes on: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/JettyUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPCleanMojo.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPCleanMojo.java 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPCleanMojo.java 2011-08-30 14:37:34 UTC (rev 1215) @@ -1,18 +1,41 @@ +/* + * #%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.nuiton.util.FileUtil; +import org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem; + import java.io.File; import java.io.FileFilter; import java.util.List; -import org.nuiton.util.FileUtil; -import org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem; - /** * Goal to remove properties files used by WikittyService over file system to * ensure transformation wikitty-file. Delete ".wp" dirs. - * + * * @author mfortun <manoel.fortun(a)gmail.com> - * @version * @goal clean * @requiresProject true * @requiresOnline true @@ -26,8 +49,8 @@ @Override public boolean accept(File pathname) { return pathname.isDirectory() - && pathname.getName().equals( - WikittyPublicationFileSystem.PROPERTY_DIRECTORY); + && pathname.getName().equals( + WikittyPublicationFileSystem.PROPERTY_DIRECTORY); } }; @@ -43,7 +66,7 @@ File baseDir = project.getBasedir(); // filter all properties dir List<File> propertiesDir = FileUtil.getFilteredElements(baseDir, - propertiesDirFilter, true); + propertiesDirFilter, true); // delete them for (File fipropsdir : propertiesDir) { if (getLog().isDebugEnabled()) { Property changes on: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPCleanMojo.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: 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 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployJarMojo.java 2011-08-30 14:37:34 UTC (rev 1215) @@ -78,7 +78,7 @@ /** * To deploy a wikitty publication jar. - * + * * @author tchemit <chemit(a)codelutin.com>, mfortun <manoel.fortun(a)gmail.com> * @version $Id$ * @goal deploy-jar @@ -92,7 +92,7 @@ /** * Id of server. - * + * * @parameter expression="${serverId}" * @required */ @@ -100,7 +100,7 @@ /** * URL of server to use to log into server. - * + * * @parameter expression="${serverUrl}" * @required */ @@ -109,7 +109,7 @@ /** * Whether to run the "chmod" command on the remote site after the deploy. * Defaults to "true". - * + * * @parameter expression="${maven.site.chmod}" default-value="true" */ protected boolean chmod; @@ -117,7 +117,7 @@ /** * The mode used by the "chmod" command. Only used if chmod = true. Defaults * to "g+w,a+rX". - * + * * @parameter expression="${maven.site.chmod.mode}" default-value="g+w,a+rX" */ protected String chmodMode; @@ -125,7 +125,7 @@ /** * The options used by the "chmod" command. Only used if chmod = true. * Defaults to "-Rf". - * + * * @parameter expression="${maven.site.chmod.options}" default-value="-Rf" */ protected String chmodOptions; @@ -135,7 +135,7 @@ /** * The current user system settings for use in Maven. - * + * * @parameter expression="${settings}" * @required * @readonly @@ -155,7 +155,7 @@ /** * All available wagons. - * + * * @component role="org.apache.maven.wagon.Wagon" * @since 1.0 */ @@ -170,7 +170,7 @@ /** * file to deploy - * + * * @parameter expression="${fileToDeploy}" * @required */ @@ -193,7 +193,7 @@ if (!fileToDeploy.exists()) { throw new MojoExecutionException("The file to deploy " - + fileToDeploy + " does not exist"); + + fileToDeploy + " does not exist"); } if (!isMaven3OrMore()) { @@ -213,23 +213,23 @@ if (getLog().isDebugEnabled()) { getLog().debug( "Deploying to '" + repository.getUrl() - + "',\n Using credentials from server id '" - + repository.getId() + "'"); + + "',\n Using credentials from server id '" + + repository.getId() + "'"); } try { configureWagon(wagon, repository.getId(), settings, container, - getLog()); + getLog()); AuthenticationInfo authenticationInfo = wagonManager .getAuthenticationInfo(repository.getId()); getLog().debug( "authenticationInfo with id '" - + repository.getId() - + "': " - + (authenticationInfo == null ? "-" - : authenticationInfo.getUserName())); + + repository.getId() + + "': " + + (authenticationInfo == null ? "-" + : authenticationInfo.getUserName())); try { Debug debug = new Debug(); @@ -272,7 +272,7 @@ if (wagon instanceof CommandExecutor) { CommandExecutor exec = (CommandExecutor) wagon; exec.executeCommand("chmod " + chmodOptions + " " - + chmodMode + " " + repository.getBasedir()); + + chmodMode + " " + repository.getBasedir()); } // else ? silently ignore, FileWagon is not a // CommandExecutor! @@ -292,7 +292,7 @@ protected boolean isMaven3OrMore() { return new ComparableVersion(getMavenVersion()) - .compareTo(new ComparableVersion("3.0")) >= 0; + .compareTo(new ComparableVersion("3.0")) >= 0; } protected String getMavenVersion() { @@ -339,7 +339,7 @@ * Defensively support for comma (",") and semi colon (";") in addition to * pipe ("|") as separator. * </p> - * + * * @return a ProxyInfo object instantiated or <code>null</code> if no * matching proxy is found */ @@ -365,21 +365,21 @@ String nonProxyHostSuffix = nonProxyHost.substring(pos + 1); // prefix* if (StringUtils.isNotEmpty(nonProxyHostPrefix) - && host.startsWith(nonProxyHostPrefix) - && StringUtils.isEmpty(nonProxyHostSuffix)) { + && host.startsWith(nonProxyHostPrefix) + && StringUtils.isEmpty(nonProxyHostSuffix)) { return null; } // *suffix if (StringUtils.isEmpty(nonProxyHostPrefix) - && StringUtils.isNotEmpty(nonProxyHostSuffix) - && host.endsWith(nonProxyHostSuffix)) { + && StringUtils.isNotEmpty(nonProxyHostSuffix) + && host.endsWith(nonProxyHostSuffix)) { return null; } // prefix*suffix if (StringUtils.isNotEmpty(nonProxyHostPrefix) - && host.startsWith(nonProxyHostPrefix) - && StringUtils.isNotEmpty(nonProxyHostSuffix) - && host.endsWith(nonProxyHostSuffix)) { + && host.startsWith(nonProxyHostPrefix) + && StringUtils.isNotEmpty(nonProxyHostSuffix) + && host.endsWith(nonProxyHostSuffix)) { return null; } } else if (host.equals(nonProxyHost)) { @@ -391,7 +391,7 @@ /** * Get proxy information for Maven 3. - * + * * @return */ private ProxyInfo getProxy() { @@ -406,7 +406,7 @@ // and it's the one use in wagon to find the proxy arghhh // so we will check both if (StringUtils.equalsIgnoreCase("dav", protocol) - && url.startsWith("dav:")) { + && url.startsWith("dav:")) { url = url.substring(4); if (url.startsWith("http")) { try { @@ -414,7 +414,7 @@ protocol = urlSite.getProtocol(); getLog().debug( "found dav protocol so transform to real transport protocol " - + protocol); + + protocol); } catch (MalformedURLException e) { getLog().warn("fail to build URL with " + url); } @@ -432,9 +432,9 @@ if (proxies != null) { for (Proxy proxy : proxies) { if (proxy.isActive() - && (protocol.equalsIgnoreCase(proxy - .getProtocol()) || originalProtocol - .equalsIgnoreCase(proxy.getProtocol()))) { + && (protocol.equalsIgnoreCase(proxy + .getProtocol()) || originalProtocol + .equalsIgnoreCase(proxy.getProtocol()))) { SettingsDecryptionResult result = settingsDecrypter .decrypt(new DefaultSettingsDecryptionRequest( proxy)); @@ -445,7 +445,7 @@ // so hackish for wagon the protocol is https for // site dav : dav:https://dav.codehaus.org/mojo/ proxyInfo.setType(protocol);// proxy.getProtocol() - // ); + // ); proxyInfo.setPort(proxy.getPort()); proxyInfo .setNonProxyHosts(proxy.getNonProxyHosts()); @@ -454,9 +454,9 @@ getLog().debug( "found proxyInfo " + "host:port " - + proxyInfo.getHost() + ":" - + proxyInfo.getPort() + ", " - + proxyInfo.getUserName()); + + proxyInfo.getHost() + ":" + + proxyInfo.getPort() + ", " + + proxyInfo.getUserName()); return proxyInfo; } @@ -478,31 +478,31 @@ wagon = manager.getWagon(repository); } catch (UnsupportedProtocolException e) { String shortMessage = "Unsupported protocol: '" - + repository.getProtocol() + "' for site deployment to " - + "distributionManagement.site.url=" + repository.getUrl() - + "."; + + repository.getProtocol() + "' for site deployment to " + + "distributionManagement.site.url=" + repository.getUrl() + + "."; String longMessage = "\n" - + shortMessage - + "\n" - + "Currently supported protocols are: " - + getSupportedProtocols() - + ".\n" - + " Protocols may be added through wagon providers.\n" - + " For more information, see " - + "http://maven.apache.org/plugins/maven-site-plugin/examples/adding-deploy-pr…"; + + shortMessage + + "\n" + + "Currently supported protocols are: " + + getSupportedProtocols() + + ".\n" + + " Protocols may be added through wagon providers.\n" + + " For more information, see " + + "http://maven.apache.org/plugins/maven-site-plugin/examples/adding-deploy-pr…"; getLog().error(longMessage); throw new MojoExecutionException(shortMessage); } catch (TransferFailedException e) { throw new MojoExecutionException("Unable to configure Wagon: '" - + repository.getProtocol() + "'", e); + + repository.getProtocol() + "'", e); } if (!wagon.supportsDirectoryCopy()) { throw new MojoExecutionException("Wagon protocol '" - + repository.getProtocol() - + "' doesn't support directory copying"); + + repository.getProtocol() + + "' doesn't support directory copying"); } return wagon; @@ -511,7 +511,7 @@ /** * Configure the Wagon with the information from serverConfigurationMap ( * which comes from settings.xml ) - * + * * @param wagon * @param repositoryId * @param settings @@ -519,11 +519,11 @@ * @param log * @throws WagonConfigurationException * @todo Remove when - * {@link WagonManager#getWagon(org.apache.maven.wagon.repository.Repository) - * is available}. It's available in Maven 2.0.5. + * {@link WagonManager#getWagon(org.apache.maven.wagon.repository.Repository) + * is available}. It's available in Maven 2.0.5. */ private static void configureWagon(Wagon wagon, String repositoryId, - Settings settings, PlexusContainer container, Log log) + Settings settings, PlexusContainer container, Log log) throws TransferFailedException { log.debug(" configureWagon "); @@ -544,19 +544,19 @@ componentConfigurator = (ComponentConfigurator) container .lookup(ComponentConfigurator.ROLE, "basic"); componentConfigurator.configureComponent(wagon, - plexusConf, container.getContainerRealm()); + plexusConf, container.getContainerRealm()); } catch (ComponentLookupException e) { throw new TransferFailedException( "While configuring wagon for \'" - + repositoryId - + "\': Unable to lookup wagon configurator." - + " Wagon configuration cannot be applied.", + + repositoryId + + "\': Unable to lookup wagon configurator." + + " Wagon configuration cannot be applied.", e); } catch (ComponentConfigurationException e) { throw new TransferFailedException( "While configuring wagon for \'" - + repositoryId - + "\': Unable to apply wagon configuration.", + + repositoryId + + "\': Unable to apply wagon configuration.", e); } finally { if (componentConfigurator != null) { @@ -564,7 +564,7 @@ container.release(componentConfigurator); } catch (ComponentLifecycleException e) { log.error("Problem releasing configurator - ignoring: " - + e.getMessage()); + + e.getMessage()); } } } Modified: 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 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPDeployMojo.java 2011-08-30 14:37:34 UTC (rev 1215) @@ -30,7 +30,7 @@ /** * To deploy a wikitty publication. - * + * * @author tchemit <chemit(a)codelutin.com>, mfortun <manoel.fortun(a)gmail.com> * @version $Id$ * @goal deploy @@ -55,21 +55,20 @@ String origin = getProject().getBasedir().toURI().toURL() .toExternalForm(); origin += WikittyPublicationConstant.LABEL_DELIM + SRC_DIR_NAME - + WikittyFileUtil.WIKITTY_LABEL_SEPARATOR + MAIN_DIR_NAME; - - + + WikittyFileUtil.WIKITTY_LABEL_SEPARATOR + MAIN_DIR_NAME; + + // Construct the target uri with the correct label as fragment // to ensure that wikitty under src/main/java label will be under // application name label String target = wikittyServiceUrl; target += WikittyPublicationConstant.LABEL_DELIM + applicationName; - - + // launch syncrhonise with recursion enabled and delete and existing option // disable WikittyPublicationSynchronize.synchronisationServices(origin, target, - true, false, false); + true, false, false); } } Modified: 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 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPInitMojo.java 2011-08-30 14:37:34 UTC (rev 1215) @@ -29,7 +29,7 @@ /** * To init a wikitty publication project. To init directory architecture for * wikitty publication project. - * + * * @author tchemit <chemit(a)codelutin.com>, mfortun <manoel.fortun(a)gmail.com> * @version $Id$ * @goal init @@ -55,17 +55,17 @@ * src/main/wp, src/main/ressource/images, src/main/ressource/jar */ File srcDir = new File(basedir.getAbsolutePath() + File.separator - + SRC_DIR_NAME); + + SRC_DIR_NAME); File mainDir = new File(srcDir.getAbsolutePath() + File.separator - + MAIN_DIR_NAME); + + MAIN_DIR_NAME); File appDir = new File(mainDir.getAbsolutePath() + File.separator - + APPLICATION_DIR_NAME); + + APPLICATION_DIR_NAME); File ressourceDir = new File(mainDir.getAbsolutePath() + File.separator - + RESOURCES_DIR_NAME); + + RESOURCES_DIR_NAME); File imgDir = new File(ressourceDir.getAbsolutePath() + File.separator - + IMAGES_RESOURCES_DIR_NAME); + + IMAGES_RESOURCES_DIR_NAME); File jarDir = new File(ressourceDir.getAbsolutePath() + File.separator - + JAR_RESOURCES_DIR_NAME); + + JAR_RESOURCES_DIR_NAME); // create dirs createDirectoryIfNecessary(srcDir); @@ -74,8 +74,5 @@ createDirectoryIfNecessary(ressourceDir); createDirectoryIfNecessary(imgDir); createDirectoryIfNecessary(jarDir); - } - - } Modified: 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 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPJarMojo.java 2011-08-30 14:37:34 UTC (rev 1215) @@ -24,8 +24,6 @@ */ package org.nuiton.wikitty.plugin; -import java.io.File; - import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.publication.WikittyFileUtil; @@ -36,9 +34,11 @@ import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.Search; +import java.io.File; + /** * To create a wikitty publication jar. - * + * * @author tchemit <chemit(a)codelutin.com>, mfortun <manoel.fortun(a)gmail.com> * @version $Id$ * @goal jar @@ -63,41 +63,39 @@ // to made a well formed jar we need to synchronise first // with this we will obtain the same directory/label configuration // that we will have on a classic service - + // construct uri of the file system wikitty service uri // with the correct label as fragment. String origin = getProject().getBasedir().toURI().toURL() .toExternalForm(); origin += WikittyPublicationConstant.LABEL_DELIM + SRC_DIR_NAME - + WikittyFileUtil.WIKITTY_LABEL_SEPARATOR + MAIN_DIR_NAME; + + WikittyFileUtil.WIKITTY_LABEL_SEPARATOR + MAIN_DIR_NAME; // Construct first inside the build dir a temporary repositorie String buildDir = getProject().getBuild().getDirectory(); File targetFile = new File(buildDir); createDirectoryIfNecessary(targetFile); - + String appPath = WikittyFileUtil.labelToPath(applicationName); - File appsDir = new File(buildDir+File.separator+appPath); - + File appsDir = new File(buildDir + File.separator + appPath); + createDirectoryIfNecessary(appsDir); // Construct the uri over file system to ensure that wikitties will // have the correct - String target = targetFile.toURI().toURL().toExternalForm(); + String target = targetFile.toURI().toURL().toExternalForm(); target += WikittyPublicationConstant.LABEL_DELIM + applicationName; - - + + // launch syncrhonise with recursion enabled and delete and existing option // disable WikittyPublicationSynchronize.synchronisationServices(origin, target, - true, false, false); + true, false, false); - - - + // then externalize the target that have the correct label ApplicationConfig appconfig = new ApplicationConfig(); - + // construct application config with the current wikitty service over // file system appconfig.setOption( @@ -105,18 +103,18 @@ WikittyPublicationFileSystem.class.getName()); appconfig.setOption(WikittyConfigOption.WIKITTY_SERVER_URL.getKey(), - target); - + target); + // the criteria to externalize all the wikitty Criteria critOnWikittyWithLabel = Search.query().keyword("*") .criteria(); - - String jarName = EXTERNALIZE_PREFIX+applicationName; + String jarName = EXTERNALIZE_PREFIX + applicationName; + // construct the jar with a custom name, in the build dir // the correct config for the service a the criteria WikittyPublicationExternalize.externalize(appconfig, - critOnWikittyWithLabel,targetFile, jarName); + critOnWikittyWithLabel, targetFile, jarName); } Modified: 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 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPRunMojo.java 2011-08-30 14:37:34 UTC (rev 1215) @@ -24,9 +24,6 @@ */ package org.nuiton.wikitty.plugin; -import java.io.File; -import java.io.IOException; -import java.util.List; import org.apache.commons.lang.StringUtils; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; @@ -42,9 +39,13 @@ import org.nuiton.wikitty.publication.WikittyPublicationFallbackService; import org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem; +import java.io.File; +import java.io.IOException; +import java.util.List; + /** * To run a wikitty publication project. - * + * * @author tchemit <chemit(a)codelutin.com>, mfortun <manoel.fortun(a)gmail.com> * @version $Id$ * @goal run @@ -61,24 +62,25 @@ protected static final String PUBLICATION_WAR_GROUP_ID = "org.nuiton.wikitty"; - static public String FALLBACK_PROPERTIE_FILE_NAME = "fallback.properties"; + public static final String FALLBACK_PROPERTIE_FILE_NAME = "fallback.properties"; /** * The component that is used to resolve additional artifacts required. - * @required + * + * @required * @component - * */ private ArtifactResolver artifactResolver; /** * The component used for creating artifact instances. + * * @required * @component */ private ArtifactFactory artifactFactory; - - + + /** * URL of server to use to log into server. * @@ -86,8 +88,8 @@ * @required */ protected String publicationVersion; - - + + /** * Local Repository. * @@ -105,9 +107,8 @@ * @readonly */ protected List remoteRepositories; - - - + + @Override protected void init() throws Exception { super.init(); @@ -116,10 +117,10 @@ @Override protected void doAction() throws Exception { - + // search for the wikitty publication ui war File webApp = resolveFile(); - + // prepare the fall back uri that will be a wikitty service orver // file system, our current src/main dir with the application String build = project.getBuild().getDirectory(); @@ -128,7 +129,7 @@ // construct props dir that will contain properties for fallback File propsFile = new File(build + File.separator - + FALLBACK_PROPERTIE_FILE_NAME); + + FALLBACK_PROPERTIE_FILE_NAME); if (propsFile.exists()) { deleteFile(propsFile); } @@ -136,10 +137,10 @@ // construct propertie for fallback service String fileSystemUrlService = getProject().getBasedir().toURI().toURL() .toExternalForm(); - + fileSystemUrlService += WikittyPublicationConstant.LABEL_DELIM - + SRC_DIR_NAME + WikittyFileUtil.WIKITTY_LABEL_SEPARATOR - + MAIN_DIR_NAME; + + SRC_DIR_NAME + WikittyFileUtil.WIKITTY_LABEL_SEPARATOR + + MAIN_DIR_NAME; PropertiesExtended propsFSServiceFall = new PropertiesExtended( propsFile); @@ -148,7 +149,7 @@ WikittyConfigOption.WIKITTY_WIKITTYSERVICE_COMPONENTS.getKey(), WikittyPublicationFileSystem.class.getName()); propsFSServiceFall.put(WikittyConfigOption.WIKITTY_SERVER_URL.getKey(), - fileSystemUrlService); + fileSystemUrlService); propsFSServiceFall.store(); // set the propertie to find our propertieFile @@ -166,7 +167,7 @@ jettyRunMojo.setProject(project); jettyRunMojo.execute(); - + } /* @@ -201,13 +202,13 @@ // repository, because the parent was already released (and // snapshots are updated automatically if changed) result = new File(localRepository.getBasedir(), - localRepository.pathOf(artifact)); + localRepository.pathOf(artifact)); createNewFile(result); } return result; } - - + + } Modified: 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 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/WPUpdateMojo.java 2011-08-30 14:37:34 UTC (rev 1215) @@ -30,7 +30,7 @@ /** * To update a wikitty publication project. - * + * * @author tchemit <chemit(a)codelutin.com>, mfortun <manoel.fortun(a)gmail.com> * @version $Id$ * @goal update @@ -50,13 +50,13 @@ @Override protected void doAction() throws Exception { // Same as deploy - + // construct uri of the file system wikitty service uri // with the correct label as fragment. String origin = getProject().getBasedir().toURI().toURL() .toExternalForm(); origin += WikittyPublicationConstant.LABEL_DELIM + SRC_DIR_NAME - + WikittyFileUtil.WIKITTY_LABEL_SEPARATOR + MAIN_DIR_NAME; + + WikittyFileUtil.WIKITTY_LABEL_SEPARATOR + MAIN_DIR_NAME; // Construct the target uri with the correct label as fragment // to ensure that wikitty under src/main/java label will be under @@ -68,7 +68,7 @@ // option // disable WikittyPublicationSynchronize.synchronisationServices(origin, target, - true, false, false); + true, false, false); } } Modified: trunk/wp-maven-plugin/src/main/resources/log4j.properties =================================================================== --- trunk/wp-maven-plugin/src/main/resources/log4j.properties 2011-08-30 14:31:06 UTC (rev 1214) +++ trunk/wp-maven-plugin/src/main/resources/log4j.properties 2011-08-30 14:37:34 UTC (rev 1215) @@ -1,3 +1,27 @@ +### +# #%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% +### # Global logging configuration log4j.rootLogger=FATAL, stdout Property changes on: trunk/wp-maven-plugin/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r1214 - in trunk/wikitty-publication-ui/src/main: resources webapp/WEB-INF webapp/WEB-INF/decorators webapp/WEB-INF/jsp
by mfortun＠users.nuiton.org 30 Aug '11

30 Aug '11

Author: mfortun Date: 2011-08-30 16:31:06 +0200 (Tue, 30 Aug 2011) New Revision: 1214 Url: http://nuiton.org/repositories/revision/wikitty/1214 Log: sitemesh *remove cajo server from properties Added: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/sitemesh.xml Modified: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/header.jsp Modified: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties 2011-08-30 14:10:58 UTC (rev 1213) +++ trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties 2011-08-30 14:31:06 UTC (rev 1214) @@ -24,7 +24,6 @@ ### wikitty.data.directory=target/wikitty-pub-storage -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 @@ -40,8 +39,7 @@ org.nuiton.wikitty.publication.WikittyPublicationFallbackService,\ org.nuiton.wikitty.services.WikittyServiceNotifier,\ org.nuiton.wikitty.services.WikittyServiceSecurity,\ -org.nuiton.wikitty.services.WikittyServiceAccessStat,\ -org.nuiton.wikitty.services.WikittyServiceCajoServer +org.nuiton.wikitty.services.WikittyServiceAccessStat wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ Added: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp (rev 0) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp 2011-08-30 14:31:06 UTC (rev 1214) @@ -0,0 +1,63 @@ + + + + +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %> +<%@taglib prefix="page" uri="http://www.opensymphony.com/sitemesh/page" %> +<%@taglib prefix="s" uri="/struts-tags" %> +<%@taglib prefix="sj" uri="/struts-jquery-tags" %> + +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page" + xmlns:decorator="http://www.opensymphony.com/sitemesh/decorator"> + <head> + <title>Wikitty Publication : <decorator:title default="Bow" /></title> + <decorator:head /> + <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> + <meta name="description" content="Bookmarks on the web" /> + <s:url var="temporaryXml" action="temporaryXml" /> + <s:url var="permanentXml" action="permanentXml" /> + <s:url var="favicon" value="/img/favicon.png" /> + <link rel="icon" type="image/png" href="${favicon}" /> + + + <sj:head/> + + + </head> + <body id="page-home"> + <div id="wrap"> + <div id="page"> + <%@include file="/WEB-INF/jsp/header.jsp" %> + <div id="main"> + <decorator:body /> + </div> + </div> + </div> + <%@include file="/WEB-INF/jsp/footer.jsp" %> + </body> +</html> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml 2011-08-30 14:10:58 UTC (rev 1213) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml 2011-08-30 14:31:06 UTC (rev 1214) @@ -10,5 +10,7 @@ </excludes> - + <decorator name="sitemesh" page="sitemesh.jsp"> + <pattern>/*</pattern> + </decorator> </decorators> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp 2011-08-30 14:10:58 UTC (rev 1213) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp 2011-08-30 14:31:06 UTC (rev 1214) @@ -24,10 +24,15 @@ --> <%-- Document : footer - Created on : 6 d�c. 2010, 19:21:22 + Created on : 6 dï¿½c. 2010, 19:21:22 Author : poussin --%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> +<div id="footer" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + + <div id="copyright"> Copyright Code Lutin 2010, AGPLv3 </div> +</div> -<div id="copyright"> Copyright Code Lutin 2010, AGPLv3 </div> - </body> -</html> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/header.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/header.jsp 2011-08-30 14:10:58 UTC (rev 1213) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/header.jsp 2011-08-30 14:31:06 UTC (rev 1214) @@ -27,15 +27,21 @@ Created on : 6 déc. 2010, 19:21:06 Author : poussin --%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> -<%@page contentType="text/html" pageEncoding="UTF-8"%> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> +<div id="header" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> -<html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Wikitty</title> - <link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/css/wikitty-publication.css"> - </head> - <body> + + <div id="msg"> + <span id="actionmessageHeader"> + <s:actionmessage /> + </span> + <span id="actionerrorHeader"> + <s:actionerror /> + </span> + </div> +</div> + \ No newline at end of file Added: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/sitemesh.xml =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/sitemesh.xml (rev 0) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/sitemesh.xml 2011-08-30 14:31:06 UTC (rev 1214) @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + +<sitemesh> + <property name="decorators-file" value="/WEB-INF/decorators.xml"/> + <excludes file="${decorators-file}"/> + + <page-parsers> + <parser content-type="text/html" class="com.opensymphony.module.sitemesh.parser.FastPageParser"/> + </page-parsers> + + <decorator-mappers> + + <mapper class="com.opensymphony.module.sitemesh.mapper.PageDecoratorMapper"> + <param name="property.1" value="meta.decorator"/> + <param name="property.2" value="decorator"/> + </mapper> + + <mapper class="com.opensymphony.module.sitemesh.mapper.FrameSetDecoratorMapper"> + </mapper> + + <mapper class="com.opensymphony.module.sitemesh.mapper.AgentDecoratorMapper"> + <param name="match.MSIE" value="ie"/> + <param name="match.Mozilla [" value="ns"/> + <param name="match.Opera" value="opera"/> + <param name="match.Lynx" value="lynx"/> + </mapper> + + <mapper class="com.opensymphony.module.sitemesh.mapper.PrintableDecoratorMapper"> + <param name="decorator" value="printable"/> + <param name="parameter.name" value="printable"/> + <param name="parameter.value" value="true"/> + </mapper> + + <mapper class="com.opensymphony.module.sitemesh.mapper.RobotDecoratorMapper"> + <param name="decorator" value="robot"/> + </mapper> + + <mapper class="com.opensymphony.module.sitemesh.mapper.ParameterDecoratorMapper"> + <param name="decorator.parameter" value="decorator"/> + <param name="parameter.name" value="confirm"/> + <param name="parameter.value" value="true"/> + </mapper> + + <mapper class="com.opensymphony.module.sitemesh.mapper.ConfigDecoratorMapper"> + <param name="config" value="${decorators-file}"/> + </mapper> + + </decorator-mappers> + +</sitemesh>

1 0

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

30 Aug '11

Author: mfortun Date: 2011-08-30 16:10:58 +0200 (Tue, 30 Aug 2011) New Revision: 1213 Url: http://nuiton.org/repositories/revision/wikitty/1213 Log: *add javadoc Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/EvalInterface.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java 2011-08-30 13:04:45 UTC (rev 1212) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java 2011-08-30 14:10:58 UTC (rev 1213) @@ -24,7 +24,16 @@ import org.nuiton.wikitty.publication.entities.WikittyPubTextHelper; import org.nuiton.wikitty.search.operators.Element; - +/** + * This class is used to decorate wikitty pub text content. + * Used before compile wikittyPubText to encapsulated content inside java method. + * Used to apply filter over wikittyPubText content when containing ui directive + * of others directive that need to be filtered before rendering. + * Directive that have to be encapsulate inside script vars + * + * @author mfortun + * + */ public class CodeDecorator { protected static final String FILTERS_FILE_NAME_REGEX = "filters-\\w*\\.properties"; @@ -42,6 +51,7 @@ static protected String MIME_SEP = "/"; + // TODO mfortun-2011-08-30 move those to properties file. static protected String filtersOptionDirName = "filters-properties/"; static protected String filtersOptionDefault = "filters-default.properties"; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/EvalInterface.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/EvalInterface.java 2011-08-30 13:04:45 UTC (rev 1212) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/EvalInterface.java 2011-08-30 14:10:58 UTC (rev 1213) @@ -2,13 +2,34 @@ import java.util.List; - +/** + * Interface of the eval action. Used + * @author mfortun + * + */ public interface EvalInterface { + /** + * eval the current publicat ion context + * @param context the current context + * @param subContext list of the subcontext + * @return the result of the evaluation + */ public Object doAction(PublicationContext context, List<String> subContext); + /** + * eval the current publication context + * @param context the current context + * @param subContextAsText the string to be evaluated + * @return the result of the evaluation + */ public Object doAction(PublicationContext context, String subContextAsText); + /** + * eval the current publication context + * @param context the current context + * @return the result of the evaluation + */ public Object doAction(PublicationContext context); } \ No newline at end of file Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java 2011-08-30 13:04:45 UTC (rev 1212) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java 2011-08-30 14:10:58 UTC (rev 1213) @@ -39,9 +39,12 @@ /** * Class used to determine mimetype for an extension, used to determine type of - * wikittypub (data or text) with the extension and the mime type + * wikittypub (data or text) with the extension and the mime type. * + * This class is the one which handle mime type <-> file extension mapping. * + * + * * @author mfortun * */

1 0

r1212 - trunk/wikitty-publication/src/site/exemple
by mfortun＠users.nuiton.org 30 Aug '11

30 Aug '11

Author: mfortun Date: 2011-08-30 15:04:45 +0200 (Tue, 30 Aug 2011) New Revision: 1212 Url: http://nuiton.org/repositories/revision/wikitty/1212 Log: update readme for exemple Modified: trunk/wikitty-publication/src/site/exemple/README.txt Modified: trunk/wikitty-publication/src/site/exemple/README.txt =================================================================== --- trunk/wikitty-publication/src/site/exemple/README.txt 2011-08-30 13:00:49 UTC (rev 1211) +++ trunk/wikitty-publication/src/site/exemple/README.txt 2011-08-30 13:04:45 UTC (rev 1212) @@ -1,4 +1,67 @@ -Ceci est un exemple de d'utilisation de wikitty publication pour faire des application +Ceci est un exemple de d'utilisation de wikitty publication pour faire des applications +Le projet resourceEntity: + resourceEntity/ + |-- changelog.txt + |-- LICENSE.tx + |-- LICENSE.txt + |-- pom.xml + |-- README.txt + `-- src + `-- main + |-- java + |-- resources + `-- xmi + |-- wp-resource.properties + |-- wp-resource.zargo + +ResourceEntity est un mini projet d'utilisation de Wikitty et création d'entity +et des nouvelles extensions de wikitty. Pour pouvoir utiliser resourceAppli +il faut contruire le jar de resourceEntity, puisque les entités sont utilisé +à l'intérieur. + +Le projet resourceAppli: + + resourceAppli/ + |-- pom.xml + `-- src + `-- main + |-- resources + | |-- images + | | `-- wikittypubuml.png + | `-- jar + `-- wp + |-- clearProxy.java + |-- dummy.htmljs + |-- Javahtml.htmlja + |-- JavaView.java + |-- resources.htmljs + |-- SelfModify.htmljs + |-- Test.java + `-- view.htmljs + +Ce projet est le "parfait" exemple d'utilisation, l'architecture à été initialisé +avec la commande wp:init. Pour le faire fonctionner, il faut rajouter le jar +correspondant au projet resourceEntity dans le dossier src/main/resources/jar. +Et lancer la commande wp:run. + +L'application sera disponible à l'adresse: + * http://localhost:8080/[contextData]/view/.action (avec contextData ce qu'on veut, + voir la partie sur le war pour savoir à quoi cela correspond) + +Fichier de l'application: + + * clearProxy.java, va supprimer tout les wikitty du proxy (sauf ceux de l'application) + * dummy.htmljs, exemple d'utilisation de post + * Javahtml.htmlja, intégration d'interface html avec du java + * JavaView.java, exemple avec du java corps de méthode sans signature + * resources.htmljs, permet de créer des resources Entity: intégration d'ihm, mécanisme post, utilisation des bindings, instanciation de java dans du javascript. + * view.htmljs, permet de faire des réservations de ressource: intégration d'ihm, mécanisme post, utilisation des bindings, instanciation de java dans du javascript. + * Test.java, dummy exemple + * SelfModify.htmljs, un wikitty pub text qui se tripote le content. + + + +

1 0

r1211 - trunk/wikitty-publication/src/site/doc
by mfortun＠users.nuiton.org 30 Aug '11

30 Aug '11

Author: mfortun Date: 2011-08-30 15:00:49 +0200 (Tue, 30 Aug 2011) New Revision: 1211 Url: http://nuiton.org/repositories/revision/wikitty/1211 Log: correct Modified: trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst Modified: trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst =================================================================== --- trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst 2011-08-30 12:56:51 UTC (rev 1210) +++ trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst 2011-08-30 13:00:49 UTC (rev 1211) @@ -50,10 +50,9 @@ Néanmoins cette solution ne permet que de créer des wikitty dont l'extension existe déjà dans le WikittyService. -Sinon l'interface permet de créer/modifier n'importe quel type de wikitty. +On peut ajouter les extentions que l'on veut au wikitty et remplir les champs, +mais on est limité aux extensions déjà présente dans le wikitty service. -On ajouter les extentions que l'on veut au wikitty et remplir les champs. - Interface d'édition: * /[contextData]/edit/.action (avec contextData est ce qu'on veut, voir la

1 0

r1210 - in trunk/wikitty-publication/src/site: doc exemple/resourceAppli/src/main/resources/images
by mfortun＠users.nuiton.org 30 Aug '11

30 Aug '11

Author: mfortun Date: 2011-08-30 14:56:51 +0200 (Tue, 30 Aug 2011) New Revision: 1210 Url: http://nuiton.org/repositories/revision/wikitty/1210 Log: *update diagram Modified: trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/resources/images/wikittypubuml.png Modified: trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst =================================================================== --- trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst 2011-08-30 12:49:20 UTC (rev 1209) +++ trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst 2011-08-30 12:56:51 UTC (rev 1210) @@ -57,14 +57,14 @@ Un exemple de fonctionnement **************************** -Contenu d'un wikitty pub text: +Contenu d'un wikitty pub text:: <html> <%var name="bob"%> <h1>Hello World <%=name%>!</h1> </html> -Règle de remplacement avec le template: +Règle de remplacement avec le template:: wpContext.setContentType("[ContentType]")[EndingCar] @@ -72,14 +72,15 @@ [WriteString][OpeningWriterChar][StringDelim]bob[StringDelim][ClosingWriterChar][EndingCar] - [WriteString][OpeningWriterChar][StringDelim]<h1>Hello World [StringDelim][ConcatChar]name[ConcatChar][StringDelim]!</h1>[StringDelim][ClosingWriterChar][EndingCar] + [WriteString][OpeningWriterChar][StringDelim]<h1>Hello World [StringDelim] + [ConcatChar]name[ConcatChar][StringDelim]!</h1>[StringDelim][ClosingWriterChar][EndingCar] [WriteString][OpeningWriterChar][StringDelim]</html>[StringDelim][ClosingWriterChar][EndingCar][ClosingTemplate] ce filtre sera actif quand on le mime type du wikittyPubText sera : text/[Key], après transformation par le filtre le mimetype sera [MimeType] -Si on avait utilisé le filtre de base: +Si on avait utilisé le filtre de base:: wpContext.setContentType("text/html; charset=UTF-8"); Modified: trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/resources/images/wikittypubuml.png =================================================================== (Binary files differ)

1 0

r1209 - trunk/wikitty-publication/src/site/doc
by echatellier＠users.nuiton.org 30 Aug '11

30 Aug '11

Author: echatellier Date: 2011-08-30 14:49:20 +0200 (Tue, 30 Aug 2011) New Revision: 1209 Url: http://nuiton.org/repositories/revision/wikitty/1209 Log: Rapide relecture Modified: trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst Modified: trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst =================================================================== --- trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst 2011-08-30 12:47:39 UTC (rev 1208) +++ trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst 2011-08-30 12:49:20 UTC (rev 1209) @@ -11,23 +11,23 @@ Depuis un système de fichier **************************** -L'idéal est utilisé le plugin maven prévu à cet effet. +L'idéal est d'utiliser le plugin maven prévu à cet effet. Il faut un Pom élémentaire comme présenté dans la doc outils_publication, et -d'initiliser le repo local avec la commande wp:init et de bien respecter -les endroit où mettre les fichiers: +d'initiliaser le repo local avec la commande wp:init et de bien respecter +les endroits où mettre les fichiers:: -src/main/wp - #toute les pages -src/main/ressources/images + src/main/wp + #toutes les pages + src/main/ressources/images #stocker les images -src/main/ressources/jar - #stoker les jars + src/main/ressources/jar + #stocker les jars -Comme cela est fait dans l'exemple fournit dans Wikitty Publication. +comme cela est fait dans l'exemple fournit dans Wikitty Publication. -Dans le cas où l'on developpe sur un système de fichier il faut faire attention -au extension des fichiers auquelles corresponds leurs mime type, celon le mapping -contenu dans l'application soit par défaut: +Dans le cas où l'on développe sur un système de fichier, il faut faire attention +aux extensions des fichiers auxquels corresponds leurs mimes types, selon le +mapping contenu dans l'application soit par défaut: text/javascript=wp text/html.javascript=htmljs @@ -38,14 +38,14 @@ application/jar=jar application/uml.jar=zargo -Les mime type déterminent les langages présent dans les fichiers et donc -comment ils seront éxécuté, pour en savoir plus voir la documentation sur -Wikitty Publication Web Application ou celle traitant de l'ajout de langage. +Les mime type déterminent les langages présents dans les fichiers et donc +comment ils seront éxécutés, pour en savoir plus voir la documentation sur +Wikitty Publication Web Application ou celles traitant de l'ajout de langage. Directement dans le Navigateur ****************************** -Une autre solution est de modifier creer ses wikitty directement par +Une autre solution est de modifier et créer ses wikitty directement par l'intermédiaire de l'interface d'édition, comme dans un wiki. Néanmoins cette solution ne permet que de créer des wikitty dont l'extension existe déjà dans le WikittyService. @@ -56,19 +56,20 @@ Interface d'édition: - * /[contextData]/edit/.action (avec contextData ce qu'on veut, voir la partie sur le war pour savoir à quoi cela correspond) + * /[contextData]/edit/.action (avec contextData est ce qu'on veut, voir la + partie sur le war pour savoir à quoi cela correspond) Quoi mettre dans les WikittyPubTex ? ------------------------------------ Dans le WikittyPubText, le contenu doit être écrit dans le langage correspondant au mime type. -Mais ce n'est pas tout on peut rajouter des éléments issues du binding, qui +Mais ce n'est pas tout, on peut rajouter des éléments issues du binding, qui est un mécanisme qui permet d'utiliser du java à l'intérieur du code. -Il est possible de faire des interfaces graphique en html, soit en intégrant +Il est possible de faire des interfaces graphiques en html, soit en intégrant le hmtl directement dans le code dans une variable de retour, soit en utilisant -le mécanisme de filtre et des Mime types composé. +le mécanisme de filtre et des mime types composés. par exemple le mime type: @@ -93,7 +94,7 @@ * resource.setName(wpContext.getArgument("nom")); -Par défaut il y a un certain nombre d'objet disponible en binding: +Par défaut il y a un certain nombre d'objets disponible en binding: * wpEval, correspond à l'instance de la classe java qui évalue couramment le WikittyPub, permet d'évaluer * wpSubContext, correspond à l'instance de collection contenant @@ -101,37 +102,37 @@ * wpWikitty, wikitty en cours d'évaluation * wpContext, correspond à l'instance de la classe java du context (voir interface) -Interface de wpContext: +Interface de wpContext:: public interface PublicationContext { - + HttpServletRequest getRequest(); - + HttpServletResponse getResponse(); - + /** * the current wikitty proxy * @return */ WikittyProxy getWikittyProxy(); - + /** * add context to the url and parameter if necessary * @param url * @return */ String makeUrl(String url); - + /** * the current wikitty service * @return */ WikittyService getWikittyService(); - + List<String> getMandatoryArguments(); - + String getArgument(String name); - + /** * Get * @param name @@ -139,27 +140,27 @@ * @return */ String getArgument(String name, String defaultValue); - + /** * return the actual return content tye for the page * @return */ String getContentType(); - + /** * Set the content type for the return page * @param contentType */ void setContentType(String contentType); - + String toString(); - + /** * the map of the arguments in the context * @return */ Map<String,String> getArguments(); - + } @@ -224,12 +225,13 @@ `-- view.htmljs Ce projet est le "parfait" exemple d'utilisation, l'architecture à été initialisé -avec la commande wp:init. Pour le faire fonctionner il faut rajouter le jar +avec la commande wp:init. Pour le faire fonctionner, il faut rajouter le jar correspondant au projet resourceEntity dans le dossier src/main/resources/jar. Et lancer la commande wp:run. L'application sera disponible à l'adresse: - * http://localhost:8080/[contextData]/view/.action (avec contextData ce qu'on veut, voir la partie sur le war pour savoir à quoi cela correspond) + * http://localhost:8080/[contextData]/view/.action (avec contextData ce qu'on veut, + voir la partie sur le war pour savoir à quoi cela correspond) Fichier de l'application: @@ -241,5 +243,3 @@ * view.htmljs, permet de faire des réservations de ressource: intégration d'ihm, mécanisme post, utilisation des bindings, instanciation de java dans du javascript. * Test.java, dummy exemple * SelfModify.htmljs, un wikitty pub text qui se tripote le content. - -

1 0

r1208 - in trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication: . externalize synchro
by mfortun＠users.nuiton.org 30 Aug '11

30 Aug '11

Author: mfortun Date: 2011-08-30 14:47:39 +0200 (Tue, 30 Aug 2011) New Revision: 1208 Url: http://nuiton.org/repositories/revision/wikitty/1208 Log: java doc + unused import Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronize.java 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-30 12:32:15 UTC (rev 1207) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java 2011-08-30 12:47:39 UTC (rev 1208) @@ -15,8 +15,6 @@ import org.nuiton.wikitty.publication.entities.WikittyPubData; import org.nuiton.wikitty.publication.entities.WikittyPubDataImpl; import org.nuiton.wikitty.publication.entities.WikittyPubText; -import org.nuiton.wikitty.publication.entities.WikittyPubTextCompiled; -import org.nuiton.wikitty.publication.entities.WikittyPubTextCompiledImpl; import org.nuiton.wikitty.publication.entities.WikittyPubTextImpl; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-08-30 12:32:15 UTC (rev 1207) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-08-30 12:47:39 UTC (rev 1208) @@ -6,11 +6,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import java.util.jar.JarFile; - import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; @@ -26,7 +22,6 @@ import org.nuiton.wikitty.publication.PropertiesExtended; import org.nuiton.wikitty.publication.CodeDecorator; import org.nuiton.wikitty.publication.WikittyFileUtil; -import org.nuiton.wikitty.publication.WikittyPublicationConstant; import org.nuiton.wikitty.publication.entities.WikittyPubData; import org.nuiton.wikitty.publication.entities.WikittyPubDataHelper; import org.nuiton.wikitty.publication.entities.WikittyPubText; @@ -36,10 +31,9 @@ import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; -import org.nuiton.wikitty.search.operators.Element; /** - * Entry point for the main externalize functionnality + * Entry point for the main externalize functionality * * @author mfortun * @@ -74,6 +68,16 @@ } + /** + * Externalize the current dir as if it was a wikitty service on + * file system. + * + * Create the Jar in the current directory + * + * @param args + * @throws ArgumentsParserException + * @throws IOException + */ static public void main(String[] args) throws ArgumentsParserException, IOException { @@ -101,6 +105,14 @@ } + /** + * Externalize all the wikitty found on the wikitty service designed + * by the application config + * + * @param conf application config initialized to create a wikitty service + * @throws ArgumentsParserException + * @throws IOException + */ static public void externalize(ApplicationConfig conf) throws ArgumentsParserException, IOException { // Found all wikity on the file System @@ -109,7 +121,14 @@ externalize(conf, findAllCrit); } - + /** + * Externalize all the wikitty found(with the criteria) on the wikitty service designed + * by the application config + * @param conf application config initialized to create a wikitty service + * @param crit the criteria for the wikitty to externalize + * @throws ArgumentsParserException + * @throws IOException + */ static public void externalize(ApplicationConfig conf, Criteria crit) throws ArgumentsParserException, IOException { @@ -119,7 +138,15 @@ externalize(conf, crit, currentFile); } - + /** + * Externalize all the wikitty found(with the criteria) on the wikitty service designed + * by the application config and put the result jar in the target dir + * @param conf application config initialized to create a wikitty service + * @param crit the criteria for the wikitty to externalize + * @param targetDir where the jar will be create + * @throws ArgumentsParserException + * @throws IOException + */ static public void externalize(ApplicationConfig conf, Criteria crit, File targetDir) throws ArgumentsParserException, IOException { @@ -128,7 +155,17 @@ externalize(conf, crit, targetDir, jarName); } - + /** + * Externalize all the wikitty found(with the criteria) on the wikitty service designed + * by the application config and put the result jar in the target dir with the specific name + * @param conf application config initialized to create a wikitty service + * @param crit the criteria for the wikitty to externalize + * @param targetDir where the jar will be create + * @param jarName the name for the jar + * @return the jar created + * @throws ArgumentsParserException + * @throws IOException + */ static public File externalize(ApplicationConfig conf, Criteria crit, File TargetDir, String jarName) throws ArgumentsParserException, IOException { 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-30 12:32:15 UTC (rev 1207) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationSynchronize.java 2011-08-30 12:47:39 UTC (rev 1208) @@ -213,6 +213,15 @@ synchronisationServices(origin, target, isRecur, isDelete, isExisting); } + /** + * Synchronize the wikitty service designed by their Uri + * @param origin Uri of the wikitty service from + * @param target Uri of the wikitty service to + * @param isRecur If recursion for synchronize (only label or label and sub label) + * @param isDelete if only delete wikitty that are on origin but not on target + * @param isExisting if only update wikitty and not send wikitty that are on origin and not on target + * @throws URISyntaxException + */ static public void synchronisationServices(String origin, String target, boolean isRecur, boolean isDelete, boolean isExisting) throws URISyntaxException {

1 0

r1207 - in trunk/wikitty-publication/src: main/java/org/nuiton/wikitty/publication site/doc site/exemple/resourceAppli/src/main/wp
by mfortun＠users.nuiton.org 30 Aug '11

30 Aug '11

Author: mfortun Date: 2011-08-30 14:32:15 +0200 (Tue, 30 Aug 2011) New Revision: 1207 Url: http://nuiton.org/repositories/revision/wikitty/1207 Log: *complete how to doc *add some feature into example Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PublicationContext.java trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/view.htmljs Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PublicationContext.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PublicationContext.java 2011-08-30 12:19:40 UTC (rev 1206) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/PublicationContext.java 2011-08-30 12:32:15 UTC (rev 1207) @@ -20,6 +20,10 @@ HttpServletResponse getResponse(); + /** + * the current wikitty proxy + * @return + */ WikittyProxy getWikittyProxy(); /** @@ -28,21 +32,43 @@ * @return */ String makeUrl(String url); - + + /** + * the current wikitty service + * @return + */ WikittyService getWikittyService(); List<String> getMandatoryArguments(); String getArgument(String name); + /** + * Get + * @param name + * @param defaultValue + * @return + */ String getArgument(String name, String defaultValue); + /** + * return the actual return content tye for the page + * @return + */ String getContentType(); + /** + * Set the content type for the return page + * @param contentType + */ void setContentType(String contentType); String toString(); + /** + * the map of the arguments in the context + * @return + */ Map<String,String> getArguments(); } \ No newline at end of file Modified: trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst =================================================================== --- trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst 2011-08-30 12:19:40 UTC (rev 1206) +++ trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst 2011-08-30 12:32:15 UTC (rev 1207) @@ -56,38 +56,125 @@ Interface d'édition: - /[contextData]/edit/.action (avec contextData ce qu'on veut, voir la partie sur le war pour savoir à quoi cela correspond) + * /[contextData]/edit/.action (avec contextData ce qu'on veut, voir la partie sur le war pour savoir à quoi cela correspond) -Quoi mettre dans le code ? --------------------------- +Quoi mettre dans les WikittyPubTex ? +------------------------------------ +Dans le WikittyPubText, le contenu doit être écrit dans le langage correspondant +au mime type. -En quoi l'écrire -**************** +Mais ce n'est pas tout on peut rajouter des éléments issues du binding, qui +est un mécanisme qui permet d'utiliser du java à l'intérieur du code. +Il est possible de faire des interfaces graphique en html, soit en intégrant +le hmtl directement dans le code dans une variable de retour, soit en utilisant +le mécanisme de filtre et des Mime types composé. +par exemple le mime type: + * text/html.javascript signifie que on a du html et que entre les balises <% %> ou <%= %> est du javascript -Langage le bon mime type +Voir partie sur l'ajout de langage et le fonctionnement des filtres pour l'évaluation. - -faire des UI - Bindings ******** +Le mécanisme de binding permet l'import de classe java, l'invocation de méthode +et plein d'autre chose. -Les bindings sont des éléments important dans +Import d'une classe (avec le script engine javascript) : + + * importPackage(org.nuiton.wikitty.entities); +Instanciation: + * var resource = new WikittyResourceImpl(); -Choses possibles avec les Bindings -********************************** +Invocation de méthode: + * resource.setName(wpContext.getArgument("nom")); +Par défaut il y a un certain nombre d'objet disponible en binding: + + * wpEval, correspond à l'instance de la classe java qui évalue couramment le WikittyPub, permet d'évaluer + * wpSubContext, correspond à l'instance de collection contenant + * wpPage, nom de la page + * wpWikitty, wikitty en cours d'évaluation + * wpContext, correspond à l'instance de la classe java du context (voir interface) +Interface de wpContext: + public interface PublicationContext { + HttpServletRequest getRequest(); + HttpServletResponse getResponse(); + + /** + * the current wikitty proxy + * @return + */ + WikittyProxy getWikittyProxy(); + /** + * add context to the url and parameter if necessary + * @param url + * @return + */ + String makeUrl(String url); + + /** + * the current wikitty service + * @return + */ + WikittyService getWikittyService(); + + List<String> getMandatoryArguments(); + + String getArgument(String name); + + /** + * Get + * @param name + * @param defaultValue + * @return + */ + String getArgument(String name, String defaultValue); + + /** + * return the actual return content tye for the page + * @return + */ + String getContentType(); + + /** + * Set the content type for the return page + * @param contentType + */ + void setContentType(String contentType); + + String toString(); + + /** + * the map of the arguments in the context + * @return + */ + Map<String,String> getArguments(); + + } + + +Par exemple + +Construit l'url de l'image en question pour l'affichage + + * <img src='<%=wpContext.makeUrl("/raw/wikittypubuml")%>'/> + + +Intégre le résultat de l'évaluation de Test entre les balises <p> + + * <p><%=wpEval.doAction(wpContext, "Test")%></p> + + Détails de l'exemple -------------------- Modified: trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/view.htmljs =================================================================== --- trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/view.htmljs 2011-08-30 12:19:40 UTC (rev 1206) +++ trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/view.htmljs 2011-08-30 12:32:15 UTC (rev 1207) @@ -111,11 +111,13 @@ </form> +Diagramme uml de la relation: +<img src='<%=wpContext.makeUrl("/raw/wikittypubuml")%>'/> +Juste en dessous intégration du résultat de l'évaluation de WikittyPubText ja Test: +<p><%=wpEval.doAction(wpContext, "Test")%></p> - - </body> </html>

1 0

r1206 - in trunk: wikitty-solr wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin
by tchemit＠users.nuiton.org 30 Aug '11

30 Aug '11

Author: tchemit Date: 2011-08-30 14:19:40 +0200 (Tue, 30 Aug 2011) New Revision: 1206 Url: http://nuiton.org/repositories/revision/wikitty/1206 Log: fix build remove javac warning (they mean something I think :)) Modified: trunk/wikitty-solr/pom.xml trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/CopyDependencyUtil.java Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-08-30 12:08:41 UTC (rev 1205) +++ trunk/wikitty-solr/pom.xml 2011-08-30 12:19:40 UTC (rev 1206) @@ -66,7 +66,12 @@ <scope>compile</scope> </dependency> - + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> Modified: trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/CopyDependencyUtil.java =================================================================== --- trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/CopyDependencyUtil.java 2011-08-30 12:08:41 UTC (rev 1205) +++ trunk/wp-maven-plugin/src/main/java/org/nuiton/wikitty/plugin/CopyDependencyUtil.java 2011-08-30 12:19:40 UTC (rev 1206) @@ -85,7 +85,7 @@ try { ArtifactRepository targetRepository = repositoryFactory .createDeploymentArtifactRepository("local", - outputDirectory.toURL().toExternalForm(), + outputDirectory.toURI().toURL().toExternalForm(), (ArtifactRepositoryLayout) repositoryLayouts .get("default"), false /* uniqueVersion */); for (Iterator i = artifacts.iterator(); i.hasNext();) {

1 0