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

r955 - trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr
by echatellier＠users.nuiton.org 20 Jun '11

20 Jun '11

Author: echatellier Date: 2011-06-20 18:24:56 +0200 (Mon, 20 Jun 2011) New Revision: 955 Url: http://nuiton.org/repositories/revision/wikitty/955 Log: Format Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java 2011-06-20 16:13:27 UTC (rev 954) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java 2011-06-20 16:24:56 UTC (rev 955) @@ -138,8 +138,7 @@ Like like = (Like) restriction; return like2solr(like); case UNLIKE: - Unlike - unlike = (Unlike) restriction; + Unlike unlike = (Unlike) restriction; return unlike2solr(unlike); case ASSOCIATED: AssociatedRestriction associated = (AssociatedRestriction) restriction;

1 0

r954 - in trunk/wikitty-struts: . src/main src/main/java src/main/java/org src/main/java/org/nuiton src/main/java/org/nuiton/wikitty src/main/java/org/nuiton/wikitty/taglib src/main/tld
by mfortun＠users.nuiton.org 20 Jun '11

20 Jun '11

Author: mfortun Date: 2011-06-20 18:13:27 +0200 (Mon, 20 Jun 2011) New Revision: 954 Url: http://nuiton.org/repositories/revision/wikitty/954 Log: * pom udated for wikitty dependency and build requirement to be a taglib * first new tag that say hello Added: trunk/wikitty-struts/src/main/java/org/ trunk/wikitty-struts/src/main/java/org/nuiton/ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/taglib/ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/taglib/HelloTag.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/taglib/WikittyTag.java trunk/wikitty-struts/src/main/tld/ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld Modified: trunk/wikitty-struts/ trunk/wikitty-struts/pom.xml Property changes on: trunk/wikitty-struts ___________________________________________________________________ Added: svn:ignore + target .classpath .project .settings Modified: trunk/wikitty-struts/pom.xml =================================================================== --- trunk/wikitty-struts/pom.xml 2011-06-20 14:10:23 UTC (rev 953) +++ trunk/wikitty-struts/pom.xml 2011-06-20 16:13:27 UTC (rev 954) @@ -17,11 +17,27 @@ <groupId>org.nuiton.wikitty</groupId> <artifactId>wikitty-struts</artifactId> - <dependencies/> - - + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + + + </dependencies> + + + +    @@ -43,15 +59,15 @@ <resource> <directory>src/main/resources</directory> </resource> + <resource> - <directory>${project.build.directory}/generated-sources/models</directory> - <includes> - <include>*.objectmodel</include> - <include>*.properties</include> - </includes> + <directory>src/main/tld</directory> + <targetPath>META-INF/tld</targetPath> </resource> + + </resources> </build> - + </project> Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/taglib/HelloTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/taglib/HelloTag.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/taglib/HelloTag.java 2011-06-20 16:13:27 UTC (rev 954) @@ -0,0 +1,55 @@ +package org.nuiton.wikitty.taglib; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.jsp.JspException; +import javax.servlet.jsp.tagext.DynamicAttributes; +import javax.servlet.jsp.tagext.SimpleTagSupport; +import javax.servlet.jsp.tagext.TagSupport; + +import org.nuiton.wikitty.entities.Wikitty; + +public class HelloTag extends TagSupport { + + private Map attributes = new HashMap(); + + protected String valeur = ""; + + protected Wikitty wikity; + + public Wikitty getWikity() { + return wikity; + } + + public void setWikity(Wikitty wikity) { + this.wikity = wikity; + } + + public String getValeur() { + return valeur; + } + + public void setValeur(String valeur) { + this.valeur = valeur; + } + + /** + * + */ + private static final long serialVersionUID = 1L; + + public int doStartTag() throws JspException { + + try { + pageContext.getOut().println( + "Hello World ! " + valeur ); + } catch (IOException e) { + throw new JspException("I/O Error", e); + } + return SKIP_BODY; + } + + +} \ No newline at end of file Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/taglib/HelloTag.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/taglib/WikittyTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/taglib/WikittyTag.java (rev 0) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/taglib/WikittyTag.java 2011-06-20 16:13:27 UTC (rev 954) @@ -0,0 +1,8 @@ +package org.nuiton.wikitty.taglib; + +public class WikittyTag { + + + + +} Property changes on: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/taglib/WikittyTag.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld (rev 0) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-06-20 16:13:27 UTC (rev 954) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> +<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + version="2.0"> + <display-name>"wikitty-struts"</display-name> + <tlib-version>1.3</tlib-version> + <jsp-version>1.2</jsp-version> + <short-name>wikitty-struts</short-name> + <uri>/wikitty-struts</uri> + + <tag> + <name>hello</name> + <tagclass>org.nuiton.wikitty.taglib.HelloTag</tagclass> + <bodycontent>empty</bodycontent> + <attribute> + <name>valeur</name> + </attribute> + <attribute> + <name>wikity</name> + + + </attribute> + <dynamic-attributes>true</dynamic-attributes> + </tag> + + + + +</taglib> Property changes on: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld ___________________________________________________________________ Added: svn:mime-type + text/plain

1 0

r953 - trunk
by echatellier＠users.nuiton.org 20 Jun '11

20 Jun '11

Author: echatellier Date: 2011-06-20 16:10:23 +0200 (Mon, 20 Jun 2011) New Revision: 953 Url: http://nuiton.org/repositories/revision/wikitty/953 Log: Les tabulations !!! Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-20 13:58:40 UTC (rev 952) +++ trunk/pom.xml 2011-06-20 14:10:23 UTC (rev 953) @@ -504,7 +504,7 @@ <id>wikitty-extra-modules</id> <modules> <module>wikitty-publication</module> - <module>wikitty-struts</module> + <module>wikitty-struts</module> </modules> </profile> </profiles>

1 0

r952 - trunk/wikitty-solr
by echatellier＠users.nuiton.org 20 Jun '11

20 Jun '11

Author: echatellier Date: 2011-06-20 15:58:40 +0200 (Mon, 20 Jun 2011) New Revision: 952 Url: http://nuiton.org/repositories/revision/wikitty/952 Log: wikiity > wikitty Modified: trunk/wikitty-solr/pom.xml Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-06-20 13:57:14 UTC (rev 951) +++ trunk/wikitty-solr/pom.xml 2011-06-20 13:58:40 UTC (rev 952) @@ -103,7 +103,7 @@ <name>Wikitty :: wikitty-solr</name> - <description>Wikiity solr search engine</description> + <description>Wikitty solr search engine</description> <inceptionYear>2009</inceptionYear>

1 0

r951 - trunk
by echatellier＠users.nuiton.org 20 Jun '11

20 Jun '11

Author: echatellier Date: 2011-06-20 15:57:14 +0200 (Mon, 20 Jun 2011) New Revision: 951 Url: http://nuiton.org/repositories/revision/wikitty/951 Log: Clean pom (useless deps) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-17 16:00:30 UTC (rev 950) +++ trunk/pom.xml 2011-06-20 13:57:14 UTC (rev 951) @@ -90,28 +90,7 @@ <scope>compile</scope> </dependency> -  -  - - <dependency> <groupId>commons-pool</groupId> <artifactId>commons-pool</artifactId> <version>1.5.4</version> @@ -126,7 +105,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.143</version> + <version>1.3.156</version> <scope>test</scope> </dependency> @@ -251,129 +230,6 @@ </dependency> <dependency> - <groupId>org.zkoss.zk</groupId> - <artifactId>zk</artifactId> - <version>${zkVersion}</version> - </dependency> - - <dependency> - <groupId>org.zkoss.zk</groupId> - <artifactId>zkplus</artifactId> - <version>${zkVersion}</version> - </dependency> - - <dependency> - <groupId>org.zkoss.zk</groupId> - <artifactId>zul</artifactId> - <version>${zkVersion}</version> - </dependency> - - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase</artifactId> - <version>${hbaseVersion}</version> - </dependency> - - <dependency> - <groupId>org.apache.hbase</groupId> - <artifactId>hbase</artifactId> - <classifier>tests</classifier> - <version>${hbaseVersion}</version> - <scope>test</scope> - </dependency> - - <dependency> -  - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - <version>0.20.3-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.2</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - <version>${jettyMorbayVersion}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>${springVersion}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${springVersion}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> - <version>${springVersion}</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${springVersion}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-orm</artifactId> - <version>${springVersion}</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jdbc</artifactId> - <version>${springVersion}</version> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.5.6-Final</version> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>4.1.0.Final</version> - </dependency> - - <dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - <version>1.0.0.Final</version> - </dependency> - - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-core</artifactId> - <version>5.4.0</version> - </dependency> - - <dependency> - <groupId>com.experlog</groupId> - <artifactId>xapool</artifactId> - <version>1.5.0</version> - </dependency> - - <dependency> <groupId>com.jgeppert.struts2.jquery</groupId> <artifactId>struts2-jquery-plugin</artifactId> <version>${struts2jqueryVersion}</version> @@ -385,27 +241,26 @@ <version>${struts2Version}</version> </dependency> - <dependency> + <dependency> <groupId>org.apache.struts</groupId> <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> - <dependency> + <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> <version>${strutsxworksVersion}</version> - </dependency> - - + </dependency> + </dependencies> </dependencyManagement>

1 0

r950 - in trunk: . wikitty-publication
by mfortun＠users.nuiton.org 17 Jun '11

17 Jun '11

Author: mfortun Date: 2011-06-17 18:00:30 +0200 (Fri, 17 Jun 2011) New Revision: 950 Url: http://nuiton.org/repositories/revision/wikitty/950 Log: * add wikitty-struts as module * add wikitty-struts as dependency for wikittyPublication Modified: trunk/pom.xml trunk/wikitty-publication/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-17 15:34:45 UTC (rev 949) +++ trunk/pom.xml 2011-06-17 16:00:30 UTC (rev 950) @@ -649,6 +649,7 @@ <id>wikitty-extra-modules</id> <modules> <module>wikitty-publication</module> + <module>wikitty-struts</module> </modules> </profile> </profiles> Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-06-17 15:34:45 UTC (rev 949) +++ trunk/wikitty-publication/pom.xml 2011-06-17 16:00:30 UTC (rev 950) @@ -37,6 +37,13 @@ </dependency> <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-struts</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <scope>runtime</scope>

1 0

r949 - /
by mfortun＠users.nuiton.org 17 Jun '11

17 Jun '11

Author: mfortun Date: 2011-06-17 17:34:45 +0200 (Fri, 17 Jun 2011) New Revision: 949 Url: http://nuiton.org/repositories/revision/wikitty/949 Log: * remove unwanted dir due to svn eclipse plug-in Removed: wikitty-struts/

1 0

r948 - /
by mfortun＠users.nuiton.org 17 Jun '11

17 Jun '11

Author: mfortun Date: 2011-06-17 17:28:12 +0200 (Fri, 17 Jun 2011) New Revision: 948 Url: http://nuiton.org/repositories/revision/wikitty/948 Log: Share project "wikitty-struts" into "http://svn.nuiton.org/svn/wikitty" Added: wikitty-struts/

1 0

r947 - in trunk: . wikitty-struts wikitty-struts/src wikitty-struts/src/main
by mfortun＠users.nuiton.org 17 Jun '11

17 Jun '11

Author: mfortun Date: 2011-06-17 17:27:29 +0200 (Fri, 17 Jun 2011) New Revision: 947 Url: http://nuiton.org/repositories/revision/wikitty/947 Log: new wikitty module for wikitty struts taglib Added: trunk/wikitty-struts/ trunk/wikitty-struts/LICENSE.txt trunk/wikitty-struts/README.txt trunk/wikitty-struts/changelog.txt trunk/wikitty-struts/pom.xml trunk/wikitty-struts/src/ trunk/wikitty-struts/src/main/ trunk/wikitty-struts/src/main/java/ trunk/wikitty-struts/src/main/ressources/ Added: trunk/wikitty-struts/LICENSE.txt =================================================================== --- trunk/wikitty-struts/LICENSE.txt (rev 0) +++ trunk/wikitty-struts/LICENSE.txt 2011-06-17 15:27:29 UTC (rev 947) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Added: trunk/wikitty-struts/pom.xml =================================================================== --- trunk/wikitty-struts/pom.xml (rev 0) +++ trunk/wikitty-struts/pom.xml 2011-06-17 15:27:29 UTC (rev 947) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>3.1.3-SNAPSHOT</version> + </parent> + +  +  +  + + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-struts</artifactId> + + <dependencies/> + + + + +  +  +  + + <name>Wikitty :: struts</name> + + <description>taglib struts for Wikitty</description> + <inceptionYear>2011</inceptionYear> + +  +  +  + + <packaging>jar</packaging> + + <build> + + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory>${project.build.directory}/generated-sources/models</directory> + <includes> + <include>*.objectmodel</include> + <include>*.properties</include> + </includes> + </resource> + </resources> + </build> + + +</project>

1 0

r946 - in trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication: . externalize
by mfortun＠users.nuiton.org 17 Jun '11

17 Jun '11

Author: mfortun Date: 2011-06-17 16:05:04 +0200 (Fri, 17 Jun 2011) New Revision: 946 Url: http://nuiton.org/repositories/revision/wikitty/946 Log: * base for wikitty publication externalize * WikittyPublicationExternalize entry point * WikittyServiceJarLoad to handle wikitty inside a jar file Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java Added: 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 (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-06-17 14:05:04 UTC (rev 946) @@ -0,0 +1,94 @@ +package org.nuiton.wikitty.publication.externalize; + +import java.io.File; + +import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.ArgumentsParserException; +import org.nuiton.util.FileUtil; +import org.nuiton.wikitty.WikittyConfigOption; +import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyServiceFactory; +import org.nuiton.wikitty.search.Search; + +/** + * Entry point for the main externalize functionnality + * + * @author mfortun + * + */ +public class WikittyPublicationExternalize { + + /* + * Class don't have to be instantiate + */ + private WikittyPublicationExternalize() { + + } + + static public void main(String[] args) throws ArgumentsParserException { + + ApplicationConfig appconfig = new ApplicationConfig(); + + appconfig.parse(args); + + appconfig + .setOption( + WikittyConfigOption.WIKITTY_WIKITTYSERVICE_COMPONENTS + .getKey(), + "org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem"); + + File currentFile = new File("."); + currentFile = new File(currentFile.getAbsolutePath()).getParentFile(); + + String Label = currentFile.getName(); + + String urlFileSystem = "file:///home/Manou/testWP#wp"; + //currentFile.getParent() + "#" + Label; + + System.out.println(urlFileSystem); + + + + appconfig.setOption(WikittyConfigOption.WIKITTY_SERVER_URL.getKey(), + urlFileSystem); + + + + + WikittyProxy proxy = new WikittyProxy( + WikittyServiceFactory.buildWikittyService(appconfig)); + + + + + + System.out.println(proxy.findAllByCriteria(Search.query().keyword("*").criteria()).size()); + + + + + + } + + /* + * Algo fonctionnement + * + * Selectionner tout les wikitty sur le file system qui sont dans le dossier + * courant, en servant d'un wikitty publication fileSystem. + * + * On va créer un dossier pour le jar "tempJar" pour chaque wikitty en + * fonction du type: -wikittyPubData: on va l'écrire sous son label le + * fichier dans le dossier tempJar et on va le référencer dans l'index + * central du dossier + * + * -WikittyPubText: .on va écrire le pub text sous son label le fichier + * correspondant .on va décorer le contenu du wikittyPubText avec les + * éléments script engine etc, on va écrire le .java correspondant .ensuite + * on va compiler le java et écrire le .class correspondant .on écrit les + * metadata et les élément d'index du wikitty pour le retrouver + * + * Une fois tout les wikitty traité on va packager le dossier tempJar en jar + * et on va supprimer le dossier tempJar + */ + +} Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java 2011-06-17 14:05:04 UTC (rev 946) @@ -0,0 +1,259 @@ +package org.nuiton.wikitty.publication.externalize; + +import java.util.Collection; +import java.util.List; + +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.search.TreeNodeResult; +import org.nuiton.wikitty.services.WikittyEvent; +import org.nuiton.wikitty.services.WikittyListener; + +/** + * Wikitty service use to load wikitty store inside jar file + * + * @author mfortun + * + */ +public class WikittyServiceJarLoader implements WikittyService { + + + + /* + * Implementer : + * + * restore + * findByCriteria + * findAllByCriteria + * exist ? + * + * + * + */ + + + @Override + public void addWikittyServiceListener(WikittyListener listener, + ServiceListenerType type) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + // + + } + + @Override + public void removeWikittyServiceListener(WikittyListener listener, + ServiceListenerType type) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + // + + } + + @Override + public String login(String login, String password) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return null; + + } + + @Override + public void logout(String securityToken) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + // + + } + + @Override + public WikittyEvent clear(String securityToken) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return null; + + } + + @Override + public boolean canWrite(String securityToken, Wikitty wikitty) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return false; + + } + + @Override + public boolean canDelete(String securityToken, String wikittyId) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return false; + + } + + @Override + public boolean canRead(String securityToken, String wikittyId) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return false; + + } + + @Override + public boolean exists(String securityToken, String wikittyId) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return false; + + } + + @Override + public boolean isDeleted(String securityToken, String wikittyId) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return false; + + } + + @Override + public WikittyEvent replay(String securityToken, List<WikittyEvent> events, + boolean force) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return null; + + } + + @Override + public WikittyEvent store(String securityToken, + Collection<Wikitty> wikitties, boolean force) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return null; + + } + + @Override + public List<String> getAllExtensionIds(String securityToken) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return null; + + } + + @Override + public List<String> getAllExtensionsRequires(String securityToken, + String extensionName) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return null; + + } + + @Override + public WikittyEvent storeExtension(String securityToken, + Collection<WikittyExtension> exts) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return null; + + } + + @Override + public WikittyEvent deleteExtension(String securityToken, + Collection<String> extNames) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return null; + + } + + @Override + public WikittyExtension restoreExtension(String securityToken, + String extensionId) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return null; + + } + + @Override + public WikittyExtension restoreExtensionLastVersion(String securityToken, + String name) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return null; + + } + + @Override + public List<Wikitty> restore(String securityToken, List<String> id) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return null; + + } + + @Override + public WikittyEvent delete(String securityToken, Collection<String> ids) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return null; + + } + + @Override + public List<PagedResult<String>> findAllByCriteria(String securityToken, + List<Criteria> criteria) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return null; + + } + + @Override + public List<String> findByCriteria(String securityToken, + List<Criteria> criteria) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return null; + + } + + @Override + public WikittyEvent deleteTree(String securityToken, String treeNodeId) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return null; + + } + + @Override + public TreeNodeResult<String> findTreeNode(String securityToken, + String wikittyId, int depth, boolean count, Criteria filter) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return null; + + } + + @Override + public Wikitty restoreVersion(String securityToken, String wikittyId, + String version) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + //return null; + + } + + @Override + public void syncSearchEngine(String securityToken) { + // TODO mfortun + throw new UnsupportedOperationException("not yet implemented"); + // + + } + +} Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java ___________________________________________________________________ Added: svn:mime-type + text/plain

1 0