February 2010 - Sandbox-commits - mailman.cloud.codelutin.com

r385 - / release-plugin-bug release-plugin-bug/other-project release-plugin-bug/other-project/other-project-api release-plugin-bug/other-project/other-project-api/src release-plugin-bug/other-project/other-project-api/src/main release-plugin-bug/other-project/other-project-api/src/main/java release-plugin-bug/other-project/other-project-api/src/main/java/bws release-plugin-bug/other-project/other-project-api/src/main/java/bws/entities release-plugin-bug/other-project/other-project-api/src/
by athimel＠users.nuiton.org Feb. 17, 2010

Feb. 17, 2010

Author: athimel Date: 2010-02-17 18:25:40 +0100 (Wed, 17 Feb 2010) New Revision: 385 Added: release-plugin-bug/ release-plugin-bug/other-project/ release-plugin-bug/other-project/other-project-api/ release-plugin-bug/other-project/other-project-api/pom.xml release-plugin-bug/other-project/other-project-api/src/ release-plugin-bug/other-project/other-project-api/src/main/ release-plugin-bug/other-project/other-project-api/src/main/java/ release-plugin-bug/other-project/other-project-api/src/main/java/bws/ release-plugin-bug/other-project/other-project-api/src/main/java/bws/entities/ release-plugin-bug/other-project/other-project-api/src/main/java/bws/entities/DummyEntity.java release-plugin-bug/other-project/other-project-api/src/main/java/bws/services/ release-plugin-bug/other-project/other-project-api/src/main/java/bws/services/Service.java release-plugin-bug/other-project/other-project-impl/ release-plugin-bug/other-project/other-project-impl/pom.xml release-plugin-bug/other-project/other-project-impl/src/ release-plugin-bug/other-project/other-project-impl/src/main/ release-plugin-bug/other-project/other-project-impl/src/main/java/ release-plugin-bug/other-project/other-project-impl/src/main/java/bws/ release-plugin-bug/other-project/other-project-impl/src/main/java/bws/services/ release-plugin-bug/other-project/other-project-impl/src/main/java/bws/services/impl/ release-plugin-bug/other-project/other-project-impl/src/main/java/bws/services/impl/ServiceImpl.java release-plugin-bug/other-project/pom.xml release-plugin-bug/test/ release-plugin-bug/test/pom.xml release-plugin-bug/test/test-api/ release-plugin-bug/test/test-api/pom.xml release-plugin-bug/test/test-api/src/ release-plugin-bug/test/test-api/src/main/ release-plugin-bug/test/test-api/src/main/java/ release-plugin-bug/test/test-api/src/main/java/bws/ release-plugin-bug/test/test-api/src/main/java/bws/entities/ release-plugin-bug/test/test-api/src/main/java/bws/entities/DummyEntity.java release-plugin-bug/test/test-api/src/main/java/bws/services/ release-plugin-bug/test/test-api/src/main/java/bws/services/Service.java release-plugin-bug/test/test-impl/ release-plugin-bug/test/test-impl/pom.xml release-plugin-bug/test/test-impl/src/ release-plugin-bug/test/test-impl/src/main/ release-plugin-bug/test/test-impl/src/main/java/ release-plugin-bug/test/test-impl/src/main/java/bws/ release-plugin-bug/test/test-impl/src/main/java/bws/services/ release-plugin-bug/test/test-impl/src/main/java/bws/services/impl/ release-plugin-bug/test/test-impl/src/main/java/bws/services/impl/ServiceImpl.java Log: Add backbone to test some maven-release-plugin bug Added: release-plugin-bug/other-project/other-project-api/pom.xml =================================================================== --- release-plugin-bug/other-project/other-project-api/pom.xml (rev 0) +++ release-plugin-bug/other-project/other-project-api/pom.xml 2010-02-17 17:25:40 UTC (rev 385) @@ -0,0 +1,50 @@ +<?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> + +  +  +  + + <groupId>org.nuiton.sandbox</groupId> + <artifactId>other-project-api</artifactId> + + <parent> + <groupId>org.nuiton.sandbox</groupId> + <artifactId>other-project</artifactId> + <version>0.0-SNAPSHOT</version> + </parent> + +  + <dependencies> + + </dependencies> + +  +  +  + + <name>org.nuiton.sandbox.other-project-api</name> + +  +  +  + + <packaging>jar</packaging> + + <build> + </build> + +  +  +  + + <repositories> + </repositories> + + <profiles> + </profiles> + +</project> + Added: release-plugin-bug/other-project/other-project-api/src/main/java/bws/entities/DummyEntity.java =================================================================== --- release-plugin-bug/other-project/other-project-api/src/main/java/bws/entities/DummyEntity.java (rev 0) +++ release-plugin-bug/other-project/other-project-api/src/main/java/bws/entities/DummyEntity.java 2010-02-17 17:25:40 UTC (rev 385) @@ -0,0 +1,16 @@ +package bws.entities; + +public class DummyEntity { + + private String id; + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + +} + Added: release-plugin-bug/other-project/other-project-api/src/main/java/bws/services/Service.java =================================================================== --- release-plugin-bug/other-project/other-project-api/src/main/java/bws/services/Service.java (rev 0) +++ release-plugin-bug/other-project/other-project-api/src/main/java/bws/services/Service.java 2010-02-17 17:25:40 UTC (rev 385) @@ -0,0 +1,11 @@ +package bws.services; + +import java.util.List; +import bws.entities.DummyEntity; + +public interface Service { + + List<DummyEntity> findAll(); + +} + Added: release-plugin-bug/other-project/other-project-impl/pom.xml =================================================================== --- release-plugin-bug/other-project/other-project-impl/pom.xml (rev 0) +++ release-plugin-bug/other-project/other-project-impl/pom.xml 2010-02-17 17:25:40 UTC (rev 385) @@ -0,0 +1,56 @@ +<?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> + +  +  +  + + <groupId>org.nuiton.sandbox</groupId> + <artifactId>other-project-impl</artifactId> + + <parent> + <groupId>org.nuiton.sandbox</groupId> + <artifactId>other-project</artifactId> + <version>0.0-SNAPSHOT</version> + </parent> + +  + <dependencies> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>other-project-api</artifactId> + <version>${project.version}</version> + </dependency> + + </dependencies> + +  +  +  + + <name>org.nuiton.sandbox.other-project-impl</name> + +  +  +  + + <packaging>jar</packaging> + + <build> + </build> + +  +  +  + + <repositories> + </repositories> + + <profiles> + </profiles> + +</project> + Added: release-plugin-bug/other-project/other-project-impl/src/main/java/bws/services/impl/ServiceImpl.java =================================================================== --- release-plugin-bug/other-project/other-project-impl/src/main/java/bws/services/impl/ServiceImpl.java (rev 0) +++ release-plugin-bug/other-project/other-project-impl/src/main/java/bws/services/impl/ServiceImpl.java 2010-02-17 17:25:40 UTC (rev 385) @@ -0,0 +1,16 @@ +package bws.services.impl; + +import java.util.List; + +import bws.entities.DummyEntity; +import bws.services.Service; + +public class ServiceImpl implements Service { + + @Override + public List<DummyEntity> findAll() { + // TODO Auto-generated method stub + return null; + } + +} Added: release-plugin-bug/other-project/pom.xml =================================================================== --- release-plugin-bug/other-project/pom.xml (rev 0) +++ release-plugin-bug/other-project/pom.xml 2010-02-17 17:25:40 UTC (rev 385) @@ -0,0 +1,47 @@ +<?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> + +  +  +  + + <groupId>org.nuiton.sandbox</groupId> + <artifactId>other-project</artifactId> + <version>0.0-SNAPSHOT</version> + + <modules> + <module>other-project-api</module> + <module>other-project-impl</module> + </modules> + +  + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/sandbox/release-plugin-bug/other-project</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/sandbox/release-plugin-bug/other-project</developerConnection> + <url>http://svn.nuiton.org/svn/sandbox/release-plugin-bug/other-project</url> + </scm> + +  +  +  + + <name>org.sharengo.sandbox.other-project</name> + + <description>Test project for some bug on maven-release-plugin</description> + <inceptionYear>2010</inceptionYear> + +  +  +  + + <packaging>pom</packaging> + + <properties> +  + <projectId>test</projectId> + </properties> + +</project> + Added: release-plugin-bug/test/pom.xml =================================================================== --- release-plugin-bug/test/pom.xml (rev 0) +++ release-plugin-bug/test/pom.xml 2010-02-17 17:25:40 UTC (rev 385) @@ -0,0 +1,47 @@ +<?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> + +  +  +  + + <groupId>org.nuiton.sandbox</groupId> + <artifactId>test</artifactId> + <version>0.0-SNAPSHOT</version> + + <modules> + <module>test-api</module> + <module>test-impl</module> + </modules> + +  + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/sandbox/release-plugin-bug/test</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/sandbox/release-plugin-bug/test</developerConnection> + <url>http://svn.nuiton.org/svn/sandbox/release-plugin-bug/test</url> + </scm> + +  +  +  + + <name>org.sharengo.sandbox.test</name> + + <description>Test project for some bug on maven-release-plugin</description> + <inceptionYear>2010</inceptionYear> + +  +  +  + + <packaging>pom</packaging> + + <properties> +  + <projectId>test</projectId> + </properties> + +</project> + Added: release-plugin-bug/test/test-api/pom.xml =================================================================== --- release-plugin-bug/test/test-api/pom.xml (rev 0) +++ release-plugin-bug/test/test-api/pom.xml 2010-02-17 17:25:40 UTC (rev 385) @@ -0,0 +1,56 @@ +<?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> + +  +  +  + + <groupId>org.nuiton.sandbox</groupId> + <artifactId>test-api</artifactId> + + <parent> + <groupId>org.nuiton.sandbox</groupId> + <artifactId>test</artifactId> + <version>0.0-SNAPSHOT</version> + </parent> + +  + <dependencies> + + <dependency> + <groupId>org.nuiton.sandbox</groupId> + <artifactId>other-project-api</artifactId> + <version>0.0-SNAPSHOT</version> + </dependency> + + </dependencies> + +  +  +  + + <name>org.nuiton.sandbox.test-api</name> + +  +  +  + + <packaging>jar</packaging> + + <build> + </build> + +  +  +  + + <repositories> + </repositories> + + <profiles> + </profiles> + +</project> + Added: release-plugin-bug/test/test-api/src/main/java/bws/entities/DummyEntity.java =================================================================== --- release-plugin-bug/test/test-api/src/main/java/bws/entities/DummyEntity.java (rev 0) +++ release-plugin-bug/test/test-api/src/main/java/bws/entities/DummyEntity.java 2010-02-17 17:25:40 UTC (rev 385) @@ -0,0 +1,16 @@ +package bws.entities; + +public class DummyEntity { + + private String id; + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + +} + Added: release-plugin-bug/test/test-api/src/main/java/bws/services/Service.java =================================================================== --- release-plugin-bug/test/test-api/src/main/java/bws/services/Service.java (rev 0) +++ release-plugin-bug/test/test-api/src/main/java/bws/services/Service.java 2010-02-17 17:25:40 UTC (rev 385) @@ -0,0 +1,11 @@ +package bws.services; + +import java.util.List; +import bws.entities.DummyEntity; + +public interface Service { + + List<DummyEntity> findAll(); + +} + Added: release-plugin-bug/test/test-impl/pom.xml =================================================================== --- release-plugin-bug/test/test-impl/pom.xml (rev 0) +++ release-plugin-bug/test/test-impl/pom.xml 2010-02-17 17:25:40 UTC (rev 385) @@ -0,0 +1,62 @@ +<?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> + +  +  +  + + <groupId>org.nuiton.sandbox</groupId> + <artifactId>test-impl</artifactId> + + <parent> + <groupId>org.nuiton.sandbox</groupId> + <artifactId>test</artifactId> + <version>0.0-SNAPSHOT</version> + </parent> + +  + <dependencies> + + <dependency> + <groupId>org.nuiton.sandbox</groupId> + <artifactId>other-project-impl</artifactId> + <version>0.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>test-api</artifactId> + <version>${project.version}</version> + </dependency> + + </dependencies> + +  +  +  + + <name>org.nuiton.sandbox.test-impl</name> + +  +  +  + + <packaging>jar</packaging> + + <build> + </build> + +  +  +  + + <repositories> + </repositories> + + <profiles> + </profiles> + +</project> + Added: release-plugin-bug/test/test-impl/src/main/java/bws/services/impl/ServiceImpl.java =================================================================== --- release-plugin-bug/test/test-impl/src/main/java/bws/services/impl/ServiceImpl.java (rev 0) +++ release-plugin-bug/test/test-impl/src/main/java/bws/services/impl/ServiceImpl.java 2010-02-17 17:25:40 UTC (rev 385) @@ -0,0 +1,16 @@ +package bws.services.impl; + +import java.util.List; + +import bws.entities.DummyEntity; +import bws.services.Service; + +public class ServiceImpl implements Service { + + @Override + public List<DummyEntity> findAll() { + // TODO Auto-generated method stub + return null; + } + +}

1 0

r384 - in wikengo_core-wikitty: . wikengo_core-wikitty-api wikengo_core-wikitty-jdbc-impl wikengo_core-wikitty-solr-impl
by kmorin＠users.nuiton.org Feb. 9, 2010

Feb. 9, 2010

Author: kmorin Date: 2010-02-09 10:32:53 +0100 (Tue, 09 Feb 2010) New Revision: 384 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: [maven-release-plugin] prepare for next development iteration Modified: wikengo_core-wikitty/pom.xml =================================================================== --- wikengo_core-wikitty/pom.xml 2010-02-09 09:32:45 UTC (rev 383) +++ wikengo_core-wikitty/pom.xml 2010-02-09 09:32:53 UTC (rev 384) @@ -9,7 +9,7 @@ <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.0.0-alpha-6</version> + <version>1.0.0-alpha-7-SNAPSHOT</version> <modules> <module>wikengo_core-wikitty-api</module> @@ -62,9 +62,9 @@ </distributionManagement> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/sandbox/tags/core-wikitty-1.0.0-alpha-6</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/sandbox/tags/core-wikitty-1.0.0-alpha-6</developerConnection> - <url>http://www.nuiton.org/repositories/browse/sandbox/tags/core-wikitty-1.0.0-a…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/sandbox/wikengo_core-wikitty/</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/sandbox/wikengo_core-wikitty</developerConnection> + <url>http://www.nuiton.org/repositories/browse/sandbox/wikengo_core-wikitty</url> </scm>  Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml 2010-02-09 09:32:45 UTC (rev 383) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml 2010-02-09 09:32:53 UTC (rev 384) @@ -12,7 +12,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.0.0-alpha-6</version> + <version>1.0.0-alpha-7-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 2010-02-09 09:32:45 UTC (rev 383) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/pom.xml 2010-02-09 09:32:53 UTC (rev 384) @@ -7,7 +7,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.0.0-alpha-6</version> + <version>1.0.0-alpha-7-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 2010-02-09 09:32:45 UTC (rev 383) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml 2010-02-09 09:32:53 UTC (rev 384) @@ -12,7 +12,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.0.0-alpha-6</version> + <version>1.0.0-alpha-7-SNAPSHOT</version> </parent> <dependencies>

1 0

r383 - tags
by kmorin＠users.nuiton.org Feb. 9, 2010

Feb. 9, 2010

Author: kmorin Date: 2010-02-09 10:32:45 +0100 (Tue, 09 Feb 2010) New Revision: 383 Added: tags/core-wikitty-1.0.0-alpha-6/ Log: [maven-scm] copy for tag core-wikitty-1.0.0-alpha-6

1 0

r382 - in wikengo_core-wikitty: . wikengo_core-wikitty-api wikengo_core-wikitty-jdbc-impl wikengo_core-wikitty-solr-impl
by kmorin＠users.nuiton.org Feb. 9, 2010

Feb. 9, 2010

Author: kmorin Date: 2010-02-09 10:32:40 +0100 (Tue, 09 Feb 2010) New Revision: 382 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: [maven-release-plugin] prepare release core-wikitty-1.0.0-alpha-6 Modified: wikengo_core-wikitty/pom.xml =================================================================== --- wikengo_core-wikitty/pom.xml 2010-02-08 09:35:55 UTC (rev 381) +++ wikengo_core-wikitty/pom.xml 2010-02-09 09:32:40 UTC (rev 382) @@ -9,7 +9,7 @@ <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.0.0-alpha-6-SNAPSHOT</version> + <version>1.0.0-alpha-6</version> <modules> <module>wikengo_core-wikitty-api</module> @@ -62,9 +62,9 @@ </distributionManagement> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/sandbox/wikengo_core-wikitty/</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/sandbox/wikengo_core-wikitty</developerConnection> - <url>http://www.nuiton.org/repositories/browse/sandbox/wikengo_core-wikitty</url> + <connection>scm:svn:http://svn.nuiton.org/svn/sandbox/tags/core-wikitty-1.0.0-alpha-6</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/sandbox/tags/core-wikitty-1.0.0-alpha-6</developerConnection> + <url>http://www.nuiton.org/repositories/browse/sandbox/tags/core-wikitty-1.0.0-a…</url> </scm>  Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml 2010-02-08 09:35:55 UTC (rev 381) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/pom.xml 2010-02-09 09:32:40 UTC (rev 382) @@ -12,7 +12,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.0.0-alpha-6-SNAPSHOT</version> + <version>1.0.0-alpha-6</version> </parent> <dependencies> Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/pom.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/pom.xml 2010-02-08 09:35:55 UTC (rev 381) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/pom.xml 2010-02-09 09:32:40 UTC (rev 382) @@ -7,7 +7,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.0.0-alpha-6-SNAPSHOT</version> + <version>1.0.0-alpha-6</version> </parent> <dependencies> Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml 2010-02-08 09:35:55 UTC (rev 381) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/pom.xml 2010-02-09 09:32:40 UTC (rev 382) @@ -12,7 +12,7 @@ <parent> <groupId>org.sharengo.wikengo</groupId> <artifactId>core-wikitty</artifactId> - <version>1.0.0-alpha-6-SNAPSHOT</version> + <version>1.0.0-alpha-6</version> </parent> <dependencies>

1 0

r381 - in wikengo_core-wikitty: wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc
by schorlet＠users.nuiton.org Feb. 8, 2010

Feb. 8, 2010

Author: schorlet Date: 2010-02-08 10:35:55 +0100 (Mon, 08 Feb 2010) New Revision: 381 Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java Log: remplacement des system.out par log.debug Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2010-02-08 09:27:40 UTC (rev 380) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2010-02-08 09:35:55 UTC (rev 381) @@ -255,7 +255,7 @@ public PagedResult<Wikitty> findAllByCriteria(Criteria criteria) { - System.out.println("facetField : " + criteria.getFacetField()); + log.debug("facetField : " + criteria.getFacetField()); PagedResult<String> resultId = getSearchEngine().findAllByCriteria(criteria); PagedResult<Wikitty> result = resultId.cast(getWikittyStorage()); return result; Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java 2010-02-08 09:27:40 UTC (rev 380) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java 2010-02-08 09:35:55 UTC (rev 381) @@ -341,7 +341,7 @@ wikitty.getId(), ext.getName(), fieldName, booleanValue.toString())); } else { - System.out.println("#####DEBUG####" + type.toDefinition(fieldName)); + log.debug(type.toDefinition(fieldName)); if (type.isNotNull()) { throw new WikittyException(String.format("Field %s in extension %s can't be null", fieldName, ext.getName())); @@ -356,7 +356,7 @@ wikitty.getId(), ext.getName(), fieldName, "'" + new Timestamp(dateValue.getTime()) + "'")); } else { - System.out.println("#####DEBUG####" + type.toDefinition(fieldName)); + log.debug(type.toDefinition(fieldName)); if (type.isNotNull()) { throw new WikittyException(String.format("Field %s in extension %s can't be null", fieldName, ext.getName())); @@ -371,7 +371,7 @@ wikitty.getId(), ext.getName(), fieldName, numberValue.toString())); } else { - System.out.println("#####DEBUG####" + type.toDefinition(fieldName)); + log.debug(type.toDefinition(fieldName)); if (type.isNotNull()) { throw new WikittyException(String.format("Field %s in extension %s can't be null", fieldName, ext.getName())); @@ -386,7 +386,7 @@ wikitty.getId(), ext.getName(), fieldName, "'" + stringValue.replace("'", "''") + "'")); } else { - System.out.println("#####DEBUG####" + type.toDefinition(fieldName)); + log.debug(type.toDefinition(fieldName)); if (type.isNotNull()) { throw new WikittyException(String.format("Field %s in extension %s can't be null", fieldName, ext.getName())); @@ -401,7 +401,7 @@ wikitty.getId(), ext.getName(), fieldName, "'" + objectValue.toString().replace("'", "''") + "'")); } else { - System.out.println("#####DEBUG####" + type.toDefinition(fieldName)); + log.debug(type.toDefinition(fieldName)); if (type.isNotNull()) { throw new WikittyException(String.format("Field %s in extension %s can't be null", fieldName, ext.getName())); @@ -416,7 +416,7 @@ wikitty.getId(), ext.getName(), fieldName, "'" + objectValue.toString().replace("'", "''") + "'")); } else { - System.out.println("#####DEBUG####" + type.toDefinition(fieldName)); + log.debug(type.toDefinition(fieldName)); if (type.isNotNull()) { throw new WikittyException(String.format("Field %s in extension %s can't be null", fieldName, ext.getName()));

1 0

r380 - in testgenerationpdf/trunk: . lib src/main/java/org/codelutin src/main/resources
by echatellier＠users.nuiton.org Feb. 8, 2010

Feb. 8, 2010

Author: echatellier Date: 2010-02-08 10:27:40 +0100 (Mon, 08 Feb 2010) New Revision: 380 Added: testgenerationpdf/trunk/lib/ testgenerationpdf/trunk/lib/readme.txt Removed: testgenerationpdf/trunk/src/main/java/org/codelutin/itext/ Modified: testgenerationpdf/trunk/pom.xml testgenerationpdf/trunk/src/main/resources/index.html Log: Update (test yahp 1.2.20a) Added: testgenerationpdf/trunk/lib/readme.txt =================================================================== --- testgenerationpdf/trunk/lib/readme.txt (rev 0) +++ testgenerationpdf/trunk/lib/readme.txt 2010-02-08 09:27:40 UTC (rev 380) @@ -0,0 +1,9 @@ +You need all yahp libaries and deps to compile this project. + +yahp-1.2.20a.jar +yahp-internal-1.2.20a.jar +yahp-itext-1.2.20a.jar (official 2.0.8 not working) +yahp-shanijar-1.2.20a.jar +yahp-xmlapi-1.2.20a.jar +core-renderer-r8.jar (from https://xhtmlrenderer.dev.java.net/ official working) +yahp-jtidy-1.2.20a.jar (official may work ???) \ No newline at end of file Modified: testgenerationpdf/trunk/pom.xml =================================================================== --- testgenerationpdf/trunk/pom.xml 2010-02-07 07:39:23 UTC (rev 379) +++ testgenerationpdf/trunk/pom.xml 2010-02-08 09:27:40 UTC (rev 380) @@ -37,9 +37,16 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>com.lowagie</groupId> - <artifactId>itext</artifactId> - <version>2.1.7</version> - </dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> </dependencies> </project> Modified: testgenerationpdf/trunk/src/main/resources/index.html =================================================================== --- testgenerationpdf/trunk/src/main/resources/index.html 2010-02-07 07:39:23 UTC (rev 379) +++ testgenerationpdf/trunk/src/main/resources/index.html 2010-02-08 09:27:40 UTC (rev 380) @@ -10,7 +10,7 @@ </head> <body> -C'était un bel Ã©tÃ©<br /> +C'était un bel été<br /> Il pleuvait ! </body> </html>

1 0

r379 - wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty
by schorlet＠users.nuiton.org Feb. 7, 2010

Feb. 7, 2010

Author: schorlet Date: 2010-02-07 08:39:23 +0100 (Sun, 07 Feb 2010) New Revision: 379 Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java Log: ajout du support des criteres de tri dans la recherche Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java 2010-02-05 21:58:45 UTC (rev 378) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java 2010-02-07 07:39:23 UTC (rev 379) @@ -17,7 +17,15 @@ package org.sharengo.wikitty; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.Map.Entry; import org.sharengo.wikitty.search.Element; @@ -216,6 +224,17 @@ Criteria serviceCriteria = search.criteria(criteria.getName()); serviceCriteria.setFirstIndex(criteria.getFirstIndex()); serviceCriteria.setEndIndex(criteria.getEndIndex()); + + List<String> sortAscending = criteria.getSortAscending(); + if (sortAscending != null) { + serviceCriteria.setSortAscending(sortAscending.toArray(new String[sortAscending.size()])); + } + + List<String> sortDescending = criteria.getSortDescending(); + if (sortDescending != null) { + serviceCriteria.setSortDescending(sortDescending.toArray(new String[sortDescending.size()])); + } + List<String> fieldFacets = criteria.getFacetField(); if(fieldFacets != null) { serviceCriteria.setFacetField(fieldFacets.toArray(new String[fieldFacets.size()]));

1 0

r378 - in wikengo_core-wikitty: wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr
by schorlet＠users.nuiton.org Feb. 5, 2010

Feb. 5, 2010

Author: schorlet Date: 2010-02-05 22:58:45 +0100 (Fri, 05 Feb 2010) New Revision: 378 Modified: 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/WikittyServiceInMemory.java wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java Log: ajout d'une methode delete sur WikittySearchEngine permettant de supprimer un document sans aucune autre forme de traitement Modified: 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 2010-02-05 09:36:36 UTC (rev 377) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittySearchEngine.java 2010-02-05 21:58:45 UTC (rev 378) @@ -73,6 +73,14 @@ public List<Command> delete(WikittyTransaction transaction, List<String> idList) throws WikittyException; + /** + * Delete all object with idList argument. + * + * throw an exception + * @param idList + */ + public void delete(List<String> idList) throws WikittyException; + public PagedResult<String> findAllByCriteria(Criteria criteria); /** Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyServiceInMemory.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyServiceInMemory.java 2010-02-05 09:36:36 UTC (rev 377) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyServiceInMemory.java 2010-02-05 21:58:45 UTC (rev 378) @@ -265,6 +265,10 @@ return new ArrayList<Command>(); } + public void delete(List<String> idList) throws WikittyException { + // do nothing + } + public boolean checkRestriction( Restriction restriction, Wikitty w ) { if ( restriction instanceof BinaryOperator ) { BinaryOperator binOp = (BinaryOperator) restriction; @@ -299,13 +303,13 @@ break; case ENDS_WITH: if ( t.getType() != TYPE.STRING ) - throw new WikittyException("Can't search for contents that 'ends with' on attribute type different of String. " + + throw new WikittyException("Can't search for contents that 'ends with' on attribute type different of String. " + "Attribute " + fqfieldName + " is " + t.getType().name() ); checked = ((String) o).endsWith( (String) value ); break; case STARTS_WITH: if ( t.getType() != TYPE.STRING ) - throw new WikittyException("Can't search for contents that 'starts with' on attribute type different of String. " + + throw new WikittyException("Can't search for contents that 'starts with' on attribute type different of String. " + "Attribute " + fqfieldName + " is " + t.getType().name() ); checked = ((String) o).startsWith( (String) value ); break; @@ -435,4 +439,4 @@ } } -} \ No newline at end of file +} 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 2010-02-05 09:36:36 UTC (rev 377) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java 2010-02-05 21:58:45 UTC (rev 378) @@ -27,8 +27,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Set; -import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.solr.client.solrj.SolrQuery; @@ -41,14 +41,10 @@ import org.apache.solr.common.SolrDocumentList; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.core.CoreContainer; -import org.apache.solr.core.CoreDescriptor; -import org.apache.solr.core.SolrConfig; -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; -import org.sharengo.wikitty.FieldType.TYPE; import org.sharengo.wikitty.PagedResult; import org.sharengo.wikitty.TreeNode; import org.sharengo.wikitty.UpdateResponse; @@ -58,6 +54,7 @@ import org.sharengo.wikitty.WikittyExtensionStorage; import org.sharengo.wikitty.WikittySearchEngine; import org.sharengo.wikitty.WikittyTransaction; +import org.sharengo.wikitty.FieldType.TYPE; import org.sharengo.wikitty.search.Element; import org.sharengo.wikitty.search.Search; @@ -347,6 +344,17 @@ return result; } + public void delete(List<String> idList) throws WikittyException { + try { + for (String id : idList) { + solrServer.deleteById(id); + } + solrServer.commit(); + } catch (Exception e) { + throw new WikittyException(e); + } + } + public UpdateResponse commit(WikittyTransaction transaction, List<Command> wikittyIndexationCommandList) { try {

1 0

r377 - in wikengo_core-wikitty: wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr
by kmorin＠users.nuiton.org Feb. 5, 2010

Feb. 5, 2010

Author: kmorin Date: 2010-02-05 10:36:36 +0100 (Fri, 05 Feb 2010) New Revision: 377 Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java Log: - correction in the criteria copy in findAllByCriteria method in WikittyProxy : did not recreate the facets in the copy of the criteria Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2010-02-04 11:09:30 UTC (rev 376) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2010-02-05 09:36:36 UTC (rev 377) @@ -255,6 +255,7 @@ public PagedResult<Wikitty> findAllByCriteria(Criteria criteria) { + System.out.println("facetField : " + criteria.getFacetField()); PagedResult<String> resultId = getSearchEngine().findAllByCriteria(criteria); PagedResult<Wikitty> result = resultId.cast(getWikittyStorage()); return result; Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java 2010-02-04 11:09:30 UTC (rev 376) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/WikittyProxy.java 2010-02-05 09:36:36 UTC (rev 377) @@ -204,7 +204,6 @@ */ public <E extends BusinessEntity> PagedResult<E> findAllByCriteria( Class<E> clazz, Criteria criteria) { - // newInstance only return BusinessEntityWikittyImpl BusinessEntityWikitty sample = (BusinessEntityWikitty)WikittyUtil.newInstance(clazz); @@ -217,6 +216,14 @@ Criteria serviceCriteria = search.criteria(criteria.getName()); serviceCriteria.setFirstIndex(criteria.getFirstIndex()); serviceCriteria.setEndIndex(criteria.getEndIndex()); + List<String> fieldFacets = criteria.getFacetField(); + if(fieldFacets != null) { + serviceCriteria.setFacetField(fieldFacets.toArray(new String[fieldFacets.size()])); + } + List<Criteria> criteriaFacets = criteria.getFacetCriteria(); + if(criteriaFacets != null) { + serviceCriteria.setFacetCriteria(criteriaFacets.toArray(new Criteria[criteriaFacets.size()])); + } PagedResult<Wikitty> pagedResult = wikittyService.findAllByCriteria(serviceCriteria); // we can cast with autoconvert true because we have add restriction 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 2010-02-04 11:09:30 UTC (rev 376) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/java/org/sharengo/wikitty/solr/WikittySearchEngineSolr.java 2010-02-05 09:36:36 UTC (rev 377) @@ -384,7 +384,6 @@ public PagedResult<String> findAllByCriteria(Criteria criteria) { try { - // Create query with restriction String queryString = restriction2Solr.toSolr(criteria.getRestriction(), solrServer); SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + queryString);

1 0

r376 - in wikengo_core-wikitty: . wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc wikengo_core-wikitty-solr-impl/src/main/resources
by schorlet＠users.nuiton.org Feb. 4, 2010

Feb. 4, 2010

Author: schorlet Date: 2010-02-04 12:09:30 +0100 (Thu, 04 Feb 2010) New Revision: 376 Modified: wikengo_core-wikitty/changelog.txt wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyExtensionStorageJDBC.java 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/WikittyStorageJDBC.java wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/resources/schema.xml Log: change dynamicField named "*_s" from type "text_fr" to type "string" add new class constructor: WikittyExtensionStorageJDBC(Properties properties) WikittyStorageJDBC(WikittyExtensionStorage extensionStorage, Properties properties) in order to pass custom jdbc connection properties Modified: wikengo_core-wikitty/changelog.txt =================================================================== --- wikengo_core-wikitty/changelog.txt 2010-02-03 16:57:15 UTC (rev 375) +++ wikengo_core-wikitty/changelog.txt 2010-02-04 11:09:30 UTC (rev 376) @@ -1,3 +1,12 @@ +1.0.0-alpha-6 +============= + +change dynamicField named "*_s" from type "text_fr" to type "string" +add new class constructor: + WikittyExtensionStorageJDBC(Properties properties) + WikittyStorageJDBC(WikittyExtensionStorage extensionStorage, Properties properties) + in order to pass custom jdbc connection properties + 1.0.0-alpha-5 ============= Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyExtensionStorageJDBC.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-02-03 16:57:15 UTC (rev 375) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-02-04 11:09:30 UTC (rev 376) @@ -17,17 +17,39 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. *##%*/ -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.sharengo.wikitty.*; -import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.*; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_FIELDRANK; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_FIELDTYPE; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_ID; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_NAME; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_REQUIRES; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_TAG_VALUES; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_VERSION; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.closeConnection; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.getConnection; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.loadProperties; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.sharengo.wikitty.FieldType; +import org.sharengo.wikitty.UpdateResponse; +import org.sharengo.wikitty.WikittyException; +import org.sharengo.wikitty.WikittyExtension; +import org.sharengo.wikitty.WikittyExtensionStorage; +import org.sharengo.wikitty.WikittyTransaction; +import org.sharengo.wikitty.WikittyUtil; + /** * @author morin * @version $Revision$ @@ -86,7 +108,7 @@ /** * Properties file */ - protected Properties conf = loadProperties(); + protected Properties conf; class CommandJDBC implements Command { protected String queries; @@ -108,7 +130,12 @@ protected Map<String, String> lastVersion = null; public WikittyExtensionStorageJDBC() { + this(loadProperties()); + } + + public WikittyExtensionStorageJDBC(Properties properties) { //check if driver ca be loaded + conf = properties; try { Class.forName(conf.getProperty(driver)); } catch (ClassNotFoundException eee) { @@ -122,7 +149,7 @@ Connection con = null; //connect try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); try { statement.execute(conf.getProperty(extAdminCreationQ)); @@ -148,7 +175,7 @@ throws WikittyException { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); List<Command> result = new ArrayList<Command>(extensions.size()); for (WikittyExtension ext : extensions) { @@ -194,7 +221,7 @@ List<Command> extensionStorageCommandList) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); for (Command command : extensionStorageCommandList) { CommandJDBC commandJDBC = (CommandJDBC) command; @@ -218,7 +245,7 @@ public boolean exists(String id) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //select the data with teh id "id" in the admin table ResultSet resultSet = statement.executeQuery( @@ -238,7 +265,7 @@ public List<String> getAllExtensionIds() { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); List<String> result = new ArrayList<String>(); Statement statement = con.createStatement(); //get all extensions names and versions @@ -263,7 +290,7 @@ public List<WikittyExtension> getAllExtensions(boolean lastVersion) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); List<WikittyExtension> result = new ArrayList<WikittyExtension>(); Statement statement = con.createStatement(); @@ -312,7 +339,7 @@ lastVersion = new HashMap<String, String>(); Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //get all extensions names and versions ResultSet resultSet = statement.executeQuery( @@ -346,7 +373,7 @@ if (result == null) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //get the data with the id "id" in the admin table ResultSet adminResultSet = statement.executeQuery( 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 2010-02-03 16:57:15 UTC (rev 375) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyJDBCUtil.java 2010-02-04 11:09:30 UTC (rev 376) @@ -18,16 +18,15 @@ package org.sharengo.wikitty.jdbc; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.io.IOException; import java.net.URL; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; import java.util.Properties; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * @author morin * @version $Revision$ @@ -113,10 +112,6 @@ static protected String password = "jdbc.con.password"; /** - * Properties file - */ - protected static Properties conf = loadProperties(); - /** * location of default config (in class-path) */ public static final String CONFIG_FILE = "jdbc.properties"; @@ -147,7 +142,7 @@ * @return a new Connection (db transaction) * @throws SQLException if the connection fails */ - public static Connection getConnection() throws SQLException { + public static Connection getConnection(Properties conf) throws SQLException { Connection con = DriverManager.getConnection(conf.getProperty(host), conf.getProperty(userName), conf.getProperty(password)); con.setAutoCommit(false); Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java 2010-02-03 16:57:15 UTC (rev 375) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java 2010-02-04 11:09:30 UTC (rev 376) @@ -16,18 +16,50 @@ *##%*/ package org.sharengo.wikitty.jdbc; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.sharengo.wikitty.*; -import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.*; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_BOOLEAN_VALUE; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_DATE_VALUE; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_DELETION_DATE; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_EXTENSION; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_FIELDNAME; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_ID; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_NUMBER_VALUE; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_TEXT_VALUE; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_VERSION; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.closeConnection; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.getConnection; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.loadProperties; import java.math.BigDecimal; -import java.sql.*; -import java.util.*; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.sharengo.wikitty.FieldType; +import org.sharengo.wikitty.UpdateResponse; +import org.sharengo.wikitty.Wikitty; +import org.sharengo.wikitty.WikittyException; +import org.sharengo.wikitty.WikittyExtension; +import org.sharengo.wikitty.WikittyExtensionStorage; +import org.sharengo.wikitty.WikittyStorage; +import org.sharengo.wikitty.WikittyTransaction; +import org.sharengo.wikitty.WikittyUtil; + /** * @author morin * @version $Revision$ @@ -99,7 +131,7 @@ /** * Properties file */ - protected Properties conf = loadProperties(); + protected Properties conf; /** * used to parse list field from hbase data. ex: extension.fieldname[11/15] @@ -134,6 +166,11 @@ protected WikittyExtensionStorage extensionStorage; public WikittyStorageJDBC(WikittyExtensionStorage extensionStorage) { + this(extensionStorage, loadProperties()); + } + + public WikittyStorageJDBC(WikittyExtensionStorage extensionStorage, Properties properties) { + this.conf = properties; this.extensionStorage = extensionStorage; //check if driver ca be loaded try { @@ -149,7 +186,7 @@ Connection con = null; //connect try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); try { statement.execute(conf.getProperty(wikittyAdminCreationQ)); @@ -175,7 +212,7 @@ boolean disableAutoVersionIncrement) throws WikittyException { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); List<Command> result = new ArrayList<Command>(wikitties.size()); for (Wikitty wikitty : wikitties) { Statement statement = con.createStatement(); @@ -428,7 +465,7 @@ List<Command> wikittyStorageCommandList) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); UpdateResponse result = new UpdateResponse(); for (Command command : wikittyStorageCommandList) { @@ -462,7 +499,7 @@ public boolean exists(String id) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //select the data with the id "id" in the admin table ResultSet resultSet = statement.executeQuery( @@ -482,7 +519,7 @@ public boolean isDeleted(String id) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //select the data with the id "id" in the admin table ResultSet resultSet = statement.executeQuery( @@ -510,7 +547,7 @@ String id, String... fqFieldName) throws WikittyException { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //select the data with the id "id" in the admin table ResultSet adminResultSet = statement.executeQuery( @@ -686,10 +723,10 @@ } @Override - public void scanWikitties(Scanner scanner) { + public void scanWikitties(Scanner scanner) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //select the data with the id "id" in the admin table ResultSet adminResultSet = statement.executeQuery( 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 2010-02-03 16:57:15 UTC (rev 375) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/resources/schema.xml 2010-02-04 11:09:30 UTC (rev 376) @@ -295,7 +295,7 @@ <copyField source="*_dt" dest="text"/> <dynamicField name="*_i" type="sint" indexed="true" stored="true" multiValued="true"/> - <dynamicField name="*_s" type="text_fr" indexed="true" stored="true" multiValued="true"/> + <dynamicField name="*_s" type="string" indexed="true" stored="true" multiValued="true"/> <dynamicField name="*_l" type="slong" indexed="true" stored="true" multiValued="true"/> <dynamicField name="*_t" type="text_fr" indexed="true" stored="true" multiValued="true"/> <dynamicField name="*_b" type="boolean" indexed="true" stored="true" multiValued="true"/>

1 0