November 2009 - Sandbox-commits - mailman.cloud.codelutin.com

r327 - wikengo_core-wikitty/wikengo_core-wikitty-solr-impl
by tchemit＠users.nuiton.org 15 Nov '09

15 Nov '09

Author: tchemit Date: 2009-11-15 16:18:24 +0100 (Sun, 15 Nov 2009) New Revision: 327 Removed: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml~ Log: remove backup file from vcs Deleted: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml~ =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml~ 2009-11-15 15:15:30 UTC (rev 326) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml~ 2009-11-15 15:18:24 UTC (rev 327) @@ -1,92 +0,0 @@ -<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"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - - <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty-solr-impl</artifactId> - - <parent> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty</artifactId> - <version>1.0-CL-SNAPSHOT</version> - </parent> - - <dependencies> -  - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>core-wikitty-api</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-core</artifactId> - <version>1.3.0</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - </dependencies> - -  -  -  - - <name>org.sharengo.wikengo.core-wikitty-solr-impl</name> - - <description>hbase impl of wikitty</description> - <inceptionYear>2009</inceptionYear> - -  -  -  - - <packaging>jar</packaging> - - <properties> - <maven.test.skip>true</maven.test.skip> - <maven.test.failure.ignore>true</maven.test.failure.ignore> - </properties> - -  -  -  - - <repositories> - <repository> - <id>sharengo-maven2-repository</id> - <name>Sharengo's repository</name> - <url>http://maven2.sharengo.org</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> - -</project> -

1 0

r326 - wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc
by tchemit＠users.nuiton.org 15 Nov '09

15 Nov '09

Author: tchemit Date: 2009-11-15 16:15:30 +0100 (Sun, 15 Nov 2009) New Revision: 326 Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyJDBCUtil.java Log: fix loading jdbc config for webstart Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyJDBCUtil.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyJDBCUtil.java 2009-11-13 18:31:28 UTC (rev 325) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyJDBCUtil.java 2009-11-15 15:15:30 UTC (rev 326) @@ -112,6 +112,10 @@ * Properties file */ protected static Properties conf = loadProperties(); + /** + * location of default config (in class-path) + */ + public static final String CONFIG_FILE = "jdbc.properties"; /** * Loads the properties in the jdbc.properties file. @@ -121,11 +125,13 @@ public static Properties loadProperties() { Properties properties = new Properties(); try { - URL url = ClassLoader.getSystemResource("jdbc.properties"); + //TC-20091115 does not work with webstart, prefer use a nearest classloader + //URL url = ClassLoader.getSystemResource("jdbc.properties"); + URL url = WikittyJDBCUtil.class.getClassLoader().getResource(CONFIG_FILE); properties.load(url.openStream()); - } catch (IOException eee) { + } catch (Exception eee) { if (log.isErrorEnabled()) { - log.error("Unable to load property file"); + log.error("Unable to load property file "+CONFIG_FILE+" for reason "+eee.getMessage(),eee); } } return properties;

1 0

r325 - in wikengo_core-wikitty: . wikengo_core-wikitty-api wikengo_core-wikitty-jdbc-impl wikengo_core-wikitty-solr-impl
by tchemit＠users.nuiton.org 13 Nov '09

13 Nov '09

Author: tchemit Date: 2009-11-13 19:31:28 +0100 (Fri, 13 Nov 2009) New Revision: 325 Modified: wikengo_core-wikitty/pom.xml wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/pom.xml wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml Log: next version is 1.0.0-alpha-2-SNAPSHOT Modified: wikengo_core-wikitty/pom.xml =================================================================== --- wikengo_core-wikitty/pom.xml 2009-11-13 18:30:20 UTC (rev 324) +++ wikengo_core-wikitty/pom.xml 2009-11-13 18:31:28 UTC (rev 325) @@ -10,7 +10,7 @@ <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.0.0-alpha-1</version> + <version>1.0.0-alpha-2-SNAPSHOT</version> <modules> <module>wikengo_core-wikitty-api</module> Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml 2009-11-13 18:30:20 UTC (rev 324) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml 2009-11-13 18:31:28 UTC (rev 325) @@ -13,7 +13,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.0.0-alpha-1</version> + <version>1.0.0-alpha-2-SNAPSHOT</version> </parent> <dependencies> Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/pom.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/pom.xml 2009-11-13 18:30:20 UTC (rev 324) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/pom.xml 2009-11-13 18:31:28 UTC (rev 325) @@ -8,7 +8,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.0.0-alpha-1</version> + <version>1.0.0-alpha-2-SNAPSHOT</version> </parent> <dependencies> Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml 2009-11-13 18:30:20 UTC (rev 324) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml 2009-11-13 18:31:28 UTC (rev 325) @@ -13,7 +13,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.0.0-alpha-1</version> + <version>1.0.0-alpha-2-SNAPSHOT</version> </parent> <dependencies>

1 0

r324 - tags
by tchemit＠users.nuiton.org 13 Nov '09

13 Nov '09

Author: tchemit Date: 2009-11-13 19:30:20 +0100 (Fri, 13 Nov 2009) New Revision: 324 Added: tags/wikengo_core-wikitty-1.0.0-alpha-1/ Log: smal release for release 0.0.1 of vradi

1 0

r323 - /
by tchemit＠users.nuiton.org 13 Nov '09

13 Nov '09

Author: tchemit Date: 2009-11-13 19:30:00 +0100 (Fri, 13 Nov 2009) New Revision: 323 Added: tags/ Log:

1 0

r322 - in wikengo_core-wikitty: . wikengo_core-wikitty-api wikengo_core-wikitty-jdbc-impl wikengo_core-wikitty-solr-impl
by tchemit＠users.nuiton.org 13 Nov '09

13 Nov '09

Author: tchemit Date: 2009-11-13 19:28:53 +0100 (Fri, 13 Nov 2009) New Revision: 322 Removed: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/core-wikitty-solr-impl.iml Modified: wikengo_core-wikitty/pom.xml wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/pom.xml wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml Log: prepare tag for release 1.0.0-alpha-1 Modified: wikengo_core-wikitty/pom.xml =================================================================== --- wikengo_core-wikitty/pom.xml 2009-11-13 17:54:23 UTC (rev 321) +++ wikengo_core-wikitty/pom.xml 2009-11-13 18:28:53 UTC (rev 322) @@ -10,7 +10,7 @@ <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-alpha-1</version> <modules> <module>wikengo_core-wikitty-api</module> @@ -21,7 +21,7 @@  <dependencyManagement> Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml 2009-11-13 17:54:23 UTC (rev 321) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml 2009-11-13 18:28:53 UTC (rev 322) @@ -13,7 +13,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-alpha-1</version> </parent> <dependencies> Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/pom.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/pom.xml 2009-11-13 17:54:23 UTC (rev 321) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/pom.xml 2009-11-13 18:28:53 UTC (rev 322) @@ -8,7 +8,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-alpha-1</version> </parent> <dependencies> Property changes on: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl ___________________________________________________________________ Added: svn:ignore + target *.iml *.ipr *.iws Deleted: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/core-wikitty-solr-impl.iml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/core-wikitty-solr-impl.iml 2009-11-13 17:54:23 UTC (rev 321) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/core-wikitty-solr-impl.iml 2009-11-13 18:28:53 UTC (rev 322) @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/../target/classes" /> - <output-test url="file://$MODULE_DIR$/../target/test-classes" /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" /> - <excludeFolder url="file://$MODULE_DIR$/target" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="core-wikitty-api" exported="" /> - <orderEntry type="library" exported="" scope="RUNTIME" name="Maven: log4j:log4j:1.2.14" level="project" /> - <orderEntry type="library" exported="" name="Maven: commons-logging:commons-logging:1.1.1" level="project" /> - <orderEntry type="library" exported="" name="Maven: xpp3:xpp3:1.1.4c" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.solr:solr-core:1.3.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.solr:solr-common:1.3.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.solr:solr-solrj:1.3.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" /> - <orderEntry type="library" exported="" name="Maven: commons-codec:commons-codec:1.3" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.commons:commons-io:1.3.2" level="project" /> - <orderEntry type="library" exported="" name="Maven: commons-fileupload:commons-fileupload:1.2" level="project" /> - <orderEntry type="library" exported="" name="Maven: stax:stax:1.2.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: stax:stax-api:1.0.1" level="project" /> - <orderEntry type="library" exported="" name="Maven: net.java.dev.stax-utils:stax-utils:20040917" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.solr:solr-lucene-analyzers:1.3.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.solr:solr-lucene-core:1.3.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.solr:solr-lucene-highlighter:1.3.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.solr:solr-lucene-queries:1.3.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.solr:solr-lucene-snowball:1.3.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.solr:solr-lucene-spellchecker:1.3.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.solr:solr-commons-csv:1.3.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: woodstox:wstx-asl:3.2.7" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.apache.geronimo.specs:geronimo-stax-api_1.0_spec:1.0.1" level="project" /> - <orderEntry type="library" exported="" scope="RUNTIME" name="Maven: javax.servlet:servlet-api:2.5" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.nuiton:nuiton-utils:1.1.1" level="project" /> - <orderEntry type="library" exported="" name="Maven: commons-primitives:commons-primitives:1.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> - <orderEntry type="library" exported="" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" /> - <orderEntry type="library" exported="" name="Maven: org.nuiton.i18n:nuiton-i18n-api:1.0.1" level="project" /> - </component> -</module> - Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml 2009-11-13 17:54:23 UTC (rev 321) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml 2009-11-13 18:28:53 UTC (rev 322) @@ -13,7 +13,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0-alpha-1</version> </parent> <dependencies>

1 0

r321 - in wikengo_core-wikitty: . wikengo_core-wikitty-api wikengo_core-wikitty-jdbc-impl wikengo_core-wikitty-solr-impl
by tchemit＠users.nuiton.org 13 Nov '09

13 Nov '09

Author: tchemit Date: 2009-11-13 18:54:23 +0100 (Fri, 13 Nov 2009) New Revision: 321 Modified: wikengo_core-wikitty/pom.xml wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/pom.xml wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/core-wikitty-solr-impl.iml wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml Log: remove all sharengo dependencies : too messy to make a release fo it, moreover we do not have the mavenpom and it is on a SNAPSHOT,... Modified: wikengo_core-wikitty/pom.xml =================================================================== --- wikengo_core-wikitty/pom.xml 2009-11-12 16:57:47 UTC (rev 320) +++ wikengo_core-wikitty/pom.xml 2009-11-13 17:54:23 UTC (rev 321) @@ -1,29 +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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty</artifactId> - <version>1.0-CL-SNAPSHOT</version> - - <modules> - <module>wikengo_core-wikitty-api</module> - <module>wikengo_core-wikitty-jdbc-impl</module> - <module>wikengo_core-wikitty-solr-impl</module> - </modules> - - <parent> <groupId>org.sharengo.wikengo</groupId> - <artifactId>mavenpom</artifactId> + <artifactId>core-wikitty</artifactId> <version>1.0.0-SNAPSHOT</version> - </parent> - <distributionManagement> + <modules> + <module>wikengo_core-wikitty-api</module> + <module>wikengo_core-wikitty-jdbc-impl</module> + <module>wikengo_core-wikitty-solr-impl</module> + </modules> + +  + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.7</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>compile</scope> + <version>1.1.1</version> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>runtime</scope> + </dependency> + + </dependencies> + </dependencyManagement> + + <distributionManagement> <repository> <id>nuiton</id> <url>scpexe://nuiton.org/var/lib/maven/release</url> @@ -34,53 +62,275 @@ </snapshotRepository> </distributionManagement> -  -  -  +  +  +  - <name>org.sharengo.wikengo.core-wikitty</name> + <name>org.sharengo.wikengo.core-wikitty</name> - <description>wikitty multi-module project</description> - <inceptionYear>2009</inceptionYear> + <description>wikitty multi-module project</description> + <inceptionYear>2009</inceptionYear> -  -  -  +  +  +  - <packaging>pom</packaging> + <packaging>pom</packaging> - <properties> -  - <projectId>core-wikitty</projectId> - </properties> + <properties> +  + <projectId>core-wikitty</projectId> - <build> - </build> -  -  -  +  + <maven.compile.source>1.6</maven.compile.source> + <maven.compile.target>1.6</maven.compile.target> - <repositories> +  + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <repository> - <id>sharengo-maven2-repository</id> - <name>Sharengo's repository</name> - <url>http://maven2.sharengo.org</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> +  + <maven.src.dir>${basedir}/src</maven.src.dir> - </repositories> +  + <maven.test.testFailureIgnore>false</maven.test.testFailureIgnore> - <profiles> -  +  + <maven.test.skip>false</maven.test.skip> + +  + <maven.test.forkMode>once</maven.test.forkMode> + +  + <maven.reports.generate>true</maven.reports.generate> + +  + <javadoc.version>2.4</javadoc.version> + +  + <maven.javadoc.skip>false</maven.javadoc.skip> + + <spring.version>2.5.5</spring.version> + <hessian.version>3.1.6</hessian.version> + + </properties> + + <build> + + <pluginManagement> + + <plugins> + + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.3</version> + <configuration> + <encoding>${project.build.sourceEncoding}</encoding> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>${maven.compile.source}</source> + <target>${maven.compile.target}</target> + <encoding>${project.build.sourceEncoding}</encoding> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <skip>${maven.test.skip}</skip> + <testFailureIgnore>${maven.test.testFailureIgnore}</testFailureIgnore> + <forkMode>${maven.test.forkMode}</forkMode> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.1</version> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-war-plugin</artifactId> + <version>2.1-beta-1</version> + <configuration> + <warSourceDirectory>${maven.src.dir}/main/webapp</warSourceDirectory> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> + <inherited>true</inherited> + + <configuration> + <archive> +  +  + <manifest> + <mainClass>${maven.jar.main.class}</mainClass> + </manifest> + <manifestEntries> + <url>${pom.url}</url> + </manifestEntries> + </archive> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-source-plugin</artifactId> + <version>2.1</version> + <inherited>true</inherited> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc.version}</version> + <configuration> + <docencoding>${project.reporting.outputEncoding}</docencoding> + <encoding>${project.reporting.outputEncoding}</encoding> + <charset>${project.reporting.outputEncoding}</charset> + <quiet>true</quiet> + <excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames> +  +  + </configuration> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-eclipse-plugin</artifactId> + <version>2.7</version> + <configuration> + <ajdtVersion>none</ajdtVersion> + <sourceIncludes> + <sourceInclude>**/*</sourceInclude> + </sourceIncludes> + <downloadSources>true</downloadSources> + <downloadJavadocs>true</downloadJavadocs> + <addGroupIdToProjectName>true</addGroupIdToProjectName> + </configuration> + </plugin> + + </plugins> + </pluginManagement> + + </build> + +  +  +  + + + <repositories> + + <repository> + <id>nuiton-repository</id> + <name>Repo Nuiton</name> + <url>http://maven.nuiton.org/release</url> + </repository> + +  + +  + +  + +  + + </repositories> + + <pluginRepositories> + + <pluginRepository> + <id>nuiton-repository</id> + <name>Repo Nuiton</name> + <url>http://maven.nuiton.org/release</url> + </pluginRepository> + + </pluginRepositories> + + <profiles> +  <profile> <id>release-profile</id> <activation> @@ -124,7 +374,7 @@ </build> </profile> - </profiles> + </profiles> </project> Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml 2009-11-12 16:57:47 UTC (rev 320) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml 2009-11-13 17:54:23 UTC (rev 321) @@ -1,224 +1,225 @@ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  - - <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty-api</artifactId> +  +  +  - <parent> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty</artifactId> - <version>1.0-CL-SNAPSHOT</version> - </parent> + <groupId>org.sharengo.wikengo</groupId> + <artifactId>core-wikitty-api</artifactId> - <dependencies> -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <parent> + <groupId>org.sharengo.wikengo</groupId> + <artifactId>core-wikitty</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.8</version> - <classifier>jdk15</classifier> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>${spring.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${spring.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${spring.version}</version> - <scope>test</scope> - </dependency> + <dependencies> -  - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> -  - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.8</version> + <classifier>jdk15</classifier> + <scope>test</scope> + </dependency> - <dependency> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - <version>1.1.4c</version> - </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + +  + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + +  + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + <version>1.1.4c</version> + </dependency> </dependencies> -  -  -  +  +  +  - <name>org.sharengo.wikengo.core-wikitty-api</name> + <name>org.sharengo.wikengo.core-wikitty-api</name> - <description>public api of wikitty</description> - <inceptionYear>2009</inceptionYear> + <description>public api of wikitty</description> + <inceptionYear>2009</inceptionYear> -  -  -  +  +  +  - <packaging>jar</packaging> + <packaging>jar</packaging> - <properties> - <eugene.version>1.0.0</eugene.version> - <eugengo.version>0.6-SNAPSHOT</eugengo.version> + <properties> + <eugene.version>1.0.0</eugene.version> + <eugengo.version>0.6.0</eugengo.version> -  - <maven.gen.dir>${project.build.directory}/generated-sources</maven.gen.dir> +  + <maven.gen.dir>${project.build.directory}/generated-sources</maven.gen.dir> -  - <maven.test.gen.dir>${project.build.directory}/generated-test-sources</maven.test.gen.dir> +  + <maven.test.gen.dir>${project.build.directory}/generated-test-sources</maven.test.gen.dir> <maven.test.skip>false</maven.test.skip> <maven.test.failure.ignore>true</maven.test.failure.ignore> - </properties> + </properties> - <build> - <finalName>wikitty-api</finalName> - <resources> - <resource> - <directory>${maven.src.dir}/main/resources/</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - </includes> - </resource> - <resource> - <directory>${maven.src.dir}/main/java/</directory> - <includes> - <include>**/*.java</include> - </includes> - </resource> - <resource> - <directory>${maven.gen.dir}/java/</directory> - <includes> - <include>**/*.java</include> - </includes> - </resource> - </resources> + <build> + <finalName>wikitty-api</finalName> + <resources> + <resource> + <directory>src/main/resources/</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + </includes> + </resource> + <resource> + <directory>src/main/java/</directory> + <includes> + <include>**/*.java</include> + </includes> + </resource> + <resource> + <directory>${maven.gen.dir}/java/</directory> + <includes> + <include>**/*.java</include> + </includes> + </resource> + </resources> - <pluginManagement> - <plugins> -  - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>attach-test</id> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> -  - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>${eugene.version}</version> - <dependencies> - <dependency> - <groupId>org.sharengo</groupId> - <artifactId>eugengo</artifactId> - <version>${eugengo.version}</version> - </dependency> -  - <dependency> - <groupId>org.eclipse.uml2.uml</groupId> - <artifactId>resources</artifactId> - <version>2.1.0-v200706251652</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.uml2</groupId> - <artifactId>uml</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </plugin> - </plugins> - </pluginManagement> + <pluginManagement> + <plugins> +  + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>attach-test</id> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> +  + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${eugene.version}</version> + <dependencies> + <dependency> + <groupId>org.sharengo</groupId> + <artifactId>eugengo</artifactId> + <version>${eugengo.version}</version> + </dependency> +  + <dependency> + <groupId>org.eclipse.uml2.uml</groupId> + <artifactId>resources</artifactId> + <version>2.1.0-v200706251652</version> + <exclusions> + <exclusion> + <groupId>org.eclipse.uml2</groupId> + <artifactId>uml</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> - <plugins> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <executions> - <execution> - <id>api generator</id> -  - <phase>process-sources</phase> + <plugins> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <id>api generator</id> +  + <phase>process-sources</phase> -  - <configuration> - <addCompileDirectory>true</addCompileDirectory> - <zargoResources> - <input>${maven.src.dir}/main/uml/wikitty-api</input> - </zargoResources> - <includes>**/*.objectmodel</includes> - <templates>org.nuiton.eugengo.generator.WikittyMetaGenerator</templates> - <defaultPackage>org.sharengo.wikitty</defaultPackage> - <extractedPackages>org.sharengo.wikitty</extractedPackages> - <generatedPackages>org.sharengo.wikitty</generatedPackages> - </configuration> - <goals> - <goal>zargo2xmi</goal> - <goal>xmi2objectmodel</goal> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> +  + <configuration> +  + <zargoResources> + <input>${maven.src.dir}/main/uml/wikitty-api</input> + </zargoResources> + <includes>**/*.objectmodel</includes> + <templates>org.nuiton.eugengo.generator.WikittyMetaGenerator</templates> + <defaultPackage>org.sharengo.wikitty</defaultPackage> + <extractedPackages>org.sharengo.wikitty</extractedPackages> + <generatedPackages>org.sharengo.wikitty</generatedPackages> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2objectmodel</goal> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> -  -  -  +  +  +  - <repositories> - <repository> - <id>sharengo-maven2-repository</id> - <name>Sharengo's repository</name> - <url>http://maven2.sharengo.org</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> +  </project> Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/pom.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/pom.xml 2009-11-12 16:57:47 UTC (rev 320) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/pom.xml 2009-11-13 17:54:23 UTC (rev 321) @@ -1,6 +1,5 @@ - <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"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.sharengo.wikengo</groupId> @@ -9,17 +8,17 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.0-CL-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> </parent> <dependencies> -  +  <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> -  +  <dependency> <groupId>${project.groupId}</groupId> <artifactId>core-wikitty-api</artifactId> @@ -30,30 +29,30 @@ <artifactId>core-wikitty-solr-impl</artifactId> <version>${project.version}</version> </dependency> - <dependency> +  - <dependency> +  - <dependency> +  - <dependency> +  -  +  <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-core</artifactId> @@ -66,37 +65,37 @@ <scope>runtime</scope> </dependency> - <dependency> +  <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <version>1.1.118</version> </dependency> </dependencies> - -  -  +  +  +  <name>org.sharengo.wikengo.core-wikitty-jdbc-impl</name> <description>public api of wikitty</description> <inceptionYear>2009</inceptionYear> -  -  -  +  +  +  <packaging>jar</packaging> <properties> <maven.test.skip>true</maven.test.skip> </properties> - - <repositories> +  </project> Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/core-wikitty-solr-impl.iml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/core-wikitty-solr-impl.iml 2009-11-12 16:57:47 UTC (rev 320) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/core-wikitty-solr-impl.iml 2009-11-13 17:54:23 UTC (rev 321) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <output url="file://$MODULE_DIR$/../target/classes" /> + <output-test url="file://$MODULE_DIR$/../target/test-classes" /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml 2009-11-12 16:57:47 UTC (rev 320) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml 2009-11-13 17:54:23 UTC (rev 321) @@ -1,99 +1,99 @@ <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"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty-solr-impl</artifactId> + <groupId>org.sharengo.wikengo</groupId> + <artifactId>core-wikitty-solr-impl</artifactId> - <parent> - <groupId>org.sharengo.wikengo</groupId> - <artifactId>core-wikitty</artifactId> - <version>1.0-CL-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.sharengo.wikengo</groupId> + <artifactId>core-wikitty</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> - <dependencies> -  - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>core-wikitty-api</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> + <dependencies> +  + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>core-wikitty-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> -  - <dependency> - <groupId>org.apache.solr</groupId> - <artifactId>solr-core</artifactId> - <version>1.3.0</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>runtime</scope> - </dependency> +  + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-core</artifactId> + <version>1.3.0</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>1.1.1</version> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.1.1</version> + </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - </dependencies> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + </dependencies> -  -  -  +  +  +  - <name>org.sharengo.wikengo.core-wikitty-solr-impl</name> + <name>org.sharengo.wikengo.core-wikitty-solr-impl</name> - <description>hbase impl of wikitty</description> - <inceptionYear>2009</inceptionYear> + <description>hbase impl of wikitty</description> + <inceptionYear>2009</inceptionYear> -  -  -  +  +  +  - <packaging>jar</packaging> + <packaging>jar</packaging> - <properties> - <maven.test.skip>true</maven.test.skip> - <maven.test.failure.ignore>true</maven.test.failure.ignore> - </properties> + <properties> + <maven.test.skip>true</maven.test.skip> + <maven.test.failure.ignore>true</maven.test.failure.ignore> + </properties> -  -  -  +  +  +  - <repositories> - <repository> - <id>sharengo-maven2-repository</id> - <name>Sharengo's repository</name> - <url>http://maven2.sharengo.org</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> +  </project>

1 0

r320 - wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr
by kmorin＠users.nuiton.org 12 Nov '09

12 Nov '09

Author: kmorin Date: 2009-11-12 17:57:47 +0100 (Thu, 12 Nov 2009) New Revision: 320 Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java Log: handles fieldname with spaces Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java 2009-11-10 16:33:04 UTC (rev 319) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java 2009-11-12 16:57:47 UTC (rev 320) @@ -124,7 +124,7 @@ if (version != null) { // not valid extension is version == null WikittyExtension ext = extensionStorage.restore( WikittyExtension.computeId(extName, version)); - FieldType type = ext.getFieldType(fieldName); + FieldType type = ext.getFieldType(fieldName.replace(" ", "_")); if (type != null) { // type can be null if extension version differ result = WikittySearchEngineSolr.getSolrFieldName( fqfieldname, type); @@ -527,7 +527,7 @@ /** * Create all index document to used to modify indexation. * this method don't modify index - * @param wikitties all wikitties object to index + * @param w all wikitties object to index * @return list of SolrInputDocument used to modify index */ protected SolrInputDocument createIndexDocument(Wikitty w) {

1 0

r319 - wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty
by kmorin＠users.nuiton.org 10 Nov '09

10 Nov '09

Author: kmorin Date: 2009-11-10 17:33:04 +0100 (Tue, 10 Nov 2009) New Revision: 319 Added: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittySearchEngine.java Log: config solr Added: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittySearchEngine.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittySearchEngine.java (rev 0) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittySearchEngine.java 2009-11-10 16:33:04 UTC (rev 319) @@ -0,0 +1,89 @@ +/* *##% + * Copyright (c) 2009 poussin. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + *##%*/ + +package org.sharengo.wikitty; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * WikittySearchEngine is used to abstract search engin used in WikittyService. + * + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public interface WikittySearchEngine { + + /** + * Remove all data in index, no call to commit needed. This method commit + * automaticaly. + */ + public void clear(); + + /** + * Changes the data directory + * @param newDataDir the new data directory path + * @param oldDataDir the old data directory path. + * If null, the data in the old directory will not be copied. + */ + public void changeDataDir(String newDataDir, String oldDataDir); + + /** + * Prepare list of command needed to update indexation data. If command + * creation is impossible this method must throw an Exception + * @param wikitties + * @return + */ + public List<Command> prepare(WikittyTransaction transaction, + Collection<Wikitty> wikitties); + + /** + * Commit all modification command passed in argument + * @param wikittyIndexationCommandList + * @return information usefull for client side update data + */ + public UpdateResponse commit(WikittyTransaction transaction, + List<Command> wikittyIndexationCommandList); + + /** + * Delete all object with id argument. If id is not valid or don't exist + * throw an exception + * @param idList + * @return + */ + public List<Command> delete(WikittyTransaction transaction, + List<String> idList) throws WikittyException; + + public PagedResult<String> findAllByCriteria(Criteria criteria); + + /** + * Find all children ids with count for a node wikitty. + * @param w + * @return + */ + public Map<String, Integer> findAllChildren(Wikitty w); + + /** + * Command update + */ + static public interface Command {} +}

1 0

r318 - in wikengo_core-wikitty/wikengo_core-wikitty-solr-impl: . src/main/java/org/sharengo/wikitty/solr src/main/resources src/test/resources
by kmorin＠users.nuiton.org 10 Nov '09

10 Nov '09

Author: kmorin Date: 2009-11-10 17:31:10 +0100 (Tue, 10 Nov 2009) New Revision: 318 Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/core-wikitty-solr-impl.iml wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/Restriction2Solr.java wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittyQueryParser.java wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/resources/schema.xml wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/test/resources/log4j.properties Log: config solr Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/core-wikitty-solr-impl.iml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/core-wikitty-solr-impl.iml 2009-11-10 16:30:58 UTC (rev 317) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/core-wikitty-solr-impl.iml 2009-11-10 16:31:10 UTC (rev 318) @@ -36,6 +36,11 @@ <orderEntry type="library" exported="" name="Maven: woodstox:wstx-asl:3.2.7" level="project" /> <orderEntry type="library" exported="" name="Maven: org.apache.geronimo.specs:geronimo-stax-api_1.0_spec:1.0.1" level="project" /> <orderEntry type="library" exported="" scope="RUNTIME" name="Maven: javax.servlet:servlet-api:2.5" level="project" /> + <orderEntry type="library" exported="" name="Maven: org.nuiton:nuiton-utils:1.1.1" level="project" /> + <orderEntry type="library" exported="" name="Maven: commons-primitives:commons-primitives:1.0" level="project" /> + <orderEntry type="library" exported="" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> + <orderEntry type="library" exported="" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" /> + <orderEntry type="library" exported="" name="Maven: org.nuiton.i18n:nuiton-i18n-api:1.0.1" level="project" /> </component> </module> Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml 2009-11-10 16:30:58 UTC (rev 317) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml 2009-11-10 16:31:10 UTC (rev 318) @@ -42,7 +42,14 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.1.1</version> + </dependency> + + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/Restriction2Solr.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/Restriction2Solr.java 2009-11-10 16:30:58 UTC (rev 317) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/Restriction2Solr.java 2009-11-10 16:31:10 UTC (rev 318) @@ -146,7 +146,7 @@ private String associated2solr(AssociatedRestriction associated, SolrServer solr) throws WikittyException { String subQuery = toSolr( associated.getRestriction() ); - SolrQuery query = new SolrQuery(subQuery); + SolrQuery query = new SolrQuery(WikittySearchEngineSolr.SOLR_QUERY_PARSER + subQuery); query.setRows(MAX_SUBQUERY_RESULT); QueryResponse resp = null; try { @@ -162,11 +162,11 @@ throw new WikittyException("Associated " + associated.getElement().getName() + " do not retrieved any result"); } if ( size == 1 ) { - generatedRestriction = RestrictionHelper.eq( associated.getElement(), (String) solrResults.get(0).getFieldValue("id") ); + generatedRestriction = RestrictionHelper.eq( associated.getElement(), (String) solrResults.get(0).getFieldValue(WikittySearchEngineSolr.SOLR_ID) ); } else { List<String> ids = new ArrayList<String>(solrResults.size()); for (SolrDocument doc : solrResults) { - String id = (String) doc.getFieldValue("id"); // FIXME : set a constant field reference + String id = (String) doc.getFieldValue(WikittySearchEngineSolr.SOLR_ID); ids.add(id); } generatedRestriction = new In(associated.getElement(), ids); @@ -236,8 +236,8 @@ private String neq2solr(NotEquals neq) throws WikittyException { - return "( *:* - " + element2solr(neq.getElement()) + ":" - + value2solr(neq.getValue()) + " )"; + return "-" + element2solr(neq.getElement()) + ":" + + value2solr(neq.getValue()); } private String less2solr(Less less) throws WikittyException { @@ -290,27 +290,18 @@ if (contains.getValue().size() < 1) { throw new WikittyException("CONTAINS is an operator that handle 1 operand at least"); } - boolean first = true; + + String operand = ""; StringBuffer result = new StringBuffer(); + result.append("("); for (String value : contains.getValue()) { - if (first) { - result.append("( "); - first = false; - } else { - result.append(" AND "); - } - result.append("( "); + result.append(operand); result.append(element2solr(contains.getElement())) .append(":").append(value2solr(value)); - result.append(" OR "); - result.append(element2solr(contains.getElement())) - .append(":").append(value2solr(value)); - result.append(" OR "); - result.append(element2solr(contains.getElement())) - .append(":").append(value2solr(value)); - result.append(" )"); + operand = " OR "; } - return result.append(" )").toString(); + result.append(")"); + return result.toString(); } private String start2solr(StartsWith start) @@ -351,7 +342,6 @@ result = Restriction2Solr.escapeValue(reverse(value)); } else { result = Restriction2Solr.escapeValue(value); - // result = value; } } else { result = ""; @@ -379,9 +369,8 @@ } private static String escapeValue(String value) { - final String LUCENE_REPLACE_PATTERN = "\\+" + "|-" + "|&&" + "|\\|\\|" - + "|!" + "|\$|\$" + "|\\[|\\]" + "|\\{|\\}" + "|\\^" + "|\"" - + "|\\~" + "|\\*" + "|\\?" + "|:" + "|\\\\"; + final String LUCENE_REPLACE_PATTERN = "\\+" + "|-" + "|&&" + "|\\|" + + "|!" + "|\$|\$" + "|\\[|\\]" + "|\\{|\\}" + "|\"" + "|:"; return value.replaceAll(LUCENE_REPLACE_PATTERN, "\\\\$0"); } @@ -389,8 +378,9 @@ int i, len = source.length(); StringBuffer dest = new StringBuffer(len); - for (i = (len - 1); i >= 0; i--) + for (i = (len - 1); i >= 0; i--) { dest.append(source.charAt(i)); + } return dest.toString(); } } Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittyQueryParser.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittyQueryParser.java 2009-11-10 16:30:58 UTC (rev 317) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittyQueryParser.java 2009-11-10 16:31:10 UTC (rev 318) @@ -17,7 +17,6 @@ /** * Add allow leading wildcard * setAllowLeadingWildcard(true); - * setLowercaseExpandedTerms(true); * <br>Example: <code>{!wikitty q.op=AND df=text sort='price asc'}myfield:foo +bar -baz</code> * More information @see LuceneQParserPlugin */ @@ -49,9 +48,12 @@ public Query parse() throws ParseException { String defaultField = getParam(CommonParams.DF); + if(defaultField == null) { + defaultField = "text"; + } + lparser = new SolrQueryParser(this, defaultField); lparser.setAllowLeadingWildcard(true); - lparser.setLowercaseExpandedTerms(true); String opParam = getParam(QueryParsing.OP); if (opParam != null) { Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java 2009-11-10 16:30:58 UTC (rev 317) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java 2009-11-10 16:31:10 UTC (rev 318) @@ -18,14 +18,17 @@ package org.sharengo.wikitty.solr; +import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.solr.client.solrj.SolrQuery; @@ -38,7 +41,7 @@ import org.apache.solr.common.SolrDocumentList; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.core.CoreContainer; -import org.apache.solr.core.SolrCore; +import org.nuiton.util.FileUtil; import org.sharengo.wikitty.Criteria; import org.sharengo.wikitty.FacetTopic; import org.sharengo.wikitty.FieldType; @@ -50,7 +53,7 @@ import org.sharengo.wikitty.WikittyException; import org.sharengo.wikitty.WikittyExtension; import org.sharengo.wikitty.WikittyExtensionStorage; -import org.sharengo.wikitty.WikittySearchEngin; +import org.sharengo.wikitty.WikittySearchEngine; import org.sharengo.wikitty.WikittyTransaction; import org.sharengo.wikitty.search.Search; @@ -62,7 +65,7 @@ * Last update: $Date$ * by : $Author$ */ -public class WikittySearchEngineSolr implements WikittySearchEngin { +public class WikittySearchEngineSolr implements WikittySearchEngine { /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(WikittySearchEngineSolr.class); @@ -84,6 +87,7 @@ static final public String TREENODE_CHILD = TREENODE_PREFIX + "wikittyId"; static final public String TREENODE_EMPTY = TREENODE_PREFIX + "empty"; static final public String TREENODE_ROOT = TREENODE_PREFIX + "root"; + static final public String TREENODE_PATH = TREENODE_PREFIX + "path"; static protected class CommandSolr implements Command { /** if is store command toStore is true, if is delete toStore is false */ @@ -158,15 +162,26 @@ } - /** + protected static class ReindexChildTreeNode extends HashSet<String> { + public static ReindexChildTreeNode getReindexChildTreeNode(WikittyTransaction transaction) { + ReindexChildTreeNode value = (ReindexChildTreeNode) transaction.getTagValue(ReindexChildTreeNode.class); + if(value == null) { + value = new ReindexChildTreeNode(); + transaction.setTagValue(ReindexChildTreeNode.class, value); + } + return value; + } + } + + /** * Store parent for each node and search in index if not known parent */ protected static class ParentMap extends HashMap<String, String> { - protected WikittySearchEngineSolr searchEngineSolr; + protected WikittySearchEngineSolr searchEnginSolr; - public ParentMap(WikittySearchEngineSolr searchEngineSolr) { - this.searchEngineSolr = searchEngineSolr; + public ParentMap(WikittySearchEngineSolr searchEnginSolr) { + this.searchEnginSolr = searchEnginSolr; } @Override @@ -176,7 +191,7 @@ // If not found in map, search in index if(parent == null) { - SolrDocument doc = searchEngineSolr.findById(id); + SolrDocument doc = searchEnginSolr.findById(id); if(doc == null) { // is root return null; @@ -191,11 +206,11 @@ * Add parent map in transaction if is not exists and return it */ public static ParentMap getParentMap( - WikittySearchEngineSolr searchEngineSolr, + WikittySearchEngineSolr searchEnginSolr, WikittyTransaction transaction) { ParentMap value = (ParentMap) transaction.getTagValue(ParentMap.class); if(value == null) { - value = new ParentMap(searchEngineSolr); + value = new ParentMap(searchEnginSolr); transaction.setTagValue(ParentMap.class, value); } return value; @@ -203,7 +218,7 @@ } /** solr server */ - protected SolrServer solrServer; + protected SolrServer solrServer; /** Criteria transformer to solr */ protected Restriction2Solr restriction2Solr; /** Field modifier use to transform to solr format */ @@ -215,6 +230,7 @@ CoreContainer.Initializer initializer = new CoreContainer.Initializer(); CoreContainer coreContainer = initializer.initialize(); solrServer = new EmbeddedSolrServer(coreContainer, ""); + fieldModifier = new TypeFieldModifer(extensionStorage); restriction2Solr = new Restriction2Solr(fieldModifier); @@ -232,18 +248,46 @@ } } + public void changeDataDir(String newDataDir, String oldDataDir) { + try { + if(oldDataDir != null) { + File newFile = new File(newDataDir); + File oldFile = new File(oldDataDir); + FileUtil.copyRecursively(oldFile, newFile); + } + CoreContainer.Initializer initializer = new CoreContainer.Initializer(); + initializer.setSolrConfigFilename(newDataDir); + CoreContainer coreContainer = initializer.initialize(); + solrServer = new EmbeddedSolrServer(coreContainer, ""); + } catch (Exception eee) { + throw new WikittyException(eee); + } + } + public List<Command> prepare(WikittyTransaction transaction, Collection<Wikitty> wikitties) { List<Command> result = new ArrayList<Command>(wikitties.size()); + ReindexChildTreeNode reindexChildTreeNode = ReindexChildTreeNode.getReindexChildTreeNode(transaction); + for (Wikitty w : wikitties) { - // Store known parent in transaction if(w.hasExtension(TreeNode.EXT_TREENODE)) { - ParentMap parentMap = ParentMap.getParentMap(this, transaction); - String wikittyId = w.getId(); - String parentId = w.getFieldAsWikitty( - TreeNode.EXT_TREENODE, TreeNode.FIELD_PARENT); - parentMap.put(wikittyId, parentId); + Set<String> children = w.getFieldAsSet(TreeNode.EXT_TREENODE, TreeNode.FIELD_CHILDREN, String.class); + if(children != null) { + reindexChildTreeNode.addAll(children); + } + + // Search deleted children + String treeNodeId = w.getId(); + SolrDocument treeNodeDoc = findById(treeNodeId); + if(treeNodeDoc != null) { + Collection oldChildren = treeNodeDoc. + getFieldValues(TreeNode.FQ_FIELD_CHILDREN + "_t"); + if(oldChildren != null) { + reindexChildTreeNode.addAll(oldChildren); + } + } + } result.add(new CommandSolr(w)); @@ -251,30 +295,59 @@ return result; } + public List<Command> delete(WikittyTransaction transaction, + List<String> idList) throws WikittyException { + List<Command> result = new ArrayList<Command>(idList.size()); + ReindexChildTreeNode reindexChildTreeNode = ReindexChildTreeNode.getReindexChildTreeNode(transaction); + + try { + for (String id : idList) { + SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + TREENODE_PREFIX + id + ":*"); + QueryResponse response = solrServer.query(query); + SolrDocumentList updateDocs = response.getResults(); + + for (Iterator<SolrDocument> iterator = updateDocs.iterator(); + iterator.hasNext();) { + SolrDocument solrDocument = iterator.next(); + String childId = (String) solrDocument.getFieldValue(TREENODE_CHILD); + reindexChildTreeNode.add(childId); + } + + result.add(new CommandSolr(id)); + } + } catch (Exception eee) { + throw new WikittyException(eee); + } + + return result; + } + public UpdateResponse commit(WikittyTransaction transaction, List<Command> wikittyIndexationCommandList) { try { + for (Command c : wikittyIndexationCommandList) { CommandSolr cs = (CommandSolr) c; if (cs.toStore) { SolrInputDocument doc = createIndexDocument(cs.wikitty); solrServer.add(doc); - - Collection<SolrInputDocument> docs = createTreeNodeIndex(transaction, cs.wikitty); - if(!docs.isEmpty()) { - solrServer.add(docs); - } - } else { // Delete all reference on tree - solrServer.deleteByQuery(TREENODE_CHILD + ":" + cs.id); - // FIXME: jru 20091027 delete node in middle in tree - solrServer.deleteByQuery(TREENODE_PREFIX + cs.id + ":" + TREENODE_EMPTY); + solrServer.deleteById(TREENODE_PREFIX + cs.id); solrServer.deleteById(cs.id); } } solrServer.commit(); + + // Reindex child in tree node + ParentMap parentMap = ParentMap.getParentMap(this, transaction); + ReindexChildTreeNode reindexChildTreeNode = ReindexChildTreeNode.getReindexChildTreeNode(transaction); + for (String childId : reindexChildTreeNode) { + SolrInputDocument doc = createTreeNodeDocument(parentMap, childId); + solrServer.add(doc); + } + solrServer.commit(); // no specific result needed UpdateResponse result = new UpdateResponse(); @@ -284,15 +357,6 @@ } } - public List<Command> delete(WikittyTransaction transaction, - List<String> idList) throws WikittyException { - List<Command> result = new ArrayList<Command>(idList.size()); - for (String id : idList) { - result.add(new CommandSolr(id)); - } - return result; - } - public PagedResult<String> findAllByCriteria(Criteria criteria) { try { @@ -333,6 +397,7 @@ // Add faceting List<String> facetField = criteria.getFacetField(); + log.debug("facetField : " + facetField); List<Criteria> facetCriteria = criteria.getFacetCriteria(); // use to map query string to criteria facet name @@ -462,14 +527,15 @@ /** * Create all index document to used to modify indexation. * this method don't modify index - * @param w wikitty object to index + * @param wikitties all wikitties object to index * @return list of SolrInputDocument used to modify index */ protected SolrInputDocument createIndexDocument(Wikitty w) { log.debug("index wikitty " + w.getId()); SolrInputDocument doc = new SolrInputDocument(); - doc.addField(SOLR_ID, w.getId()); + String id = w.getId(); + doc.addField(SOLR_ID,id); for (String name : w.getExtensionNames()) { doc.addField(SOLR_EXTENSIONS, name); @@ -507,103 +573,97 @@ } } } - return doc; } /** - * Create a doc for each child for a tree node, his contains the path for - * the child. Update old doc when the node is moved and child is deleted. + * Create a doc between nodes and child */ - protected Collection<SolrInputDocument> createTreeNodeIndex( - WikittyTransaction transaction, Wikitty w) - throws IOException, SolrServerException { - - Collection<SolrInputDocument> result = new ArrayList<SolrInputDocument>(); - if(w.hasExtension(TreeNode.EXT_TREENODE)) { - String treeNodeId = w.getId(); - ParentMap parentMap = (ParentMap) transaction.getTagValue(ParentMap.class); + public SolrInputDocument createTreeNodeDocument(ParentMap parentMap, String childId) throws IOException, SolrServerException { + SolrInputDocument doc = new SolrInputDocument(); + doc.setField(SOLR_ID, TREENODE_PREFIX + childId); + doc.setField(TREENODE_CHILD, childId); - // Init new children with all children in node - List<String> children = w.getFieldAsList(TreeNode.EXT_TREENODE, - TreeNode.FIELD_CHILDREN, String.class); - List<String> newChildren = new ArrayList<String>(); - if(children != null) { - newChildren.addAll(children); - } + // Find all node contain child + SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + TreeNode.FQ_FIELD_CHILDREN + "_t:" + childId); + QueryResponse response = solrServer.query(query); + SolrDocumentList updateDocs = response.getResults(); - // Find old document to do diff - SolrDocument treeNodeDoc = findById(treeNodeId); - if(treeNodeDoc != null) { - Collection oldChildren = treeNodeDoc. - getFieldValues(TreeNode.FQ_FIELD_CHILDREN + "_t"); + List<String> paths = new ArrayList<String>(); + for (Iterator<SolrDocument> iterator = updateDocs.iterator(); + iterator.hasNext();) { + SolrDocument solrDocument = iterator.next(); - // Remove old children not in current node - List<String> removeChildren = new ArrayList<String>(); - if(oldChildren != null) { - removeChildren.addAll(oldChildren); - removeChildren.removeAll(children); - for (String removeChild : removeChildren) { - solrServer.deleteByQuery(TREENODE_CHILD + ":" + removeChild); - } + String treeNodeId = (String) solrDocument.getFieldValue(SOLR_ID); + doc.addField(TREENODE_PREFIX + treeNodeId, TREENODE_EMPTY); - // Remove old child in new children - newChildren.removeAll(oldChildren); + // Add path + String childParent = treeNodeId; + String parent = parentMap.get(childParent); + while (parent != null) { + if(!paths.contains(parent)) { + doc.addField(TREENODE_PREFIX + parent, childParent); + paths.add(parent); } - // Update path other node refer to current node - // FIXME jru 20091926 test change path - SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + TREENODE_PREFIX + treeNodeId + ":*"); - QueryResponse response = solrServer.query(query); - SolrDocumentList updateDocs = response.getResults(); - for (Iterator<SolrDocument> iterator = updateDocs.iterator(); iterator.hasNext();) { - SolrDocument solrDocument = iterator.next(); - String child = (String) solrDocument.getFieldValue(TreeNode.EXT_TREENODE + ".wikittyId"); - // Child is not deleted - if(!removeChildren.contains(child)) { - SolrInputDocument doc = createTreeNodeDocument(treeNodeId, child, parentMap); + childParent = parent; + parent = parentMap.get(childParent); + } + doc.addField(TREENODE_ROOT, childParent); + } + + return doc; + } - // Copy other field after node - String parent = TREENODE_PREFIX + treeNodeId; - String childParent = (String) solrDocument.getFieldValue(parent); - while (childParent != null) { - doc.setField(parent, childParent); - parent = TREENODE_PREFIX + childParent; - childParent = (String) solrDocument.getFieldValue(parent); - } - result.add(doc); - } + /** + * Update all document depend a deleted node in tree + */ + public void updateTreeNodeDocument(Map<String, SolrInputDocument> documents, String nodeId) throws SolrServerException { + SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + TREENODE_PREFIX + nodeId + ":*"); + QueryResponse response = solrServer.query(query); + SolrDocumentList updateDocs = response.getResults(); + + for (Iterator<SolrDocument> iterator = updateDocs.iterator(); iterator.hasNext();) { + SolrDocument solrDocument = iterator.next(); + + String documentId = (String) solrDocument.getFieldValue(SOLR_ID); + SolrInputDocument alreadyDone = documents.get(documentId); + + if (alreadyDone == null) { + SolrInputDocument doc = updateTreeNodeDocument(solrDocument, nodeId); + documents.put(documentId, doc); + } else { + // Copy other field after node + String parent = (String) alreadyDone.getFieldValue(TREENODE_PREFIX + nodeId); + if (parent != null) { + // Recreate doc a sub node is deleted + SolrInputDocument doc = updateTreeNodeDocument(solrDocument, nodeId); + documents.put(documentId, doc); } } - - // New children - for (String newChild : newChildren) { - SolrInputDocument doc = createTreeNodeDocument(treeNodeId, newChild, parentMap); - result.add(doc); - } - } - return result; } /** - * Create a doc between node and child + * Re-create a new document without node deleted, from age document */ - public SolrInputDocument createTreeNodeDocument(String treeNodeId, String child, ParentMap parentMap) { + public SolrInputDocument updateTreeNodeDocument(SolrDocument solrDocument, String nodeId) { + String documentId = (String) solrDocument.getFieldValue(SOLR_ID); + SolrInputDocument doc = new SolrInputDocument(); - doc.setField(SOLR_ID, TreeNode.EXT_TREENODE + "-" + treeNodeId + "-" + child); - doc.setField(TREENODE_CHILD, child); - doc.setField(TREENODE_PREFIX + treeNodeId, TREENODE_EMPTY); - - // Add path - String childParent = treeNodeId; - String parent = parentMap.get(childParent); - while (parent != null) { - doc.setField(TREENODE_PREFIX + parent, childParent); - childParent = parent; - parent = parentMap.get(childParent); + doc.setField(SOLR_ID, documentId); + doc.setField(TREENODE_CHILD, solrDocument.getFieldValue(TREENODE_CHILD)); + + // Copy other field after node + String parent = (String) solrDocument.getFieldValue(TREENODE_PREFIX + nodeId); + if (parent != null) { + String childParent = (String) solrDocument.getFieldValue(parent); + while (childParent != null) { + doc.setField(parent, childParent); + parent = TREENODE_PREFIX + childParent; + childParent = (String) solrDocument.getFieldValue(parent); + } } - doc.setField(TREENODE_ROOT, childParent); return doc; } Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/resources/schema.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/resources/schema.xml 2009-11-10 16:30:58 UTC (rev 317) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/resources/schema.xml 2009-11-10 16:31:10 UTC (rev 318) @@ -16,10 +16,10 @@ limitations under the License. --> - -  + -->  <fieldType name="date" class="solr.DateField" sortMissingLast="true" omitNorms="true"/> @@ -114,11 +114,11 @@  <filter class="solr.PatternReplaceFilterFactory" @@ -259,50 +259,56 @@ </analyzer> </fieldType> -  - <fieldtype name="ignored" stored="false" indexed="false" class="solr.StrField" /> +  + <fieldtype name="ignored" stored="false" indexed="false" class="solr.StrField" /> </types> <fields> - <field name="id" type="string" indexed="true" stored="true" required="true" /> + <field name="id" type="string" indexed="true" stored="true" required="true" /> <field name="extensions" type="string" indexed="true" stored="false" multiValued="true"/>  <field name="text" type="text" indexed="true" stored="false" multiValued="true"/> + <copyField source="*_i" dest="text"/> + <copyField source="*_s" dest="text"/> + <copyField source="*_l" dest="text"/> + <copyField source="*_t" dest="text"/> + <copyField source="*_b" dest="text"/> + <copyField source="*_f" dest="text"/> + <copyField source="*_d" dest="text"/> + <copyField source="*_dt" dest="text"/> - <dynamicField name="Label.label*" type="text" indexed="true" stored="true" multiValued="true"/> - <dynamicField name="*_i" type="sint" indexed="true" stored="true" multiValued="true"/> - <dynamicField name="*_s" type="string" indexed="true" stored="true" multiValued="true"/> + <dynamicField name="*_s" type="text" indexed="true" stored="true" multiValued="true"/> <dynamicField name="*_l" type="slong" indexed="true" stored="true" multiValued="true"/> - <dynamicField name="*_t" type="string" indexed="true" stored="true" multiValued="true"/> + <dynamicField name="*_t" type="text" indexed="true" stored="true" multiValued="true"/> <dynamicField name="*_b" type="boolean" indexed="true" stored="true" multiValued="true"/> <dynamicField name="*_f" type="sfloat" indexed="true" stored="true" multiValued="true"/> <dynamicField name="*_d" type="sdouble" indexed="true" stored="true" multiValued="true"/> <dynamicField name="*_dt" type="date" indexed="true" stored="true" multiValued="true"/>  - <dynamicField name="*" type="string" indexed="true" stored="true" multiValued="true"/> + <dynamicField name="*" type="text" indexed="true" stored="true" multiValued="true"/>  - <dynamicField name="_*" type="string" indexed="true" stored="true" multiValued="true"/> + <dynamicField name="_*" type="text" indexed="true" stored="true" multiValued="true"/> </fields> -  <uniqueKey>id</uniqueKey>  - <defaultSearchField>id</defaultSearchField> + <defaultSearchField>text</defaultSearchField>  - <solrQueryParser defaultOperator="OR"/> + <solrQueryParser defaultOperator="AND"/> -</schema> +</schema> \ No newline at end of file Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/test/resources/log4j.properties =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/test/resources/log4j.properties 2009-11-10 16:30:58 UTC (rev 317) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/test/resources/log4j.properties 2009-11-10 16:31:10 UTC (rev 318) @@ -6,4 +6,4 @@ # Configuration by components log4j.rootLogger=ERROR, logConsole log4j.category.org.sharengo.wikitty=DEBUG -#log4j.category.org.apache.solr=DEBUG +log4j.category.org.apache.solr=DEBUG

1 0